jro_apps/redmine Commit - r21:5f185b6c0532

data locking for issues...

Jean-Philippe Lang -

r21:5f185b6c0532

parent child

Context file:

r21:5f185b6c0532

Collapse all files

redmine/app/controllers/issues_controller.rb +56 -51

             # redMine - project management software
             # Copyright (C) 2006  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.
             class IssuesController < ApplicationController
-            	layout 'base'
+              layout 'base'
-            	before_filter :find_project, :authorize
+              before_filter :find_project, :authorize
-            	helper :custom_fields
+              helper :custom_fields
-            	include CustomFieldsHelper
+              include CustomFieldsHelper
-            	def show
+              def show
-                @status_options = @issue.status.workflows.find(:all, :conditions => ["role_id=? and tracker_id=?", self.logged_in_user.role_for_project(@project.id), @issue.tracker.id]).collect{ |w| w.new_status } if self.logged_in_user
+                @status_options = @issue.status.workflows.find(:all, :include => :new_status, :conditions => ["role_id=? and tracker_id=?", self.logged_in_user.role_for_project(@project.id), @issue.tracker.id]).collect{ |w| w.new_status } if self.logged_in_user
                 @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
-            	end
+              end
-            	def edit
+              def edit
-            		@priorities = Enumeration::get_values('IPRI')
+                @priorities = Enumeration::get_values('IPRI')
+                if request.get?
-            		if request.get?
+                  @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
-            			@custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
+                else
-            		else
+                  begin
-            			# Retrieve custom fields and values
+                    # Retrieve custom fields and values
-            			@custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
+                    @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
-            			@issue.custom_values = @custom_values
+                    @issue.custom_values = @custom_values
-            			@issue.attributes = params[:issue]
+                    @issue.attributes = params[:issue]
-            			if @issue.save
+                    if @issue.save
-            				flash[:notice] = l(:notice_successful_update)
+                      flash[:notice] = l(:notice_successful_update)
-            				redirect_to :action => 'show', :id => @issue
+                      redirect_to :action => 'show', :id => @issue
-            			end
+                    end
-            		end
+                  rescue ActiveRecord::StaleObjectError
-            	end
+                    # Optimistic locking exception
+                    flash[:notice] = l(:notice_locking_conflict)
-            	def change_status
+                  end
-            		@history = @issue.histories.build(params[:history])
+                end
+              end
+              def change_status
+                @history = @issue.histories.build(params[:history])
                 @status_options = @issue.status.workflows.find(:all, :conditions => ["role_id=? and tracker_id=?", self.logged_in_user.role_for_project(@project.id), @issue.tracker.id]).collect{ |w| w.new_status } if self.logged_in_user
+                if params[:confirm]
-            		if params[:confirm]
+                  begin
-            				@history.author_id = self.logged_in_user.id if self.logged_in_user
+                    @history.author_id = self.logged_in_user.id if self.logged_in_user
+                    @issue.status = @history.status
-            			if @history.save
+                    @issue.fixed_version_id = (params[:issue][:fixed_version_id])
-            				@issue.status = @history.status
+                    @issue.assigned_to_id = (params[:issue][:assigned_to_id])
-            				@issue.fixed_version_id = (params[:issue][:fixed_version_id])
+                    @issue.lock_version = (params[:issue][:lock_version])
-            				@issue.assigned_to_id = (params[:issue][:assigned_to_id])
+                    if @issue.save
-            				if @issue.save
+                      flash[:notice] = l(:notice_successful_update)
-            					flash[:notice] = l(:notice_successful_update)
+                      Mailer.deliver_issue_change_status(@issue) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
-            					Mailer.deliver_issue_change_status(@issue) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
+                      redirect_to :action => 'show', :id => @issue
-            					redirect_to :action => 'show', :id => @issue
+                    end
-            				end
+                  rescue ActiveRecord::StaleObjectError
-            			end
+                    # Optimistic locking exception
-            		end
+                    flash[:notice] = l(:notice_locking_conflict)
+                  end
+                end
                 @assignable_to = @project.members.find(:all, :include => :user).collect{ |m| m.user }
+              end
-            	end
+              def destroy
-            	def destroy
+                @issue.destroy
-            		@issue.destroy
+                redirect_to :controller => 'projects', :action => 'list_issues', :id => @project
-            		redirect_to :controller => 'projects', :action => 'list_issues', :id => @project
+              end
-            	end
               def add_attachment
                 # Save the attachment
                 if params[:attachment][:file].size > 0
                   @attachment = @issue.attachments.build(params[:attachment])
                   @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                   @attachment.save
                 end
                 redirect_to :action => 'show', :id => @issue
               end
               def destroy_attachment
                 @issue.attachments.find(params[:attachment_id]).destroy
                 redirect_to :action => 'show', :id => @issue
               end
               # Send the file in stream mode
               def download
                 @attachment = @issue.attachments.find(params[:attachment_id])
                 send_file @attachment.diskfile, :filename => @attachment.filename
               end
             private
               def find_project
-                @issue = Issue.find(params[:id])
+                @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
                 @project = @issue.project
               end
             end

redmine/app/views/issues/change_status.rhtml +2 -1

             <h2><%=l(:label_issue)%> #<%= @issue.id %>: <%= @issue.subject %></h2>
             <%= error_messages_for 'history' %>
             <%= start_form_tag({:action => 'change_status', :id => @issue}, :class => "tabular") %>
             <%= hidden_field_tag 'confirm', 1 %>
             <%= hidden_field 'history', 'status_id' %>
             <div class="box">
             <p><label><%=l(:label_issue_status_new)%></label> <%= @history.status.name %></p>
             <p><label for="issue_assigned_to_id"><%=l(:field_assigned_to)%></label>
             <select name="issue[assigned_to_id]">
             <option value=""></option>
             <%= options_from_collection_for_select @assignable_to, "id", "display_name", @issue.assigned_to_id %></p>
             </select></p>
             <p><label for="issue_fixed_version"><%=l(:field_fixed_version)%></label>
             <select name="issue[fixed_version_id]">
             <option value="">--none--</option>
             <%= options_from_collection_for_select @issue.project.versions, "id", "name", @issue.fixed_version_id %>
             </select></p>
             <p><label for="history_notes"><%=l(:field_notes)%></label>
             <%= text_area 'history', 'notes', :cols => 60, :rows => 10  %></p>
             </div>
+            <%= hidden_field 'issue', 'lock_version' %>
             <%= submit_tag l(:button_save) %>
             <%= end_form_tag %>

redmine/app/views/issues/edit.rhtml +1 -1

             <h2><%= @issue.tracker.name %> #<%= @issue.id %> - <%= @issue.subject %></h2>
             <% labelled_tabular_form_for :issue, @issue, :url => {:action => 'edit'} do |f| %>
             <%= error_messages_for 'issue' %>
             <div class="box">
             <!--[form:issue]-->
             <p><label><%=l(:field_status)%></label> <%= @issue.status.name %></p>
             <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), :required => true %></p>
             <p><%= f.select :assigned_to_id, (@issue.project.members.collect {|m| [m.name, m.user_id]}), :include_blank => true %></p>
             <p><%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}) %></p>
             <p><%= f.text_field :subject, :size => 80, :required => true %></p>
             <p><%= f.text_area :description, :cols => 60, :rows => 10, :required => true %></p>
             <p><%= f.date_select :due_date, :start_year => Date.today.year, :include_blank => true %></p>
             <% for @custom_value in @custom_values %>
             	<p><%= custom_field_tag_with_label @custom_value %></p>
             <% end %>
             <p><%= f.select :fixed_version_id, (@project.versions.collect {|v| [v.name, v.id]}), { :include_blank => true } %>
             </select></p>
             <!--[eoform:issue]-->
             </div>
+            <%= f.hidden_field :lock_version %>
             <%= submit_tag l(:button_save) %>
             <% end %>

redmine/app/views/issues/show.rhtml +1 -1

             <h2><%= @issue.tracker.name %> #<%= @issue.id %> - <%= @issue.subject %></h2>
             <div class="box">
             <p>
             <b><%=l(:field_status)%> :</b> <%= @issue.status.name %> &nbsp &nbsp
             <b><%=l(:field_priority)%> :</b> <%= @issue.priority.name %> &nbsp &nbsp
             <b><%=l(:field_assigned_to)%> :</b> <%= @issue.assigned_to ? @issue.assigned_to.display_name : "-" %> &nbsp &nbsp
             <b><%=l(:field_category)%> :</b> <%= @issue.category ? @issue.category.name : "-"  %>
             </p>
             <p><b><%=l(:field_author)%> :</b> <%= @issue.author.display_name %></p>
             <p><b><%=l(:field_subject)%> :</b> <%= @issue.subject %></p>
             <p><b><%=l(:field_description)%> :</b> <%= simple_format auto_link @issue.description %></p>
             <p><b><%=l(:field_due_date)%> :</b> <%= format_date(@issue.due_date) %></p>
             <p><b><%=l(:field_created_on)%> :</b> <%= format_date(@issue.created_on) %></p>
             <% for custom_value in @custom_values %>
             <p><b><%= custom_value.custom_field.name %></b> : <%= show_value custom_value %></p>
             <% end %>
             <% if authorize_for('issues', 'edit') %>
               <%= start_form_tag ({:controller => 'issues', :action => 'edit', :id => @issue}, :method => "get" ) %>
               <%= submit_tag l(:button_edit) %>
               <%= end_form_tag %>
               &nbsp;&nbsp;
             <% end %>
             <% if authorize_for('issues', 'change_status') and @status_options and !@status_options.empty? %>
               <%= start_form_tag ({:controller => 'issues', :action => 'change_status', :id => @issue}) %>
               <label for="history_status_id"><%=l(:label_change_status)%> :</label>
               <select name="history[status_id]">
               <%= options_from_collection_for_select @status_options, "id", "name" %>
               </select>
               <%= submit_tag l(:button_change) %>
               <%= end_form_tag %>
               &nbsp;&nbsp;
             <% end %>
             <% if authorize_for('issues', 'destroy') %>
               <%= start_form_tag ({:controller => 'issues', :action => 'destroy', :id => @issue} ) %>
               <%= submit_tag l(:button_delete) %>
               <%= end_form_tag %>
               &nbsp;&nbsp;
             <% end %>
             </div>
             <div class="splitcontentleft">
             <div class="box">
             <h3><%=l(:label_history)%></h3>
             <table width="100%">
-            <% for history in @issue.histories.find(:all, :include => :author) %>
+            <% for history in @issue.histories.find(:all, :include => [:author, :status]) %>
             <tr>
             <td><%= format_date(history.created_on) %></td>
             <td><%= history.author.display_name %></td>
             <td><b><%= history.status.name %></b></td>
             </tr>
             <% if history.notes? %>
             	<tr><td colspan=3><div class="notes"><%= history.notes %></td></tr>
             <% end %>
             <% end %>
             </table>
             </div>
             </div>
             <div class="splitcontentright">
             <div class="box">
             <h3><%=l(:label_attachment_plural)%></h3>
             <table width="100%">
             <% for attachment in @issue.attachments %>
             <tr>
             <td><%= link_to attachment.filename, :action => 'download', :id => @issue, :attachment_id => attachment %> (<%= human_size(attachment.filesize) %>)</td>
             <td><%= format_date(attachment.created_on) %></td>
             <td><%= attachment.author.display_name %></td>
             <% if authorize_for('issues', 'destroy_attachment') %>
               <td>
               <%= start_form_tag :action => 'destroy_attachment', :id => @issue, :attachment_id => attachment %>
               <%= submit_tag l(:button_delete), :class => "button-small" %>
               <%= end_form_tag %>
               </td>
             <% end %>
             </tr>
             <% end %>
             </table>
             <br />
             <% if authorize_for('issues', 'add_attachment') %>
               <%= start_form_tag ({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true) %>
               <%=l(:label_attachment_new)%>: <%= file_field 'attachment', 'file'  %>
               <%= submit_tag l(:button_add) %>
               <%= end_form_tag %>
             <% end %>
             </div>
             </div>

redmine/db/migrate/001_setup.rb +2 -1

             # redMine - project management software
             # Copyright (C) 2006  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.
             class Setup < ActiveRecord::Migration
               def self.up
                 create_table "attachments", :force => true do |t|
                   t.column "container_id", :integer, :default => 0, :null => false
                   t.column "container_type", :string, :limit => 30, :default => "", :null => false
                   t.column "filename", :string, :default => "", :null => false
                   t.column "disk_filename", :string, :default => "", :null => false
                   t.column "filesize", :integer, :default => 0, :null => false
                   t.column "content_type", :string, :limit => 60, :default => ""
                   t.column "digest", :string, :limit => 40, :default => "", :null => false
                   t.column "downloads", :integer, :default => 0, :null => false
                   t.column "author_id", :integer, :default => 0, :null => false
                   t.column "created_on", :timestamp
                 end
                 create_table "auth_sources", :force => true do |t|
                   t.column "type", :string, :limit => 30, :default => "", :null => false
                   t.column "name", :string, :limit => 60, :default => "", :null => false
                   t.column "host", :string, :limit => 60
                   t.column "port", :integer
                   t.column "account", :string, :limit => 60
                   t.column "account_password", :string, :limit => 60
                   t.column "base_dn", :string, :limit => 255
                   t.column "attr_login", :string, :limit => 30
                   t.column "attr_firstname", :string, :limit => 30
                   t.column "attr_lastname", :string, :limit => 30
                   t.column "attr_mail", :string, :limit => 30
                   t.column "onthefly_register", :boolean, :default => false, :null => false
                 end
                 create_table "custom_fields", :force => true do |t|
                   t.column "type", :string, :limit => 30, :default => "", :null => false
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                   t.column "field_format", :string, :limit => 30, :default => "", :null => false
                   t.column "possible_values", :text, :default => ""
                   t.column "regexp", :string, :default => ""
                   t.column "min_length", :integer, :default => 0, :null => false
                   t.column "max_length", :integer, :default => 0, :null => false
                   t.column "is_required", :boolean, :default => false, :null => false
                   t.column "is_for_all", :boolean, :default => false, :null => false
                 end
                 create_table "custom_fields_projects", :id => false, :force => true do |t|
                   t.column "custom_field_id", :integer, :default => 0, :null => false
                   t.column "project_id", :integer, :default => 0, :null => false
                 end
                 create_table "custom_fields_trackers", :id => false, :force => true do |t|
                   t.column "custom_field_id", :integer, :default => 0, :null => false
                   t.column "tracker_id", :integer, :default => 0, :null => false
                 end
                 create_table "custom_values", :force => true do |t|
                   t.column "customized_type", :string, :limit => 30, :default => "", :null => false
                   t.column "customized_id", :integer, :default => 0, :null => false
                   t.column "custom_field_id", :integer, :default => 0, :null => false
                   t.column "value", :text, :default => "", :null => false
                 end
                 create_table "documents", :force => true do |t|
                   t.column "project_id", :integer, :default => 0, :null => false
                   t.column "category_id", :integer, :default => 0, :null => false
                   t.column "title", :string, :limit => 60, :default => "", :null => false
                   t.column "description", :text, :default => ""
                   t.column "created_on", :timestamp
                 end
                 create_table "enumerations", :force => true do |t|
                   t.column "opt", :string, :limit => 4, :default => "", :null => false
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                 end
                 create_table "issue_categories", :force => true do |t|
                   t.column "project_id", :integer, :default => 0, :null => false
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                 end
                 create_table "issue_histories", :force => true do |t|
                   t.column "issue_id", :integer, :default => 0, :null => false
                   t.column "status_id", :integer, :default => 0, :null => false
                   t.column "author_id", :integer, :default => 0, :null => false
                   t.column "notes", :text, :default => ""
                   t.column "created_on", :timestamp
                 end
                 add_index "issue_histories", ["issue_id"], :name => "issue_histories_issue_id"
                 create_table "issue_statuses", :force => true do |t|
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                   t.column "is_closed", :boolean, :default => false, :null => false
                   t.column "is_default", :boolean, :default => false, :null => false
                   t.column "html_color", :string, :limit => 6, :default => "FFFFFF", :null => false
                 end
                 create_table "issues", :force => true do |t|
                   t.column "tracker_id", :integer, :default => 0, :null => false
                   t.column "project_id", :integer, :default => 0, :null => false
                   t.column "subject", :string, :default => "", :null => false
                   t.column "description", :text, :default => "", :null => false
                   t.column "due_date", :date
                   t.column "category_id", :integer
                   t.column "status_id", :integer, :default => 0, :null => false
                   t.column "assigned_to_id", :integer
                   t.column "priority_id", :integer, :default => 0, :null => false
                   t.column "fixed_version_id", :integer
                   t.column "author_id", :integer, :default => 0, :null => false
+                  t.column "lock_version", :integer, :default => 0, :null => false
                   t.column "created_on", :timestamp
                   t.column "updated_on", :timestamp
                 end
                 add_index "issues", ["project_id"], :name => "issues_project_id"
                 create_table "members", :force => true do |t|
                   t.column "user_id", :integer, :default => 0, :null => false
                   t.column "project_id", :integer, :default => 0, :null => false
                   t.column "role_id", :integer, :default => 0, :null => false
                   t.column "created_on", :timestamp
                 end
                 create_table "news", :force => true do |t|
                   t.column "project_id", :integer
                   t.column "title", :string, :limit => 60, :default => "", :null => false
                   t.column "summary", :string, :limit => 255, :default => ""
                   t.column "description", :text, :default => "", :null => false
                   t.column "author_id", :integer, :default => 0, :null => false
                   t.column "created_on", :timestamp
                 end
                 create_table "permissions", :force => true do |t|
                   t.column "controller", :string, :limit => 30, :default => "", :null => false
                   t.column "action", :string, :limit => 30, :default => "", :null => false
                   t.column "description", :string, :limit => 60, :default => "", :null => false
                   t.column "is_public", :boolean, :default => false, :null => false
                   t.column "sort", :integer, :default => 0, :null => false
                   t.column "mail_option", :boolean, :default => false, :null => false
                   t.column "mail_enabled", :boolean, :default => false, :null => false
                 end
                 create_table "permissions_roles", :id => false, :force => true do |t|
                   t.column "permission_id", :integer, :default => 0, :null => false
                   t.column "role_id", :integer, :default => 0, :null => false
                 end
                 add_index "permissions_roles", ["role_id"], :name => "permissions_roles_role_id"
                 create_table "projects", :force => true do |t|
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                   t.column "description", :string, :default => "", :null => false
                   t.column "homepage", :string, :limit => 60, :default => ""
                   t.column "is_public", :boolean, :default => true, :null => false
                   t.column "parent_id", :integer
                   t.column "projects_count", :integer, :default => 0
                   t.column "created_on", :timestamp
                   t.column "updated_on", :timestamp
                 end
                 create_table "roles", :force => true do |t|
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                 end
                 create_table "tokens", :force => true do |t|
                   t.column "user_id", :integer, :default => 0, :null => false
                   t.column "action", :string, :limit => 30, :default => "", :null => false
                   t.column "value", :string, :limit => 40, :default => "", :null => false
                   t.column "created_on", :datetime, :null => false
                 end
                 create_table "trackers", :force => true do |t|
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                   t.column "is_in_chlog", :boolean, :default => false, :null => false
                 end
                 create_table "users", :force => true do |t|
                   t.column "login", :string, :limit => 30, :default => "", :null => false
                   t.column "hashed_password", :string, :limit => 40, :default => "", :null => false
                   t.column "firstname", :string, :limit => 30, :default => "", :null => false
                   t.column "lastname", :string, :limit => 30, :default => "", :null => false
                   t.column "mail", :string, :limit => 60, :default => "", :null => false
                   t.column "mail_notification", :boolean, :default => true, :null => false
                   t.column "admin", :boolean, :default => false, :null => false
                   t.column "status", :integer, :default => 1, :null => false
                   t.column "last_login_on", :datetime
                   t.column "language", :string, :limit => 2, :default => ""
                   t.column "auth_source_id", :integer
                   t.column "created_on", :timestamp
                   t.column "updated_on", :timestamp
                 end
                 create_table "versions", :force => true do |t|
                   t.column "project_id", :integer, :default => 0, :null => false
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                   t.column "description", :string, :default => ""
                   t.column "effective_date", :date, :null => false
                   t.column "created_on", :timestamp
                   t.column "updated_on", :timestamp
                 end
                 create_table "workflows", :force => true do |t|
                   t.column "tracker_id", :integer, :default => 0, :null => false
                   t.column "old_status_id", :integer, :default => 0, :null => false
                   t.column "new_status_id", :integer, :default => 0, :null => false
                   t.column "role_id", :integer, :default => 0, :null => false
                 end
                 # project
                 Permission.create :controller => "projects", :action => "show", :description => "label_overview", :sort => 100, :is_public => true
                 Permission.create :controller => "projects", :action => "changelog", :description => "label_change_log", :sort => 105, :is_public => true
                 Permission.create :controller => "reports", :action => "issue_report", :description => "label_report_plural", :sort => 110, :is_public => true
                 Permission.create :controller => "projects", :action => "settings", :description => "label_settings", :sort => 150
                 Permission.create :controller => "projects", :action => "edit", :description => "button_edit", :sort => 151
                 # members
                 Permission.create :controller => "projects", :action => "list_members", :description => "button_list", :sort => 200, :is_public => true
                 Permission.create :controller => "projects", :action => "add_member", :description => "button_add", :sort => 220
                 Permission.create :controller => "members", :action => "edit", :description => "button_edit", :sort => 221
                 Permission.create :controller => "members", :action => "destroy", :description => "button_delete", :sort => 222
                 # versions
                 Permission.create :controller => "projects", :action => "add_version", :description => "button_add", :sort => 320
                 Permission.create :controller => "versions", :action => "edit", :description => "button_edit", :sort => 321
                 Permission.create :controller => "versions", :action => "destroy", :description => "button_delete", :sort => 322
                 # issue categories
                 Permission.create :controller => "projects", :action => "add_issue_category", :description => "button_add", :sort => 420
                 Permission.create :controller => "issue_categories", :action => "edit", :description => "button_edit", :sort => 421
                 Permission.create :controller => "issue_categories", :action => "destroy", :description => "button_delete", :sort => 422
                 # issues
                 Permission.create :controller => "projects", :action => "list_issues", :description => "button_list", :sort => 1000, :is_public => true
                 Permission.create :controller => "projects", :action => "export_issues_csv", :description => "label_export_csv", :sort => 1001, :is_public => true
                 Permission.create :controller => "issues", :action => "show", :description => "button_view", :sort => 1005, :is_public => true
                 Permission.create :controller => "issues", :action => "download", :description => "button_download", :sort => 1010, :is_public => true
                 Permission.create :controller => "projects", :action => "add_issue", :description => "button_add", :sort => 1050, :mail_option => 1, :mail_enabled => 1
                 Permission.create :controller => "issues", :action => "edit", :description => "button_edit", :sort => 1055
                 Permission.create :controller => "issues", :action => "change_status", :description => "label_change_status", :sort => 1060, :mail_option => 1, :mail_enabled => 1
                 Permission.create :controller => "issues", :action => "destroy", :description => "button_delete", :sort => 1065
                 Permission.create :controller => "issues", :action => "add_attachment", :description => "label_attachment_new", :sort => 1070
                 Permission.create :controller => "issues", :action => "destroy_attachment", :description => "label_attachment_delete", :sort => 1075
                 # news
                 Permission.create :controller => "projects", :action => "list_news", :description => "button_list", :sort => 1100, :is_public => true
                 Permission.create :controller => "news", :action => "show", :description => "button_view", :sort => 1101, :is_public => true
                 Permission.create :controller => "projects", :action => "add_news", :description => "button_add", :sort => 1120
                 Permission.create :controller => "news", :action => "edit", :description => "button_edit", :sort => 1121
                 Permission.create :controller => "news", :action => "destroy", :description => "button_delete", :sort => 1122
                 # documents
                 Permission.create :controller => "projects", :action => "list_documents", :description => "button_list", :sort => 1200, :is_public => true
                 Permission.create :controller => "documents", :action => "show", :description => "button_view", :sort => 1201, :is_public => true
                 Permission.create :controller => "documents", :action => "download", :description => "button_download", :sort => 1202, :is_public => true
                 Permission.create :controller => "projects", :action => "add_document", :description => "button_add", :sort => 1220
                 Permission.create :controller => "documents", :action => "edit", :description => "button_edit", :sort => 1221
                 Permission.create :controller => "documents", :action => "destroy", :description => "button_delete", :sort => 1222
                 Permission.create :controller => "documents", :action => "add_attachment", :description => "label_attachment_new", :sort => 1223
                 Permission.create :controller => "documents", :action => "destroy_attachment", :description => "label_attachment_delete", :sort => 1224
                 # files
                 Permission.create :controller => "projects", :action => "list_files", :description => "button_list", :sort => 1300, :is_public => true
                 Permission.create :controller => "versions", :action => "download", :description => "button_download", :sort => 1301, :is_public => true
                 Permission.create :controller => "projects", :action => "add_file", :description => "button_add", :sort => 1320
                 Permission.create :controller => "versions", :action => "destroy_file", :description => "button_delete", :sort => 1322
                 # create default administrator account
                 user = User.create :firstname => "redMine", :lastname => "Admin", :mail => "admin@somenet.foo", :mail_notification => true, :language => "en"
                 user.login = "admin"
                 user.password = "admin"
                 user.admin = true
                 user.save
               end
               def self.down
                 drop_table :attachments
                 drop_table :auth_sources
                 drop_table :custom_fields
                 drop_table :custom_fields_projects
                 drop_table :custom_fields_trackers
                 drop_table :custom_values
                 drop_table :documents
                 drop_table :enumerations
                 drop_table :issue_categories
                 drop_table :issue_histories
                 drop_table :issue_statuses
                 drop_table :issues
                 drop_table :members
                 drop_table :news
                 drop_table :permissions
                 drop_table :permissions_roles
                 drop_table :projects
                 drop_table :roles
                 drop_table :trackers
                 drop_table :tokens
                 drop_table :users
                 drop_table :versions
                 drop_table :workflows
               end
             end

redmine/lang/de.yml +1 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: Bitte auserwählt
             activerecord_error_inclusion: ist nicht in der Liste eingeschlossen
             activerecord_error_exclusion: ist reserviert
             activerecord_error_invalid: ist unzulässig
             activerecord_error_confirmation: bringt nicht Bestätigung zusammen
             activerecord_error_accepted: muß angenommen werden
             activerecord_error_empty: kann nicht leer sein
             activerecord_error_blank: kann nicht leer sein
             activerecord_error_too_long: ist zu lang
             activerecord_error_too_short: ist zu kurz
             activerecord_error_wrong_length: ist die falsche Länge
             activerecord_error_taken: ist bereits genommen worden
             activerecord_error_not_a_number: ist nicht eine Zahl
             general_fmt_age: %d yr
             general_fmt_age_plural: %d yrs
             general_fmt_date: %%b %%d, %%Y (%%a)
             general_fmt_datetime: %%b %%d, %%Y (%%a), %%I:%%M %%p
             general_fmt_datetime_short: %%b %%d, %%I:%%M %%p
             general_fmt_time: %%I:%%M %%p
             general_text_No: 'Nein'
             general_text_Yes: 'Ja'
             general_text_no: 'nein'
             general_text_yes: 'ja'
             general_lang_de: 'Deutsch'
             notice_account_updated: Konto wurde erfolgreich aktualisiert.
             notice_account_invalid_creditentials: Unzulässiger Benutzer oder Passwort
             notice_account_password_updated: Passwort wurde erfolgreich aktualisiert.
             notice_account_wrong_password: Falsches Passwort
             notice_account_register_done: Konto wurde erfolgreich verursacht.
             notice_account_unknown_email: Unbekannter Benutzer.
             notice_can_t_change_password: Dieses Konto verwendet eine externe Authentisierung Quelle. Unmöglich, das Kennwort zu ändern.
             notice_account_lost_email_sent: Ein email mit Anweisungen, ein neues Kennwort zu wählen ist dir geschickt worden.
             notice_account_activated: Dein Konto ist aktiviert worden. Du kannst jetzt einloggen.
             notice_successful_create: Erfolgreiche Kreation.
             notice_successful_update: Erfolgreiches Update.
             notice_successful_delete: Erfolgreiche Auslassung.
             notice_successful_connection: Erfolgreicher Anschluß.
             notice_file_not_found: Erbetene Akte besteht nicht oder ist gelöscht worden.
+            notice_locking_conflict: Data have been updated by another user.
             gui_validation_error: 1 Störung
             gui_validation_error_plural: %d Störungen
             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: Grootte
             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: Títel
             field_project: Projekt
             #field_issue: Issue
             field_status: Status
             field_notes: Anmerkungen
             field_is_closed: Problem erledigt
             #field_is_default: Default status
             field_html_color: Farbe
             field_tracker: Tracker
             field_subject: Thema
             #field_due_date: Due date
             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: Subprojekt von
             field_is_in_chlog: Ansicht der Issues in der Historie
             field_login: Mitgliedsname
             field_mail_notification: Mailbenachrichtigung
             #field_admin: Administrator
             field_locked: Gesperrt
             field_last_login_on: Letzte Anmeldung
             field_language: Sprache
             field_effective_date: Datum
             field_password: Passwort
             field_new_password: Neues Passwort
             field_password_confirmation: Bestätigung
             field_version: Version
             field_type: Typ
             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
             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: Latest projects
             #label_issue: Issue
             #label_issue_new: New issue
             #label_issue_plural: Issues
             #label_issue_view_all: View all issues
             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: Problem Status
             label_issue_status_plural: Problem Stati
             label_issue_status_new: Neuer Status
             label_issue_category: Problem Kategorie
             label_issue_category_plural: Problem 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: Enumerationen
             label_enumeration_new: Neuer Wert
             label_information: Information
             label_information_plural: Informationen
             #label_please_login: Please login
             label_register: Anmelden
             label_password_lost: Passwort 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 Issues
             label_assigned_to_me_issues: Mir zugewiesen
             label_last_login: Letzte Anmeldung
             #label_last_updates: Last updated
             #label_last_updates_plural: %d last updated
             label_registered_on: Angemeldet am
             label_activity: Aktivität
             label_new: Neue
             label_logged_as: Angemeldet als
             #label_environment: Environment
             label_authentication: Authentisierung
             #label_auth_source: Authentification mode
             #label_auth_source_new: New authentication mode
             #label_auth_source_plural: Authentification modes
             #label_subproject: Subproject
             #label_subproject_plural: Subprojects
             label_min_max_length: Min - Max Länge
             label_list: Liste
             label_date: Date
             label_integer: Zahl
             label_boolean: Boolesch
             #label_string: String
             label_text: 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: Delete file
             label_attachment_plural: Dateien
             label_report: Bericht
             label_report_plural: Berichte
             #label_news: Neuigkeiten
             #label_news_new: Add news
             #label_news_plural: Neuigkeiten
             label_news_latest: Letzte Neuigkeiten
             label_news_view_all: Alle Neuigkeiten 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_csv: Export to CSV
             label_read: Lesen...
             label_public_projects: Öffentliche Projekte
             #label_open_issues: Open
             #label_open_issues_plural: Open
             #label_closed_issues: Closed
             #label_closed_issues_plural: Closed
             label_total: Gesamtzahl
             label_permissions: Berechtigungen
             label_current_status: Gegenwärtiger Status
             label_new_statuses_allowed: Neue Status gewährten
             label_all: Alle
             label_none: Kein
             label_next: Weiter
             label_previous: Zurück
             label_used_by: Benutzt von
             button_login: Einloggen
             button_submit: Einreichen
             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: Verriegeln
             button_unlock: Entriegeln
             button_download: Fernzuladen
             button_list: Aufzulisten
             button_view: Siehe
             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 heisst keine Beschränkung
             #text_possible_values_info: values separated with |
             text_project_destroy_confirmation: Sind sie sicher, daß sie das Projekt löschen wollen ?
             text_workflow_edit: Auswahl Workflow zum Bearbeiten
             text_are_you_sure: Sind sie sicher ?
             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
             enumeration_issue_priorities: Issue-Prioritäten
             enumeration_doc_categories: Dokumentenkategorien

redmine/lang/en.yml +1 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
             general_fmt_age: %d yr
             general_fmt_age_plural: %d yrs
             general_fmt_date: %%b %%d, %%Y (%%a)
             general_fmt_datetime: %%b %%d, %%Y (%%a), %%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'
             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: Requested file doesn't exist or has been deleted.
+            notice_locking_conflict: Data have been updated by another user.
             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: Catogory
             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_login: Login
             field_mail_notification: Mail notifications
             field_admin: Administrator
             field_locked: Locked
             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
             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: Authentification mode
             label_auth_source_new: New authentication mode
             label_auth_source_plural: Authentification modes
             label_subproject: Subproject
             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: String
             label_text: 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_csv: Export to CSV
             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
             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
             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_possible_values_info: values separated with |
             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 ?
             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
             enumeration_issue_priorities: Issue priorities
             enumeration_doc_categories: Document categories

redmine/lang/es.yml +1 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
             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'
             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: Requested file doesn't exist or has been deleted.
+            notice_locking_conflict: Data have been updated by another user.
             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: Minimum length
             #field_max_length: Maximum length
             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: Due date
             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: Subproject de
             field_is_in_chlog: Consultar las peticiones en el histórico
             field_login: Identificador
             field_mail_notification: Notificación por mail
             field_admin: Administrador
             field_locked: Cerrado
             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: 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
             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: Latest projects
             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: Register
             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: Authentication
             #label_auth_source: Authentification mode
             #label_auth_source_new: New authentication mode
             #label_auth_source_plural: Authentification modes
             #label_subproject: Subproject
             #label_subproject_plural: Subprojects
             #label_min_max_length: Min - Max length
             #label_list: List
             label_date: Fecha
             #label_integer: Integer
             #label_boolean: Boolean
             #label_string: String
             #label_text: Text
             #label_attribute: Attribute
             #label_attribute_plural: Attributes
             label_download: %d Telecarga
             label_download_plural: %d Telecargas
             #label_no_data: No data to display
             label_change_status: Cambiar el estatuto
             label_history: Histórico
             label_attachment: Fichero
             label_attachment_new: Nuevo fichero
             #label_attachment_delete: Delete file
             label_attachment_plural: Ficheros
             #label_report: Report
             #label_report_plural: Reports
             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_csv: Exportar a CSV
             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: Current status
             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
             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
             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_possible_values_info: values separated with |
             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 ?
             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
             enumeration_issue_priorities: Prioridad de las peticiones
             enumeration_doc_categories: Categorías del documento

redmine/lang/fr.yml +1 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
             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'
             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: Le fichier demandé n'existe pas ou a été supprimé.
+            notice_locking_conflict: Les données ont été mises à jour par un autre utilisateur. Mise à jour impossible.
             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_login: Identifiant
             field_mail_notification: Notifications par mail
             field_admin: Administrateur
             field_locked: Verrouillé
             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
             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: Sous-projet
             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: Chaîne
             label_text: Texte
             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_csv: Exporter en CSV
             label_read: Lire...
             label_public_projects: Projets publics
             label_open_issues: Ouverte
             label_open_issues_plural: Ouvertes
             label_closed_issues: Fermée
             label_closed_issues_plural: Fermées
             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
             button_login: Connexion
             button_submit: Soumettre
             button_save: Valider
             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
             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_possible_values_info: valeurs séparées par |
             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 ?
             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
             enumeration_issue_priorities: Priorités des demandes
             enumeration_doc_categories: Catégories des documents

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