jro_apps/redmine Commit - r387:2b70760594f2

patch #9627 Add Side by Side in Diff view (Cyril Mougel)...

Jean-Philippe Lang -

r387:2b70760594f2

parent child

Context file:

r387:2b70760594f2

Collapse all files

app/controllers/repositories_controller.rb +3 -2

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'SVG/Graph/Bar'
             require 'SVG/Graph/BarHorizontal'
             class RepositoriesController < ApplicationController
               layout 'base'
               before_filter :find_project
               before_filter :authorize, :except => [:stats, :graph]
               before_filter :check_project_privacy, :only => [:stats, :graph]
               def show
                 # get entries for the browse frame
                 @entries = @repository.scm.entries('')
                 show_error and return unless @entries
                 # check if new revisions have been committed in the repository
                 scm_latestrev = @entries.revisions.latest
                 if Setting.autofetch_changesets? && scm_latestrev && ((@repository.latest_changeset.nil?) || (@repository.latest_changeset.revision < scm_latestrev.identifier.to_i))
                   @repository.fetch_changesets
                   @repository.reload
                 end
                 @changesets = @repository.changesets.find(:all, :limit => 5, :order => "committed_on DESC")
               end
               def browse
                 @entries = @repository.scm.entries(@path, @rev)
                 show_error and return unless @entries
               end
               def revisions
                 unless @path == ''
                   @entry = @repository.scm.entry(@path, @rev)
                   show_error and return unless @entry
                 end
                 @repository.changesets_with_path @path do
                   @changeset_count = @repository.changesets.count
                   @changeset_pages = Paginator.new self, @changeset_count,
 ,
               								      params['page']
                   @changesets = @repository.changesets.find(:all,
               						:limit  =>  @changeset_pages.items_per_page,
               						:offset =>  @changeset_pages.current.offset)
                 end
                 render :action => "revisions", :layout => false if request.xhr?
               end
               def entry
                 if 'raw' == params[:format]
                   content = @repository.scm.cat(@path, @rev)
                   show_error and return unless content
                   send_data content, :filename => @path.split('/').last
                 end
               end
               def revision
                 @changeset = @repository.changesets.find_by_revision(@rev)
                 show_error and return unless @changeset
               end
               def diff
                 @rev_to = params[:rev_to] || (@rev-1)
-                @diff = @repository.scm.diff(params[:path], @rev, @rev_to)
+                type = params[:type] || 'inline'
+                @diff = @repository.scm.diff(params[:path], @rev, @rev_to, type)
                 show_error and return unless @diff
               end
               def stats
               end
               def graph
                 data = nil
                 case params[:graph]
                 when "commits_per_month"
                   data = graph_commits_per_month(@repository)
                 when "commits_per_author"
                   data = graph_commits_per_author(@repository)
                 end
                 if data
                   headers["Content-Type"] = "image/svg+xml"
                   send_data(data, :type => "image/svg+xml", :disposition => "inline")
                 else
                   render_404
                 end
               end
             private
               def find_project
                 @project = Project.find(params[:id])
                 @repository = @project.repository
                 render_404 and return false unless @repository
                 @path = params[:path].squeeze('/').gsub(/^\//, '') if params[:path]
                 @path ||= ''
                 @rev = params[:rev].to_i if params[:rev] and params[:rev].to_i > 0
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def show_error
                 flash.now[:notice] = l(:notice_scm_error)
                 render :nothing => true, :layout => true
               end
               def graph_commits_per_month(repository)
                 @date_to = Date.today
                 @date_from = @date_to << 12
                 commits_by_day = repository.changesets.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
                 commits_by_month = [0] * 12
                 commits_by_day.each {|c| commits_by_month[c.first.to_date.months_ago] += c.last }
                 changes_by_day = repository.changes.count(:all, :group => :commit_date)
                 changes_by_month = [0] * 12
                 changes_by_day.each {|c| changes_by_month[c.first.to_date.months_ago] += c.last }
                 fields = []
                 month_names = l(:actionview_datehelper_select_month_names_abbr).split(',')
 .times {|m| fields << month_names[((Date.today.month - 1 - m) % 12)]}
                 graph = SVG::Graph::Bar.new(
                   :height => 300,
                   :width => 500,
                   :fields => fields.reverse,
                   :stack => :side,
                   :scale_integers => true,
                   :step_x_labels => 2,
                   :show_data_values => false,
                   :graph_title => l(:label_commits_per_month),
                   :show_graph_title => true
                 )
                 graph.add_data(
                   :data => commits_by_month[0..11].reverse,
                   :title => l(:label_revision_plural)
                 )
                 graph.add_data(
                   :data => changes_by_month[0..11].reverse,
                   :title => l(:label_change_plural)
                 )
                 graph.burn
               end
               def graph_commits_per_author(repository)
                 commits_by_author = repository.changesets.count(:all, :group => :committer)
                 commits_by_author.sort! {|x, y| x.last <=> y.last}
                 changes_by_author = repository.changes.count(:all, :group => :committer)
                 h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o}
                 fields = commits_by_author.collect {|r| r.first}
                 commits_data = commits_by_author.collect {|r| r.last}
                 changes_data = commits_by_author.collect {|r| h[r.first] || 0}
                 fields = fields + [""]*(10 - fields.length) if fields.length<10
                 commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10
                 changes_data = changes_data + [0]*(10 - changes_data.length) if changes_data.length<10
                 graph = SVG::Graph::BarHorizontal.new(
                   :height => 300,
                   :width => 500,
                   :fields => fields,
                   :stack => :side,
                   :scale_integers => true,
                   :show_data_values => false,
                   :rotate_y_labels => false,
                   :graph_title => l(:label_commits_per_author),
                   :show_graph_title => true
                 )
                 graph.add_data(
                   :data => commits_data,
                   :title => l(:label_revision_plural)
                 )
                 graph.add_data(
                   :data => changes_data,
                   :title => l(:label_change_plural)
                 )
                 graph.burn
               end
             end
             class Date
               def months_ago(date = Date.today)
                 (date.year - self.year)*12 + (date.month - self.month)
               end
               def weeks_ago(date = Date.today)
                 (date.year - self.year)*52 + (date.cweek - self.cweek)
               end
-            end
  No newline at end of file
+            end

app/models/svn_repos.rb +166 -2

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'rexml/document'
+            require 'cgi'
             module SvnRepos
               class CommandFailed < StandardError #:nodoc:
               end
               class Base
                 def initialize(url, root_url=nil, login=nil, password=nil)
                   @url = url
                   @login = login if login && !login.empty?
                   @password = (password || "") if @login
                   @root_url = root_url.blank? ? retrieve_root_url : root_url
                 end
                 def root_url
                   @root_url
                 end
                 def url
                   @url
                 end
                 # get info about the svn repository
                 def info
                   cmd = "svn info --xml #{target('')}"
                   cmd << " --username #{@login} --password #{@password}" if @login
                   info = nil
                   shellout(cmd) do |io|
                     begin
                       doc = REXML::Document.new(io)
                       #root_url = doc.elements["info/entry/repository/root"].text
                       info = Info.new({:root_url => doc.elements["info/entry/repository/root"].text,
                                        :lastrev => Revision.new({
                                          :identifier => doc.elements["info/entry/commit"].attributes['revision'],
                                          :time => Time.parse(doc.elements["info/entry/commit/date"].text),
                                          :author => (doc.elements["info/entry/commit/author"] ? doc.elements["info/entry/commit/author"].text : "")
                                        })
                                      })
                     rescue
                     end
                   end
                   return nil if $? && $?.exitstatus != 0
                   info
                 rescue Errno::ENOENT => e
                   return nil
                 end
                 # Returns the entry identified by path and revision identifier
                 # or nil if entry doesn't exist in the repository
                 def entry(path=nil, identifier=nil)
                   e = entries(path, identifier)
                   e ? e.first : nil
                 end
                 # Returns an Entries collection
                 # or nil if the given path doesn't exist in the repository
                 def entries(path=nil, identifier=nil)
                   path ||= ''
                   identifier = 'HEAD' unless identifier and identifier > 0
                   entries = Entries.new
                   cmd = "svn list --xml #{target(path)}@#{identifier}"
                   cmd << " --username #{@login} --password #{@password}" if @login
                   shellout(cmd) do |io|
                     begin
                       doc = REXML::Document.new(io)
                       doc.elements.each("lists/list/entry") do |entry|
                         entries << Entry.new({:name => entry.elements['name'].text,
                                     :path => ((path.empty? ? "" : "#{path}/") + entry.elements['name'].text),
                                     :kind => entry.attributes['kind'],
                                     :size => (entry.elements['size'] and entry.elements['size'].text).to_i,
                                     :lastrev => Revision.new({
                                       :identifier => entry.elements['commit'].attributes['revision'],
                                       :time => Time.parse(entry.elements['commit'].elements['date'].text),
                                       :author => (entry.elements['commit'].elements['author'] ? entry.elements['commit'].elements['author'].text : "")
                                       })
                                     })
                       end
                     rescue
                     end
                   end
                   return nil if $? && $?.exitstatus != 0
                   entries.sort_by_name
                 rescue Errno::ENOENT => e
                   raise CommandFailed
                 end
                 def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                   path ||= ''
                   identifier_from = 'HEAD' unless identifier_from and identifier_from.to_i > 0
                   identifier_to = 1 unless identifier_to and identifier_to.to_i > 0
                   revisions = Revisions.new
                   cmd = "svn log --xml -r #{identifier_from}:#{identifier_to}"
                   cmd << " --username #{@login} --password #{@password}" if @login
                   cmd << " --verbose " if  options[:with_paths]
                   cmd << target(path)
                   shellout(cmd) do |io|
                     begin
                       doc = REXML::Document.new(io)
                       doc.elements.each("log/logentry") do |logentry|
                         paths = []
                         logentry.elements.each("paths/path") do |path|
                           paths << {:action => path.attributes['action'],
                                     :path => path.text,
                                     :from_path => path.attributes['copyfrom-path'],
                                     :from_revision => path.attributes['copyfrom-rev']
                                     }
                         end
                         paths.sort! { |x,y| x[:path] <=> y[:path] }
                         revisions << Revision.new({:identifier => logentry.attributes['revision'],
                                       :author => (logentry.elements['author'] ? logentry.elements['author'].text : ""),
                                       :time => Time.parse(logentry.elements['date'].text),
                                       :message => logentry.elements['msg'].text,
                                       :paths => paths
                                     })
                       end
                     rescue
                     end
                   end
                   return nil if $? && $?.exitstatus != 0
                   revisions
                 rescue Errno::ENOENT => e
                   raise CommandFailed
                 end
-                def diff(path, identifier_from, identifier_to=nil)
+                def diff(path, identifier_from, identifier_to=nil, type="inline")
                   path ||= ''
                   if identifier_to and identifier_to.to_i > 0
                     identifier_to = identifier_to.to_i
                   else
                     identifier_to = identifier_from.to_i - 1
                   end
                   cmd = "svn diff -r "
                   cmd << "#{identifier_to}:"
                   cmd << "#{identifier_from}"
                   cmd << "#{target(path)}@#{identifier_from}"
                   cmd << " --username #{@login} --password #{@password}" if @login
                   diff = []
                   shellout(cmd) do |io|
                     io.each_line do |line|
                       diff << line
                     end
                   end
                   return nil if $? && $?.exitstatus != 0
-                  diff
+                  DiffTableList.new diff, type
                 rescue Errno::ENOENT => e
                   raise CommandFailed
                 end
                 def cat(path, identifier=nil)
                   identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
                   cmd = "svn cat #{target(path)}@#{identifier}"
                   cmd << " --username #{@login} --password #{@password}" if @login
                   cat = nil
                   shellout(cmd) do |io|
                     cat = io.read
                   end
                   return nil if $? && $?.exitstatus != 0
                   cat
                 rescue Errno::ENOENT => e
                   raise CommandFailed
                 end
               private
                 def retrieve_root_url
                   info = self.info
                   info ? info.root_url : nil
                 end
                 def target(path)
                   path ||= ""
                   base = path.match(/^\//) ? root_url : url
                   " \"" << "#{base}/#{path}".gsub(/["'?<>\*]/, '') << "\""
                 end
                 def logger
                   RAILS_DEFAULT_LOGGER
                 end
                 def shellout(cmd, &block)
                   logger.debug "Shelling out: #{cmd}" if logger && logger.debug?
                   IO.popen(cmd, "r+") do |io|
                     io.close_write
                     block.call(io) if block_given?
                   end
                 end
               end
               class Entries < Array
                 def sort_by_name
                   sort {|x,y|
                     if x.kind == y.kind
                       x.name <=> y.name
                     else
                       x.kind <=> y.kind
                     end
                   }
                 end
                 def revisions
                   revisions ||= Revisions.new(collect{|entry| entry.lastrev})
                 end
               end
               class Info
                 attr_accessor :root_url, :lastrev
                 def initialize(attributes={})
                   self.root_url = attributes[:root_url] if attributes[:root_url]
                   self.lastrev = attributes[:lastrev]
                 end
               end
               class Entry
                 attr_accessor :name, :path, :kind, :size, :lastrev
                 def initialize(attributes={})
                   self.name = attributes[:name] if attributes[:name]
                   self.path = attributes[:path] if attributes[:path]
                   self.kind = attributes[:kind] if attributes[:kind]
                   self.size = attributes[:size].to_i if attributes[:size]
                   self.lastrev = attributes[:lastrev]
                 end
                 def is_file?
                   'file' == self.kind
                 end
                 def is_dir?
                   'dir' == self.kind
                 end
               end
               class Revisions < Array
                 def latest
                   sort {|x,y| x.time <=> y.time}.last
                 end
               end
               class Revision
                 attr_accessor :identifier, :author, :time, :message, :paths
                 def initialize(attributes={})
                   self.identifier = attributes[:identifier]
                   self.author = attributes[:author]
                   self.time = attributes[:time]
                   self.message = attributes[:message] || ""
                   self.paths = attributes[:paths]
                 end
+              end
+              # A line of Diff
+              class Diff
+                attr_accessor :nb_line_left
+                attr_accessor :line_left
+                attr_accessor :nb_line_right
+                attr_accessor :line_right
+                attr_accessor :type_diff_right
+                attr_accessor :type_diff_left
+                def initialize ()
+                  self.nb_line_left = ''
+                  self.nb_line_right = ''
+                  self.line_left = ''
+                  self.line_right = ''
+                  self.type_diff_right = ''
+                  self.type_diff_left = ''
+                end
+                def inspect
+                  puts '### Start Line Diff ###'
+                  puts self.nb_line_left
+                  puts self.line_left
+                  puts self.nb_line_right
+                  puts self.line_right
+                end
+              end
+              class DiffTableList < Array
+                def initialize (diff, type="inline")
+                    diff_table = DiffTable.new type
+                    diff.each do |line|
+                        if line =~ /^Index: (.*)$/
+                            self << diff_table if diff_table.length > 1
+                            diff_table = DiffTable.new type
+                        end
+                        a = diff_table.add_line line
+                    end
+                    self << diff_table
+                end
+              end
+              # Class for create a Diff
+              class DiffTable < Hash
+                attr_reader :file_name, :line_num_l, :line_num_r
+                # Initialize with a Diff file and the type of Diff View
+                # The type view must be inline or sbs (side_by_side)
+                def initialize (type="inline")
+                  @parsing = false
+                  @nb_line = 1
+                  @start = false
+                  @before = 'same'
+                  @second = true
+                  @type = type
+                end
+                # Function for add a line of this Diff
+                def add_line(line)
+                  unless @parsing
+                    if line =~ /^Index: (.*)$/
+                      @file_name = $1
+                      return false
+                    elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
+                      @line_num_l = $2.to_i
+                      @line_num_r = $5.to_i
+                      @parsing = true
+                    end
+                  else
+                    if line =~ /^_+$/
+                      self.delete(self.keys.sort.last)
+                      @parsing = false
+                      return false
+                    elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
+                      @line_num_l = $2.to_i
+                      @line_num_r = $5.to_i
+                    else
+                      @nb_line += 1 if parse_line(line, @type)
+                    end
+                  end
+                  return true
+                end
+                def inspect
+                  puts '### DIFF TABLE ###'
+                  puts "file : #{file_name}"
+                  self.each do |d|
+                    d.inspect
+                  end
+                end
+              private
+                # Test if is a Side By Side type
+                def sbs?(type, func)
+                  if @start and type == "sbs"
+                    if @before == func and @second
+                      tmp_nb_line = @nb_line
+                      self[tmp_nb_line] = Diff.new
+                    else
+                        @second = false
+                        tmp_nb_line = @start
+                        @start += 1
+                        @nb_line -= 1
+                    end
+                  else
+                    tmp_nb_line = @nb_line
+                    @start = @nb_line
+                    self[tmp_nb_line] = Diff.new
+                    @second = true
+                  end
+                  unless self[tmp_nb_line]
+                    @nb_line += 1
+                    self[tmp_nb_line] = Diff.new
+                  else
+                    self[tmp_nb_line]
+                  end
+                end
+                # Escape the HTML for the diff
+                def escapeHTML(line)
+                    CGI.escapeHTML(line).gsub(/\s/, '&nbsp;')
+                end
+                def parse_line (line, type="inline")
+                  if line[0, 1] == "+"
+                    diff = sbs? type, 'add'
+                    @before = 'add'
+                    diff.line_left = escapeHTML line[1..-1]
+                    diff.nb_line_left = @line_num_l
+                    diff.type_diff_left = 'diff_in'
+                    @line_num_l += 1
+                    true
+                  elsif line[0, 1] == "-"
+                    diff = sbs? type, 'remove'
+                    @before = 'remove'
+                    diff.line_right = escapeHTML line[1..-1]
+                    diff.nb_line_right = @line_num_r
+                    diff.type_diff_right = 'diff_out'
+                    @line_num_r += 1
+                    true
+                  elsif line[0, 1] =~ /\s/
+                    @before = 'same'
+                    @start = false
+                    diff = Diff.new
+                    diff.line_right = escapeHTML line[1..-1]
+                    diff.nb_line_right = @line_num_r
+                    diff.line_left = escapeHTML line[1..-1]
+                    diff.nb_line_left = @line_num_l
+                    self[@nb_line] = diff
+                    @line_num_l += 1
+                    @line_num_r += 1
+                    true
+                  else
+                    false
+                  end
+                end
               end
             end

app/views/repositories/diff.rhtml +81 -59

@@ -1,67 +1,89
1	<h2><%= l(:label_revision) %> <%= @rev %>: <%= @path.gsub(/^.*\//, '') %></h2>	1	<h2><%= l(:label_revision) %> <%= @rev %>: <%= @path.gsub(/^.*\//, '') %></h2>
2		2
3	<% parsing = false	3	<!-- Choose view type -->
4	line_num_l = 0	4	<% form_tag({ :controller => 'repositories', :action => 'diff'}, :method => 'get') do %>
5	line_num_r = 0 %>	5	<% params.each do \|k, p\| %>
6	<% @diff.each do \|line\| %>	6	<% if k != "type" %>
7	<%	7	<%= hidden_field_tag(k,p) %>
8	if line =~ /^Index: (.*)$/	8	<% end %>
9	if parsing %>	9	<% end %>
10	</tbody></table>	10	<p><label><%= l(:label_view_diff) %></label>
11	<%	11	<%= select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], params[:type]), :onchange => "if (this.value != '') {this.form.submit()}" %>
12	end	12	<%= submit_tag l(:button_apply) %></p>
13	parsing = false %>	13	<% end %>
14	<table class="list"><thead>	14	<% @diff.each do \|table_file\| %>
15	<tr><th colspan="3" class="list-filename"><%= l(:label_attachment) %>: <%= $1 %></th></tr>	15	<% if params[:type] == 'sbs' %>
16	<tr><th>@<%= @rev %></th><th>@<%= @rev_to %></th><th></th></tr>	16	<table class="list">
17	</thead><tbody>	17	<thead>
18	<%	18	<tr>
19	next	19	<th colspan="4" class="list-filename">
20	elsif line =~ /^@@ (\+\|\-)(\d+)(,\d+)? (\+\|\-)(\d+)(,\d+)? @@/	20	<%= l(:label_attachment) %>: <%= table_file.file_name %>
21	line_num_l = $2.to_i	21	</th>
22	line_num_r = $5.to_i	22	</tr>
23	parsing = true	23	<tr>
24	next	24	<th colspan="2"><%= l(:label_revision) %> <%= @rev %></th>
25	elsif line =~ /^_+$/	25	<th colspan="2"><%= l(:label_revision) %> <%= @rev_to %></th>
26	# We have reached the 'Properties' section.	26	</tr>
27	parsing = false	27	</thead>
28	next	28	<tbody>
29	end	29	<% table_file.keys.sort.each do \|key\| %>
30	next unless parsing	30	<tr>
31	%>	31	<th class="line-num">
32		32	<%= table_file[key].nb_line_left %>
33	<tr>	33	</th>
34		34	<td class="line-code <%= table_file[key].type_diff_left %>">
35	<% case line[0, 1]	35	<%= table_file[key].line_left %>
36	when " " %>	36	</td>
37	<th class="line-num"><%= line_num_l %></th>	37	<th class="line-num">
38	<th class="line-num"><%= line_num_r %></th>	38	<%= table_file[key].nb_line_right %>
39	<td class="line-code">	39	</th>
40	<% line_num_l = line_num_l + 1	40	<td class="line-code <%= table_file[key].type_diff_right %>">
41	line_num_r = line_num_r + 1	41	<%= table_file[key].line_right %>
42		42	</td>
43	when "-" %>	43	</tr>
44	<th class="line-num"></th>	44	<% end %>
45	<th class="line-num"><%= line_num_r %></th>	45	</tbody>
46	<td class="line-code" style="background: #fdd;">	46	</table>
47	<% line_num_r = line_num_r + 1
48
49	when "+" %>
50	<th class="line-num"><%= line_num_l %></th>
51	<th class="line-num"></th>
52	<td class="line-code" style="background: #dfd;">
53	<% line_num_l = line_num_l + 1
54
55	else
56	next
57	end %>
58
59	<%= h(line[1..-1]).gsub(/\s/, " ") %></td></tr>
60		47
		48	<% else %>
		49	<table class="list">
		50	<thead>
		51	<tr>
		52	<th colspan="3" class="list-filename">
		53	<%= l(:label_attachment) %>: <%= table_file.file_name %>
		54	</th>
		55	</tr>
		56	<tr>
		57	<th>@<%= @rev %></th>
		58	<th>@<%= @rev_to %></th>
		59	<th></th>
		60	</tr>
		61	</thead>
		62	<tbody>
		63	<% table_file.keys.sort.each do \|key, line\| %>
		64	<tr>
		65	<th class="line-num">
		66	<%= table_file[key].nb_line_left %>
		67	</th>
		68	<th class="line-num">
		69	<%= table_file[key].nb_line_right %>
		70	</th>
		71	<% if table_file[key].line_left.empty? %>
		72	<td class="line-code <%= table_file[key].type_diff_right %>">
		73	<%= table_file[key].line_right %>
		74	</td>
		75	<% else %>
		76	<td class="line-code <%= table_file[key].type_diff_left %>">
		77	<%= table_file[key].line_left %>
		78	</td>
		79	<% end %>
		80	</tr>
		81	<% end %>
		82	</tbody>
		83	</table>
		84	<% end %>
61	<% end %>	85	<% end %>
62	</tbody>
63	</table>
64		86
65	<% content_for :header_tags do %>	87	<% content_for :header_tags do %>
66	<%= stylesheet_link_tag "scm" %>	88	<%= stylesheet_link_tag "scm" %>
67	<% end %>	89	<% end %>

lang/de.yml +3 0

             _gloc_rule_default: '|n| n==1 ? "" : "_plural" '
             actionview_datehelper_select_day_prefix:
             actionview_datehelper_select_month_names: Januar,Februar,März,April,Mai,Juni,Juli,August,September,Oktober,November,Dezember
             actionview_datehelper_select_month_names_abbr: Jan,Feb,Mär,Apr,Mai,Jun,Jul,Aug,Sep,Okt,Nov,Dez
             actionview_datehelper_select_month_prefix:
             actionview_datehelper_select_year_prefix:
             actionview_datehelper_time_in_words_day: 1 Tag
             actionview_datehelper_time_in_words_day_plural: %d Tage
             actionview_datehelper_time_in_words_hour_about: ungefähr eine Stunde
             actionview_datehelper_time_in_words_hour_about_plural: ungefähr %d Stunden
             actionview_datehelper_time_in_words_hour_about_single: ungefähr eine Stunde
             actionview_datehelper_time_in_words_minute: 1 Minute
             actionview_datehelper_time_in_words_minute_half: halbe Minute
             actionview_datehelper_time_in_words_minute_less_than: weniger als eine Minute
             actionview_datehelper_time_in_words_minute_plural: %d Minuten
             actionview_datehelper_time_in_words_minute_single: 1 Minute
             actionview_datehelper_time_in_words_second_less_than: Weniger als eine Sekunde
             actionview_datehelper_time_in_words_second_less_than_plural: weniger als %d Sekunden
             actionview_instancetag_blank_option: Bitte auswählen
             activerecord_error_inclusion: ist nicht inbegriffen
             activerecord_error_exclusion: ist reserviert
             activerecord_error_invalid: ist unzulässig
             activerecord_error_confirmation: Bestätigung nötig
             activerecord_error_accepted: muss angenommen werden
             activerecord_error_empty: darf nicht leer sein
             activerecord_error_blank: darf nicht leer sein
             activerecord_error_too_long: ist zu lang
             activerecord_error_too_short: ist zu kurz
             activerecord_error_wrong_length: hat die falsche Länge
             activerecord_error_taken: ist bereits vergeben
             activerecord_error_not_a_number: ist keine Zahl
             activerecord_error_not_a_date: ist kein gültiges Datum
             activerecord_error_greater_than_start_date: muss größer als Anfangsdatum sein
             general_fmt_age: %d Jahr
             general_fmt_age_plural: %d Jahre
             general_fmt_date: %%d.%%m.%%y
             general_fmt_datetime: %%d.%%m.%%y, %%H:%%M
             general_fmt_datetime_short: %%d.%%m, %%H:%%M
             general_fmt_time: %%H:%%M
             general_text_No: 'Nein'
             general_text_Yes: 'Ja'
             general_text_no: 'nein'
             general_text_yes: 'ja'
             general_lang_de: 'Deutsch'
             general_csv_separator: ';'
             general_csv_encoding: ISO-8859-1
             general_pdf_encoding: ISO-8859-1
             general_day_names: Montag,Dienstag,Mittwoch,Donnerstag,Freitag,Samstag,Sonntag
             notice_account_updated: Konto wurde erfolgreich aktualisiert.
             notice_account_invalid_creditentials: Benutzer oder Kennwort unzulässig
             notice_account_password_updated: Kennwort wurde erfolgreich aktualisiert.
             notice_account_wrong_password: Falsches Kennwort
             notice_account_register_done: Konto wurde erfolgreich angelegt.
             notice_account_unknown_email: Unbekannter Benutzer.
             notice_can_t_change_password: Dieses Konto verwendet eine externe Authentifizierungs-Quelle. Unmöglich, das Kennwort zu ändern.
             notice_account_lost_email_sent: Eine E-Mail mit Anweisungen, ein neues Kennwort zu wählen, wurde Ihnen geschickt.
             notice_account_activated: Dein Konto ist aktiviert. Sie können sich jetzt einloggen.
             notice_successful_create: Erfolgreich angelegt
             notice_successful_update: Erfolgreiche Aktualisierung.
             notice_successful_delete: Erfolgreiche Löschung.
             notice_successful_connection: Verbindung erfolgreich.
             notice_file_not_found: Anhang besteht nicht oder ist gelöscht worden.
             notice_locking_conflict: Datum wurde von einem anderen Benutzer geändert.
             notice_scm_error: Eintrag und/oder Revision besteht nicht im SVN.
             mail_subject_lost_password: Ihr redMine Kennwort
             mail_subject_register: redMine Kontoaktivierung
             gui_validation_error: 1 Fehler
             gui_validation_error_plural: %d Fehler
             field_name: Name
             field_description: Beschreibung
             field_summary: Zusammenfassung
             field_is_required: Erforderlich
             field_firstname: Vorname
             field_lastname: Nachname
             field_mail: Email
             field_filename: Datei
             field_filesize: Größe
             field_downloads: Downloads
             field_author: Autor
             field_created_on: Angelegt
             field_updated_on: Aktualisiert
             field_field_format: Format
             field_is_for_all: Für alle Projekte
             field_possible_values: Mögliche Werte
             field_regexp: Regulärer Ausdruck
             field_min_length: Minimale Länge
             field_max_length: Maximale Länge
             field_value: Wert
             field_category: Kategorie
             field_title: Titel
             field_project: Projekt
             field_issue: Ticket
             field_status: Status
             field_notes: Kommentare
             field_is_closed: Problem erledigt
             field_is_default: Default
             field_html_color: Farbe
             field_tracker: Tracker
             field_subject: Thema
             field_due_date: Abgabedatum
             field_assigned_to: Zugewiesen an
             field_priority: Priorität
             field_fixed_version: Erledigt in Version
             field_user: Benutzer
             field_role: Rolle
             field_homepage: Startseite
             field_is_public: Öffentlich
             field_parent: Unterprojekt von
             field_is_in_chlog: Ansicht im Change-Log
             field_is_in_roadmap: Ansicht in der Roadmap
             field_login: Mitgliedsname
             field_mail_notification: Mailbenachrichtigung
             field_admin: Administrator
             field_last_login_on: Letzte Anmeldung
             field_language: Sprache
             field_effective_date: Datum
             field_password: Kennwort
             field_new_password: Neues Kennwort
             field_password_confirmation: Bestätigung
             field_version: Version
             field_type: Typ
             field_host: Host
             field_port: Port
             field_account: Konto
             field_base_dn: Base DN
             field_attr_login: Mitgliedsnameattribut
             field_attr_firstname: Vornamensattribut
             field_attr_lastname: Namenattribut
             field_attr_mail: Emailattribut
             field_onthefly: On-the-fly Benutzerkreation
             field_start_date: Beginn
             field_done_ratio: %% erledigt
             field_auth_source: Authentifizierungs-Modus
             field_hide_mail: Email Adresse nicht anzeigen
             field_comment: Kommentar
             field_url: URL
             field_start_page: Hauptseite
             field_subproject: Subprojekt von
             field_hours: Stunden
             field_activity: Aktivität
             field_spent_on: Datum
             setting_app_title: Applikation Titel
             setting_app_subtitle: Applikation Untertitel
             setting_welcome_text: Willkommenstext
             setting_default_language: Default Sprache
             setting_login_required: Authent. erfordert
             setting_self_registration: Anmeldung ermöglicht
             setting_attachment_max_size: max. Dateigröße
             setting_issues_export_limit: Limit Export Tickets
             setting_mail_from: Mail Absender
             setting_host_name: Host Name
             setting_text_formatting: Textformatierung
             setting_wiki_compression: Wiki-Historie komprimieren
             setting_feeds_limit: Limit Feed Inhalt
             setting_autofetch_changesets: Autofetch SVN commits
             label_user: Benutzer
             label_user_plural: Benutzer
             label_user_new: Neuer Benutzer
             label_project: Projekt
             label_project_new: Neues Projekt
             label_project_plural: Projekte
             label_project_latest: Neueste Projekte
             label_issue: Ticket
             label_issue_new: Neues Ticket
             label_issue_plural: Tickets
             label_issue_view_all: Alle Tickets ansehen
             label_document: Dokument
             label_document_new: Neues Dokument
             label_document_plural: Dokumente
             label_role: Rolle
             label_role_plural: Rollen
             label_role_new: Neue Rolle
             label_role_and_permissions: Rollen und Rechte
             label_member: Mitglied
             label_member_new: Neues Mitglied
             label_member_plural: Mitglieder
             label_tracker: Tracker
             label_tracker_plural: Tracker
             label_tracker_new: Neuer Tracker
             label_workflow: Workflow
             label_issue_status: Ticket-Status
             label_issue_status_plural: Ticket-Status
             label_issue_status_new: Neuer Status
             label_issue_category: Ticket-Kategorie
             label_issue_category_plural: Ticket-Kategorien
             label_issue_category_new: Neue Kategorie
             label_custom_field: Benutzerdefiniertes Feld
             label_custom_field_plural: Benutzerdefinierte Felder
             label_custom_field_new: Neues Feld
             label_enumerations: Aufzählungen
             label_enumeration_new: Neuer Wert
             label_information: Information
             label_information_plural: Informationen
             label_please_login: Anmelden
             label_register: Anmelden
             label_password_lost: Kennwort vergessen
             label_home: Hauptseite
             label_my_page: Meine Seite
             label_my_account: Mein Konto
             label_my_projects: Meine Projekte
             label_administration: Administration
             label_login: Einloggen
             label_logout: Abmelden
             label_help: Hilfe
             label_reported_issues: Gemeldete Tickets
             label_assigned_to_me_issues: Mir zugewiesen
             label_last_login: Letzte Anmeldung
             label_last_updates: zuletzt aktualisiert
             label_last_updates_plural: %d zuletzt aktualisierten
             label_registered_on: Angemeldet am
             label_activity: Aktivität
             label_new: Neu
             label_logged_as: Angemeldet als
             label_environment: Environment
             label_authentication: Authentifizierung
             label_auth_source: Authentifizierungs-Modus
             label_auth_source_new: Neuer Authentifizierungs-Modus
             label_auth_source_plural: Authentifizierungs-Arten
             label_subproject_plural: Sub Projekte
             label_min_max_length: Min - Max Länge
             label_list: Liste
             label_date: Datum
             label_integer: Zahl
             label_boolean: Boolean
             label_string: Text
             label_text: Langer Text
             label_attribute: Attribut
             label_attribute_plural: Attribute
             label_download: %d Download
             label_download_plural: %d Downloads
             label_no_data: Nichts anzuzeigen
             label_change_status: Statuswechsel
             label_history: Historie
             label_attachment: Datei
             label_attachment_new: Neue Datei
             label_attachment_delete: Anhang löschen
             label_attachment_plural: Dateien
             label_report: Bericht
             label_report_plural: Berichte
             label_news: News
             label_news_new: News hinzufügen
             label_news_plural: News
             label_news_latest: Letzte News
             label_news_view_all: Alle News anzeigen
             label_change_log: Change-Log
             label_settings: Konfiguration
             label_overview: Übersicht
             label_version: Version
             label_version_new: Neue Version
             label_version_plural: Versionen
             label_confirmation: Bestätigung
             label_export_to: Export zu
             label_read: Lesen...
             label_public_projects: Öffentliche Projekte
             label_open_issues: offen
             label_open_issues_plural: offen
             label_closed_issues: geschlossen
             label_closed_issues_plural: geschlossen
             label_total: Gesamtzahl
             label_permissions: Berechtigungen
             label_current_status: Gegenwärtiger Status
             label_new_statuses_allowed: Neue Berechtigungen
             label_all: alle
             label_none: kein
             label_next: Weiter
             label_previous: Zurück
             label_used_by: Benutzt von
             label_details: Details...
             label_add_note: Kommentar hinzufügen
             label_per_page: Pro Seite
             label_calendar: Kalender
             label_months_from: Monate ab
             label_gantt: Gantt
             label_internal: Intern
             label_last_changes: %d letzte Änderungen
             label_change_view_all: Alle Änderungen ansehen
             label_personalize_page: Diese Seite anpassen
             label_comment: Kommentar
             label_comment_plural: Kommentare
             label_comment_add: Kommentar hinzufügen
             label_comment_added: Kommentar hinzugefügt
             label_comment_delete: Kommentar löschen
             label_query: Benutzerdefinierte Abfrage
             label_query_plural: Benutzerdefinierte Berichte
             label_query_new: Neuer Bericht
             label_filter_add: Filter hinzufügen
             label_filter_plural: Filter
             label_equals: ist
             label_not_equals: ist nicht
             label_in_less_than: in weniger als
             label_in_more_than: in mehr als
             label_in: an
             label_today: heute
             label_less_than_ago: vor weniger als
             label_more_than_ago: vor mehr als
             label_ago: vor
             label_contains: enthält
             label_not_contains: enthält nicht
             label_day_plural: Tage
             label_repository: SVN Projektarchiv
             label_browse: Codebrowser
             label_modification: %d Änderung
             label_modification_plural: %d Änderungen
             label_revision: Revision
             label_revision_plural: Revisionen
             label_added: hinzugefügt
             label_modified: geändert
             label_deleted: gelöscht
             label_latest_revision: Aktuellste Revision
             label_latest_revision_plural: Aktuellste Revisionen
             label_view_revisions: Revisionen anzeigen
             label_max_size: Maximale Größe
             label_on: von
             label_sort_highest: Anfang
             label_sort_higher: eins höher
             label_sort_lower: eins tiefer
             label_sort_lowest: Ende
             label_roadmap: Roadmap
             label_roadmap_due_in: Fällig in
             label_roadmap_no_issues: Keine Tickets für diese Version
             label_search: Suche
             label_result: %d Resultat
             label_result_plural: %d Resultate
             label_all_words: Alle Wörter
             label_wiki: Wiki
             label_wiki_edit: Wiki Bearbeitung
             label_wiki_edit_plural: Wiki Bearbeitungen
             label_page_index: Index
             label_current_version: Gegenwärtige Version
             label_preview: Vorschau
             label_feed_plural: Feeds
             label_changes_details: Details aller Änderungen
             label_issue_tracking: Tickets
             label_spent_time: Aufgewendete Zeit
             label_f_hour: %.2f Stunde
             label_f_hour_plural: %.2f Stunden
             label_time_tracking: Zeiterfassung
             label_change_plural: Änderungen
             label_statistics: Statistiken
             label_commits_per_month: Übertragungen pro Monat
             label_commits_per_author: Übertragungen pro Autor
+            label_view_diff: View differences
+            label_diff_inline: inline
+            label_diff_side_by_side: side by side
             button_login: Einloggen
             button_submit: OK
             button_save: Speichern
             button_check_all: Alles auswählen
             button_uncheck_all: Alles abwählen
             button_delete: Löschen
             button_create: Anlegen
             button_test: Testen
             button_edit: Bearbeiten
             button_add: Hinzufügen
             button_change: Wechseln
             button_apply: Anwenden
             button_clear: Zurücksetzen
             button_lock: Sperren
             button_unlock: Entsperren
             button_download: Download
             button_list: Liste
             button_view: Siehe
             button_move: Verschieben
             button_back: Zurück
             button_cancel: Abbrechen
             button_activate: Aktivieren
             button_sort: Sortieren
             button_log_time: Log time
             status_active: aktiv
             status_registered: angemeldet
             status_locked: gesperrt
             text_select_mail_notifications: Aktionen für die Mailbenachrichtigung aktiviert werden soll.
             text_regexp_info: eg. ^[A-Z0-9]+$
             text_min_max_length_info: 0 heißt keine Beschränkung
             text_project_destroy_confirmation: Sind Sie sicher, dass sie das Projekt löschen wollen?
             text_workflow_edit: Workflow zum Bearbeiten auswählen
             text_are_you_sure: Sind Sie sicher?
             text_journal_changed: geändert von %s zu %s
             text_journal_set_to: gestellt zu %s
             text_journal_deleted: gelöscht
             text_tip_task_begin_day: Aufgabe, die an diesem Tag beginnt
             text_tip_task_end_day: Aufgabe, die an diesem Tag beendet
             text_tip_task_begin_end_day: Aufgabe, die an diesem Tag beginnt und beendet
             default_role_manager: Manager
             default_role_developper: Developer
             default_role_reporter: Reporter
             default_tracker_bug: Fehler
             default_tracker_feature: Feature
             default_tracker_support: Support
             default_issue_status_new: Neu
             default_issue_status_assigned: Zugewiesen
             default_issue_status_resolved: Gelöst
             default_issue_status_feedback: Feedback
             default_issue_status_closed: Erledigt
             default_issue_status_rejected: Abgewiesen
             default_doc_category_user: Benutzerdokumentation
             default_doc_category_tech: Technische Dokumentation
             default_priority_low: Niedrig
             default_priority_normal: Normal
             default_priority_high: Hoch
             default_priority_urgent: Dringend
             default_priority_immediate: Sofort
             default_activity_design: Design
             default_activity_development: Development
             enumeration_issue_priorities: Ticket-Prioritäten
             enumeration_doc_categories: Dokumentenkategorien
             enumeration_activities: Aktivitäten (Zeiterfassung)

lang/en.yml +3 0

             _gloc_rule_default: '|n| n==1 ? "" : "_plural" '
             actionview_datehelper_select_day_prefix:
             actionview_datehelper_select_month_names: January,February,March,April,May,June,July,August,September,October,November,December
             actionview_datehelper_select_month_names_abbr: Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec
             actionview_datehelper_select_month_prefix:
             actionview_datehelper_select_year_prefix:
             actionview_datehelper_time_in_words_day: 1 day
             actionview_datehelper_time_in_words_day_plural: %d days
             actionview_datehelper_time_in_words_hour_about: about an hour
             actionview_datehelper_time_in_words_hour_about_plural: about %d hours
             actionview_datehelper_time_in_words_hour_about_single: about an hour
             actionview_datehelper_time_in_words_minute: 1 minute
             actionview_datehelper_time_in_words_minute_half: half a minute
             actionview_datehelper_time_in_words_minute_less_than: less than a minute
             actionview_datehelper_time_in_words_minute_plural: %d minutes
             actionview_datehelper_time_in_words_minute_single: 1 minute
             actionview_datehelper_time_in_words_second_less_than: less than a second
             actionview_datehelper_time_in_words_second_less_than_plural: less than %d seconds
             actionview_instancetag_blank_option: Please select
             activerecord_error_inclusion: is not included in the list
             activerecord_error_exclusion: is reserved
             activerecord_error_invalid: is invalid
             activerecord_error_confirmation: doesn't match confirmation
             activerecord_error_accepted: must be accepted
             activerecord_error_empty: can't be empty
             activerecord_error_blank: can't be blank
             activerecord_error_too_long: is too long
             activerecord_error_too_short: is too short
             activerecord_error_wrong_length: is the wrong length
             activerecord_error_taken: has already been taken
             activerecord_error_not_a_number: is not a number
             activerecord_error_not_a_date: is not a valid date
             activerecord_error_greater_than_start_date: must be greater than start date
             general_fmt_age: %d yr
             general_fmt_age_plural: %d yrs
             general_fmt_date: %%m/%%d/%%Y
             general_fmt_datetime: %%m/%%d/%%Y %%I:%%M %%p
             general_fmt_datetime_short: %%b %%d, %%I:%%M %%p
             general_fmt_time: %%I:%%M %%p
             general_text_No: 'No'
             general_text_Yes: 'Yes'
             general_text_no: 'no'
             general_text_yes: 'yes'
             general_lang_en: 'English'
             general_csv_separator: ','
             general_csv_encoding: ISO-8859-1
             general_pdf_encoding: ISO-8859-1
             general_day_names: Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday
             notice_account_updated: Account was successfully updated.
             notice_account_invalid_creditentials: Invalid user or password
             notice_account_password_updated: Password was successfully updated.
             notice_account_wrong_password: Wrong password
             notice_account_register_done: Account was successfully created.
             notice_account_unknown_email: Unknown user.
             notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password.
             notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you.
             notice_account_activated: Your account has been activated. You can now log in.
             notice_successful_create: Successful creation.
             notice_successful_update: Successful update.
             notice_successful_delete: Successful deletion.
             notice_successful_connection: Successful connection.
             notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
             notice_locking_conflict: Data have been updated by another user.
             notice_scm_error: Entry and/or revision doesn't exist in the repository.
             mail_subject_lost_password: Your redMine password
             mail_subject_register: redMine account activation
             gui_validation_error: 1 error
             gui_validation_error_plural: %d errors
             field_name: Name
             field_description: Description
             field_summary: Summary
             field_is_required: Required
             field_firstname: Firstname
             field_lastname: Lastname
             field_mail: Email
             field_filename: File
             field_filesize: Size
             field_downloads: Downloads
             field_author: Author
             field_created_on: Created
             field_updated_on: Updated
             field_field_format: Format
             field_is_for_all: For all projects
             field_possible_values: Possible values
             field_regexp: Regular expression
             field_min_length: Minimum length
             field_max_length: Maximum length
             field_value: Value
             field_category: Category
             field_title: Title
             field_project: Project
             field_issue: Issue
             field_status: Status
             field_notes: Notes
             field_is_closed: Issue closed
             field_is_default: Default status
             field_html_color: Color
             field_tracker: Tracker
             field_subject: Subject
             field_due_date: Due date
             field_assigned_to: Assigned to
             field_priority: Priority
             field_fixed_version: Fixed version
             field_user: User
             field_role: Role
             field_homepage: Homepage
             field_is_public: Public
             field_parent: Subproject of
             field_is_in_chlog: Issues displayed in changelog
             field_is_in_roadmap: Issues displayed in roadmap
             field_login: Login
             field_mail_notification: Mail notifications
             field_admin: Administrator
             field_last_login_on: Last connection
             field_language: Language
             field_effective_date: Date
             field_password: Password
             field_new_password: New password
             field_password_confirmation: Confirmation
             field_version: Version
             field_type: Type
             field_host: Host
             field_port: Port
             field_account: Account
             field_base_dn: Base DN
             field_attr_login: Login attribute
             field_attr_firstname: Firstname attribute
             field_attr_lastname: Lastname attribute
             field_attr_mail: Email attribute
             field_onthefly: On-the-fly user creation
             field_start_date: Start
             field_done_ratio: %% Done
             field_auth_source: Authentication mode
             field_hide_mail: Hide my email address
             field_comment: Comment
             field_url: URL
             field_start_page: Start page
             field_subproject: Subproject
             field_hours: Hours
             field_activity: Activity
             field_spent_on: Date
             setting_app_title: Application title
             setting_app_subtitle: Application subtitle
             setting_welcome_text: Welcome text
             setting_default_language: Default language
             setting_login_required: Authent. required
             setting_self_registration: Self-registration enabled
             setting_attachment_max_size: Attachment max. size
             setting_issues_export_limit: Issues export limit
             setting_mail_from: Emission mail address
             setting_host_name: Host name
             setting_text_formatting: Text formatting
             setting_wiki_compression: Wiki history compression
             setting_feeds_limit: Feed content limit
             setting_autofetch_changesets: Autofetch SVN commits
             label_user: User
             label_user_plural: Users
             label_user_new: New user
             label_project: Project
             label_project_new: New project
             label_project_plural: Projects
             label_project_latest: Latest projects
             label_issue: Issue
             label_issue_new: New issue
             label_issue_plural: Issues
             label_issue_view_all: View all issues
             label_document: Document
             label_document_new: New document
             label_document_plural: Documents
             label_role: Role
             label_role_plural: Roles
             label_role_new: New role
             label_role_and_permissions: Roles and permissions
             label_member: Member
             label_member_new: New member
             label_member_plural: Members
             label_tracker: Tracker
             label_tracker_plural: Trackers
             label_tracker_new: New tracker
             label_workflow: Workflow
             label_issue_status: Issue status
             label_issue_status_plural: Issue statuses
             label_issue_status_new: New status
             label_issue_category: Issue category
             label_issue_category_plural: Issue categories
             label_issue_category_new: New category
             label_custom_field: Custom field
             label_custom_field_plural: Custom fields
             label_custom_field_new: New custom field
             label_enumerations: Enumerations
             label_enumeration_new: New value
             label_information: Information
             label_information_plural: Information
             label_please_login: Please login
             label_register: Register
             label_password_lost: Lost password
             label_home: Home
             label_my_page: My page
             label_my_account: My account
             label_my_projects: My projects
             label_administration: Administration
             label_login: Login
             label_logout: Logout
             label_help: Help
             label_reported_issues: Reported issues
             label_assigned_to_me_issues: Issues assigned to me
             label_last_login: Last connection
             label_last_updates: Last updated
             label_last_updates_plural: %d last updated
             label_registered_on: Registered on
             label_activity: Activity
             label_new: New
             label_logged_as: Logged as
             label_environment: Environment
             label_authentication: Authentication
             label_auth_source: Authentication mode
             label_auth_source_new: New authentication mode
             label_auth_source_plural: Authentication modes
             label_subproject_plural: Subprojects
             label_min_max_length: Min - Max length
             label_list: List
             label_date: Date
             label_integer: Integer
             label_boolean: Boolean
             label_string: Text
             label_text: Long text
             label_attribute: Attribute
             label_attribute_plural: Attributes
             label_download: %d Download
             label_download_plural: %d Downloads
             label_no_data: No data to display
             label_change_status: Change status
             label_history: History
             label_attachment: File
             label_attachment_new: New file
             label_attachment_delete: Delete file
             label_attachment_plural: Files
             label_report: Report
             label_report_plural: Reports
             label_news: News
             label_news_new: Add news
             label_news_plural: News
             label_news_latest: Latest news
             label_news_view_all: View all news
             label_change_log: Change log
             label_settings: Settings
             label_overview: Overview
             label_version: Version
             label_version_new: New version
             label_version_plural: Versions
             label_confirmation: Confirmation
             label_export_to: Export to
             label_read: Read...
             label_public_projects: Public projects
             label_open_issues: open
             label_open_issues_plural: open
             label_closed_issues: closed
             label_closed_issues_plural: closed
             label_total: Total
             label_permissions: Permissions
             label_current_status: Current status
             label_new_statuses_allowed: New statuses allowed
             label_all: all
             label_none: none
             label_next: Next
             label_previous: Previous
             label_used_by: Used by
             label_details: Details...
             label_add_note: Add a note
             label_per_page: Per page
             label_calendar: Calendar
             label_months_from: months from
             label_gantt: Gantt
             label_internal: Internal
             label_last_changes: last %d changes
             label_change_view_all: View all changes
             label_personalize_page: Personalize this page
             label_comment: Comment
             label_comment_plural: Comments
             label_comment_add: Add a comment
             label_comment_added: Comment added
             label_comment_delete: Delete comments
             label_query: Custom query
             label_query_plural: Custom queries
             label_query_new: New query
             label_filter_add: Add filter
             label_filter_plural: Filters
             label_equals: is
             label_not_equals: is not
             label_in_less_than: in less than
             label_in_more_than: in more than
             label_in: in
             label_today: today
             label_less_than_ago: less than days ago
             label_more_than_ago: more than days ago
             label_ago: days ago
             label_contains: contains
             label_not_contains: doesn't contain
             label_day_plural: days
             label_repository: SVN Repository
             label_browse: Browse
             label_modification: %d change
             label_modification_plural: %d changes
             label_revision: Revision
             label_revision_plural: Revisions
             label_added: added
             label_modified: modified
             label_deleted: deleted
             label_latest_revision: Latest revision
             label_latest_revision_plural: Latest revisions
             label_view_revisions: View revisions
             label_max_size: Maximum size
             label_on: 'on'
             label_sort_highest: Move to top
             label_sort_higher: Move up
             label_sort_lower: Move down
             label_sort_lowest: Move to bottom
             label_roadmap: Roadmap
             label_roadmap_due_in: Due in
             label_roadmap_no_issues: No issues for this version
             label_search: Search
             label_result: %d result
             label_result_plural: %d results
             label_all_words: All words
             label_wiki: Wiki
             label_wiki_edit: Wiki edit
             label_wiki_edit_plural: Wiki edits
             label_page_index: Index
             label_current_version: Current version
             label_preview: Preview
             label_feed_plural: Feeds
             label_changes_details: Details of all changes
             label_issue_tracking: Issue tracking
             label_spent_time: Spent time
             label_f_hour: %.2f hour
             label_f_hour_plural: %.2f hours
             label_time_tracking: Time tracking
             label_change_plural: Changes
             label_statistics: Statistics
             label_commits_per_month: Commits per month
             label_commits_per_author: Commits per author
+            label_view_diff: View differences
+            label_diff_inline: inline
+            label_diff_side_by_side: side by side
             button_login: Login
             button_submit: Submit
             button_save: Save
             button_check_all: Check all
             button_uncheck_all: Uncheck all
             button_delete: Delete
             button_create: Create
             button_test: Test
             button_edit: Edit
             button_add: Add
             button_change: Change
             button_apply: Apply
             button_clear: Clear
             button_lock: Lock
             button_unlock: Unlock
             button_download: Download
             button_list: List
             button_view: View
             button_move: Move
             button_back: Back
             button_cancel: Cancel
             button_activate: Activate
             button_sort: Sort
             button_log_time: Log time
             status_active: active
             status_registered: registered
             status_locked: locked
             text_select_mail_notifications: Select actions for which mail notifications should be sent.
             text_regexp_info: eg. ^[A-Z0-9]+$
             text_min_max_length_info: 0 means no restriction
             text_project_destroy_confirmation: Are you sure you want to delete this project and all related data ?
             text_workflow_edit: Select a role and a tracker to edit the workflow
             text_are_you_sure: Are you sure ?
             text_journal_changed: changed from %s to %s
             text_journal_set_to: set to %s
             text_journal_deleted: deleted
             text_tip_task_begin_day: task beginning this day
             text_tip_task_end_day: task ending this day
             text_tip_task_begin_end_day: task beginning and ending this day
             default_role_manager: Manager
             default_role_developper: Developer
             default_role_reporter: Reporter
             default_tracker_bug: Bug
             default_tracker_feature: Feature
             default_tracker_support: Support
             default_issue_status_new: New
             default_issue_status_assigned: Assigned
             default_issue_status_resolved: Resolved
             default_issue_status_feedback: Feedback
             default_issue_status_closed: Closed
             default_issue_status_rejected: Rejected
             default_doc_category_user: User documentation
             default_doc_category_tech: Technical documentation
             default_priority_low: Low
             default_priority_normal: Normal
             default_priority_high: High
             default_priority_urgent: Urgent
             default_priority_immediate: Immediate
             default_activity_design: Design
             default_activity_development: Development
             enumeration_issue_priorities: Issue priorities
             enumeration_doc_categories: Document categories
             enumeration_activities: Activities (time tracking)

lang/es.yml +3 0

             _gloc_rule_default: '|n| n==1 ? "" : "_plural" '
             actionview_datehelper_select_day_prefix:
             actionview_datehelper_select_month_names: Enero,Febrero,Marzo,Abril,Mayo,Junio,Julio,Agosto,Septiembre,Octubre,Noviembre,Diciembre
             actionview_datehelper_select_month_names_abbr: Ene,Feb,Mar,Abr,Mayo,Jun,Jul,Ago,Sep,Oct,Nov,Dic
             actionview_datehelper_select_month_prefix:
             actionview_datehelper_select_year_prefix:
             actionview_datehelper_time_in_words_day: 1 day
             actionview_datehelper_time_in_words_day_plural: %d days
             actionview_datehelper_time_in_words_hour_about: about an hour
             actionview_datehelper_time_in_words_hour_about_plural: about %d hours
             actionview_datehelper_time_in_words_hour_about_single: about an hour
             actionview_datehelper_time_in_words_minute: 1 minute
             actionview_datehelper_time_in_words_minute_half: half a minute
             actionview_datehelper_time_in_words_minute_less_than: less than a minute
             actionview_datehelper_time_in_words_minute_plural: %d minutes
             actionview_datehelper_time_in_words_minute_single: 1 minute
             actionview_datehelper_time_in_words_second_less_than: less than a second
             actionview_datehelper_time_in_words_second_less_than_plural: less than %d seconds
             actionview_instancetag_blank_option: Please select
             activerecord_error_inclusion: is not included in the list
             activerecord_error_exclusion: is reserved
             activerecord_error_invalid: is invalid
             activerecord_error_confirmation: doesn't match confirmation
             activerecord_error_accepted: must be accepted
             activerecord_error_empty: can't be empty
             activerecord_error_blank: can't be blank
             activerecord_error_too_long: is too long
             activerecord_error_too_short: is too short
             activerecord_error_wrong_length: is the wrong length
             activerecord_error_taken: has already been taken
             activerecord_error_not_a_number: is not a number
             activerecord_error_not_a_date: no es una fecha válida
             activerecord_error_greater_than_start_date: debe ser la fecha mayor que del comienzo
             general_fmt_age: %d año
             general_fmt_age_plural: %d años
             general_fmt_date: %%d/%%m/%%Y
             general_fmt_datetime: %%d/%%m/%%Y %%H:%%M
             general_fmt_datetime_short: %%d/%%m %%H:%%M
             general_fmt_time: %%H:%%M
             general_text_No: 'No'
             general_text_Yes: 'Sí'
             general_text_no: 'no'
             general_text_yes: 'sí'
             general_lang_es: 'Español'
             general_csv_separator: ';'
             general_csv_encoding: ISO-8859-1
             general_pdf_encoding: ISO-8859-1
             general_day_names: Lunes,Martes,Miércoles,Jueves,Viernes,Sábado,Domingo
             notice_account_updated: Account was successfully updated.
             notice_account_invalid_creditentials: Invalid user or password
             notice_account_password_updated: Password was successfully updated.
             notice_account_wrong_password: Wrong password
             notice_account_register_done: Account was successfully created.
             notice_account_unknown_email: Unknown user.
             notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password.
             notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you.
             notice_account_activated: Your account has been activated. You can now log in.
             notice_successful_create: Successful creation.
             notice_successful_update: Successful update.
             notice_successful_delete: Successful deletion.
             notice_successful_connection: Successful connection.
             notice_file_not_found: La página que intentabas tener acceso no existe ni se ha quitado.
             notice_locking_conflict: Data have been updated by another user.
             notice_scm_error: La entrada y/o la revisión no existe en el depósito.
             mail_subject_lost_password: Tu contraseña del redMine
             mail_subject_register: Activación de la cuenta del redMine
             gui_validation_error: 1 error
             gui_validation_error_plural: %d errores
             field_name: Nombre
             field_description: Descripción
             field_summary: Resumen
             field_is_required: Obligatorio
             field_firstname: Nombre
             field_lastname: Apellido
             field_mail: Email
             field_filename: Fichero
             field_filesize: Tamaño
             field_downloads: Telecargas
             field_author: Autor
             field_created_on: Creado
             field_updated_on: Actualizado
             field_field_format: Formato
             field_is_for_all: Para todos los proyectos
             field_possible_values: Valores posibles
             field_regexp: Expresión regular
             field_min_length: Longitud mínima
             field_max_length: Longitud máxima
             field_value: Valor
             field_category: Categoría
             field_title: Título
             field_project: Proyecto
             field_issue: Petición
             field_status: Estatuto
             field_notes: Notas
             field_is_closed: Petición resuelta
             field_is_default: Estatuto por defecto
             field_html_color: Color
             field_tracker: Tracker
             field_subject: Tema
             field_due_date: Fecha debida
             field_assigned_to: Asignado a
             field_priority: Prioridad
             field_fixed_version: Versión corregida
             field_user: Usuario
             field_role: Papel
             field_homepage: Sitio web
             field_is_public: Público
             field_parent: Proyecto secundario de
             field_is_in_chlog: Consultar las peticiones en el histórico
             field_is_in_roadmap: Consultar las peticiones en el roadmap
             field_login: Identificador
             field_mail_notification: Notificación por mail
             field_admin: Administrador
             field_last_login_on: Última conexión
             field_language: Lengua
             field_effective_date: Fecha
             field_password: Contraseña
             field_new_password: Nueva contraseña
             field_password_confirmation: Confirmación
             field_version: Versión
             field_type: Tipo
             field_host: Anfitrión
             field_port: Puerto
             field_account: Cuenta
             field_base_dn: Base DN
             field_attr_login: Cualidad del identificador
             field_attr_firstname: Cualidad del nombre
             field_attr_lastname: Cualidad del apellido
             field_attr_mail: Cualidad del Email
             field_onthefly: Creación del usuario On-the-fly
             field_start_date: Comienzo
             field_done_ratio: %% Realizado
             field_auth_source: Modo de la autentificación
             field_hide_mail: Ocultar mi email address
             field_comment: Comentario
             field_url: URL
             field_start_page: Página principal
             field_subproject: Proyecto secundario
             field_hours: Hours
             field_activity: Activity
             field_spent_on: Fecha
             setting_app_title: Título del aplicación
             setting_app_subtitle: Subtítulo del aplicación
             setting_welcome_text: Texto acogida
             setting_default_language: Lengua del defecto
             setting_login_required: Autentif. requerida
             setting_self_registration: Registro permitido
             setting_attachment_max_size: Tamaño máximo del fichero
             setting_issues_export_limit: Issues export limit
             setting_mail_from: Email de la emisión
             setting_host_name: Nombre de anfitrión
             setting_text_formatting: Formato de texto
             setting_wiki_compression: Compresión de la historia de Wiki
             setting_feeds_limit: Feed content limit
             setting_autofetch_changesets: Autofetch SVN commits
             label_user: Usuario
             label_user_plural: Usuarios
             label_user_new: Nuevo usuario
             label_project: Proyecto
             label_project_new: Nuevo proyecto
             label_project_plural: Proyectos
             label_project_latest: Los proyectos más últimos
             label_issue: Petición
             label_issue_new: Nueva petición
             label_issue_plural: Peticiones
             label_issue_view_all: Ver todas las peticiones
             label_document: Documento
             label_document_new: Nuevo documento
             label_document_plural: Documentos
             label_role: Papel
             label_role_plural: Papeles
             label_role_new: Nuevo papel
             label_role_and_permissions: Papeles y permisos
             label_member: Miembro
             label_member_new: Nuevo miembro
             label_member_plural: Miembros
             label_tracker: Tracker
             label_tracker_plural: Trackers
             label_tracker_new: Nuevo tracker
             label_workflow: Workflow
             label_issue_status: Estatuto de petición
             label_issue_status_plural: Estatutos de las peticiones
             label_issue_status_new: Nuevo estatuto
             label_issue_category: Categoría de las peticiones
             label_issue_category_plural: Categorías de las peticiones
             label_issue_category_new: Nueva categoría
             label_custom_field: Campo personalizado
             label_custom_field_plural: Campos personalizados
             label_custom_field_new: Nuevo campo personalizado
             label_enumerations: Listas de valores
             label_enumeration_new: Nuevo valor
             label_information: Informacion
             label_information_plural: Informaciones
             label_please_login: Conexión
             label_register: Registrar
             label_password_lost: ¿Olvidaste la contraseña?
             label_home: Acogida
             label_my_page: Mi página
             label_my_account: Mi cuenta
             label_my_projects: Mis proyectos
             label_administration: Administración
             label_login: Conexión
             label_logout: Desconexión
             label_help: Ayuda
             label_reported_issues: Peticiones registradas
             label_assigned_to_me_issues: Peticiones que me están asignadas
             label_last_login: Última conexión
             label_last_updates: Actualizado
             label_last_updates_plural: %d Actualizados
             label_registered_on: Inscrito el
             label_activity: Actividad
             label_new: Nuevo
             label_logged_as: Conectado como
             label_environment: Environment
             label_authentication: Autentificación
             label_auth_source: Modo de la autentificación
             label_auth_source_new: Nuevo modo de la autentificación
             label_auth_source_plural: Modos de la autentificación
             label_subproject_plural: Proyectos secundarios
             label_min_max_length: Longitud mín - máx
             label_list: Lista
             label_date: Fecha
             label_integer: Número
             label_boolean: Boleano
             label_string: Texto
             label_text: Texto largo
             label_attribute: Cualidad
             label_attribute_plural: Cualidades
             label_download: %d Telecarga
             label_download_plural: %d Telecargas
             label_no_data: Ningunos datos a exhibir
             label_change_status: Cambiar el estatuto
             label_history: Histórico
             label_attachment: Fichero
             label_attachment_new: Nuevo fichero
             label_attachment_delete: Suprimir el fichero
             label_attachment_plural: Ficheros
             label_report: Informe
             label_report_plural: Informes
             label_news: Noticia
             label_news_new: Nueva noticia
             label_news_plural: Noticias
             label_news_latest: Últimas noticias
             label_news_view_all: Ver todas las noticias
             label_change_log: Cambios
             label_settings: Configuración
             label_overview: Vistazo
             label_version: Versión
             label_version_new: Nueva versión
             label_version_plural: Versiónes
             label_confirmation: Confirmación
             label_export_to: Exportar a
             label_read: Leer...
             label_public_projects: Proyectos publicos
             label_open_issues: abierta
             label_open_issues_plural: abiertas
             label_closed_issues: cerrada
             label_closed_issues_plural: cerradas
             label_total: Total
             label_permissions: Permisos
             label_current_status: Estado actual
             label_new_statuses_allowed: Nuevos estatutos autorizados
             label_all: todos
             label_none: ninguno
             label_next: Próximo
             label_previous: Precedente
             label_used_by: Utilizado por
             label_details: Detalles...
             label_add_note: Agregar una nota
             label_per_page: Por la página
             label_calendar: Calendario
             label_months_from: meses de
             label_gantt: Gantt
             label_internal: Interno
             label_last_changes: %d cambios del último
             label_change_view_all: Ver todos los cambios
             label_personalize_page: Personalizar esta página
             label_comment: Comentario
             label_comment_plural: Comentarios
             label_comment_add: Agregar un comentario
             label_comment_added: Comentario agregó
             label_comment_delete: Suprimir comentarios
             label_query: Pregunta personalizada
             label_query_plural: Preguntas personalizadas
             label_query_new: Nueva preguntas
             label_filter_add: Agregar el filtro
             label_filter_plural: Filtros
             label_equals: igual
             label_not_equals: no igual
             label_in_less_than: en menos que
             label_in_more_than: en más que
             label_in: en
             label_today: hoy
             label_less_than_ago: hace menos de
             label_more_than_ago: hace más de
             label_ago: hace
             label_contains: contiene
             label_not_contains: no contiene
             label_day_plural: días
             label_repository: Depósito SVN
             label_browse: Hojear
             label_modification: %d modificación
             label_modification_plural: %d modificaciones
             label_revision: Revisión
             label_revision_plural: Revisiones
             label_added: agregado
             label_modified: modificado
             label_deleted: suprimido
             label_latest_revision: La revisión más última
             label_latest_revision_plural: Latest revisions
             label_view_revisions: Ver las revisiones
             label_max_size: Tamaño máximo
             label_on: en
             label_sort_highest: Primero
             label_sort_higher: Subir
             label_sort_lower: Bajar
             label_sort_lowest: Último
             label_roadmap: Roadmap
             label_roadmap_due_in: Due in
             label_roadmap_no_issues: No issues for this version
             label_search: Búsqueda
             label_result: %d resultado
             label_result_plural: %d resultados
             label_all_words: Todas las palabras
             label_wiki: Wiki
             label_wiki_edit: Wiki edit
             label_wiki_edit_plural: Wiki edits
             label_page_index: Índice
             label_current_version: Versión actual
             label_preview: Previo
             label_feed_plural: Feeds
             label_changes_details: Detalles de todos los cambios
             label_issue_tracking: Issue tracking
             label_spent_time: Spent time
             label_f_hour: %.2f hour
             label_f_hour_plural: %.2f hours
             label_time_tracking: Time tracking
             label_change_plural: Changes
             label_statistics: Statistics
             label_commits_per_month: Commits per month
             label_commits_per_author: Commits per author
+            label_view_diff: View differences
+            label_diff_inline: inline
+            label_diff_side_by_side: side by side
             button_login: Conexión
             button_submit: Someter
             button_save: Validar
             button_check_all: Seleccionar todo
             button_uncheck_all: No seleccionar nada
             button_delete: Suprimir
             button_create: Crear
             button_test: Testar
             button_edit: Modificar
             button_add: Añadir
             button_change: Cambiar
             button_apply: Aplicar
             button_clear: Anular
             button_lock: Bloquear
             button_unlock: Desbloquear
             button_download: Telecargar
             button_list: Listar
             button_view: Ver
             button_move: Mover
             button_back: Atrás
             button_cancel: Cancelar
             button_activate: Activar
             button_sort: Clasificar
             button_log_time: Log time
             status_active: active
             status_registered: registered
             status_locked: locked
             text_select_mail_notifications: Seleccionar las actividades que necesitan la activación de la notificación por mail.
             text_regexp_info: eg. ^[A-Z0-9]+$
             text_min_max_length_info: 0 para ninguna restricción
             text_project_destroy_confirmation: ¿ Estás seguro de querer eliminar el proyecto ?
             text_workflow_edit: Seleccionar un workflow para actualizar
             text_are_you_sure: ¿ Estás seguro ?
             text_journal_changed: cambiado de %s a %s
             text_journal_set_to: fijado a %s
             text_journal_deleted: suprimido
             text_tip_task_begin_day: tarea que comienza este día
             text_tip_task_end_day: tarea que termina este día
             text_tip_task_begin_end_day: tarea que comienza y termina este día
             default_role_manager: Manager
             default_role_developper: Desarrollador
             default_role_reporter: Informador
             default_tracker_bug: Anomalía
             default_tracker_feature: Evolución
             default_tracker_support: Asistencia
             default_issue_status_new: Nuevo
             default_issue_status_assigned: Asignada
             default_issue_status_resolved: Resuelta
             default_issue_status_feedback: Comentario
             default_issue_status_closed: Cerrada
             default_issue_status_rejected: Rechazada
             default_doc_category_user: Documentación del usuario
             default_doc_category_tech: Documentación tecnica
             default_priority_low: Bajo
             default_priority_normal: Normal
             default_priority_high: Alto
             default_priority_urgent: Urgente
             default_priority_immediate: Ahora
             default_activity_design: Design
             default_activity_development: Development
             enumeration_issue_priorities: Prioridad de las peticiones
             enumeration_doc_categories: Categorías del documento
             enumeration_activities: Activities (time tracking)

lang/fr.yml +3 0

             _gloc_rule_default: '|n| n<=1 ? "" : "_plural" '
             actionview_datehelper_select_day_prefix:
             actionview_datehelper_select_month_names: Janvier,Février,Mars,Avril,Mai,Juin,Juillet,Août,Septembre,Octobre,Novembre,Décembre
             actionview_datehelper_select_month_names_abbr: Jan,Fév,Mars,Avril,Mai,Juin,Juil,Août,Sept,Oct,Nov,Déc
             actionview_datehelper_select_month_prefix:
             actionview_datehelper_select_year_prefix:
             actionview_datehelper_time_in_words_day: 1 jour
             actionview_datehelper_time_in_words_day_plural: %d jours
             actionview_datehelper_time_in_words_hour_about: about an hour
             actionview_datehelper_time_in_words_hour_about_plural: about %d hours
             actionview_datehelper_time_in_words_hour_about_single: about an hour
             actionview_datehelper_time_in_words_minute: 1 minute
             actionview_datehelper_time_in_words_minute_half: 30 secondes
             actionview_datehelper_time_in_words_minute_less_than: moins d'une minute
             actionview_datehelper_time_in_words_minute_plural: %d minutes
             actionview_datehelper_time_in_words_minute_single: 1 minute
             actionview_datehelper_time_in_words_second_less_than: moins d'une seconde
             actionview_datehelper_time_in_words_second_less_than_plural: moins de %d secondes
             actionview_instancetag_blank_option: Choisir
             activerecord_error_inclusion: n'est pas inclus dans la liste
             activerecord_error_exclusion: est reservé
             activerecord_error_invalid: est invalide
             activerecord_error_confirmation: ne correspond pas à la confirmation
             activerecord_error_accepted: doit être accepté
             activerecord_error_empty: doit être renseigné
             activerecord_error_blank: doit être renseigné
             activerecord_error_too_long: est trop long
             activerecord_error_too_short: est trop court
             activerecord_error_wrong_length: n'est pas de la bonne longueur
             activerecord_error_taken: est déjà utilisé
             activerecord_error_not_a_number: n'est pas un nombre
             activerecord_error_not_a_date: n'est pas une date valide
             activerecord_error_greater_than_start_date: doit être postérieur à la date de début
             general_fmt_age: %d an
             general_fmt_age_plural: %d ans
             general_fmt_date: %%d/%%m/%%Y
             general_fmt_datetime: %%d/%%m/%%Y %%H:%%M
             general_fmt_datetime_short: %%d/%%m %%H:%%M
             general_fmt_time: %%H:%%M
             general_text_No: 'Non'
             general_text_Yes: 'Oui'
             general_text_no: 'non'
             general_text_yes: 'oui'
             general_lang_fr: 'Français'
             general_csv_separator: ';'
             general_csv_encoding: ISO-8859-1
             general_pdf_encoding: ISO-8859-1
             general_day_names: Lundi,Mardi,Mercredi,Jeudi,Vendredi,Samedi,Dimanche
             notice_account_updated: Le compte a été mis à jour avec succès.
             notice_account_invalid_creditentials: Identifiant ou mot de passe invalide.
             notice_account_password_updated: Mot de passe mis à jour avec succès.
             notice_account_wrong_password: Mot de passe incorrect
             notice_account_register_done: Un message contenant les instructions pour activer votre compte vous a été envoyé.
             notice_account_unknown_email: Aucun compte ne correspond à cette adresse.
             notice_can_t_change_password: Ce compte utilise une authentification externe. Impossible de changer le mot de passe.
             notice_account_lost_email_sent: Un message contenant les instructions pour choisir un nouveau mot de passe vous a été envoyé.
             notice_account_activated: Votre compte a été activé. Vous pouvez à présent vous connecter.
             notice_successful_create: Création effectuée avec succès.
             notice_successful_update: Mise à jour effectuée avec succès.
             notice_successful_delete: Suppression effectuée avec succès.
             notice_successful_connection: Connection réussie.
             notice_file_not_found: La page à laquelle vous souhaitez accéder n'existe pas ou a été supprimée.
             notice_locking_conflict: Les données ont été mises à jour par un autre utilisateur. Mise à jour impossible.
             notice_scm_error: L'entrée et/ou la révision demandée n'existe pas dans le dépôt.
             mail_subject_lost_password: Votre mot de passe redMine
             mail_subject_register: Activation de votre compte redMine
             gui_validation_error: 1 erreur
             gui_validation_error_plural: %d erreurs
             field_name: Nom
             field_description: Description
             field_summary: Résumé
             field_is_required: Obligatoire
             field_firstname: Prénom
             field_lastname: Nom
             field_mail: Email
             field_filename: Fichier
             field_filesize: Taille
             field_downloads: Téléchargements
             field_author: Auteur
             field_created_on: Créé
             field_updated_on: Mis à jour
             field_field_format: Format
             field_is_for_all: Pour tous les projets
             field_possible_values: Valeurs possibles
             field_regexp: Expression régulière
             field_min_length: Longueur minimum
             field_max_length: Longueur maximum
             field_value: Valeur
             field_category: Catégorie
             field_title: Titre
             field_project: Projet
             field_issue: Demande
             field_status: Statut
             field_notes: Notes
             field_is_closed: Demande fermée
             field_is_default: Statut par défaut
             field_html_color: Couleur
             field_tracker: Tracker
             field_subject: Sujet
             field_due_date: Date d'échéance
             field_assigned_to: Assigné à
             field_priority: Priorité
             field_fixed_version: Version corrigée
             field_user: Utilisateur
             field_role: Rôle
             field_homepage: Site web
             field_is_public: Public
             field_parent: Sous-projet de
             field_is_in_chlog: Demandes affichées dans l'historique
             field_is_in_roadmap: Demandes affichées dans la roadmap
             field_login: Identifiant
             field_mail_notification: Notifications par mail
             field_admin: Administrateur
             field_last_login_on: Dernière connexion
             field_language: Langue
             field_effective_date: Date
             field_password: Mot de passe
             field_new_password: Nouveau mot de passe
             field_password_confirmation: Confirmation
             field_version: Version
             field_type: Type
             field_host: Hôte
             field_port: Port
             field_account: Compte
             field_base_dn: Base DN
             field_attr_login: Attribut Identifiant
             field_attr_firstname: Attribut Prénom
             field_attr_lastname: Attribut Nom
             field_attr_mail: Attribut Email
             field_onthefly: Création des utilisateurs à la volée
             field_start_date: Début
             field_done_ratio: %% Réalisé
             field_auth_source: Mode d'authentification
             field_hide_mail: Cacher mon adresse mail
             field_comment: Commentaire
             field_url: URL
             field_start_page: Page de démarrage
             field_subproject: Sous-projet
             field_hours: Heures
             field_activity: Activité
             field_spent_on: Date
             setting_app_title: Titre de l'application
             setting_app_subtitle: Sous-titre de l'application
             setting_welcome_text: Texte d'accueil
             setting_default_language: Langue par défaut
             setting_login_required: Authentif. obligatoire
             setting_self_registration: Enregistrement autorisé
             setting_attachment_max_size: Taille max des fichiers
             setting_issues_export_limit: Limite export demandes
             setting_mail_from: Adresse d'émission
             setting_host_name: Nom d'hôte
             setting_text_formatting: Formatage du texte
             setting_wiki_compression: Compression historique wiki
             setting_feeds_limit: Limite du contenu des flux RSS
             setting_autofetch_changesets: Récupération auto. des commits SVN
             label_user: Utilisateur
             label_user_plural: Utilisateurs
             label_user_new: Nouvel utilisateur
             label_project: Projet
             label_project_new: Nouveau projet
             label_project_plural: Projets
             label_project_latest: Derniers projets
             label_issue: Demande
             label_issue_new: Nouvelle demande
             label_issue_plural: Demandes
             label_issue_view_all: Voir toutes les demandes
             label_document: Document
             label_document_new: Nouveau document
             label_document_plural: Documents
             label_role: Rôle
             label_role_plural: Rôles
             label_role_new: Nouveau rôle
             label_role_and_permissions: Rôles et permissions
             label_member: Membre
             label_member_new: Nouveau membre
             label_member_plural: Membres
             label_tracker: Tracker
             label_tracker_plural: Trackers
             label_tracker_new: Nouveau tracker
             label_workflow: Workflow
             label_issue_status: Statut de demandes
             label_issue_status_plural: Statuts de demandes
             label_issue_status_new: Nouveau statut
             label_issue_category: Catégorie de demandes
             label_issue_category_plural: Catégories de demandes
             label_issue_category_new: Nouvelle catégorie
             label_custom_field: Champ personnalisé
             label_custom_field_plural: Champs personnalisés
             label_custom_field_new: Nouveau champ personnalisé
             label_enumerations: Listes de valeurs
             label_enumeration_new: Nouvelle valeur
             label_information: Information
             label_information_plural: Informations
             label_please_login: Identification
             label_register: S'enregistrer
             label_password_lost: Mot de passe perdu
             label_home: Accueil
             label_my_page: Ma page
             label_my_account: Mon compte
             label_my_projects: Mes projets
             label_administration: Administration
             label_login: Connexion
             label_logout: Déconnexion
             label_help: Aide
             label_reported_issues: Demandes soumises
             label_assigned_to_me_issues: Demandes qui me sont assignées
             label_last_login: Dernière connexion
             label_last_updates: Dernière mise à jour
             label_last_updates_plural: %d dernières mises à jour
             label_registered_on: Inscrit le
             label_activity: Activité
             label_new: Nouveau
             label_logged_as: Connecté en tant que
             label_environment: Environnement
             label_authentication: Authentification
             label_auth_source: Mode d'authentification
             label_auth_source_new: Nouveau mode d'authentification
             label_auth_source_plural: Modes d'authentification
             label_subproject_plural: Sous-projets
             label_min_max_length: Longueurs mini - maxi
             label_list: Liste
             label_date: Date
             label_integer: Entier
             label_boolean: Booléen
             label_string: Texte
             label_text: Texte long
             label_attribute: Attribut
             label_attribute_plural: Attributs
             label_download: %d Téléchargement
             label_download_plural: %d Téléchargements
             label_no_data: Aucune donnée à afficher
             label_change_status: Changer le statut
             label_history: Historique
             label_attachment: Fichier
             label_attachment_new: Nouveau fichier
             label_attachment_delete: Supprimer le fichier
             label_attachment_plural: Fichiers
             label_report: Rapport
             label_report_plural: Rapports
             label_news: Annonce
             label_news_new: Nouvelle annonce
             label_news_plural: Annonces
             label_news_latest: Dernières annonces
             label_news_view_all: Voir toutes les annonces
             label_change_log: Historique
             label_settings: Configuration
             label_overview: Aperçu
             label_version: Version
             label_version_new: Nouvelle version
             label_version_plural: Versions
             label_confirmation: Confirmation
             label_export_to: Exporter en
             label_read: Lire...
             label_public_projects: Projets publics
             label_open_issues: ouvert
             label_open_issues_plural: ouverts
             label_closed_issues: fermé
             label_closed_issues_plural: fermés
             label_total: Total
             label_permissions: Permissions
             label_current_status: Statut actuel
             label_new_statuses_allowed: Nouveaux statuts autorisés
             label_all: tous
             label_none: aucun
             label_next: Suivant
             label_previous: Précédent
             label_used_by: Utilisé par
             label_details: Détails...
             label_add_note: Ajouter une note
             label_per_page: Par page
             label_calendar: Calendrier
             label_months_from: mois depuis
             label_gantt: Gantt
             label_internal: Interne
             label_last_changes: %d derniers changements
             label_change_view_all: Voir tous les changements
             label_personalize_page: Personnaliser cette page
             label_comment: Commentaire
             label_comment_plural: Commentaires
             label_comment_add: Ajouter un commentaire
             label_comment_added: Commentaire ajouté
             label_comment_delete: Supprimer les commentaires
             label_query: Rapport personnalisé
             label_query_plural: Rapports personnalisés
             label_query_new: Nouveau rapport
             label_filter_add: Ajouter le filtre
             label_filter_plural: Filtres
             label_equals: égal
             label_not_equals: différent
             label_in_less_than: dans moins de
             label_in_more_than: dans plus de
             label_in: dans
             label_today: aujourd'hui
             label_less_than_ago: il y a moins de
             label_more_than_ago: il y a plus de
             label_ago: il y a
             label_contains: contient
             label_not_contains: ne contient pas
             label_day_plural: jours
             label_repository: Dépôt SVN
             label_browse: Parcourir
             label_modification: %d modification
             label_modification_plural: %d modifications
             label_revision: Révision
             label_revision_plural: Révisions
             label_added: ajouté
             label_modified: modifié
             label_deleted: supprimé
             label_latest_revision: Dernière révision
             label_latest_revision_plural: Dernières révisions
             label_view_revisions: Voir les révisions
             label_max_size: Taille maximale
             label_on: sur
             label_sort_highest: Remonter en premier
             label_sort_higher: Remonter
             label_sort_lower: Descendre
             label_sort_lowest: Descendre en dernier
             label_roadmap: Roadmap
             label_roadmap_due_in: Echéance dans
             label_roadmap_no_issues: Aucune demande pour cette version
             label_search: Recherche
             label_result: %d résultat
             label_result_plural: %d résultats
             label_all_words: Tous les mots
             label_wiki: Wiki
             label_wiki_edit: Révision wiki
             label_wiki_edit_plural: Révisions wiki
             label_page_index: Index
             label_current_version: Version actuelle
             label_preview: Prévisualisation
             label_feed_plural: Flux RSS
             label_changes_details: Détails de tous les changements
             label_issue_tracking: Suivi des demandes
             label_spent_time: Temps passé
             label_f_hour: %.2f heure
             label_f_hour_plural: %.2f heures
             label_time_tracking: Suivi du temps
             label_change_plural: Changements
             label_statistics: Statistiques
             label_commits_per_month: Commits par mois
             label_commits_per_author: Commits par auteur
+            label_view_diff: Voir les différences
+            label_diff_inline: en ligne
+            label_diff_side_by_side: côte à côte
             button_login: Connexion
             button_submit: Soumettre
             button_save: Sauvegarder
             button_check_all: Tout cocher
             button_uncheck_all: Tout décocher
             button_delete: Supprimer
             button_create: Créer
             button_test: Tester
             button_edit: Modifier
             button_add: Ajouter
             button_change: Changer
             button_apply: Appliquer
             button_clear: Effacer
             button_lock: Verrouiller
             button_unlock: Déverrouiller
             button_download: Télécharger
             button_list: Lister
             button_view: Voir
             button_move: Déplacer
             button_back: Retour
             button_cancel: Annuler
             button_activate: Activer
             button_sort: Trier
             button_log_time: Saisir temps
             status_active: actif
             status_registered: enregistré
             status_locked: vérouillé
             text_select_mail_notifications: Sélectionner les actions pour lesquelles la notification par mail doit être activée.
             text_regexp_info: ex. ^[A-Z0-9]+$
             text_min_max_length_info: 0 pour aucune restriction
             text_project_destroy_confirmation: Etes-vous sûr de vouloir supprimer ce projet et tout ce qui lui est rattaché ?
             text_workflow_edit: Sélectionner un tracker et un rôle pour éditer le workflow
             text_are_you_sure: Etes-vous sûr ?
             text_journal_changed: changé de %s à %s
             text_journal_set_to: mis à %s
             text_journal_deleted: supprimé
             text_tip_task_begin_day: tâche commençant ce jour
             text_tip_task_end_day: tâche finissant ce jour
             text_tip_task_begin_end_day: tâche commençant et finissant ce jour
             default_role_manager: Manager
             default_role_developper: Développeur
             default_role_reporter: Rapporteur
             default_tracker_bug: Anomalie
             default_tracker_feature: Evolution
             default_tracker_support: Assistance
             default_issue_status_new: Nouveau
             default_issue_status_assigned: Assigné
             default_issue_status_resolved: Résolu
             default_issue_status_feedback: Commentaire
             default_issue_status_closed: Fermé
             default_issue_status_rejected: Rejeté
             default_doc_category_user: Documentation utilisateur
             default_doc_category_tech: Documentation technique
             default_priority_low: Bas
             default_priority_normal: Normal
             default_priority_high: Haut
             default_priority_urgent: Urgent
             default_priority_immediate: Immédiat
             default_activity_design: Conception
             default_activity_development: Développement
             enumeration_issue_priorities: Priorités des demandes
             enumeration_doc_categories: Catégories des documents
             enumeration_activities: Activités (suivi du temps)

lang/it.yml +3 0

             _gloc_rule_default: '|n| n==1 ? "" : "_plural" '
             actionview_datehelper_select_day_prefix:
             actionview_datehelper_select_month_names: Gennaio,Febbraio,Marzo,Aprile,Maggio,Giugno,Luglio,Agosto,Settembre,Ottobre,Novembre,Dicembre
             actionview_datehelper_select_month_names_abbr: Gen,Feb,Mar,Apr,Mag,Giu,Lug,Ago,Set,Ott,Nov,Dic
             actionview_datehelper_select_month_prefix:
             actionview_datehelper_select_year_prefix:
             actionview_datehelper_time_in_words_day: 1 giorno
             actionview_datehelper_time_in_words_day_plural: %d giorni
             actionview_datehelper_time_in_words_hour_about: circa un'ora
             actionview_datehelper_time_in_words_hour_about_plural: circa %d ore
             actionview_datehelper_time_in_words_hour_about_single: circa un'ora
             actionview_datehelper_time_in_words_minute: 1 minuto
             actionview_datehelper_time_in_words_minute_half: mezzo minuto
             actionview_datehelper_time_in_words_minute_less_than: meno di un minuto
             actionview_datehelper_time_in_words_minute_plural: %d minuti
             actionview_datehelper_time_in_words_minute_single: 1 minuto
             actionview_datehelper_time_in_words_second_less_than: meno di un secondo
             actionview_datehelper_time_in_words_second_less_than_plural: meno di %d secondi
             actionview_instancetag_blank_option: Scegli
             activerecord_error_inclusion: non è incluso nella lista
             activerecord_error_exclusion: e' riservato
             activerecord_error_invalid: non e' valido
             activerecord_error_confirmation: doesn't match confirmation
             activerecord_error_accepted: deve essere accettato
             activerecord_error_empty: non puo' essere vuoto
             activerecord_error_blank: non puo' essere blank
             activerecord_error_too_long: e' troppo lungo/a
             activerecord_error_too_short: e' troppo corto/a
             activerecord_error_wrong_length: e' della lunghezza sbagliata
             activerecord_error_taken: e' gia' stato/a preso/a
             activerecord_error_not_a_number: non e' un numero
             activerecord_error_not_a_date: non e' una data valida
             activerecord_error_greater_than_start_date: deve essere maggiore della data di partenza
             general_fmt_age: %d yr
             general_fmt_age_plural: %d yrs
             general_fmt_date: %%d/%%m/%%Y
             general_fmt_datetime: %%d/%%m/%%Y %%I:%%M %%p
             general_fmt_datetime_short: %%b %%d, %%I:%%M %%p
             general_fmt_time: %%I:%%M %%p
             general_text_No: 'No'
             general_text_Yes: 'Si'
             general_text_no: 'no'
             general_text_yes: 'si'
             general_lang_it: 'Italiano'
             general_csv_separator: ','
             general_csv_encoding: ISO-8859-1
             general_pdf_encoding: ISO-8859-1
             general_day_names: Lunedì,Martedì,Mercoledì,Giovedì,Venerdì,Sabato,Domenica
             notice_account_updated: L'utenza è stata aggiornata.
             notice_account_invalid_creditentials: Nome utente o password non validi.
             notice_account_password_updated: La password è stata aggiornata.
             notice_account_wrong_password: Password errata
             notice_account_register_done: L'utenza è stata creata.
             notice_account_unknown_email: Utente sconosciuto.
             notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password.
             notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you.
             notice_account_activated: Your account has been activated. You can now log in.
             notice_successful_create: Successful creation.
             notice_successful_update: Successful update.
             notice_successful_delete: Successful deletion.
             notice_successful_connection: Successful connection.
             notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
             notice_locking_conflict: Data have been updated by another user.
             notice_scm_error: Entry and/or revision doesn't exist in the repository.
             mail_subject_lost_password: Password redMine
             mail_subject_register: Attivazione utenza redMine
             gui_validation_error: 1 errore
             gui_validation_error_plural: %d errori
             field_name: Nome
             field_description: Descrizione
             field_summary: Sommario
             field_is_required: Richiesto
             field_firstname: Nome
             field_lastname: Cognome
             field_mail: Email
             field_filename: File
             field_filesize: Dimensione
             field_downloads: Downloads
             field_author: Autore
             field_created_on: Creato
             field_updated_on: Aggiornato
             field_field_format: Formato
             field_is_for_all: Per tutti i progetti
             field_possible_values: Valori possibili
             field_regexp: Espressione regolare
             field_min_length: Lunghezza minima
             field_max_length: Lunghezza massima
             field_value: Valore
             field_category: Categoria
             field_title: Titolo
             field_project: Progetto
             field_issue: Issue
             field_status: Stato
             field_notes: Note
             field_is_closed: Chiude il contesto
             field_is_default: Stato predefinito
             field_html_color: Colore
             field_tracker: Tracker
             field_subject: Oggetto
             field_due_date: Data ultima
             field_assigned_to: Assegnato a
             field_priority: Priorita'
             field_fixed_version: Versione di fix
             field_user: Utente
             field_role: Ruolo
             field_homepage: Homepage
             field_is_public: Pubblico
             field_parent: Sottoprogetto di
             field_is_in_chlog: Contesti mostrati nel changelog
             field_is_in_roadmap: Contesti mostrati nel roadmap
             field_login: Login
             field_mail_notification: Notifiche via e-mail
             field_admin: Amministratore
             field_last_login_on: Ultima connessione
             field_language: Lingua
             field_effective_date: Data
             field_password: Password
             field_new_password: Nuova password
             field_password_confirmation: Conferma
             field_version: Versione
             field_type: Tipo
             field_host: Host
             field_port: Porta
             field_account: Utenza
             field_base_dn: DN base
             field_attr_login: Attributo login
             field_attr_firstname: Attributo nome
             field_attr_lastname: Attributo cognome
             field_attr_mail: Attributo e-mail
             field_onthefly: Creazione utenza "al volo"
             field_start_date: Inizio
             field_done_ratio: %% completo
             field_auth_source: Modalità di autenticazione
             field_hide_mail: Nascondi il mio indirizzo di e-mail
             field_comment: Commento
             field_url: URL
             field_start_page: Pagina principale
             field_subproject: Sottoprogetto
             field_hours: Hours
             field_activity: Activity
             field_spent_on: Data
             setting_app_title: Titolo applicazione
             setting_app_subtitle: Sottotitolo applicazione
             setting_welcome_text: Testo di benvenuto
             setting_default_language: Lingua di default
             setting_login_required: Autenticazione richiesta
             setting_self_registration: Auto-registrazione abilitata
             setting_attachment_max_size: Massima dimensione allegati
             setting_issues_export_limit: Limite esportazione contesti
             setting_mail_from: Indirizzo sorgente e-mail
             setting_host_name: Nome host
             setting_text_formatting: Formattazione testo
             setting_wiki_compression: Compressione di storia di Wiki
             setting_feeds_limit: Feed content limit
             setting_autofetch_changesets: Autofetch SVN commits
             label_user: Utente
             label_user_plural: Utenti
             label_user_new: Nuovo utente
             label_project: Progetto
             label_project_new: New project
             label_project_plural: Progetti
             label_project_latest: Ultimi progetti registrati
             label_issue: Contesto
             label_issue_new: Nuovo contesto
             label_issue_plural: Contesti
             label_issue_view_all: Mostra tutti i contesti
             label_document: Documento
             label_document_new: Nuovo documento
             label_document_plural: Documenti
             label_role: Ruolo
             label_role_plural: Ruoli
             label_role_new: Nuovo ruolo
             label_role_and_permissions: Ruoli e permessi
             label_member: Membro
             label_member_new: Nuovo membro
             label_member_plural: Membri
             label_tracker: Tracker
             label_tracker_plural: Trackers
             label_tracker_new: Nuovo tracker
             label_workflow: Workflow
             label_issue_status: Stato contesti
             label_issue_status_plural: Stati contesto
             label_issue_status_new: Nuovo stato
             label_issue_category: Categorie contesti
             label_issue_category_plural: Categorie contesto
             label_issue_category_new: Nuova categoria
             label_custom_field: Campo personalizzato
             label_custom_field_plural: Campi personalizzati
             label_custom_field_new: Nuovo campo personalizzato
             label_enumerations: Enumerazioni
             label_enumeration_new: Nuovo valore
             label_information: Informazione
             label_information_plural: Informazioni
             label_please_login: Autenticarsi
             label_register: Registrati
             label_password_lost: Password dimenticata
             label_home: Home
             label_my_page: Pagina personale
             label_my_account: La mia utenza
             label_my_projects: I miei progetti
             label_administration: Amministrazione
             label_login: Login
             label_logout: Logout
             label_help: Aiuto
             label_reported_issues: Contesti segnalati
             label_assigned_to_me_issues: I miei contesti
             label_last_login: Ultimo collegamento
             label_last_updates: Ultimo aggiornamento
             label_last_updates_plural: %d ultimo aggiornamento
             label_registered_on: Registrato il
             label_activity: Attività
             label_new: Nuovo
             label_logged_as: Autenticato come
             label_environment: Ambiente
             label_authentication: Autenticazione
             label_auth_source: Modalità di autenticazione
             label_auth_source_new: Nuova modalità di autenticazione
             label_auth_source_plural: Modalità di autenticazione
             label_subproject_plural: Sottoprogetti
             label_min_max_length: Lunghezza minima - massima
             label_list: Elenco
             label_date: Data
             label_integer: Intero
             label_boolean: Booleano
             label_string: Testo
             label_text: Testo esteso
             label_attribute: Attributo
             label_attribute_plural: Attributi
             label_download: %d Download
             label_download_plural: %d Download
             label_no_data: Nessun dato disponibile
             label_change_status: Cambia stato
             label_history: Cronologia
             label_attachment: File
             label_attachment_new: Nuovo file
             label_attachment_delete: Elimina file
             label_attachment_plural: File
             label_report: Report
             label_report_plural: Report
             label_news: Notizia
             label_news_new: Aggiungi notizia
             label_news_plural: Notizie
             label_news_latest: Utime notizie
             label_news_view_all: Tutte le notizie
             label_change_log: Change log
             label_settings: Impostazioni
             label_overview: Panoramica
             label_version: Versione
             label_version_new: Nuova versione
             label_version_plural: Versioni
             label_confirmation: Conferma
             label_export_to: Esporta su
             label_read: Leggi...
             label_public_projects: Progetti pubblici
             label_open_issues: aperta
             label_open_issues_plural: aperte
             label_closed_issues: chiusa
             label_closed_issues_plural: chiuse
             label_total: Totale
             label_permissions: Permessi
             label_current_status: Stato attuale
             label_new_statuses_allowed: Nuovi stati possibili
             label_all: tutti
             label_none: nessuno
             label_next: Successivo
             label_previous: Precedente
             label_used_by: Usato da
             label_details: Dettagli...
             label_add_note: Aggiungi una nota
             label_per_page: Per pagina
             label_calendar: Calendario
             label_months_from: mesi da
             label_gantt: Gantt
             label_internal: Interno
             label_last_changes: ultime %d modifiche
             label_change_view_all: Tutte le modifiche
             label_personalize_page: Personalizza la pagina
             label_comment: Commento
             label_comment_plural: Commenti
             label_comment_add: Aggiungi un commento
             label_comment_added: Commento aggiunto
             label_comment_delete: Elimina commenti
             label_query: Custom query
             label_query_plural: Query personalizzate
             label_query_new: Nuova query
             label_filter_add: Aggiungi filtro
             label_filter_plural: Filtri
             label_equals: è
             label_not_equals: non è
             label_in_less_than: è minore di
             label_in_more_than: è maggiore di
             label_in: in
             label_today: oggi
             label_less_than_ago: meno di giorni fa
             label_more_than_ago: più di giorni fa
             label_ago: giorni fa
             label_contains: contiene
             label_not_contains: non contiene
             label_day_plural: giorni
             label_repository: SVN Repository
             label_browse: Browse
             label_modification: %d modifica
             label_modification_plural: %d modifiche
             label_revision: Versione
             label_revision_plural: Versioni
             label_added: aggiunto
             label_modified: modificato
             label_deleted: eliminato
             label_latest_revision: Ultima versione
             label_latest_revision_plural: Latest revisions
             label_view_revisions: Mostra versioni
             label_max_size: Dimensione massima
             label_on: 'on'
             label_sort_highest: Sposta in cima
             label_sort_higher: Su
             label_sort_lower: Giù
             label_sort_lowest: Sposta in fondo
             label_roadmap: Roadmap
             label_roadmap_due_in: Due in
             label_roadmap_no_issues: No issues for this version
             label_search: Ricerca
             label_result: %d risultato
             label_result_plural: %d risultati
             label_all_words: Tutte le parole
             label_wiki: Wiki
             label_wiki_edit: Wiki edit
             label_wiki_edit_plural: Wiki edits
             label_page_index: Indice
             label_current_version: Versione corrente
             label_preview: Previsione
             label_feed_plural: Feeds
             label_changes_details: Particolari di tutti i cambiamenti
             label_issue_tracking: Issue tracking
             label_spent_time: Spent time
             label_f_hour: %.2f hour
             label_f_hour_plural: %.2f hours
             label_time_tracking: Time tracking
             label_change_plural: Changes
             label_statistics: Statistics
             label_commits_per_month: Commits per month
             label_commits_per_author: Commits per author
+            label_view_diff: View differences
+            label_diff_inline: inline
+            label_diff_side_by_side: side by side
             button_login: Login
             button_submit: Invia
             button_save: Salva
             button_check_all: Seleziona tutti
             button_uncheck_all: Deseleziona tutti
             button_delete: Elimina
             button_create: Crea
             button_test: Test
             button_edit: Modifica
             button_add: Aggiungi
             button_change: Modifica
             button_apply: Applica
             button_clear: Pulisci
             button_lock: Blocca
             button_unlock: Sblocca
             button_download: Scarica
             button_list: Elenca
             button_view: Mostra
             button_move: Sposta
             button_back: Indietro
             button_cancel: Annulla
             button_activate: Attiva
             button_sort: Ordina
             button_log_time: Log time
             status_active: active
             status_registered: registered
             status_locked: bloccato
             text_select_mail_notifications: Select actions for which mail notifications should be sent.
             text_regexp_info: eg. ^[A-Z0-9]+$
             text_min_max_length_info: 0 means no restriction
             text_project_destroy_confirmation: Are you sure you want to delete this project and all related data ?
             text_workflow_edit: Select a role and a tracker to edit the workflow
             text_are_you_sure: Are you sure ?
             text_journal_changed: changed from %s to %s
             text_journal_set_to: set to %s
             text_journal_deleted: deleted
             text_tip_task_begin_day: task beginning this day
             text_tip_task_end_day: task ending this day
             text_tip_task_begin_end_day: task beginning and ending this day
             default_role_manager: Manager
             default_role_developper: Sviluppatore
             default_role_reporter: Reporter
             default_tracker_bug: Contesto
             default_tracker_feature: Funzione
             default_tracker_support: Supporto
             default_issue_status_new: Nuovo/a
             default_issue_status_assigned: Assegnato/a
             default_issue_status_resolved: Risolto/a
             default_issue_status_feedback: Feedback
             default_issue_status_closed: Chiuso/a
             default_issue_status_rejected: Rifiutato/a
             default_doc_category_user: Documentazione utente
             default_doc_category_tech: Documentazione tecnica
             default_priority_low: Bassa
             default_priority_normal: Normale
             default_priority_high: Alta
             default_priority_urgent: Urgente
             default_priority_immediate: Immediata
             default_activity_design: Design
             default_activity_development: Development
             enumeration_issue_priorities: Priorità contesti
             enumeration_doc_categories: Categorie di documenti
             enumeration_activities: Activities (time tracking)

lang/ja.yml +3 0

             _gloc_rule_default: '|n| n==1 ? "" : "_plural" '
             actionview_datehelper_select_day_prefix:
             actionview_datehelper_select_month_names: 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月
             actionview_datehelper_select_month_names_abbr: 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月
             actionview_datehelper_select_month_prefix:
             actionview_datehelper_select_year_prefix:
             actionview_datehelper_select_year_suffix: 月
             actionview_datehelper_time_in_words_day: 1日
             actionview_datehelper_time_in_words_day_plural: %d日間
             actionview_datehelper_time_in_words_hour_about: 約1時間
             actionview_datehelper_time_in_words_hour_about_plural: 約%d時間
             actionview_datehelper_time_in_words_hour_about_single: 約1時間
             actionview_datehelper_time_in_words_minute: 1分
             actionview_datehelper_time_in_words_minute_half: 約30秒
             actionview_datehelper_time_in_words_minute_less_than: 1分以内
             actionview_datehelper_time_in_words_minute_plural: %d分
             actionview_datehelper_time_in_words_minute_single: 1分
             actionview_datehelper_time_in_words_second_less_than: 1秒以内
             actionview_datehelper_time_in_words_second_less_than_plural: %d秒以内
             actionview_instancetag_blank_option: 選んでください
             activerecord_error_inclusion: がリストに含まれていません
             activerecord_error_exclusion: が予約されています
             activerecord_error_invalid: が無効です
             activerecord_error_confirmation: 確認のパスワードと合っていません
             activerecord_error_accepted: must be accepted
             activerecord_error_empty: が空です
             activerecord_error_blank: が空白です
             activerecord_error_too_long: が長すぎます
             activerecord_error_too_short: が短かすぎます
             activerecord_error_wrong_length: の長さが間違っています
             activerecord_error_taken: has already been taken
             activerecord_error_not_a_number: が数字ではありません
             activerecord_error_not_a_date: の日付が間違っています
             activerecord_error_greater_than_start_date: を開始日より後にしてください
             general_fmt_age: %d歳
             general_fmt_age_plural: %d歳
             general_fmt_date: %%Y年%%m月%%d日
             general_fmt_datetime: %%Y年%%m月%%d日 %%H:%%M %%p
             general_fmt_datetime_short: %%b %%d, %%H:%%M %%p
             general_fmt_time: %%H:%%M %%p
             general_text_No: 'いいえ'
             general_text_Yes: 'はい'
             general_text_no: 'いいえ'
             general_text_yes: 'はい'
             general_lang_ja: 'Japanese (日本語)'
             general_csv_separator: ','
             general_csv_encoding: SJIS
             general_pdf_encoding: SJIS
             general_day_names: 日曜日, 月曜日, 火曜日, 水曜日, 木曜日, 金曜日, 土曜日
             notice_account_updated: アカウントが更新されました。
             notice_account_invalid_creditentials: ユーザ名もしくはパスワードが無効
             notice_account_password_updated: パスワードが更新されました。
             notice_account_wrong_password: パスワードが違います
             notice_account_register_done: アカウントが作成されました。
             notice_account_unknown_email: ユーザが存在しません。
             notice_can_t_change_password: このアカウントでは外部認証を使っています。パスワードは変更できません。
             notice_account_lost_email_sent: 新しいパスワードのメールを送信しました。
             notice_account_activated: アカウントが有効になりました。ログインできます。
             notice_successful_create: 作成しました。
             notice_successful_update: 更新しました。
             notice_successful_delete: 削除しました。
             notice_successful_connection: 接続しました。
             notice_file_not_found: アクセスしようとしたページは存在しないか削除されています。
             notice_locking_conflict: 別のユーザがデータを更新しています。
             notice_scm_error: リポジトリに、エントリ/リビジョンが存在しません。
             mail_subject_lost_password: redMine パスワード
             mail_subject_register: redMine アカウントが有効になりました
             gui_validation_error: 1 件のエラー
             gui_validation_error_plural: %d 件のエラー
             field_name: 名前
             field_description: 説明
             field_summary: サマリ
             field_is_required: 必須
             field_firstname: 名前
             field_lastname: 苗字
             field_mail: メールアドレス
             field_filename: ファイル
             field_filesize: サイズ
             field_downloads: ダウンロード
             field_author: 起票者
             field_created_on: 作成日
             field_updated_on: 更新日
             field_field_format: 書式
             field_is_for_all: 全プロジェクト向け
             field_possible_values: 選択肢
             field_regexp: 正規表現
             field_min_length: 最小値
             field_max_length: 最大値
             field_value: 値
             field_category: カテゴリ
             field_title: タイトル
             field_project: プロジェクト
             field_issue: 問題
             field_status: ステータス
             field_notes: 注記
             field_is_closed: 終了した問題
             field_is_default: デフォルトのステータス
             field_html_color: 色
             field_tracker: トラッカー
             field_subject: 題名
             field_due_date: 期限日
             field_assigned_to: 担当者
             field_priority: 優先度
             field_fixed_version: 修正されたバージョン
             field_user: ユーザ
             field_role: 役割
             field_homepage: ホームページ
             field_is_public: 公開
             field_parent: 親プロジェクト名
             field_is_in_chlog: 変更記録に表示されている問題
             field_is_in_roadmap: Issues displayed in roadmap
             field_login: ログイン
             field_mail_notification: メール通知
             field_admin: 管理者
             field_last_login_on: 最終接続日
             field_language: 言語
             field_effective_date: 日付
             field_password: パスワード
             field_new_password: 新しいパスワード
             field_password_confirmation: パスワードの確認
             field_version: バージョン
             field_type: タイプ
             field_host: ホスト
             field_port: ポート
             field_account: アカウント
             field_base_dn: Base DN
             field_attr_login: ログイン名属性
             field_attr_firstname: 名前属性
             field_attr_lastname: 苗字属性
             field_attr_mail: メール属性
             field_onthefly: あわせてユーザを作成
             field_start_date: 開始日
             field_done_ratio: 進捗 %%
             field_auth_source: 認証モード
             field_hide_mail: Emailアドレスを隠す
             field_comment: コメント
             field_url: URL
             field_start_page: メインページ
             field_subproject: サブプロジェクト
             field_hours: Hours
             field_activity: Activity
             field_spent_on: 日付
             setting_app_title: アプリケーションのタイトル
             setting_app_subtitle: アプリケーションのサブタイトル
             setting_welcome_text: ウェルカムメッセージ
             setting_default_language: 既定の言語
             setting_login_required: 認証が必要
             setting_self_registration: ユーザは自分で登録できる
             setting_attachment_max_size: 添付の最大サイズ
             setting_issues_export_limit: 出力する問題数の上限
             setting_mail_from: Emission メールアドレス
             setting_host_name: ホスト名
             setting_text_formatting: テキストの書式
             setting_wiki_compression: Wiki history compression
             setting_feeds_limit: Feed content limit
             setting_autofetch_changesets: Autofetch SVN commits
             label_user: ユーザ
             label_user_plural: ユーザ
             label_user_new: 新しいユーザ
             label_project: プロジェクト
             label_project_new: 新しいプロジェクト
             label_project_plural: プロジェクト
             label_project_latest: 最近のプロジェクト
             label_issue: 問題
             label_issue_new: 新しい問題
             label_issue_plural: 問題
             label_issue_view_all: 問題を全て見る
             label_document: 文書
             label_document_new: 新しい文書
             label_document_plural: 文書
             label_role: ロール
             label_role_plural: ロール
             label_role_new: 新しいロール
             label_role_and_permissions: ロールと権限
             label_member: メンバー
             label_member_new: 新しいメンバー
             label_member_plural: メンバー
             label_tracker: トラッカー
             label_tracker_plural: トラッカー
             label_tracker_new: 新しいトラッカーを作成
             label_workflow: ワークフロー
             label_issue_status: 問題の状態
             label_issue_status_plural: 問題の状態
             label_issue_status_new: 新しい状態
             label_issue_category: 問題のカテゴリ
             label_issue_category_plural: 問題のカテゴリ
             label_issue_category_new: 新しいカテゴリ
             label_custom_field: カスタムフィールド
             label_custom_field_plural: カスタムフィールド
             label_custom_field_new: 新しいカスタムフィールドを作成
             label_enumerations: 列挙項目
             label_enumeration_new: 新しい値
             label_information: 情報
             label_information_plural: 情報
             label_please_login: ログインしてください
             label_register: 登録する
             label_password_lost: パスワードの再発行
             label_home: ホーム
             label_my_page: マイページ
             label_my_account: マイアカウント
             label_my_projects: マイプロジェクト
             label_administration: 管理
             label_login: ログイン
             label_logout: ログアウト
             label_help: ヘルプ
             label_reported_issues: 報告されている問題
             label_assigned_to_me_issues: 担当している問題
             label_last_login: 最近の接続
             label_last_updates: 最近の更新 1 件
             label_last_updates_plural: 最近の更新 %d 件
             label_registered_on: 登録日
             label_activity: 活動
             label_new: 新しく作成
             label_logged_as: ログイン中：
             label_environment: 環境
             label_authentication: 認証
             label_auth_source: 認証モード
             label_auth_source_new: 新しい認証モード
             label_auth_source_plural: 認証モード
             label_subproject_plural: サブプロジェクト
             label_min_max_length: 最小値 - 最大値の長さ
             label_list: リストから選択
             label_date: 日付
             label_integer: 整数
             label_boolean: 真偽値
             label_string: テキスト
             label_text: 長いテキスト
             label_attribute: 属性
             label_attribute_plural: 属性
             label_download: %d ダウンロード
             label_download_plural: %d ダウンロード
             label_no_data: 表示するデータがありません
             label_change_status: 変更の状況
             label_history: 履歴
             label_attachment: ファイル
             label_attachment_new: 新しいファイル
             label_attachment_delete: ファイルを削除
             label_attachment_plural: ファイル
             label_report: レポート
             label_report_plural: レポート
             label_news: ニュース
             label_news_new: ニュースを追加
             label_news_plural: ニュース
             label_news_latest: 最新ニュース
             label_news_view_all: 全てのニュースを見る
             label_change_log: 変更記録
             label_settings: 設定
             label_overview: 概要
             label_version: バージョン
             label_version_new: 新しいバージョン
             label_version_plural: バージョン
             label_confirmation: 確認
             label_export_to: 他の形式に出力
             label_read: 読む...
             label_public_projects: 公開プロジェクト
             label_open_issues: 未着手
             label_open_issues_plural: 未着手
             label_closed_issues: 終了
             label_closed_issues_plural: 終了
             label_total: 合計
             label_permissions: 権限
             label_current_status: 現在の状態
             label_new_statuses_allowed: 状態の移行先
             label_all: 全て
             label_none: なし
             label_next: 次
             label_previous: 前
             label_used_by: 使用中
             label_details: 詳細...
             label_add_note: 注記を追加
             label_per_page: ページ毎
             label_calendar: カレンダー
             label_months_from: ヶ月 from
             label_gantt: ガントチャート
             label_internal: Internal
             label_last_changes: 最新の変更 %d 件
             label_change_view_all: 全ての変更を見る
             label_personalize_page: このページをパーソナライズする
             label_comment: コメント
             label_comment_plural: コメント
             label_comment_add: コメント追加
             label_comment_added: 追加されたコメント
             label_comment_delete: コメント削除
             label_query: カスタムクエリ
             label_query_plural: カスタムクエリ
             label_query_new: 新しいクエリ
             label_filter_add: フィルタ追加
             label_filter_plural: フィルタ
             label_equals: 等しい
             label_not_equals: 等しくない
             label_in_less_than: 残日数がこれより多い
             label_in_more_than: 残日数がこれより少ない
             label_in: 残日数
             label_today: 今日
             label_less_than_ago: 経過日数がこれより少ない
             label_more_than_ago: 経過日数がこれより多い
             label_ago: 日前
             label_contains: 含む
             label_not_contains: 含まない
             label_day_plural: 日
             label_repository: SVNリポジトリ
             label_browse: ブラウズ
             label_modification: %d 点の変更
             label_modification_plural: %d 点の変更
             label_revision: リビジョン
             label_revision_plural: リビジョン
             label_added: 追加された
             label_modified: 変更された
             label_deleted: 削除された
             label_latest_revision: 最新リビジョン
             label_latest_revision_plural: Latest revisions
             label_view_revisions: リビジョンを見る
             label_max_size: 最大サイズ
             label_on: 他
             label_sort_highest: 一番上へ
             label_sort_higher: 上へ
             label_sort_lower: 下へ
             label_sort_lowest: 一番下へ
             label_roadmap: ロードマップ
             label_roadmap_due_in: Due in
             label_roadmap_no_issues: No issues for this version
             label_search: 検索
             label_result: %d 件の結果
             label_result_plural: %d 件の結果
             label_all_words: すべての単語
             label_wiki: Wiki
             label_wiki_edit: Wiki edit
             label_wiki_edit_plural: Wiki edits
             label_page_index: 索引
             label_current_version: 最近版
             label_preview: 下検分
             label_feed_plural: Feeds
             label_changes_details: Details of all changes
             label_issue_tracking: Issue tracking
             label_spent_time: Spent time
             label_f_hour: %.2f hour
             label_f_hour_plural: %.2f hours
             label_time_tracking: Time tracking
             label_change_plural: Changes
             label_statistics: Statistics
             label_commits_per_month: Commits per month
             label_commits_per_author: Commits per author
+            label_view_diff: View differences
+            label_diff_inline: inline
+            label_diff_side_by_side: side by side
             button_login: ログイン
             button_submit: 変更
             button_save: 保存
             button_check_all: チェックを全部つける
             button_uncheck_all: チェックを全部外す
             button_delete: 削除
             button_create: 作成
             button_test: テスト
             button_edit: 編集
             button_add: 追加
             button_change: 変更
             button_apply: 適用
             button_clear: クリア
             button_lock: ロック
             button_unlock: アンロック
             button_download: ダウンロード
             button_list: 一覧
             button_view: 見る
             button_move: 移動
             button_back: 戻る
             button_cancel: キャンセル
             button_activate: 有効にする
             button_sort: ソート
             button_log_time: Log time
             status_active: active
             status_registered: registered
             status_locked: ロック済
             text_select_mail_notifications: どのメール通知を送信するか、アクションを選択してください。
             text_regexp_info: 例) ^[A-Z0-9]+$
             text_min_max_length_info: 0だと無制限になります
             text_project_destroy_confirmation: 本当にこのプロジェクトと関連データを削除したいのですか？
             text_workflow_edit: ワークフローを編集するロールとトラッカーを選んでください
             text_are_you_sure: 本当に？
             text_journal_changed: %s から %s への変更
             text_journal_set_to: %s にセット
             text_journal_deleted: 削除
             text_tip_task_begin_day: この日に開始するタスク
             text_tip_task_end_day: この日に終了するタスク
             text_tip_task_begin_end_day: この日のうちに開始して終了するタスク
             default_role_manager: 管理者
             default_role_developper: 開発者
             default_role_reporter: 報告者
             default_tracker_bug: バグ
             default_tracker_feature: 機能
             default_tracker_support: サポート
             default_issue_status_new: 新規
             default_issue_status_assigned: 分担
             default_issue_status_resolved: 解決
             default_issue_status_feedback: フィードバック
             default_issue_status_closed: 終了
             default_issue_status_rejected: 却下
             default_doc_category_user: ユーザ文書
             default_doc_category_tech: 技術文書
             default_priority_low: 低め
             default_priority_normal: 通常
             default_priority_high: 高め
             default_priority_urgent: 急いで
             default_priority_immediate: 今すぐ
             default_activity_design: Design
             default_activity_development: Development
             enumeration_issue_priorities: 問題の優先度
             enumeration_doc_categories: 文書カテゴリ
             enumeration_activities: Activities (time tracking)

public/stylesheets/scm.css +8 0

             div.action_M { background: #fd8 }
             div.action_D { background: #f88 }
             div.action_A { background: #bfb }
             tr.spacing {
                 border: 1px solid #d7d7d7;
             }
             .line-num {
                 border: 1px solid #d7d7d7;
             	font-size: 0.8em;
             	text-align: right;
             	width: 3em;
             	padding-right: 3px;
             }
             .line-code {
             	font-family: "Courier New", monospace;
             	font-size: 1em;
             }
             table.list thead th.list-filename {
             	background-color: #ddc;
             	font-weight: bolder;
             	text-align: left;
             }
+            .diff_out{
+              background: #fdd;
+            }
+            .diff_in{
+              background: #dfd;
+            }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages