Tagging 1.0.2

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/tags/1.0.2@4213 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/controllers/activities_controller.rb

@@ -0,0 +1,59 @@
+class ActivitiesController < ApplicationController
+  menu_item :activity
+  before_filter :find_optional_project
+  accept_key_auth :index
+
+  def index
+    @days = Setting.activity_days_default.to_i
+    
+    if params[:from]
+      begin; @date_to = params[:from].to_date + 1; rescue; end
+    end
+
+    @date_to ||= Date.today + 1
+    @date_from = @date_to - @days
+    @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
+    @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
+    
+    @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project, 
+                                                             :with_subprojects => @with_subprojects,
+                                                             :author => @author)
+    @activity.scope_select {|t| !params["show_#{t}"].nil?}
+    @activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?
+
+    events = @activity.events(@date_from, @date_to)
+    
+    if events.empty? || stale?(:etag => [events.first, User.current])
+      respond_to do |format|
+        format.html { 
+          @events_by_day = events.group_by(&:event_date)
+          render :layout => false if request.xhr?
+        }
+        format.atom {
+          title = l(:label_activity)
+          if @author
+            title = @author.name
+          elsif @activity.scope.size == 1
+            title = l("label_#{@activity.scope.first.singularize}_plural")
+          end
+          render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
+        }
+      end
+    end
+    
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+
+  private
+
+  # TODO: refactor, duplicated in projects_controller
+  def find_optional_project
+    return true unless params[:id]
+    @project = Project.find(params[:id])
+    authorize
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+
+end

app/controllers/context_menus_controller.rb

@@ -6,9 +6,15 @@ class ContextMenusController < ApplicationController
     if (@issues.size == 1)
       @issue = @issues.first
       @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
+    else
+      @allowed_statuses = @issues.map do |i|
+        i.new_statuses_allowed_to(User.current)
+      end.inject do |memo,s|
+        memo & s
+      end
     end
-    projects = @issues.collect(&:project).compact.uniq
-    @project = projects.first if projects.size == 1
+    @projects = @issues.collect(&:project).compact.uniq
+    @project = @projects.first if @projects.size == 1
 
     @can = {:edit => (@project && User.current.allowed_to?(:edit_issues, @project)),
             :log_time => (@project && User.current.allowed_to?(:log_time, @project)),

app/controllers/files_controller.rb

@@ -0,0 +1,37 @@
+class FilesController < ApplicationController
+  menu_item :files
+
+  before_filter :find_project
+  before_filter :authorize
+
+  helper :sort
+  include SortHelper
+
+  def index
+    sort_init 'filename', 'asc'
+    sort_update 'filename' => "#{Attachment.table_name}.filename",
+                'created_on' => "#{Attachment.table_name}.created_on",
+                'size' => "#{Attachment.table_name}.filesize",
+                'downloads' => "#{Attachment.table_name}.downloads"
+                
+    @containers = [ Project.find(@project.id, :include => :attachments, :order => sort_clause)]
+    @containers += @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
+    render :layout => !request.xhr?
+  end
+
+  # TODO: split method into new (GET) and create (POST)
+  def new
+    if request.post?
+      container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
+      attachments = Attachment.attach_files(container, params[:attachments])
+      render_attachment_warning_if_needed(container)
+
+      if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
+        Mailer.deliver_attachments_added(attachments[:files])
+      end
+      redirect_to :controller => 'files', :action => 'index', :id => @project
+      return
+    end
+    @versions = @project.versions.sort
+  end
+end

app/controllers/issues_controller.rb

@@ -20,13 +20,13 @@ class IssuesController < ApplicationController
   default_search_scope :issues
   
   before_filter :find_issue, :only => [:show, :edit, :update]
-  before_filter :find_issues, :only => [:bulk_edit, :move, :perform_move, :destroy]
+  before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :move, :perform_move, :destroy]
   before_filter :find_project, :only => [:new, :create]
-  before_filter :authorize, :except => [:index, :changes]
-  before_filter :find_optional_project, :only => [:index, :changes]
+  before_filter :authorize, :except => [:index]
+  before_filter :find_optional_project, :only => [:index]
   before_filter :check_for_default_issue_status, :only => [:new, :create]
   before_filter :build_new_issue_from_params, :only => [:new, :create]
-  accept_key_auth :index, :show, :changes
+  accept_key_auth :index, :show
 
   rescue_from Query::StatementInvalid, :with => :query_statement_invalid
   
@@ -54,6 +54,7 @@ class IssuesController < ApplicationController
          :render => { :nothing => true, :status => :method_not_allowed }
 
   verify :method => :post, :only => :create, :render => {:nothing => true, :status => :method_not_allowed }
+  verify :method => :post, :only => :bulk_update, :render => {:nothing => true, :status => :method_not_allowed }
   verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
   
   def index
@@ -95,21 +96,6 @@ class IssuesController < ApplicationController
     render_404
   end
   
-  def changes
-    retrieve_query
-    sort_init 'id', 'desc'
-    sort_update(@query.sortable_columns)
-    
-    if @query.valid?
-      @journals = @query.journals(:order => "#{Journal.table_name}.created_on DESC", 
-                                  :limit => 25)
-    end
-    @title = (@project ? @project.name : Setting.app_title) + ": " + (@query.new_record? ? l(:label_changes_details) : @query.name)
-    render :layout => false, :content_type => 'application/atom+xml'
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-  
   def show
     @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
     @journals.each_with_index {|j,i| j.indice = i+1}
@@ -124,7 +110,7 @@ class IssuesController < ApplicationController
       format.html { render :template => 'issues/show.rhtml' }
       format.xml  { render :layout => false }
       format.json { render :text => @issue.to_json, :layout => false }
-      format.atom { render :action => 'changes', :layout => false, :content_type => 'application/atom+xml' }
+      format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
       format.pdf  { send_data(issue_to_pdf(@issue), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") }
     end
   end
@@ -147,7 +133,7 @@ class IssuesController < ApplicationController
       call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
       respond_to do |format|
         format.html {
-          redirect_to(params[:continue] ? { :action => 'new', :issue => {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?} } :
+          redirect_to(params[:continue] ?  { :action => 'new', :project_id => @project, :issue => {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?} } :
                       { :action => 'show', :id => @issue })
         }
         format.xml  { render :action => 'show', :status => :created, :location => url_for(:controller => 'issues', :action => 'show', :id => @issue) }
@@ -206,29 +192,28 @@ class IssuesController < ApplicationController
   # Bulk edit a set of issues
   def bulk_edit
     @issues.sort!
-    if request.post?
-      attributes = (params[:issue] || {}).reject {|k,v| v.blank?}
-      attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
-      attributes[:custom_field_values].reject! {|k,v| v.blank?} if attributes[:custom_field_values]
-      
-      unsaved_issue_ids = []
-      @issues.each do |issue|
-        issue.reload
-        journal = issue.init_journal(User.current, params[:notes])
-        issue.safe_attributes = attributes
-        call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
-        unless issue.save
-          # Keep unsaved issue ids to display them in flash error
-          unsaved_issue_ids << issue.id
-        end
-      end
-      set_flash_from_bulk_issue_save(@issues, unsaved_issue_ids)
-      redirect_back_or_default({:controller => 'issues', :action => 'index', :project_id => @project})
-      return
-    end
     @available_statuses = Workflow.available_statuses(@project)
     @custom_fields = @project.all_issue_custom_fields
   end
+
+  def bulk_update
+    @issues.sort!
+    attributes = parse_params_for_bulk_issue_attributes(params)
+
+    unsaved_issue_ids = []
+    @issues.each do |issue|
+      issue.reload
+      journal = issue.init_journal(User.current, params[:notes])
+      issue.safe_attributes = attributes
+      call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
+      unless issue.save
+        # Keep unsaved issue ids to display them in flash error
+        unsaved_issue_ids << issue.id
+      end
+    end
+    set_flash_from_bulk_issue_save(@issues, unsaved_issue_ids)
+    redirect_back_or_default({:controller => 'issues', :action => 'index', :project_id => @project})
+  end
   
   def destroy
     @hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f
@@ -285,7 +270,7 @@ private
     @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
     @time_entry = TimeEntry.new
     
-    @notes = params[:notes]
+    @notes = params[:notes] || (params[:issue].present? ? params[:issue][:notes] : nil)
     @issue.init_journal(User.current, @notes)
     # User can change issue attributes only if he has :edit permission or if a workflow transition is allowed
     if (@edit_allowed || !@allowed_statuses.empty?) && params[:issue]
@@ -298,6 +283,7 @@ private
   end
 
   # TODO: Refactor, lots of extra code in here
+  # TODO: Changing tracker on an existing issue should not trigger this
   def build_new_issue_from_params
     if params[:id].blank?
       @issue = Issue.new
@@ -316,7 +302,9 @@ private
     end
     if params[:issue].is_a?(Hash)
       @issue.safe_attributes = params[:issue]
-      @issue.watcher_user_ids = params[:issue]['watcher_user_ids'] if User.current.allowed_to?(:add_issue_watchers, @project)
+      if User.current.allowed_to?(:add_issue_watchers, @project) && @issue.new_record?
+        @issue.watcher_user_ids = params[:issue]['watcher_user_ids']
+      end
     end
     @issue.author = User.current
     @issue.start_date ||= Date.today
@@ -330,4 +318,11 @@ private
       return false
     end
   end
+
+  def parse_params_for_bulk_issue_attributes(params)
+    attributes = (params[:issue] || {}).reject {|k,v| v.blank?}
+    attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
+    attributes[:custom_field_values].reject! {|k,v| v.blank?} if attributes[:custom_field_values]
+    attributes
+  end
 end

app/controllers/journals_controller.rb

@@ -18,6 +18,29 @@
 class JournalsController < ApplicationController
   before_filter :find_journal, :only => [:edit]
   before_filter :find_issue, :only => [:new]
+  before_filter :find_optional_project, :only => [:index]
+  accept_key_auth :index
+
+  helper :issues
+  helper :queries
+  include QueriesHelper
+  helper :sort
+  include SortHelper
+
+  def index
+    retrieve_query
+    sort_init 'id', 'desc'
+    sort_update(@query.sortable_columns)
+    
+    if @query.valid?
+      @journals = @query.journals(:order => "#{Journal.table_name}.created_on DESC", 
+                                  :limit => 25)
+    end
+    @title = (@project ? @project.name : Setting.app_title) + ": " + (@query.new_record? ? l(:label_changes_details) : @query.name)
+    render :layout => false, :content_type => 'application/atom+xml'
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
   
   def new
     journal = Journal.find(params[:journal_id]) if params[:journal_id]

app/controllers/project_enumerations_controller.rb

@@ -0,0 +1,26 @@
+class ProjectEnumerationsController < ApplicationController
+  before_filter :find_project
+  before_filter :authorize
+  
+  def save
+    if request.post? && params[:enumerations]
+      Project.transaction do
+        params[:enumerations].each do |id, activity|
+          @project.update_or_create_time_entry_activity(id, activity)
+        end
+      end
+      flash[:notice] = l(:notice_successful_update)
+    end
+    
+    redirect_to :controller => 'projects', :action => 'settings', :tab => 'activities', :id => @project
+  end
+
+  def destroy
+    @project.time_entry_activities.each do |time_entry_activity|
+      time_entry_activity.destroy(time_entry_activity.parent)
+    end
+    flash[:notice] = l(:notice_successful_update)
+    redirect_to :controller => 'projects', :action => 'settings', :tab => 'activities', :id => @project
+  end
+
+end

app/controllers/projects_controller.rb

@@ -17,24 +17,24 @@
 
 class ProjectsController < ApplicationController
   menu_item :overview
-  menu_item :activity, :only => :activity
   menu_item :roadmap, :only => :roadmap
-  menu_item :files, :only => [:list_files, :add_file]
   menu_item :settings, :only => :settings
   
-  before_filter :find_project, :except => [ :index, :list, :add, :copy, :activity ]
-  before_filter :find_optional_project, :only => :activity
-  before_filter :authorize, :except => [ :index, :list, :add, :copy, :archive, :unarchive, :destroy, :activity ]
-  before_filter :authorize_global, :only => :add
+  before_filter :find_project, :except => [ :index, :list, :new, :create, :copy ]
+  before_filter :authorize, :except => [ :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy]
+  before_filter :authorize_global, :only => [:new, :create]
   before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
-  accept_key_auth :activity, :index
-  
-  after_filter :only => [:add, :edit, :archive, :unarchive, :destroy] do |controller|
+  accept_key_auth :index
+
+  after_filter :only => [:create, :edit, :update, :archive, :unarchive, :destroy] do |controller|
     if controller.request.post?
       controller.send :expire_action, :controller => 'welcome', :action => 'robots.txt'
     end
   end
-  
+
+  # TODO: convert to PUT only
+  verify :method => [:post, :put], :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
+
   helper :sort
   include SortHelper
   helper :custom_fields
@@ -63,40 +63,45 @@ class ProjectsController < ApplicationController
     end
   end
   
-  # Add a new project
-  def add
+  def new
     @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
     @trackers = Tracker.all
     @project = Project.new(params[:project])
-    if request.get?
-      @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
-      @project.trackers = Tracker.all
-      @project.is_public = Setting.default_projects_public?
-      @project.enabled_module_names = Setting.default_projects_modules
-    else
-      @project.enabled_module_names = params[:enabled_modules]
-      if validate_parent_id && @project.save
-        @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
-        # Add current user as a project member if he is not admin
-        unless User.current.admin?
-          r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
-          m = Member.new(:user => User.current, :roles => [r])
-          @project.members << m
-        end
-        respond_to do |format|
-          format.html { 
-            flash[:notice] = l(:notice_successful_create)
-            redirect_to :controller => 'projects', :action => 'settings', :id => @project
-          }
-          format.xml  { head :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
-        end
-      else
-        respond_to do |format|
-          format.html
-          format.xml  { render :xml => @project.errors, :status => :unprocessable_entity }
-        end
+
+    @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
+    @project.trackers = Tracker.all
+    @project.is_public = Setting.default_projects_public?
+    @project.enabled_module_names = Setting.default_projects_modules
+  end
+
+  def create
+    @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
+    @trackers = Tracker.all
+    @project = Project.new(params[:project])
+
+    @project.enabled_module_names = params[:enabled_modules]
+    if validate_parent_id && @project.save
+      @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
+      # Add current user as a project member if he is not admin
+      unless User.current.admin?
+        r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
+        m = Member.new(:user => User.current, :roles => [r])
+        @project.members << m
       end
-    end	
+      respond_to do |format|
+        format.html { 
+          flash[:notice] = l(:notice_successful_create)
+          redirect_to :controller => 'projects', :action => 'settings', :id => @project
+        }
+        format.xml  { head :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
+      end
+    else
+      respond_to do |format|
+        format.html { render :action => 'new' }
+        format.xml  { render :xml => @project.errors, :status => :unprocessable_entity }
+      end
+    end
+    
   end
   
   def copy
@@ -120,13 +125,13 @@ class ProjectsController < ApplicationController
         if validate_parent_id && @project.copy(@source_project, :only => params[:only])
           @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
           flash[:notice] = l(:notice_successful_create)
-          redirect_to :controller => 'admin', :action => 'projects'
+          redirect_to :controller => 'projects', :action => 'settings'
         elsif !@project.new_record?
           # Project was created
           # But some objects were not copied due to validation failures
           # (eg. issues from disabled trackers)
           # TODO: inform about that
-          redirect_to :controller => 'admin', :action => 'projects'
+          redirect_to :controller => 'projects', :action => 'settings'
         end
       end
     end
@@ -177,28 +182,27 @@ class ProjectsController < ApplicationController
     @wiki ||= @project.wiki
   end
   
-  # Edit @project
   def edit
-    if request.get?
+  end
+
+  def update
+    @project.attributes = params[:project]
+    if validate_parent_id && @project.save
+      @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
+      respond_to do |format|
+        format.html { 
+          flash[:notice] = l(:notice_successful_update)
+          redirect_to :action => 'settings', :id => @project
+        }
+        format.xml  { head :ok }
+      end
     else
-      @project.attributes = params[:project]
-      if validate_parent_id && @project.save
-        @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
-        respond_to do |format|
-          format.html { 
-            flash[:notice] = l(:notice_successful_update)
-            redirect_to :action => 'settings', :id => @project
-          }
-          format.xml  { head :ok }
-        end
-      else
-        respond_to do |format|
-          format.html { 
-            settings
-            render :action => 'settings'
-          }
-          format.xml  { render :xml => @project.errors, :status => :unprocessable_entity }
-        end
+      respond_to do |format|
+        format.html { 
+          settings
+          render :action => 'settings'
+        }
+        format.xml  { render :xml => @project.errors, :status => :unprocessable_entity }
       end
     end
   end
@@ -241,120 +245,6 @@ class ProjectsController < ApplicationController
     @project = nil
   end
 
-  def add_file
-    if request.post?
-      container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
-      attachments = Attachment.attach_files(container, params[:attachments])
-      render_attachment_warning_if_needed(container)
-
-      if !attachments.empty? && Setting.notified_events.include?('file_added')
-        Mailer.deliver_attachments_added(attachments[:files])
-      end
-      redirect_to :controller => 'projects', :action => 'list_files', :id => @project
-      return
-    end
-    @versions = @project.versions.sort
-  end
-
-  def save_activities
-    if request.post? && params[:enumerations]
-      Project.transaction do
-        params[:enumerations].each do |id, activity|
-          @project.update_or_create_time_entry_activity(id, activity)
-        end
-      end
-      flash[:notice] = l(:notice_successful_update)
-    end
-    
-    redirect_to :controller => 'projects', :action => 'settings', :tab => 'activities', :id => @project
-  end
-
-  def reset_activities
-    @project.time_entry_activities.each do |time_entry_activity|
-      time_entry_activity.destroy(time_entry_activity.parent)
-    end
-    flash[:notice] = l(:notice_successful_update)
-    redirect_to :controller => 'projects', :action => 'settings', :tab => 'activities', :id => @project
-  end
-  
-  def list_files
-    sort_init 'filename', 'asc'
-    sort_update 'filename' => "#{Attachment.table_name}.filename",
-                'created_on' => "#{Attachment.table_name}.created_on",
-                'size' => "#{Attachment.table_name}.filesize",
-                'downloads' => "#{Attachment.table_name}.downloads"
-                
-    @containers = [ Project.find(@project.id, :include => :attachments, :order => sort_clause)]
-    @containers += @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
-    render :layout => !request.xhr?
-  end
-
-  def roadmap
-    @trackers = @project.trackers.find(:all, :order => 'position')
-    retrieve_selected_tracker_ids(@trackers, @trackers.select {|t| t.is_in_roadmap?})
-    @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
-    project_ids = @with_subprojects ? @project.self_and_descendants.collect(&:id) : [@project.id]
-    
-    @versions = @project.shared_versions || []
-    @versions += @project.rolled_up_versions.visible if @with_subprojects
-    @versions = @versions.uniq.sort
-    @versions.reject! {|version| version.closed? || version.completed? } unless params[:completed]
-    
-    @issues_by_version = {}
-    unless @selected_tracker_ids.empty?
-      @versions.each do |version|
-        issues = version.fixed_issues.visible.find(:all,
-                                                   :include => [:project, :status, :tracker, :priority],
-                                                   :conditions => {:tracker_id => @selected_tracker_ids, :project_id => project_ids},
-                                                   :order => "#{Project.table_name}.lft, #{Tracker.table_name}.position, #{Issue.table_name}.id")
-        @issues_by_version[version] = issues
-      end
-    end
-    @versions.reject! {|version| !project_ids.include?(version.project_id) && @issues_by_version[version].blank?}
-  end
-  
-  def activity
-    @days = Setting.activity_days_default.to_i
-    
-    if params[:from]
-      begin; @date_to = params[:from].to_date + 1; rescue; end
-    end
-
-    @date_to ||= Date.today + 1
-    @date_from = @date_to - @days
-    @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
-    @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
-    
-    @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project, 
-                                                             :with_subprojects => @with_subprojects,
-                                                             :author => @author)
-    @activity.scope_select {|t| !params["show_#{t}"].nil?}
-    @activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?
-
-    events = @activity.events(@date_from, @date_to)
-    
-    if events.empty? || stale?(:etag => [events.first, User.current])
-      respond_to do |format|
-        format.html { 
-          @events_by_day = events.group_by(&:event_date)
-          render :layout => false if request.xhr?
-        }
-        format.atom {
-          title = l(:label_activity)
-          if @author
-            title = @author.name
-          elsif @activity.scope.size == 1
-            title = l("label_#{@activity.scope.first.singularize}_plural")
-          end
-          render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
-        }
-      end
-    end
-    
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-  
 private
   def find_optional_project
     return true unless params[:id]
@@ -364,14 +254,6 @@ private
     render_404
   end
 
-  def retrieve_selected_tracker_ids(selectable_trackers, default_trackers=nil)
-    if ids = params[:tracker_ids]
-      @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
-    else
-      @selected_tracker_ids = (default_trackers || selectable_trackers).collect {|t| t.id.to_s }
-    end
-  end
-  
   # Validates parent_id param according to user's permissions
   # TODO: move it to Project model in a validation that depends on User.current
   def validate_parent_id

app/controllers/timelog_controller.rb

@@ -260,8 +260,8 @@ private
     end
     
     @from, @to = @to, @from if @from && @to && @from > @to
-    @from ||= (TimeEntry.minimum(:spent_on, :include => :project, :conditions => Project.allowed_to_condition(User.current, :view_time_entries)) || Date.today) - 1
-    @to   ||= (TimeEntry.maximum(:spent_on, :include => :project, :conditions => Project.allowed_to_condition(User.current, :view_time_entries)) || Date.today)
+    @from ||= (TimeEntry.earilest_date_for_project(@project) || Date.today)
+    @to   ||= (TimeEntry.latest_date_for_project(@project) || Date.today)
   end
 
   def load_available_criterias

app/controllers/users_controller.rb

@@ -95,7 +95,9 @@ class UsersController < ApplicationController
     if request.post?
       @user.admin = params[:user][:admin] if params[:user][:admin]
       @user.login = params[:user][:login] if params[:user][:login]
-      @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless params[:password].nil? or params[:password].empty? or @user.auth_source_id
+      if params[:password].present? && (@user.auth_source_id.nil? || params[:user][:auth_source_id].blank?)
+        @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
+      end
       @user.group_ids = params[:user][:group_ids] if params[:user][:group_ids]
       @user.attributes = params[:user]
       # Was the account actived ? (do it before User#save clears the change)

app/controllers/versions_controller.rb

@@ -18,13 +18,37 @@
 class VersionsController < ApplicationController
   menu_item :roadmap
   model_object Version
-  before_filter :find_model_object, :except => [:new, :close_completed]
-  before_filter :find_project_from_association, :except => [:new, :close_completed]
-  before_filter :find_project, :only => [:new, :close_completed]
+  before_filter :find_model_object, :except => [:index, :new, :create, :close_completed]
+  before_filter :find_project_from_association, :except => [:index, :new, :create, :close_completed]
+  before_filter :find_project, :only => [:index, :new, :create, :close_completed]
   before_filter :authorize
 
   helper :custom_fields
   helper :projects
+
+  def index
+    @trackers = @project.trackers.find(:all, :order => 'position')
+    retrieve_selected_tracker_ids(@trackers, @trackers.select {|t| t.is_in_roadmap?})
+    @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
+    project_ids = @with_subprojects ? @project.self_and_descendants.collect(&:id) : [@project.id]
+    
+    @versions = @project.shared_versions || []
+    @versions += @project.rolled_up_versions.visible if @with_subprojects
+    @versions = @versions.uniq.sort
+    @versions.reject! {|version| version.closed? || version.completed? } unless params[:completed]
+    
+    @issues_by_version = {}
+    unless @selected_tracker_ids.empty?
+      @versions.each do |version|
+        issues = version.fixed_issues.visible.find(:all,
+                                                   :include => [:project, :status, :tracker, :priority],
+                                                   :conditions => {:tracker_id => @selected_tracker_ids, :project_id => project_ids},
+                                                   :order => "#{Project.table_name}.lft, #{Tracker.table_name}.position, #{Issue.table_name}.id")
+        @issues_by_version[version] = issues
+      end
+    end
+    @versions.reject! {|version| !project_ids.include?(version.project_id) && @issues_by_version[version].blank?}
+  end
   
   def show
     @issues = @version.fixed_issues.visible.find(:all,
@@ -39,6 +63,17 @@ class VersionsController < ApplicationController
       attributes.delete('sharing') unless attributes.nil? || @version.allowed_sharings.include?(attributes['sharing'])
       @version.attributes = attributes
     end
+  end
+
+  def create
+    # TODO: refactor with code above in #new
+    @version = @project.versions.build
+    if params[:version]
+      attributes = params[:version].dup
+      attributes.delete('sharing') unless attributes.nil? || @version.allowed_sharings.include?(attributes['sharing'])
+      @version.attributes = attributes
+    end
+
     if request.post?
       if @version.save
         respond_to do |format|
@@ -55,7 +90,7 @@ class VersionsController < ApplicationController
         end
       else
         respond_to do |format|
-          format.html
+          format.html { render :action => 'new' }
           format.js do
             render(:update) {|page| page.alert(@version.errors.full_messages.join('\n')) }
           end
@@ -63,8 +98,11 @@ class VersionsController < ApplicationController
       end
     end
   end
-  
+
   def edit
+  end
+  
+  def update
     if request.post? && params[:version]
       attributes = params[:version].dup
       attributes.delete('sharing') unless @version.allowed_sharings.include?(attributes['sharing'])
@@ -105,4 +143,13 @@ private
   rescue ActiveRecord::RecordNotFound
     render_404
   end
+
+  def retrieve_selected_tracker_ids(selectable_trackers, default_trackers=nil)
+    if ids = params[:tracker_ids]
+      @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
+    else
+      @selected_tracker_ids = (default_trackers || selectable_trackers).collect {|t| t.id.to_s }
+    end
+  end
+
 end

app/helpers/admin_helper.rb

@@ -20,12 +20,4 @@ module AdminHelper
     options_for_select([[l(:label_all), ''], 
                         [l(:status_active), 1]], selected)
   end
-  
-  def css_project_classes(project)
-    s = 'project'
-    s << ' root' if project.root?
-    s << ' child' if project.child?
-    s << (project.leaf? ? ' leaf' : ' parent')
-    s
-  end
 end

app/helpers/application_helper.rb

@@ -32,8 +32,27 @@ module ApplicationHelper
   end
 
   # Display a link if user is authorized
+  #
+  # @param [String] name Anchor text (passed to link_to)
+  # @param [Hash, String] options Hash params or url for the link target (passed to link_to).
+  #        This will checked by authorize_for to see if the user is authorized
+  # @param [optional, Hash] html_options Options passed to link_to
+  # @param [optional, Hash] parameters_for_method_reference Extra parameters for link_to
   def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
-    link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action])
+    if options.is_a?(String)
+      begin
+        route = ActionController::Routing::Routes.recognize_path(options.gsub(/\?.*/,''), :method => options[:method] || :get)
+        link_controller = route[:controller]
+        link_action = route[:action]
+      rescue ActionController::RoutingError # Parse failed, not a route
+        link_controller, link_action = nil, nil
+      end
+    else
+      link_controller = options[:controller] || params[:controller]
+      link_action = options[:action]
+    end
+
+    link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(link_controller, link_action)
   end
 
   # Display a link to remote if user is authorized
@@ -302,7 +321,7 @@ module ApplicationHelper
   def time_tag(time)
     text = distance_of_time_in_words(Time.now, time)
     if @project
-      link_to(text, {:controller => 'projects', :action => 'activity', :id => @project, :from => time.to_date}, :title => format_time(time))
+      link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => time.to_date}, :title => format_time(time))
     else
       content_tag('acronym', text, :title => format_time(time))
     end
@@ -805,7 +824,7 @@ module ApplicationHelper
   # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe <joe@foo.bar>')
   def avatar(user, options = { })
     if Setting.gravatar_enabled?
-      options.merge!({:ssl => Setting.protocol == 'https', :default => Setting.gravatar_default})
+      options.merge!({:ssl => (defined?(request) && request.ssl?), :default => Setting.gravatar_default})
       email = nil
       if user.respond_to?(:mail)
         email = user.mail

app/helpers/calendars_helper.rb

@@ -0,0 +1,38 @@
+module CalendarsHelper
+  def link_to_previous_month(year, month)
+    target_year, target_month = if month == 1
+                                  [year - 1, 12]
+                                else
+                                  [year, month - 1]
+                                end
+    
+    name = if target_month == 12
+             "#{month_name(target_month)} #{target_year}"
+           else
+             "#{month_name(target_month)}"
+           end
+    
+     link_to_remote ('« ' + name),
+                        {:update => "content", :url => { :year => target_year, :month => target_month }},
+                        {:href => url_for(:action => 'show', :year => target_year, :month => target_month)}
+  end
+
+  def link_to_next_month(year, month)
+    target_year, target_month = if month == 12
+                                  [year + 1, 1]
+                                else
+                                  [year, month + 1]
+                                end
+
+    name = if target_month == 1
+             "#{month_name(target_month)} #{target_year}"
+           else
+             "#{month_name(target_month)}"
+           end
+
+    link_to_remote (name + ' »'), 
+                        {:update => "content", :url => { :year => target_year, :month => target_month }},
+                        {:href => url_for(:action => 'show', :year => target_year, :month =>target_month)}
+
+  end
+end

app/helpers/issues_helper.rb

@@ -28,7 +28,16 @@ module IssuesHelper
       ancestors << issue unless issue.leaf?
     end
   end
-  
+
+  # Renders a HTML/CSS tooltip
+  #
+  # To use, a trigger div is needed.  This is a div with the class of "tooltip"
+  # that contains this method wrapped in a span with the class of "tip"
+  #
+  #    <div class="tooltip"><%= link_to_issue(issue) %>
+  #      <span class="tip"><%= render_issue_tooltip(issue) %></span>
+  #    </div>
+  #
   def render_issue_tooltip(issue)
     @cached_label_status ||= l(:field_status)
     @cached_label_start_date ||= l(:field_start_date)

app/models/issue.rb

@@ -245,7 +245,7 @@ class Issue < ActiveRecord::Base
   end
   
   def done_ratio
-    if Issue.use_status_for_done_ratio? && status && status.default_done_ratio?
+    if Issue.use_status_for_done_ratio? && status && status.default_done_ratio
       status.default_done_ratio
     else
       read_attribute(:done_ratio)
@@ -308,7 +308,7 @@ class Issue < ActiveRecord::Base
   # Set the done_ratio using the status if that setting is set.  This will keep the done_ratios
   # even if the user turns off the setting later
   def update_done_ratio_from_issue_status
-    if Issue.use_status_for_done_ratio? && status && status.default_done_ratio?
+    if Issue.use_status_for_done_ratio? && status && status.default_done_ratio
       self.done_ratio = status.default_done_ratio
     end
   end
@@ -357,6 +357,11 @@ class Issue < ActiveRecord::Base
   def overdue?
     !due_date.nil? && (due_date < Date.today) && !status.is_closed?
   end
+
+  # Does this issue have children?
+  def children?
+    !leaf?
+  end
   
   # Users the issue can be assigned to
   def assignable_users
@@ -684,7 +689,7 @@ class Issue < ActiveRecord::Base
       end
       
       # done ratio = weighted average ratio of leaves
-      unless Issue.use_status_for_done_ratio? && p.status && p.status.default_done_ratio?
+      unless Issue.use_status_for_done_ratio? && p.status && p.status.default_done_ratio
         leaves_count = p.leaves.count
         if leaves_count > 0
           average = p.leaves.average(:estimated_hours).to_f
@@ -821,7 +826,7 @@ class Issue < ActiveRecord::Base
                                                 j.id as #{select_field},
                                                 count(i.id) as total 
                                               from 
-                                                  #{Issue.table_name} i, #{IssueStatus.table_name} s, #{joins} as j
+                                                  #{Issue.table_name} i, #{IssueStatus.table_name} s, #{joins} j
                                               where 
                                                 i.status_id=s.id 
                                                 and #{where}

app/models/journal.rb

@@ -65,4 +65,12 @@ class Journal < ActiveRecord::Base
   def attachments
     journalized.respond_to?(:attachments) ? journalized.attachments : nil
   end
+
+  # Returns a string of css classes
+  def css_classes
+    s = 'journal'
+    s << ' has-notes' unless notes.blank?
+    s << ' has-details' unless details.blank?
+    s
+  end
 end

app/models/mailer.rb

@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'ar_condition'
+
 class Mailer < ActionMailer::Base
   layout 'mailer'
   helper :application
@@ -306,13 +308,16 @@ class Mailer < ActionMailer::Base
   # * :days     => how many days in the future to remind about (defaults to 7)
   # * :tracker  => id of tracker for filtering issues (defaults to all trackers)
   # * :project  => id or identifier of project to process (defaults to all projects)
+  # * :users    => array of user ids who should be reminded
   def self.reminders(options={})
     days = options[:days] || 7
     project = options[:project] ? Project.find(options[:project]) : nil
     tracker = options[:tracker] ? Tracker.find(options[:tracker]) : nil
+    user_ids = options[:users]
 
     s = ARCondition.new ["#{IssueStatus.table_name}.is_closed = ? AND #{Issue.table_name}.due_date <= ?", false, days.day.from_now.to_date]
     s << "#{Issue.table_name}.assigned_to_id IS NOT NULL"
+    s << ["#{Issue.table_name}.assigned_to_id IN (?)", user_ids] if user_ids.present?
     s << "#{Project.table_name}.status = #{Project::STATUS_ACTIVE}"
     s << "#{Issue.table_name}.project_id = #{project.id}" if project
     s << "#{Issue.table_name}.tracker_id = #{tracker.id}" if tracker

app/models/principal.rb

@@ -33,7 +33,11 @@ class Principal < ActiveRecord::Base
   }
   
   before_create :set_default_empty_values
-  
+
+  def name(formatter = nil)
+    to_s
+  end
+
   def <=>(principal)
     if self.class.name == principal.class.name
       self.to_s.downcase <=> principal.to_s.downcase

app/models/project.rb

@@ -412,7 +412,15 @@ class Project < ActiveRecord::Base
   def short_description(length = 255)
     description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
   end
-  
+
+  def css_classes
+    s = 'project'
+    s << ' root' if root?
+    s << ' child' if child?
+    s << (leaf? ? ' leaf' : ' parent')
+    s
+  end
+
   # Return true if this project is allowed to do the specified action.
   # action can be:
   # * a parameter-like Hash (eg. :controller => 'projects', :action => 'edit')
@@ -441,6 +449,15 @@ class Project < ActiveRecord::Base
       enabled_modules.clear
     end
   end
+
+  # Returns an array of projects that are in this project's hierarchy
+  #
+  # Example: parents, children, siblings
+  def hierarchy
+    parents = project.self_and_ancestors || []
+    descendants = project.descendants || []
+    project_hierarchy = parents | descendants # Set union
+  end
   
   # Returns an auto-generated project identifier based on the last identifier used
   def self.next_identifier

app/models/time_entry.rb

@@ -81,4 +81,20 @@ class TimeEntry < ActiveRecord::Base
       yield
     end
   end
+
+  def self.earilest_date_for_project(project=nil)
+    finder_conditions = ARCondition.new(Project.allowed_to_condition(User.current, :view_time_entries))
+    if project
+      finder_conditions << ["project_id IN (?)", project.hierarchy.collect(&:id)]
+    end
+    TimeEntry.minimum(:spent_on, :include => :project, :conditions => finder_conditions.conditions)
+  end
+
+  def self.latest_date_for_project(project=nil)
+    finder_conditions = ARCondition.new(Project.allowed_to_condition(User.current, :view_time_entries))
+    if project
+      finder_conditions << ["project_id IN (?)", project.hierarchy.collect(&:id)]
+    end
+    TimeEntry.maximum(:spent_on, :include => :project, :conditions => finder_conditions.conditions)
+  end
 end

app/models/user.rb

@@ -352,6 +352,12 @@ class User < Principal
       false
     end
   end
+
+  # Is the user allowed to do the specified action on any project?
+  # See allowed_to? for the actions and valid options.
+  def allowed_to_globally?(action, options)
+    allowed_to?(action, nil, options.reverse_merge(:global => true))
+  end
   
   def self.current=(user)
     @current_user = user

app/views/admin/projects.rhtml

@@ -1,5 +1,5 @@
 <div class="contextual">
-<%= link_to l(:label_project_new), {:controller => 'projects', :action => 'add'}, :class => 'icon icon-add' %>
+<%= link_to l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add' %>
 </div>
 
 <h2><%=l(:label_project_plural)%></h2>
@@ -26,7 +26,7 @@
   </tr></thead>
   <tbody>
 <% project_tree(@projects) do |project, level| %>
-  <tr class="<%= cycle("odd", "even") %> <%= css_project_classes(project) %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
+  <tr class="<%= cycle("odd", "even") %> <%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
 	<td class="name"><%= link_to_project(project, :action => 'settings') %></td>
 	<td><%= textilizable project.short_description, :project => project %></td>
 	<td align="center"><%= checked_image project.is_public? %></td>

app/views/boards/index.rhtml

@@ -30,11 +30,11 @@
 </table>
 
 <% other_formats_links do |f| %>
-	<%= f.link_to 'Atom', :url => {:controller => 'projects', :action => 'activity', :id => @project, :show_messages => 1, :key => User.current.rss_key} %>
+	<%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_messages => 1, :key => User.current.rss_key} %>
 <% end %>
 
 <% content_for :header_tags do %>
-  <%= auto_discovery_link_tag(:atom, {:controller => 'projects', :action => 'activity', :id => @project, :format => 'atom', :show_messages => 1, :key => User.current.rss_key}) %>
+  <%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :show_messages => 1, :key => User.current.rss_key}) %>
 <% end %>
 
 <% html_title l(:label_board_plural) %>

app/views/calendars/show.html.erb

@@ -9,14 +9,7 @@
 </fieldset>
 
 <p style="float:right;">
-<%= link_to_remote ('&#171; ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")), 
-                        {:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) }},
-                        {:href => url_for(:action => 'show', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1))}
-                        %> |
-<%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' &#187;'), 
-                        {:update => "content", :url => { :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) }},
-                        {:href => url_for(:action => 'show', :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1))}
-                        %>
+  <%= link_to_previous_month(@year, @month) %> | <%= link_to_next_month(@year, @month) %>
 </p>
 
 <p class="buttons">

app/views/context_menus/issues.html.erb

@@ -4,20 +4,23 @@
 <% if !@issue.nil? -%>
 	<li><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue},
 	        :class => 'icon-edit', :disabled => !@can[:edit] %></li>
-	<li class="folder">			
-		<a href="#" class="submenu" onclick="return false;"><%= l(:field_status) %></a>
-		<ul>
-		<% @statuses.each do |s| -%>
-		    <li><%= context_menu_link s.name, {:controller => 'issues', :action => 'update', :id => @issue, :issue => {:status_id => s}, :back_url => @back}, :method => :put,
-		                              :selected => (s == @issue.status), :disabled => !(@can[:update] && @allowed_statuses.include?(s)) %></li>
-		<% end -%>
-		</ul>
-	</li>
 <% else %>
 	<li><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id)},
 	        :class => 'icon-edit', :disabled => !@can[:edit] %></li>
 <% end %>
 
+  <% unless @allowed_statuses.empty? %>
+	<li class="folder">			
+		<a href="#" class="submenu" onclick="return false;"><%= l(:field_status) %></a>
+		<ul>
+		<% @statuses.each do |s| -%>
+		    <li><%= context_menu_link s.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {:status_id => s}, :back_url => @back}, :method => :post,
+		                              :selected => (@issue && s == @issue.status), :disabled => !(@can[:update] && @allowed_statuses.include?(s)) %></li>
+		<% end -%>
+		</ul>
+	</li>
+  <% end %>
+
 	<% unless @trackers.nil? %>
 	<li class="folder">			
 		<a href="#" class="submenu"><%= l(:field_tracker) %></a>
@@ -29,6 +32,8 @@
 		</ul>
 	</li>
 	<% end %>
+
+  <% if @projects.size == 1 %>
 	<li class="folder">			
 		<a href="#" class="submenu"><%= l(:field_priority) %></a>
 		<ul>
@@ -38,6 +43,8 @@
 		<% end -%>
 		</ul>
 	</li>
+  <% end %>
+
 	<% unless @project.nil? || @project.shared_versions.open.empty? -%>
 	<li class="folder">			
 		<a href="#" class="submenu"><%= l(:field_fixed_version) %></a>
@@ -77,7 +84,8 @@
 		</ul>
 	</li>
 	<% end -%>
-  <% if Issue.use_field_for_done_ratio? %>
+
+  <% if Issue.use_field_for_done_ratio? && @projects.size == 1 %>
 	<li class="folder">
 		<a href="#" class="submenu"><%= l(:field_done_ratio) %></a>
 		<ul>
@@ -88,6 +96,7 @@
 		</ul>
 	</li>
   <% end %>
+
 <% if !@issue.nil? %>
 	<% if @can[:log_time] -%>
 	<li><%= context_menu_link l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue},

app/views/files/index.html.erb

@@ -1,5 +1,5 @@
 <div class="contextual">
-<%= link_to_if_authorized l(:label_attachment_new), {:controller => 'projects', :action => 'add_file', :id => @project}, :class => 'icon icon-add' %>
+<%= link_to_if_authorized l(:label_attachment_new), {:controller => 'files', :action => 'new', :id => @project}, :class => 'icon icon-add' %>
 </div>
 
 <h2><%=l(:label_attachment_plural)%></h2>

app/views/files/new.html.erb

@@ -2,7 +2,7 @@
 
 <%= error_messages_for 'attachment' %>
 <div class="box">
-<% form_tag({ :action => 'add_file', :id => @project }, :multipart => true, :class => "tabular") do %>
+<% form_tag({ :action => 'new', :id => @project }, :multipart => true, :class => "tabular") do %>
 
 <% if @versions.any? %>
 <p><label for="version_id"><%=l(:field_version)%></label>

app/views/issues/_action_menu.rhtml

@@ -6,5 +6,5 @@
 <%= link_to_if_authorized l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-duplicate' %>
 <%= link_to_if_authorized l(:button_copy), new_issue_move_path(:id => @issue, :copy_options => {:copy => 't'}), :class => 'icon icon-copy' %>
 <%= link_to_if_authorized l(:button_move), new_issue_move_path(:id => @issue), :class => 'icon icon-move' %>
-<%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
+<%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => (@issue.leaf? ? l(:text_are_you_sure) : l(:text_are_you_sure_with_children)), :method => :post, :class => 'icon icon-del' %>
 </div>

app/views/issues/_attributes.rhtml

@@ -23,7 +23,7 @@
 <%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'),
                      l(:label_version_new),
                      'version[name]', 
-                     {:controller => 'versions', :action => 'new', :project_id => @project},
+                     {:controller => 'versions', :action => 'create', :project_id => @project},
                      :title => l(:label_version_new), 
                      :tabindex => 200) if authorize_for('versions', 'new') %>
 </p>
@@ -40,6 +40,6 @@
 </div>
 
 <div style="clear:both;"> </div>
-<%= render :partial => 'form_custom_fields' %>
+<%= render :partial => 'issues/form_custom_fields' %>
 
 <% end %>

app/views/issues/_form.rhtml

@@ -1,3 +1,5 @@
+<%= call_hook(:view_issues_form_details_top, { :issue => @issue, :form => f }) %>
+
 <div id="issue_descr_fields" <%= 'style="display:none"' unless @issue.new_record? || @issue.errors.any? %>>
 <p><%= f.select :tracker_id, @project.trackers.collect {|t| [t.name, t.id]}, :required => true %></p>
 <%= observe_field :issue_tracker_id, :url => { :action => :new, :project_id => @project, :id => @issue },
@@ -20,7 +22,7 @@
 </div>
 
 <div id="attributes" class="attributes">
-	<%= render :partial => 'attributes' %>
+	<%= render :partial => 'issues/attributes' %>
 </div>
 
 <% if @issue.new_record? %>

app/views/issues/_history.rhtml

@@ -1,6 +1,6 @@
 <% reply_links = authorize_for('issues', 'edit') -%>
 <% for journal in journals %>
-  <div id="change-<%= journal.id %>" class="journal">
+  <div id="change-<%= journal.id %>" class="<%= journal.css_classes %>">
     <h4><div class="journal-link"><%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %></div>
     <%= avatar(journal.user, :size => "24") %>
     <%= content_tag('a', '', :name => "note-#{journal.indice}")%>

app/views/issues/_list.rhtml

@@ -3,7 +3,7 @@
 <div class="autoscroll">
 <table class="list issues">
     <thead><tr>
-        <th><%= link_to image_tag('toggle_check.png'), {}, :onclick => 'toggleIssuesSelection(Element.up(this, "form")); return false;',
+        <th class="checkbox hide-when-print"><%= link_to image_tag('toggle_check.png'), {}, :onclick => 'toggleIssuesSelection(Element.up(this, "form")); return false;',
                                                            :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
         </th>
 		<%= sort_header_tag('id', :caption => '#', :default_order => 'desc') %>
@@ -25,7 +25,7 @@
 		<% previous_group = group %>
   <% end %>
 	<tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
-	    <td class="checkbox"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td>
+	  <td class="checkbox hide-when-print"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td>
 		<td class="id"><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td>
         <% query.columns.each do |column| %><%= content_tag 'td', column_content(column, issue), :class => column.name %><% end %>
 	</tr>

app/views/issues/_relations.rhtml

@@ -28,6 +28,7 @@
 <% remote_form_for(:relation, @relation, 
                  :url => {:controller => 'issue_relations', :action => 'new', :issue_id => @issue},
                  :method => :post,
+                 :complete => "Form.Element.focus('relation_issue_to_id');",
                  :html => {:id => 'new-relation-form', :style => (@relation ? '' : 'display: none;')}) do |f| %>
 <%= render :partial => 'issue_relations/form', :locals => {:f => f}%>
 <% end %>

app/views/issues/bulk_edit.rhtml

@@ -2,7 +2,7 @@
 
 <ul><%= @issues.collect {|i| content_tag('li', link_to(h("#{i.tracker} ##{i.id}"), { :action => 'show', :id => i }) + h(": #{i.subject}")) }.join("\n") %></ul>
 
-<% form_tag() do %>
+<% form_tag(:action => 'bulk_update') do %>
 <%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join %>
 <div class="box tabular">
 <fieldset class="attributes">

app/views/issues/index.rhtml

@@ -39,6 +39,7 @@
                        { :url => { :set_filter => 1 },
                          :before => 'selectAllOptions("selected_columns");',
                          :update => "content",
+                         :complete => "apply_filters_observer()",
                          :with => "Form.serialize('query_form')"
                        }, :class => 'icon icon-checked' %>
                        
@@ -78,7 +79,7 @@
 
 <% content_for :header_tags do %>
     <%= auto_discovery_link_tag(:atom, {:query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_issue_plural)) %>
-    <%= auto_discovery_link_tag(:atom, {:action => 'changes', :query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_changes_details)) %>
+    <%= auto_discovery_link_tag(:atom, {:controller => 'journals', :action => 'index', :query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_changes_details)) %>
 <% end %>
 
 <%= context_menu issues_context_menu_path %>

app/views/news/edit.rhtml

@@ -12,3 +12,7 @@
                    }, :accesskey => accesskey(:preview) %>
 <% end %>
 <div id="preview" class="wiki"></div>
+
+<% content_for :header_tags do %>
+  <%= stylesheet_link_tag 'scm' %>
+<% end %>

app/views/news/index.rhtml

@@ -45,6 +45,7 @@
 
 <% content_for :header_tags do %>
   <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
+  <%= stylesheet_link_tag 'scm' %>
 <% end %>
 
 <% html_title(l(:label_news_plural)) -%>

app/views/projects/_edit.rhtml

@@ -1,4 +1,4 @@
-<% labelled_tabular_form_for :project, @project, :url => { :action => "edit", :id => @project } do |f| %>
+<% labelled_tabular_form_for :project, @project, :url => { :action => "update", :id => @project } do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
 <% end %>

app/views/projects/index.rhtml

@@ -3,10 +3,10 @@
 <% end %>
 
 <div class="contextual">
-    <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'add'}, :class => 'icon icon-add') + ' |' if User.current.allowed_to?(:add_project, nil, :global => true) %>
+    <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') + ' |' if User.current.allowed_to?(:add_project, nil, :global => true) %>
     <%= link_to(l(:label_issue_view_all), { :controller => 'issues' }) + ' |' if User.current.allowed_to?(:view_issues, nil, :global => true) %>
     <%= link_to(l(:label_overall_spent_time), { :controller => 'time_entries' }) + ' |' if User.current.allowed_to?(:view_time_entries, nil, :global => true) %>
-    <%= link_to l(:label_overall_activity), { :controller => 'projects', :action => 'activity' }%>
+    <%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }%>
 </div>
 
 <h2><%=l(:label_project_plural)%></h2>

app/views/projects/new.html.erb

@@ -1,6 +1,6 @@
 <h2><%=l(:label_project_new)%></h2>
 
-<% labelled_tabular_form_for :project, @project, :url => { :action => "add" } do |f| %>
+<% labelled_tabular_form_for :project, @project, :url => { :action => "create" } do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 
 <fieldset class="box"><legend><%= l(:label_module_plural) %></legend>

app/views/projects/settings/_activities.rhtml

@@ -1,4 +1,4 @@
-<% form_tag({:controller => 'projects', :action => 'save_activities', :id => @project}, :class => "tabular") do %>
+<% form_tag({:controller => 'project_enumerations', :action => 'save', :id => @project}, :class => "tabular") do %>
 
 <table class="list">
   <thead><tr>
@@ -32,7 +32,7 @@
 </table>
 
 <div class="contextual">
-<%= link_to(l(:button_reset), {:controller => 'projects', :action => 'reset_activities', :id => @project},
+<%= link_to(l(:button_reset), {:controller => 'project_enumerations', :action => 'destroy', :id => @project},
 						:method => :delete,
 						:confirm => l(:text_are_you_sure),
             :class => 'icon icon-del') %>

app/views/projects/show.rhtml

@@ -1,6 +1,6 @@
 <div class="contextual">
 	<% if User.current.allowed_to?(:add_subprojects, @project) %>
-		<%= link_to l(:label_subproject_new), {:controller => 'projects', :action => 'add', :parent_id => @project}, :class => 'icon icon-add' %>
+		<%= link_to l(:label_subproject_new), {:controller => 'projects', :action => 'new', :parent_id => @project}, :class => 'icon icon-add' %>
 	<% end %>
 </div>
 
@@ -74,7 +74,7 @@
 <% end %>
 
 <% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, {:action => 'activity', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
+<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
 <% end %>
 
 <% html_title(l(:label_overview)) -%>

app/views/queries/_filters.rhtml

@@ -53,6 +53,18 @@ function toggle_multi_select(field) {
         select.multiple = true;
     }
 }
+
+function apply_filters_observer() {
+  $$("#query_form input[type=text]").invoke("observe", "keypress", function(e){
+    if(e.keyCode == Event.KEY_RETURN) {
+      <%= remote_function(:url => { :set_filter => 1},
+                          :update => "content",
+                          :with => "Form.serialize('query_form')",
+                          :complete => "e.stop(); apply_filters_observer()") %>
+    }
+  });
+}
+Event.observe(document,"dom:loaded", apply_filters_observer);
 //]]>
 </script>
 

app/views/repositories/diff.rhtml

@@ -1,7 +1,7 @@
 <h2><%= l(:label_revision) %> <%= format_revision(@rev_to) + ':' if @rev_to %><%= format_revision(@rev) %> <%=h @path %></h2>
 
 <!-- Choose view type -->
-<% form_tag({:path => @path}, :method => 'get') do %>
+<% form_tag({:path => to_path_param(@path)}, :method => 'get') do %>
   <%= hidden_field_tag('rev', params[:rev]) if params[:rev] %>
   <%= hidden_field_tag('rev_to', params[:rev_to]) if params[:rev_to] %>
   <p><label><%= l(:label_view_diff) %></label>

app/views/users/show.rhtml

@@ -35,7 +35,7 @@
 <div class="splitcontentright">
 
 <% unless @events_by_day.empty? %>
-<h3><%= link_to l(:label_activity), :controller => 'projects', :action => 'activity', :id => nil, :user_id => @user, :from => @events_by_day.keys.first %></h3>
+<h3><%= link_to l(:label_activity), :controller => 'activities', :action => 'index', :id => nil, :user_id => @user, :from => @events_by_day.keys.first %></h3>
 
 <p>
 <%=l(:label_reported_issues)%>: <%= Issue.count(:conditions => ["author_id=?", @user.id]) %>
@@ -57,11 +57,11 @@
 </div>
 
 <% other_formats_links do |f| %>
-	<%= f.link_to 'Atom', :url => {:controller => 'projects', :action => 'activity', :id => nil, :user_id => @user, :key => User.current.rss_key} %>
+	<%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => nil, :user_id => @user, :key => User.current.rss_key} %>
 <% end %>
 
 <% content_for :header_tags do %>
-		<%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :user_id => @user, :format => :atom, :key => User.current.rss_key) %>
+		<%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :user_id => @user, :format => :atom, :key => User.current.rss_key) %>
 <% end %>
 <% end %>
 <%= call_hook :view_account_right_bottom, :user => @user %>

app/views/versions/edit.rhtml

@@ -1,6 +1,6 @@
 <h2><%=l(:label_version)%></h2>
 
-<% labelled_tabular_form_for :version, @version, :url => { :action => 'edit' } do |f| %>
+<% labelled_tabular_form_for :version, @version, :url => { :action => 'update', :id => @version } do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
 <% end %>

app/views/versions/index.html.erb

@@ -51,4 +51,4 @@
 
 <% html_title(l(:label_roadmap)) %>
 
-<%= context_menu :controller => 'issues', :action => 'context_menu' %>
+<%= context_menu issues_context_menu_path %>

app/views/versions/new.html.erb

@@ -1,6 +1,6 @@
 <h2><%=l(:label_version_new)%></h2>
 
-<% labelled_tabular_form_for :version, @version, :url => { :action => 'new' } do |f| %>
+<% labelled_tabular_form_for :version, @version, :url => { :action => 'create', :project_id => @project } do |f| %>
 <%= render :partial => 'versions/form', :locals => { :f => f } %>
 <%= submit_tag l(:button_create) %>
-<% end %>
+<% end %>

app/views/welcome/index.rhtml

@@ -34,6 +34,6 @@
 <% content_for :header_tags do %>
 <%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
                                    :title => "#{Setting.app_title}: #{l(:label_news_latest)}") %>
-<%= auto_discovery_link_tag(:atom, {:controller => 'projects', :action => 'activity', :key => User.current.rss_key, :format => 'atom'},
+<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
                                    :title => "#{Setting.app_title}: #{l(:label_activity)}") %>
 <% end %>

app/views/wiki/special_date_index.rhtml

@@ -23,11 +23,11 @@
 
 <% unless @pages.empty? %>
 <% other_formats_links do |f| %>
-	<%= f.link_to 'Atom', :url => {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
+	<%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
 	<%= f.link_to('HTML', :url => {:action => 'special', :page => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %>
 <% end %>
 <% end %>
 
 <% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
+<%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
 <% end %>

app/views/wiki/special_page_index.rhtml

@@ -16,11 +16,11 @@
 
 <% unless @pages.empty? %>
 <% other_formats_links do |f| %>
-	<%= f.link_to 'Atom', :url => {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
+	<%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
 	<%= f.link_to('HTML', :url => {:action => 'special', :page => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %>
 <% end %>
 <% end %>
 
 <% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
+<%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
 <% end %>

config/environments/production.rb

@@ -4,9 +4,17 @@
 # Code is not reloaded between requests
 config.cache_classes = true
 
+#####
+# Customize the default logger (http://ruby-doc.org/core/classes/Logger.html)
+#
 # Use a different logger for distributed setups
 # config.logger        = SyslogLogger.new
-
+#
+# Rotate logs bigger than 1MB, keeps no more than 7 rotated logs around.
+# When setting a new Logger, make sure to set it's log level too.
+#
+# config.logger = Logger.new(config.log_path, 7, 1048576)
+# config.logger.level = Logger::INFO
 
 # Full error reports are disabled and caching is turned on
 config.action_controller.consider_all_requests_local = false

config/initializers/10-patches.rb

@@ -78,3 +78,17 @@ module AsynchronousMailer
 end
 
 ActionMailer::Base.send :include, AsynchronousMailer
+
+# TODO: Hack to support i18n 4.x on Rails 2.3.5.  Remove post 2.3.6.
+# See http://www.redmine.org/issues/6428 and http://www.redmine.org/issues/5608
+module I18n
+  module Backend
+    module Base
+      def warn_syntax_deprecation!
+        return if @skip_syntax_deprecation
+        warn "The {{key}} interpolation syntax in I18n messages is deprecated. Please use %{key} instead.\nDowngrade your i18n gem to 0.3.7 (everything above must be deinstalled) to remove this warning, see http://www.redmine.org/issues/5608 for more information."
+        @skip_syntax_deprecation = true
+      end
+    end
+  end
+end

config/locales/bg.yml

@@ -116,6 +116,7 @@ bg:
         greater_than_start_date: "трябва да е след началната дата"
         not_same_project: "не е от същия проект"
         circular_dependency: "Тази релация ще доведе до безкрайна зависимост"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   actionview_instancetag_blank_option: Изберете
   
@@ -904,3 +905,11 @@ bg:
   notice_unable_delete_time_entry: Unable to delete time log entry.
   label_overall_spent_time: Overall spent time
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
+

config/locales/bs.yml

@@ -130,6 +130,7 @@ bs:
         greater_than_start_date: "mora biti veći nego početni datum"
         not_same_project: "ne pripada istom projektu"
         circular_dependency: "Ova relacija stvar cirkularnu zavisnost"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   actionview_instancetag_blank_option: Molimo odaberite
   
@@ -924,3 +925,11 @@ bs:
   notice_unable_delete_time_entry: Unable to delete time log entry.
   label_overall_spent_time: Overall spent time
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
+

config/locales/ca.yml

@@ -1,4 +1,8 @@
+# Redmine catalan translation: 
+# by Joan Duran
+
 ca:
+  # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
   direction: ltr
   date:
     formats:
@@ -65,6 +69,7 @@ ca:
         other: "almost {{count}} years"
 
   number:
+    # Default format for numbers
     format:
       separator: "."
       delimiter: ""
@@ -83,6 +88,7 @@ ca:
           mb: "MB"
           gb: "GB"
           tb: "TB"
+
         
 # Used in array.to_sentence.
   support:
@@ -116,6 +122,7 @@ ca:
         greater_than_start_date: "ha de ser superior que la data inicial"
         not_same_project: "no pertany al mateix projecte"
         circular_dependency: "Aquesta relació crearia una dependència circular"
+        cant_link_an_issue_with_a_descendant: "Un assumpte no es pot enllaçar a una de les seves subtasques"
 
   actionview_instancetag_blank_option: Seleccioneu
   
@@ -149,18 +156,33 @@ ca:
   notice_email_sent: "S'ha enviat un correu electrònic a {{value}}"
   notice_email_error: "S'ha produït un error en enviar el correu ({{value}})"
   notice_feeds_access_key_reseted: "S'ha reiniciat la clau d'accés del RSS."
+  notice_api_access_key_reseted: "S'ha reiniciat la clau d'accés a l'API."
   notice_failed_to_save_issues: "No s'han pogut desar %s assumptes de {{count}} seleccionats: {{ids}}."
+  notice_failed_to_save_members: "No s'han pogut desar els membres: {{errors}}."
   notice_no_issue_selected: "No s'ha seleccionat cap assumpte. Activeu els assumptes que voleu editar."
   notice_account_pending: "S'ha creat el compte i ara està pendent de l'aprovació de l'administrador."
   notice_default_data_loaded: "S'ha carregat correctament la configuració predeterminada."
   notice_unable_delete_version: "No s'ha pogut suprimir la versió."
+  notice_unable_delete_time_entry: "No s'ha pogut suprimir l'entrada del registre de temps."
+  notice_issue_done_ratios_updated: "S'ha actualitzat el tant per cent dels assumptes."
   
   error_can_t_load_default_data: "No s'ha pogut carregar la configuració predeterminada: {{value}} "
   error_scm_not_found: "No s'ha trobat l'entrada o la revisió en el dipòsit."
   error_scm_command_failed: "S'ha produït un error en intentar accedir al dipòsit: {{value}}"
   error_scm_annotate: "L'entrada no existeix o no s'ha pogut anotar."
   error_issue_not_found_in_project: "No s'ha trobat l'assumpte o no pertany a aquest projecte"
-
+  error_no_tracker_in_project: "Aquest projecte no té seguidor associat. Comproveu els paràmetres del projecte."
+  error_no_default_issue_status: "No s'ha definit cap estat d'assumpte predeterminat. Comproveu la configuració (aneu a «Administració -> Estats de l'assumpte»)."
+  error_can_not_delete_custom_field: "No s'ha pogut suprimir el camp personalitat"
+  error_can_not_delete_tracker: "Aquest seguidor conté assumptes i no es pot suprimir."
+  error_can_not_remove_role: "Aquest rol s'està utilitzant i no es pot suprimir."
+  error_can_not_reopen_issue_on_closed_version: "Un assumpte assignat a una versió tancada no es pot tornar a obrir"
+  error_can_not_archive_project: "Aquest projecte no es pot arxivar"
+  error_issue_done_ratios_not_updated: "No s'ha actualitza el tant per cent dels assumptes."
+  error_workflow_copy_source: "Seleccioneu un seguidor o rol font"
+  error_workflow_copy_target: "Seleccioneu seguidors i rols objectiu"
+  error_unable_delete_issue_status: "No s'ha pogut suprimir l'estat de l'assumpte"
+  error_unable_to_connect: "No s'ha pogut connectar ({{value}})"
   warning_attachments_not_saved: "No s'han pogut desar {{count}} fitxers."
   
   mail_subject_lost_password: "Contrasenya de {{value}}"
@@ -173,6 +195,10 @@ ca:
   mail_body_account_activation_request: "S'ha registrat un usuari nou ({{value}}). El seu compte està pendent d'aprovació:"
   mail_subject_reminder: "{{count}} assumptes venceran els següents {{days}} dies"
   mail_body_reminder: "{{count}} assumptes que teniu assignades venceran els següents {{days}} dies:"
+  mail_subject_wiki_content_added: "S'ha afegit la pàgina wiki «{{page}}»"
+  mail_body_wiki_content_added: "En {{author}} ha afegit la pàgina wiki «{{page}}»."
+  mail_subject_wiki_content_updated: "S'ha actualitzat la pàgina wiki «{{page}}»"
+  mail_body_wiki_content_updated: "En {{author}} ha actualitzat la pàgina wiki «{{page}}»."
   
   gui_validation_error: 1 error
   gui_validation_error_plural: "{{count}} errors"
@@ -212,6 +238,7 @@ ca:
   field_priority: Prioritat
   field_fixed_version: Versió objectiu
   field_user: Usuari
+  field_principal: Principal
   field_role: Rol
   field_homepage: Pàgina web
   field_is_public: Públic
@@ -256,6 +283,7 @@ ca:
   field_redirect_existing_links: Redirigeix els enllaços existents
   field_estimated_hours: Temps previst
   field_column_names: Columnes
+  field_time_entries: "Registre de temps"
   field_time_zone: Zona horària
   field_searchable: Es pot cercar
   field_default_value: Valor predeterminat
@@ -265,6 +293,9 @@ ca:
   field_watcher: Vigilància
   field_identity_url: URL OpenID
   field_content: Contingut
+  field_group_by: "Agrupa els resultats per"
+  field_sharing: Compartició
+  field_parent_issue: "Tasca pare"
   
   setting_app_title: "Títol de l'aplicació"
   setting_app_subtitle: "Subtítol de l'aplicació"
@@ -300,20 +331,35 @@ ca:
   setting_activity_days_default: "Dies a mostrar l'activitat del projecte"
   setting_display_subprojects_issues: "Mostra els assumptes d'un subprojecte en el projecte pare per defecte"
   setting_enabled_scm: "Habilita l'SCM"
+  setting_mail_handler_body_delimiters: "Trunca els correus electrònics després d'una d'aquestes línies"
   setting_mail_handler_api_enabled: "Habilita el WS per correus electrònics d'entrada"
   setting_mail_handler_api_key: Clau API
   setting_sequential_project_identifiers: Genera identificadors de projecte seqüencials
   setting_gravatar_enabled: "Utilitza les icones d'usuari Gravatar"
+  setting_gravatar_default: "Imatge Gravatar predeterminada"
   setting_diff_max_lines_displayed: Número màxim de línies amb diferències mostrades
   setting_file_max_size_displayed: Mida màxima dels fitxers de text mostrats en línia
   setting_repository_log_display_limit: Número màxim de revisions que es mostren al registre de fitxers
   setting_openid: "Permet entrar i registrar-se amb l'OpenID"
-
+  setting_password_min_length: "Longitud mínima de la contrasenya"
+  setting_new_project_user_role_id: "Aquest rol es dóna a un usuari no administrador per a crear projectes"
+  setting_default_projects_modules: "Mòduls activats per defecte en els projectes nous"
+  setting_issue_done_ratio: "Calcula tant per cent realitzat de l'assumpte amb"
+  setting_issue_done_ratio_issue_status: "Utilitza l'estat de l'assumpte"
+  setting_issue_done_ratio_issue_field: "Utilitza el camp de l'assumpte"
+  setting_start_of_week: "Inicia les setmanes en"
+  setting_rest_api_enabled: "Habilita el servei web REST"
+  setting_cache_formatted_text: Cache formatted text
+  
+  permission_add_project: "Crea projectes"
+  permission_add_subprojects: "Crea subprojectes"
   permission_edit_project: Edita el projecte
   permission_select_project_modules: Selecciona els mòduls del projecte
   permission_manage_members: Gestiona els membres
+  permission_manage_project_activities: "Gestiona les activitats del projecte"
   permission_manage_versions: Gestiona les versions
   permission_manage_categories: Gestiona les categories dels assumptes
+  permission_view_issues: "Visualitza els assumptes"
   permission_add_issues: Afegeix assumptes
   permission_edit_issues: Edita els assumptes
   permission_manage_issue_relations: Gestiona les relacions dels assumptes
@@ -328,6 +374,7 @@ ca:
   permission_view_calendar: Visualitza el calendari
   permission_view_issue_watchers: Visualitza la llista de vigilàncies
   permission_add_issue_watchers: Afegeix vigilàncies
+  permission_delete_issue_watchers: Suprimeix els vigilants
   permission_log_time: Registra el temps invertit
   permission_view_time_entries: Visualitza el temps invertit
   permission_edit_time_entries: Edita els registres de temps
@@ -357,6 +404,8 @@ ca:
   permission_edit_own_messages: Edita els missatges propis
   permission_delete_messages: Suprimeix els missatges
   permission_delete_own_messages: Suprimeix els missatges propis
+  permission_export_wiki_pages: "Exporta les pàgines wiki"
+  permission_manage_subtasks: "Gestiona subtasques"
   
   project_module_issue_tracking: "Seguidor d'assumptes"
   project_module_time_tracking: Seguidor de temps
@@ -366,10 +415,13 @@ ca:
   project_module_wiki: Wiki
   project_module_repository: Dipòsit
   project_module_boards: Taulers
+  project_module_calendar: Calendari
+  project_module_gantt: Gantt
   
   label_user: Usuari
   label_user_plural: Usuaris
   label_user_new: Usuari nou
+  label_user_anonymous: Anònim
   label_project: Projecte
   label_project_new: Projecte nou
   label_project_plural: Projectes
@@ -416,12 +468,13 @@ ca:
   label_information_plural: Informació
   label_please_login: Entreu
   label_register: Registre
-  label_login_with_open_id_option: o entra amb l'OpenID
+  label_login_with_open_id_option: "o entra amb l'OpenID"
   label_password_lost: Contrasenya perduda
   label_home: Inici
   label_my_page: La meva pàgina
   label_my_account: El meu compte
   label_my_projects: Els meus projectes
+  label_my_page_block: "Els meus blocs de pàgina"
   label_administration: Administració
   label_login: Entra
   label_logout: Surt
@@ -441,6 +494,7 @@ ca:
   label_auth_source_new: "Mode d'autenticació nou"
   label_auth_source_plural: "Modes d'autenticació"
   label_subproject_plural: Subprojectes
+  label_subproject_new: "Subprojecte nou"
   label_and_its_subprojects: "{{value}} i els seus subprojectes"
   label_min_max_length: Longitud mín - max
   label_list: Llist
@@ -475,8 +529,9 @@ ca:
   label_version: Versió
   label_version_new: Versió nova
   label_version_plural: Versions
+  label_close_versions: "Tanca les versions completades"
   label_confirmation: Confirmació
-  label_export_to: 'També disponible a:'
+  label_export_to: "També disponible a:"
   label_read: Llegeix...
   label_public_projects: Projectes públics
   label_open_issues: obert
@@ -533,6 +588,8 @@ ca:
   label_not_equals: no és
   label_in_less_than: en menys de
   label_in_more_than: en més de
+  label_greater_or_equal: ">="
+  label_less_or_equal: <=
   label_in: en
   label_today: avui
   label_all_time: tot el temps
@@ -555,17 +612,21 @@ ca:
   label_browse: Navega
   label_modification: "{{count}} canvi"
   label_modification_plural: "{{count}} canvis"
+  label_branch: Branca
+  label_tag: Etiqueta
   label_revision: Revisió
   label_revision_plural: Revisions
+  label_revision_id: "Revisió {{value}}"
   label_associated_revisions: Revisions associades
   label_added: afegit
   label_modified: modificat
-  label_renamed: reanomenat
   label_copied: copiat
+  label_renamed: reanomenat
   label_deleted: suprimit
   label_latest_revision: Última revisió
   label_latest_revision_plural: Últimes revisions
   label_view_revisions: Visualitza les revisions
+  label_view_all_revisions: "Visualitza totes les revisions"
   label_max_size: Mida màxima
   label_sort_highest: Mou a la part superior
   label_sort_higher: Mou cap amunt
@@ -591,6 +652,7 @@ ca:
   label_changes_details: Detalls de tots els canvis
   label_issue_tracking: "Seguiment d'assumptes"
   label_spent_time: Temps invertit
+  label_overall_spent_time: "Temps total invertit"
   label_f_hour: "{{value}} hora"
   label_f_hour_plural: "{{value}} hores"
   label_time_tracking: Temps de seguiment
@@ -628,6 +690,8 @@ ca:
   label_board: Fòrum
   label_board_new: Fòrum nou
   label_board_plural: Fòrums
+  label_board_locked: Bloquejat
+  label_board_sticky: Sticky
   label_topic_plural: Temes
   label_message_plural: Missatges
   label_message_last: Últim missatge
@@ -643,6 +707,8 @@ ca:
   label_language_based: "Basat en l'idioma de l'usuari"
   label_sort_by: "Ordena per {{value}}"
   label_send_test_email: Envia un correu electrònic de prova
+  label_feeds_access_key: "Clau d'accés del RSS"
+  label_missing_feeds_access_key: "Falta una clau d'accés del RSS"
   label_feeds_access_key_created_on: "Clau d'accés del RSS creada fa {{value}}"
   label_module_plural: Mòduls
   label_added_time_by: "Afegit per {{author}} fa {{age}}"
@@ -688,6 +754,28 @@ ca:
   label_ascending: Ascendent
   label_descending: Descendent
   label_date_from_to: Des de {{start}} a {{end}}
+  label_wiki_content_added: "S'ha afegit la pàgina wiki"
+  label_wiki_content_updated: "S'ha actualitzat la pàgina wiki"
+  label_group: Grup
+  label_group_plural: Grups
+  label_group_new: Grup nou
+  label_time_entry_plural: Temps invertit
+  label_version_sharing_hierarchy: "Amb la jerarquia del projecte"
+  label_version_sharing_system: "Amb tots els projectes"
+  label_version_sharing_descendants: "Amb tots els subprojectes"
+  label_version_sharing_tree: "Amb l'arbre del projecte"
+  label_version_sharing_none: "Sense compartir"
+  label_update_issue_done_ratios: "Actualitza el tant per cent dels assumptes realitzats"
+  label_copy_source: Font
+  label_copy_target: Objectiu
+  label_copy_same_as_target: "El mateix que l'objectiu"
+  label_display_used_statuses_only: "Mostra només els estats que utilitza aquest seguidor"
+  label_api_access_key: "Clau d'accés a l'API"
+  label_missing_api_access_key: "Falta una clau d'accés de l'API"
+  label_api_access_key_created_on: "Clau d'accés de l'API creada fa {{value}}"
+  label_profile: Perfil
+  label_subtask_plural: Subtasques
+  label_project_copy_notifications: "Envia notificacions de correu electrònic durant la còpia del projecte"
   
   button_login: Entra
   button_submit: Tramet
@@ -709,11 +797,12 @@ ca:
   button_list: Llista
   button_view: Visualitza
   button_move: Mou
+  button_move_and_follow: "Mou i segueix"
   button_back: Enrere
   button_cancel: Cancel·la
   button_activate: Activa
   button_sort: Ordena
-  button_log_time: "Hora d'entrada"
+  button_log_time: "Registre de temps"
   button_rollback: Torna a aquesta versió
   button_watch: Vigila
   button_unwatch: No vigilis
@@ -724,15 +813,24 @@ ca:
   button_rename: Reanomena
   button_change_password: Canvia la contrasenya
   button_copy: Copia
+  button_copy_and_follow: "Copia i segueix"
   button_annotate: Anota
   button_update: Actualitza
   button_configure: Configura
   button_quote: Cita
+  button_duplicate: Duplica
+  button_show: Mostra
   
   status_active: actiu
   status_registered: informat
   status_locked: bloquejat
   
+  version_status_open: oberta
+  version_status_locked: bloquejada
+  version_status_closed: tancada
+
+  field_active: Actiu
+  
   text_select_mail_notifications: "Seleccioneu les accions per les quals s'hauria d'enviar una notificació per correu electrònic."
   text_regexp_info: ex. ^[A-Z0-9]+$
   text_min_max_length_info: 0 significa sense restricció
@@ -740,6 +838,10 @@ ca:
   text_subprojects_destroy_warning: "També seran suprimits els seus subprojectes: {{value}}."
   text_workflow_edit: Seleccioneu un rol i un seguidor per a editar el flux de treball
   text_are_you_sure: Segur?
+  text_journal_changed: "{{label}} ha canviat de {{old}} a {{new}}"
+  text_journal_set_to: "{{label}} s'ha establert a {{value}}"
+  text_journal_deleted: "{{label}} s'ha suprimit ({{old}})"
+  text_journal_added: "S'ha afegit {{label}} {{value}}"
   text_tip_task_begin_day: "tasca que s'inicia aquest dia"
   text_tip_task_end_day: tasca que finalitza aquest dia
   text_tip_task_begin_end_day: "tasca que s'inicia i finalitza aquest dia"
@@ -750,6 +852,7 @@ ca:
   text_tracker_no_workflow: "No s'ha definit cap flux de treball per a aquest seguidor"
   text_unallowed_characters: Caràcters no permesos
   text_comma_separated: Es permeten valors múltiples (separats per una coma).
+  text_line_separated: "Es permeten diversos valors (una línia per cada valor)."
   text_issues_ref_in_commit_messages: Referència i soluciona els assumptes en els missatges publicats
   text_issue_added: "L'assumpte {{id}} ha sigut informat per {{author}}."
   text_issue_updated: "L'assumpte {{id}} ha sigut actualitzat per {{author}}."
@@ -770,14 +873,21 @@ ca:
   text_destroy_time_entries_question: "S'han informat {{hours}} hores en els assumptes que aneu a suprimir. Què voleu fer?"
   text_destroy_time_entries: Suprimeix les hores informades
   text_assign_time_entries_to_project: Assigna les hores informades al projecte
-  text_reassign_time_entries: 'Torna a assignar les hores informades a aquest assumpte:'
+  text_reassign_time_entries: "Torna a assignar les hores informades a aquest assumpte:"
   text_user_wrote: "{{value}} va escriure:"
   text_enumeration_destroy_question: "{{count}} objectes estan assignats a aquest valor."
-  text_enumeration_category_reassign_to: 'Torna a assignar-los a aquest valor:'
+  text_enumeration_category_reassign_to: "Torna a assignar-los a aquest valor:"
   text_email_delivery_not_configured: "El lliurament per correu electrònic no està configurat i les notificacions estan inhabilitades.\nConfigureu el servidor SMTP a config/email.yml i reinicieu l'aplicació per habilitar-lo."
   text_repository_usernames_mapping: "Seleccioneu l'assignació entre els usuaris del Redmine i cada nom d'usuari trobat al dipòsit.\nEls usuaris amb el mateix nom d'usuari o correu del Redmine i del dipòsit s'assignaran automàticament."
   text_diff_truncated: "... Aquestes diferències s'han trucat perquè excedeixen la mida màxima que es pot mostrar."
-  text_custom_field_possible_values_info: 'Una línia per a cada valor'
+  text_custom_field_possible_values_info: "Una línia per a cada valor"
+  text_wiki_page_destroy_question: "Aquesta pàgina té {{descendants}} pàgines fill i descendents. Què voleu fer?"
+  text_wiki_page_nullify_children: "Deixa les pàgines fill com a pàgines arrel"
+  text_wiki_page_destroy_children: "Suprimeix les pàgines fill i tots els seus descendents"
+  text_wiki_page_reassign_children: "Reasigna les pàgines fill a aquesta pàgina pare"
+  text_own_membership_delete_confirmation: "Esteu a punt de suprimir algun o tots els vostres permisos i potser no podreu editar més aquest projecte.\nSegur que voleu continuar?"
+  text_zoom_in: Redueix
+  text_zoom_out: Amplia
   
   default_role_manager: Gestor
   default_role_developer: Desenvolupador
@@ -804,106 +914,10 @@ ca:
   enumeration_issue_priorities: Prioritat dels assumptes
   enumeration_doc_categories: Categories del document
   enumeration_activities: Activitats (seguidor de temps)
-  label_greater_or_equal: ">="
-  label_less_or_equal: <=
-  text_wiki_page_destroy_question: This page has {{descendants}} child page(s) and descendant(s). What do you want to do?
-  text_wiki_page_reassign_children: Reassign child pages to this parent page
-  text_wiki_page_nullify_children: Keep child pages as root pages
-  text_wiki_page_destroy_children: Delete child pages and all their descendants
-  setting_password_min_length: Minimum password length
-  field_group_by: Group results by
-  mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
-  label_wiki_content_added: Wiki page added
-  mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
-  mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
-  label_wiki_content_updated: Wiki page updated
-  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
-  permission_add_project: Create project
-  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
-  label_view_all_revisions: View all revisions
-  label_tag: Tag
-  label_branch: Branch
-  error_no_tracker_in_project: No tracker is associated to this project. Please check the Project settings.
-  error_no_default_issue_status: No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").
-  text_journal_changed: "{{label}} changed from {{old}} to {{new}}"
-  text_journal_set_to: "{{label}} set to {{value}}"
-  text_journal_deleted: "{{label}} deleted ({{old}})"
-  label_group_plural: Groups
-  label_group: Group
-  label_group_new: New group
-  label_time_entry_plural: Spent time
-  text_journal_added: "{{label}} {{value}} added"
-  field_active: Active
-  enumeration_system_activity: System Activity
-  permission_delete_issue_watchers: Delete watchers
-  version_status_closed: closed
-  version_status_locked: locked
-  version_status_open: open
-  error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened
-  label_user_anonymous: Anonymous
-  button_move_and_follow: Move and follow
-  setting_default_projects_modules: Default enabled modules for new projects
-  setting_gravatar_default: Default Gravatar image
-  field_sharing: Sharing
-  label_version_sharing_hierarchy: With project hierarchy
-  label_version_sharing_system: With all projects
-  label_version_sharing_descendants: With subprojects
-  label_version_sharing_tree: With project tree
-  label_version_sharing_none: Not shared
-  error_can_not_archive_project: This project can not be archived
-  button_duplicate: Duplicate
-  button_copy_and_follow: Copy and follow
-  label_copy_source: Source
-  setting_issue_done_ratio: Calculate the issue done ratio with
-  setting_issue_done_ratio_issue_status: Use the issue status
-  error_issue_done_ratios_not_updated: Issue done ratios not updated.
-  error_workflow_copy_target: Please select target tracker(s) and role(s)
-  setting_issue_done_ratio_issue_field: Use the issue field
-  label_copy_same_as_target: Same as target
-  label_copy_target: Target
-  notice_issue_done_ratios_updated: Issue done ratios updated.
-  error_workflow_copy_source: Please select a source tracker or role
-  label_update_issue_done_ratios: Update issue done ratios
-  setting_start_of_week: Start calendars on
-  permission_view_issues: View Issues
-  label_display_used_statuses_only: Only display statuses that are used by this tracker
-  label_revision_id: Revision {{value}}
-  label_api_access_key: API access key
-  label_api_access_key_created_on: API access key created {{value}} ago
-  label_feeds_access_key: RSS access key
-  notice_api_access_key_reseted: Your API access key was reset.
-  setting_rest_api_enabled: Enable REST web service
-  label_missing_api_access_key: Missing an API access key
-  label_missing_feeds_access_key: Missing a RSS access key
-  button_show: Show
-  text_line_separated: Multiple values allowed (one line for each value).
-  setting_mail_handler_body_delimiters: Truncate emails after one of these lines
-  permission_add_subprojects: Create subprojects
-  label_subproject_new: New subproject
-  text_own_membership_delete_confirmation: |-
-    You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
-    Are you sure you want to continue?
-  label_close_versions: Close completed versions
-  label_board_sticky: Sticky
-  label_board_locked: Locked
-  permission_export_wiki_pages: Export wiki pages
-  setting_cache_formatted_text: Cache formatted text
-  permission_manage_project_activities: Manage project activities
-  error_unable_delete_issue_status: Unable to delete issue status
-  label_profile: Profile
-  permission_manage_subtasks: Manage subtasks
-  field_parent_issue: Parent task
-  label_subtask_plural: Subtasks
-  label_project_copy_notifications: Send email notifications during the project copy
-  error_can_not_delete_custom_field: Unable to delete custom field
-  error_unable_to_connect: Unable to connect ({{value}})
-  error_can_not_remove_role: This role is in use and can not be deleted.
-  error_can_not_delete_tracker: This tracker contains issues and can't be deleted.
-  field_principal: Principal
-  label_my_page_block: My page block
-  notice_failed_to_save_members: "Failed to save member(s): {{errors}}."
-  text_zoom_out: Zoom out
-  text_zoom_in: Zoom in
-  notice_unable_delete_time_entry: Unable to delete time log entry.
-  label_overall_spent_time: Overall spent time
-  field_time_entries: Log time
+  enumeration_system_activity: Activitat del sistema
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
+

config/locales/cs.yml

@@ -24,8 +24,8 @@ cs:
       time: "%H:%M"
       short: "%d %b %H:%M"
       long: "%B %d, %Y %H:%M"
-    am: "am"
-    pm: "pm"
+    am: "dop."
+    pm: "odp."
     
   datetime:
     distance_in_words:
@@ -61,8 +61,8 @@ cs:
         one:   "více než 1 rok"
         other: "více než {{count}} roky"
       almost_x_years:
-        one:   "almost 1 year"
-        other: "almost {{count}} years"
+        one:   "témeř 1 rok"
+        other: "téměř {{count}} roky"
 
   number:
     format:
@@ -116,6 +116,7 @@ cs:
         greater_than_start_date: "musí být větší než počáteční datum"
         not_same_project: "nepatří stejnému projektu"
         circular_dependency: "Tento vztah by vytvořil cyklickou závislost"
+        cant_link_an_issue_with_a_descendant: "Úkol nemůže být spojen s jedním z jeho dílčích úkolů"
 
   # Updated by Josef Liška <jl@chl.cz>
   # CZ translation by Maxim Krušina | Massimo Filippi, s.r.o. | maxim@mxm.cz
@@ -149,19 +150,19 @@ cs:
   notice_successful_connection: Úspěšné připojení.
   notice_file_not_found: Stránka na kterou se snažíte zobrazit neexistuje nebo byla smazána.
   notice_locking_conflict: Údaje byly změněny jiným uživatelem.
-  notice_scm_error: Entry and/or revision doesn't exist in the repository.
+  notice_scm_error: Záznam a/nebo revize neexistuje v repozitáři.
   notice_not_authorized: Nemáte dostatečná práva pro zobrazení této stránky.
   notice_email_sent: "Na adresu {{value}} byl odeslán email"
   notice_email_error: "Při odesílání emailu nastala chyba ({{value}})"
   notice_feeds_access_key_reseted: Váš klíč pro přístup k RSS byl resetován.
-  notice_failed_to_save_issues: "Failed to save {{count}} issue(s) on {{total}} selected: {{ids}}."
+  notice_failed_to_save_issues: "Chyba při uložení {{count}} úkolu(ů) z {{total}} vybraných: {{ids}}."
   notice_no_issue_selected: "Nebyl zvolen žádný úkol. Prosím, zvolte úkoly, které chcete editovat"
   notice_account_pending: "Váš účet byl vytvořen, nyní čeká na schválení administrátorem."
   notice_default_data_loaded: Výchozí konfigurace úspěšně nahrána.
   
   error_can_t_load_default_data: "Výchozí konfigurace nebyla nahrána: {{value}}"
-  error_scm_not_found: "Položka a/nebo revize neexistují v repository."
-  error_scm_command_failed: "Při pokusu o přístup k repository došlo k chybě: {{value}}"
+  error_scm_not_found: "Položka a/nebo revize neexistují v repozitáři."
+  error_scm_command_failed: "Při pokusu o přístup k repozitáři došlo k chybě: {{value}}"
   error_issue_not_found_in_project: 'Úkol nebyl nalezen nebo nepatří k tomuto projektu'
   
   mail_subject_lost_password: "Vaše heslo ({{value}})"
@@ -209,10 +210,10 @@ cs:
   field_due_date: Uzavřít do
   field_assigned_to: Přiřazeno
   field_priority: Priorita
-  field_fixed_version: Přiřazeno k verzi
+  field_fixed_version: Cílová verze
   field_user: Uživatel
   field_role: Role
-  field_homepage: Homepage
+  field_homepage: Domovská stránka
   field_is_public: Veřejný
   field_parent: Nadřazený projekt
   field_is_in_roadmap: Úkoly zobrazené v plánu
@@ -264,18 +265,18 @@ cs:
   setting_app_subtitle: Podtitulek aplikace
   setting_welcome_text: Uvítací text
   setting_default_language: Výchozí jazyk
-  setting_login_required: Auten. vyžadována
+  setting_login_required: Autentifikace vyžadována
   setting_self_registration: Povolena automatická registrace
   setting_attachment_max_size: Maximální velikost přílohy
   setting_issues_export_limit: Limit pro export úkolů
   setting_mail_from: Odesílat emaily z adresy
   setting_bcc_recipients: Příjemci skryté kopie (bcc)
-  setting_host_name: Host name
+  setting_host_name: Jméno serveru
   setting_text_formatting: Formátování textu
-  setting_wiki_compression: Komperese historie Wiki
-  setting_feeds_limit: Feed content limit
+  setting_wiki_compression: Komprese historie Wiki
+  setting_feeds_limit: Limit obsahu příspěvků
   setting_default_projects_public: Nové projekty nastavovat jako veřejné
-  setting_autofetch_changesets: Autofetch commits
+  setting_autofetch_changesets: Automaticky stahovat commity
   setting_sys_api_enabled: Povolit WS pro správu repozitory
   setting_commit_ref_keywords: Klíčová slova pro odkazy
   setting_commit_fix_keywords: Klíčová slova pro uzavření
@@ -289,8 +290,8 @@ cs:
   setting_protocol: Protokol
   setting_per_page_options: Povolené počty řádků na stránce
   setting_user_format: Formát zobrazení uživatele
-  setting_activity_days_default: Days displayed on project activity
-  setting_display_subprojects_issues: Display subprojects issues on main projects by default
+  setting_activity_days_default: Dny zobrazené v činnosti projektu
+  setting_display_subprojects_issues: Automaticky zobrazit úkoly podprojektu v hlavním projektu
   
   project_module_issue_tracking: Sledování úkolů
   project_module_time_tracking: Sledování času
@@ -298,7 +299,7 @@ cs:
   project_module_documents: Dokumenty
   project_module_files: Soubory
   project_module_wiki: Wiki
-  project_module_repository: Repository
+  project_module_repository: Repozitář
   project_module_boards: Diskuse
   
   label_user: Uživatel
@@ -308,16 +309,16 @@ cs:
   label_project_new: Nový projekt
   label_project_plural: Projekty
   label_x_projects:
-    zero:  no projects
-    one:   1 project
-    other: "{{count}} projects"
+    zero:  žádné projekty
+    one:   1 projekt
+    other: "{{count}} projekty(ů)"
   label_project_all: Všechny projekty
   label_project_latest: Poslední projekty
   label_issue: Úkol
   label_issue_new: Nový úkol
   label_issue_plural: Úkoly
   label_issue_view_all: Všechny úkoly
-  label_issues_by: "Úkoly od uživatele {{value}}"
+  label_issues_by: "Úkoly podle {{value}}"
   label_issue_added: Úkol přidán
   label_issue_updated: Úkol aktualizován
   label_document: Dokument
@@ -334,7 +335,7 @@ cs:
   label_tracker: Fronta
   label_tracker_plural: Fronty
   label_tracker_new: Nová fronta
-  label_workflow: Workflow
+  label_workflow: Průběh práce
   label_issue_status: Stav úkolu
   label_issue_status_plural: Stavy úkolů
   label_issue_status_new: Nový stav
@@ -377,14 +378,14 @@ cs:
   label_list: Seznam
   label_date: Datum
   label_integer: Celé číslo
-  label_float: Desetiné číslo
+  label_float: Desetinné číslo
   label_boolean: Ano/Ne
   label_string: Text
   label_text: Dlouhý text
   label_attribute: Atribut
   label_attribute_plural: Atributy
-  label_download: "{{count}} Download"
-  label_download_plural: "{{count}} Downloads"
+  label_download: "{{count}} stažení"
+  label_download_plural: "{{count}} stažení"
   label_no_data: Žádné položky
   label_change_status: Změnit stav
   label_history: Historie
@@ -393,7 +394,7 @@ cs:
   label_attachment_delete: Odstranit soubor
   label_attachment_plural: Soubory
   label_file_added: Soubor přidán
-  label_report: Přeheled
+  label_report: Přehled
   label_report_plural: Přehledy
   label_news: Novinky
   label_news_new: Přidat novinku
@@ -415,17 +416,17 @@ cs:
   label_closed_issues: uzavřený
   label_closed_issues_plural: uzavřené
   label_x_open_issues_abbr_on_total:
-    zero:  0 open / {{total}}
-    one:   1 open / {{total}}
-    other: "{{count}} open / {{total}}"
+    zero:  0 otevřených / {{total}}
+    one:   1 otevřený / {{total}}
+    other: "{{count}} otevřených / {{total}}"
   label_x_open_issues_abbr:
-    zero:  0 open
-    one:   1 open
-    other: "{{count}} open"
+    zero:  0 otevřených
+    one:   1 otevřený
+    other: "{{count}} otevřených"
   label_x_closed_issues_abbr:
-    zero:  0 closed
-    one:   1 closed
-    other: "{{count}} closed"
+    zero:  0 uzavřených
+    one:   1 uzavřený
+    other: "{{count}} uzavřených"
   label_total: Celkem
   label_permissions: Práva
   label_current_status: Aktuální stav
@@ -449,9 +450,9 @@ cs:
   label_comment: Komentář
   label_comment_plural: Komentáře
   label_x_comments:
-    zero: no comments
-    one: 1 comment
-    other: "{{count}} comments"
+    zero: žádné komentáře
+    one: 1 komentář
+    other: "{{count}} komentářů"
   label_comment_add: Přidat komentáře
   label_comment_added: Komentář přidán
   label_comment_delete: Odstranit komentář
@@ -481,8 +482,8 @@ cs:
   label_contains: obsahuje
   label_not_contains: neobsahuje
   label_day_plural: dny
-  label_repository: Repository
-  label_repository_plural: Repository
+  label_repository: Repozitář
+  label_repository_plural: Repozitáře
   label_browse: Procházet
   label_modification: "{{count}} změna"
   label_modification_plural: "{{count}} změn"
@@ -531,7 +532,7 @@ cs:
   label_diff_inline: uvnitř
   label_diff_side_by_side: vedle sebe
   label_options: Nastavení
-  label_copy_workflow_from: Kopírovat workflow z
+  label_copy_workflow_from: Kopírovat průběh práce z
   label_permissions_report: Přehled práv
   label_watched_issues: Sledované úkoly
   label_related_issues: Související úkoly
@@ -552,7 +553,7 @@ cs:
   label_stay_logged_in: Zůstat přihlášený
   label_disabled: zakázán
   label_show_completed_versions: Ukázat dokončené verze
-  label_me: mě
+  label_me: já
   label_board: Fórum
   label_board_new: Nové fórum
   label_board_plural: Fóra
@@ -575,12 +576,12 @@ cs:
   label_module_plural: Moduly
   label_added_time_by: "Přidáno uživatelem {{author}} před {{age}}"
   label_updated_time: "Aktualizováno před {{value}}"
-  label_jump_to_a_project: Zvolit projekt...
+  label_jump_to_a_project: Vyberte projekt...
   label_file_plural: Soubory
   label_changeset_plural: Changesety
   label_default_columns: Výchozí sloupce
   label_no_change_option: (beze změny)
-  label_bulk_edit_selected_issues: Bulk edit selected issues
+  label_bulk_edit_selected_issues: Hromadná úprava vybraných úkolů
   label_theme: Téma
   label_default: Výchozí
   label_search_titles_only: Vyhledávat pouze v názvech
@@ -599,7 +600,7 @@ cs:
   label_scm: SCM
   label_plugins: Doplňky
   label_ldap_authentication: Autentifikace LDAP
-  label_downloads_abbr: D/L
+  label_downloads_abbr: Staž.
   label_optional_description: Volitelný popis
   label_add_another_file: Přidat další soubor
   label_preferences: Nastavení
@@ -652,7 +653,7 @@ cs:
   text_regexp_info: např. ^[A-Z0-9]+$
   text_min_max_length_info: 0 znamená bez limitu
   text_project_destroy_confirmation: Jste si jisti, že chcete odstranit tento projekt a všechna související data ?
-  text_workflow_edit: Vyberte roli a frontu k editaci workflow
+  text_workflow_edit: Vyberte roli a frontu k editaci průběhu práce
   text_are_you_sure: Jste si jisti?
   text_tip_task_begin_day: úkol začíná v tento den
   text_tip_task_end_day: úkol končí v tento den
@@ -661,24 +662,24 @@ cs:
   text_caracters_maximum: "{{count}} znaků maximálně."
   text_caracters_minimum: "Musí být alespoň {{count}} znaků dlouhé."
   text_length_between: "Délka mezi {{min}} a {{max}} znaky."
-  text_tracker_no_workflow: Pro tuto frontu není definován žádný workflow
+  text_tracker_no_workflow: Pro tuto frontu není definován žádný průběh práce
   text_unallowed_characters: Nepovolené znaky
   text_comma_separated: Povoleno více hodnot (oddělěné čárkou).
-  text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
+  text_issues_ref_in_commit_messages: Odkazování a opravování úkolů ve zprávách commitů
   text_issue_added: "Úkol {{id}} byl vytvořen uživatelem {{author}}."
   text_issue_updated: "Úkol {{id}} byl aktualizován uživatelem {{author}}."
-  text_wiki_destroy_confirmation: Opravdu si přejete odstranit tuto WIKI a celý její obsah?
+  text_wiki_destroy_confirmation: Opravdu si přejete odstranit tuto Wiki a celý její obsah?
   text_issue_category_destroy_question: "Některé úkoly ({{count}}) jsou přiřazeny k této kategorii. Co s nimi chtete udělat?"
   text_issue_category_destroy_assignments: Zrušit přiřazení ke kategorii
   text_issue_category_reassign_to: Přiřadit úkoly do této kategorie
   text_user_mail_option: "U projektů, které nebyly vybrány, budete dostávat oznámení pouze o vašich či o sledovaných položkách (např. o položkách jejichž jste autor nebo ke kterým jste přiřazen(a))."
-  text_no_configuration_data: "Role, fronty, stavy úkolů ani workflow nebyly zatím nakonfigurovány.\nVelice doporučujeme nahrát výchozí konfiguraci.Po té si můžete vše upravit"
+  text_no_configuration_data: "Role, fronty, stavy úkolů ani průběh práce nebyly zatím nakonfigurovány.\nVelice doporučujeme nahrát výchozí konfiguraci. Po té si můžete vše upravit"
   text_load_default_configuration: Nahrát výchozí konfiguraci
   text_status_changed_by_changeset: "Použito v changesetu {{value}}."
   text_issues_destroy_confirmation: 'Opravdu si přejete odstranit všechny zvolené úkoly?'
   text_select_project_modules: 'Aktivní moduly v tomto projektu:'
   text_default_administrator_account_changed: Výchozí nastavení administrátorského účtu změněno
-  text_file_repository_writable: Povolen zápis do repository
+  text_file_repository_writable: Povolen zápis do adresáře ukládání souborů
   text_rmagick_available: RMagick k dispozici (volitelné)
   text_destroy_time_entries_question: "U úkolů, které chcete odstranit je evidováno {{hours}} práce. Co chete udělat?"
   text_destroy_time_entries: Odstranit evidované hodiny.
@@ -692,7 +693,7 @@ cs:
   default_tracker_feature: Požadavek
   default_tracker_support: Podpora
   default_issue_status_new: Nový
-  default_issue_status_in_progress: In Progress
+  default_issue_status_in_progress: Ve vývoji
   default_issue_status_resolved: Vyřešený
   default_issue_status_feedback: Čeká se
   default_issue_status_closed: Uzavřený
@@ -704,7 +705,7 @@ cs:
   default_priority_high: Vysoká
   default_priority_urgent: Urgentní
   default_priority_immediate: Okamžitá
-  default_activity_design: Design
+  default_activity_design: Návhr
   default_activity_development: Vývoj
   
   enumeration_issue_priorities: Priority úkolů
@@ -717,8 +718,8 @@ cs:
   mail_body_reminder: "{{count}} úkol(ů), které máte přiřazeny má termín během několik dní ({{days}}):"
   mail_subject_reminder: "{{count}} úkol(ů) má termín během několik dní ({{days}})"
   text_user_wrote: "{{value}} napsal:"
-  label_duplicated_by: duplicated by
-  setting_enabled_scm: Povoleno SCM
+  label_duplicated_by: duplikováno od
+  setting_enabled_scm: Povolené SCM
   text_enumeration_category_reassign_to: 'Přeřadit je do této:'
   text_enumeration_destroy_question: "Několik ({{count}}) objektů je přiřazeno k této hodnotě."
   label_incoming_emails: Příchozí e-maily
@@ -744,22 +745,22 @@ cs:
   permission_view_changesets: Zobrazování sady změn
   permission_view_time_entries: Zobrazení stráveného času
   permission_manage_versions: Spravování verzí
-  permission_manage_wiki: Spravování wiki
+  permission_manage_wiki: Spravování Wiki
   permission_manage_categories: Spravování kategorií úkolů
-  permission_protect_wiki_pages: Zabezpečení wiki stránek
+  permission_protect_wiki_pages: Zabezpečení Wiki stránek
   permission_comment_news: Komentování novinek
   permission_delete_messages: Mazání zpráv
   permission_select_project_modules: Výběr modulů projektu
   permission_manage_documents: Správa dokumentů
-  permission_edit_wiki_pages: Upravování stránek wiki
+  permission_edit_wiki_pages: Upravování stránek Wiki
   permission_add_issue_watchers: Přidání sledujících uživatelů
   permission_view_gantt: Zobrazené Ganttova diagramu
   permission_move_issues: Přesouvání úkolů
   permission_manage_issue_relations: Spravování vztahů mezi úkoly
-  permission_delete_wiki_pages: Mazání stránek na wiki
+  permission_delete_wiki_pages: Mazání stránek na Wiki
   permission_manage_boards: Správa diskusních fór
   permission_delete_wiki_pages_attachments: Mazání příloh
-  permission_view_wiki_edits: Prohlížení historie wiki
+  permission_view_wiki_edits: Prohlížení historie Wiki
   permission_add_messages: Posílání zpráv
   permission_view_messages: Prohlížení zpráv
   permission_manage_files: Spravování souborů
@@ -771,26 +772,26 @@ cs:
   permission_delete_issues: Mazání úkolů
   permission_view_issue_watchers: Zobrazení seznamu sledujícíh uživatelů
   permission_manage_repository: Spravování repozitáře
-  permission_commit_access: Commit access
+  permission_commit_access: Commit přístup
   permission_browse_repository: Procházení repozitáře
   permission_view_documents: Prohlížení dokumentů
   permission_edit_project: Úprava projektů
   permission_add_issue_notes: Přidávání poznámek
   permission_save_queries: Ukládání dotazů
-  permission_view_wiki_pages: Prohlížení wiki
-  permission_rename_wiki_pages: Přejmenovávání wiki stránek
+  permission_view_wiki_pages: Prohlížení Wiki
+  permission_rename_wiki_pages: Přejmenovávání Wiki stránek
   permission_edit_time_entries: Upravování záznamů o stráveném času
   permission_edit_own_issue_notes: Upravování vlastních poznámek
   setting_gravatar_enabled: Použít uživatelské ikony Gravatar
   label_example: Příklad
-  text_repository_usernames_mapping: "Vybrat nebo upravit mapování mezi Redmine uživateli a uživatelskými jmény nalezenými v logu repozitáře.\nUživatelé  se shodným Redmine uživateslkým jménem a uživatelským jménem v repozitáři jsou mapovaní automaticky."
+  text_repository_usernames_mapping: "Vybrat nebo upravit mapování mezi Redmine uživateli a uživatelskými jmény nalezenými v logu repozitáře.\nUživatelé se shodným Redmine uživatelským jménem a uživatelským jménem v repozitáři jsou mapovaní automaticky."
   permission_edit_own_messages: Upravit vlastní zprávy
   permission_delete_own_messages: Smazat vlastní zprávy
   label_user_activity: "Aktivita uživatele: {{value}}"
   label_updated_time_by: "Akutualizováno: {{author}} před: {{age}}"
   text_diff_truncated: '... Rozdílový soubor je zkrácen, protože jeho délka přesahuje max. limit.'
   setting_diff_max_lines_displayed: Maximální počet zobrazenách řádků rozdílů
-  text_plugin_assets_writable: Plugin assets directory writable
+  text_plugin_assets_writable: Možnost zápisu do adresáře plugin assets
   warning_attachments_not_saved: "{{count}} soubor(ů) nebylo možné uložit."
   button_create_and_continue: Vytvořit a pokračovat
   text_custom_field_possible_values_info: 'Každá hodnota na novém řádku'
@@ -809,104 +810,111 @@ cs:
   label_date_from_to: Od {{start}} do {{end}}
   label_greater_or_equal: ">="
   label_less_or_equal: <=
-  text_wiki_page_destroy_question: This page has {{descendants}} child page(s) and descendant(s). What do you want to do?
-  text_wiki_page_reassign_children: Reassign child pages to this parent page
-  text_wiki_page_nullify_children: Keep child pages as root pages
-  text_wiki_page_destroy_children: Delete child pages and all their descendants
-  setting_password_min_length: Minimum password length
-  field_group_by: Group results by
-  mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
-  label_wiki_content_added: Wiki page added
-  mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
-  mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
-  label_wiki_content_updated: Wiki page updated
-  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
-  permission_add_project: Create project
-  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
-  label_view_all_revisions: View all revisions
+  text_wiki_page_destroy_question: Tato stránka má {{descendants}} podstránek a potomků. Co chcete udělat?
+  text_wiki_page_reassign_children: Přiřadit podstránky k tomuto rodiči
+  text_wiki_page_nullify_children: Ponechat podstránky jako kořenové stránky
+  text_wiki_page_destroy_children: Smazat podstránky a všechny jejich potomky
+  setting_password_min_length: Minimální délka hesla
+  field_group_by: Seskupovat výsledky podle
+  mail_subject_wiki_content_updated: "'{{page}}' Wiki stránka byla aktualizována"
+  label_wiki_content_added: Wiki stránka přidána
+  mail_subject_wiki_content_added: "'{{page}}' Wiki stránka byla přidána"
+  mail_body_wiki_content_added: "'{{page}}' Wiki stránka byla přidána od {{author}}."
+  label_wiki_content_updated: Wiki stránka aktualizována
+  mail_body_wiki_content_updated: "'{{page}}' Wiki stránka byla aktualizována od {{author}}."
+  permission_add_project: Vytvořit projekt
+  setting_new_project_user_role_id: Role přiřazená uživateli bez práv administrátora, který projekt vytvořil
+  label_view_all_revisions: Zobrazit všechny revize
   label_tag: Tag
   label_branch: Branch
-  error_no_tracker_in_project: No tracker is associated to this project. Please check the Project settings.
-  error_no_default_issue_status: No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").
-  text_journal_changed: "{{label}} changed from {{old}} to {{new}}"
-  text_journal_set_to: "{{label}} set to {{value}}"
-  text_journal_deleted: "{{label}} deleted ({{old}})"
-  label_group_plural: Groups
-  label_group: Group
-  label_group_new: New group
-  label_time_entry_plural: Spent time
-  text_journal_added: "{{label}} {{value}} added"
-  field_active: Active
-  enumeration_system_activity: System Activity
-  permission_delete_issue_watchers: Delete watchers
-  version_status_closed: closed
-  version_status_locked: locked
-  version_status_open: open
-  error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened
-  label_user_anonymous: Anonymous
-  button_move_and_follow: Move and follow
-  setting_default_projects_modules: Default enabled modules for new projects
-  setting_gravatar_default: Default Gravatar image
-  field_sharing: Sharing
-  label_version_sharing_hierarchy: With project hierarchy
-  label_version_sharing_system: With all projects
-  label_version_sharing_descendants: With subprojects
-  label_version_sharing_tree: With project tree
-  label_version_sharing_none: Not shared
-  error_can_not_archive_project: This project can not be archived
-  button_duplicate: Duplicate
-  button_copy_and_follow: Copy and follow
-  label_copy_source: Source
-  setting_issue_done_ratio: Calculate the issue done ratio with
-  setting_issue_done_ratio_issue_status: Use the issue status
-  error_issue_done_ratios_not_updated: Issue done ratios not updated.
-  error_workflow_copy_target: Please select target tracker(s) and role(s)
-  setting_issue_done_ratio_issue_field: Use the issue field
-  label_copy_same_as_target: Same as target
-  label_copy_target: Target
-  notice_issue_done_ratios_updated: Issue done ratios updated.
-  error_workflow_copy_source: Please select a source tracker or role
-  label_update_issue_done_ratios: Update issue done ratios
-  setting_start_of_week: Start calendars on
-  permission_view_issues: View Issues
-  label_display_used_statuses_only: Only display statuses that are used by this tracker
-  label_revision_id: Revision {{value}}
-  label_api_access_key: API access key
-  label_api_access_key_created_on: API access key created {{value}} ago
-  label_feeds_access_key: RSS access key
-  notice_api_access_key_reseted: Your API access key was reset.
-  setting_rest_api_enabled: Enable REST web service
-  label_missing_api_access_key: Missing an API access key
-  label_missing_feeds_access_key: Missing a RSS access key
-  button_show: Show
-  text_line_separated: Multiple values allowed (one line for each value).
-  setting_mail_handler_body_delimiters: Truncate emails after one of these lines
-  permission_add_subprojects: Create subprojects
-  label_subproject_new: New subproject
+  error_no_tracker_in_project: Žádná fronta nebyla přiřazena tomuto projektu. Prosím zkontroluje nastavení projektu.
+  error_no_default_issue_status: Není nastaven výchozí stav úkolu. Prosím zkontrolujte nastavení ("Administrace -> Stavy úkolů").
+  text_journal_changed: "{{label}} změněn z {{old}} na {{new}}"
+  text_journal_set_to: "{{label}} nastaven na {{value}}"
+  text_journal_deleted: "{{label}} smazán ({{old}})"
+  label_group_plural: Skupiny
+  label_group: Skupina
+  label_group_new: Nová skupina
+  label_time_entry_plural: Strávený čas
+  text_journal_added: "{{label}} {{value}} přidán"
+  field_active: Aktivní
+  enumeration_system_activity: Systémová aktivita
+  permission_delete_issue_watchers: Smazat přihlížející
+  version_status_closed: zavřený
+  version_status_locked: uzamčený
+  version_status_open: otevřený
+  error_can_not_reopen_issue_on_closed_version: Úkol přiřazený k uzavřené verzi nemůže být znovu otevřen
+  label_user_anonymous: Anonymní
+  button_move_and_follow: Přesunout a následovat
+  setting_default_projects_modules: Výchozí zapnutné moduly pro nový projekt
+  setting_gravatar_default: Výchozí Gravatar
+  field_sharing: Sdílení
+  label_version_sharing_hierarchy: S hierarchií projektu
+  label_version_sharing_system: Se všemi projekty
+  label_version_sharing_descendants: S podprojekty
+  label_version_sharing_tree: Se stromem projektu
+  label_version_sharing_none: Nesdíleno
+  error_can_not_archive_project: Tento projekt nemůže být archivován
+  button_duplicate: Duplikát
+  button_copy_and_follow: Kopírovat a následovat
+  label_copy_source: Zdroj
+  setting_issue_done_ratio: Spočítat koeficient dokončení úkolu s
+  setting_issue_done_ratio_issue_status: Použít stav úkolu
+  error_issue_done_ratios_not_updated: Koeficient dokončení úkolu nebyl aktualizován.
+  error_workflow_copy_target: Prosím vyberte cílovou frontu(y) a roly(e)
+  setting_issue_done_ratio_issue_field: Použít pole úkolu
+  label_copy_same_as_target: Stejný jako cíl
+  label_copy_target: Cíl
+  notice_issue_done_ratios_updated: Koeficienty dokončení úkolu byly aktualizovány.
+  error_workflow_copy_source: Prosím vyberte zdrojovou frontu nebo roly
+  label_update_issue_done_ratios: Aktualizovat koeficienty dokončení úkolů
+  setting_start_of_week: Začínat kalendáře
+  permission_view_issues: Zobrazit úkoly
+  label_display_used_statuses_only: Zobrazit pouze stavy které jsou použité touto frontou
+  label_revision_id: Revize {{value}}
+  label_api_access_key: API přístupový klíč
+  label_api_access_key_created_on: API přístupový klíč vytvořen {{value}} 
+  label_feeds_access_key: RSS přístupový klíč
+  notice_api_access_key_reseted: Váš API přístupový klíč byl resetován.
+  setting_rest_api_enabled: Zapnout službu REST
+  label_missing_api_access_key: Chybějící přístupový klíč API
+  label_missing_feeds_access_key: Chybějící přístupový klíč RSS
+  button_show: Zobrazit
+  text_line_separated: Více hodnot povoleno (jeden řádek pro každou hodnotu).
+  setting_mail_handler_body_delimiters: Zkrátit e-maily po jednom z těchto řádků
+  permission_add_subprojects: Vytvořit podprojekty
+  label_subproject_new: Nový podprojekt
   text_own_membership_delete_confirmation: |-
-    You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
-    Are you sure you want to continue?
-  label_close_versions: Close completed versions
-  label_board_sticky: Sticky
-  label_board_locked: Locked
-  permission_export_wiki_pages: Export wiki pages
-  setting_cache_formatted_text: Cache formatted text
-  permission_manage_project_activities: Manage project activities
-  error_unable_delete_issue_status: Unable to delete issue status
-  label_profile: Profile
-  permission_manage_subtasks: Manage subtasks
-  field_parent_issue: Parent task
-  label_subtask_plural: Subtasks
-  label_project_copy_notifications: Send email notifications during the project copy
-  error_can_not_delete_custom_field: Unable to delete custom field
-  error_unable_to_connect: Unable to connect ({{value}})
-  error_can_not_remove_role: This role is in use and can not be deleted.
-  error_can_not_delete_tracker: This tracker contains issues and can't be deleted.
-  field_principal: Principal
-  label_my_page_block: My page block
-  notice_failed_to_save_members: "Failed to save member(s): {{errors}}."
-  text_zoom_out: Zoom out
-  text_zoom_in: Zoom in
-  notice_unable_delete_time_entry: Unable to delete time log entry.
-  label_overall_spent_time: Overall spent time
-  field_time_entries: Log time
+    Chystáte se odebrat si některá nebo všechny svá oprávnění a potom již nemusíte být schopni upravit tento projekt.
+    Opravdu chcete pokračovat?
+  label_close_versions: Zavřít dokončené verze
+  label_board_sticky: Nálepka
+  label_board_locked: Uzamčeno
+  permission_export_wiki_pages: Exportovat Wiki stránky
+  setting_cache_formatted_text: Ukládat formátovaný text do vyrovnávací paměti
+  permission_manage_project_activities: Spravovat aktivity projektu
+  error_unable_delete_issue_status: Nelze smazat stavy úkolů
+  label_profile: Profil
+  permission_manage_subtasks: Spravovat podúkoly
+  field_parent_issue: Rodičovský úkol
+  label_subtask_plural: Podúkol
+  label_project_copy_notifications: Odeslat email oznámení v průběhu kopie projektu
+  error_can_not_delete_custom_field: Nelze smazat volitelné pole
+  error_unable_to_connect: Nelze se připojit ({{value}})
+  error_can_not_remove_role: Tato role je právě používaná a nelze ji smazat.
+  error_can_not_delete_tracker: Tato fronta obsahuje úkoly a nemůže být smazán.
+  field_principal: Hlavní
+  label_my_page_block: Bloky na mé stránce
+  notice_failed_to_save_members: "Nepodařilo se uložit člena(y): {{errors}}."
+  text_zoom_out: Oddálit
+  text_zoom_in: Přiblížit
+  notice_unable_delete_time_entry: Nelze smazat čas ze záznamu.
+  label_overall_spent_time: Celkově strávený čas
+  field_time_entries: Zaznamenaný čas
+  project_module_gantt: Gantt
+  project_module_calendar: Kalendář
+  field_member_of_group: Člen skupiny
+  field_assigned_to_role: Člen role
+  button_edit_associated_wikipage: "Upravit přiřazenou Wiki stránku: {{page_title}}"
+  text_are_you_sure_with_children: Smazat úkol včetně všech podúkolů?
+  field_text: Textové pole

config/locales/da.yml

@@ -130,6 +130,7 @@ da:
         greater_than_start_date: "skal være senere end startdatoen"
         not_same_project: "hører ikke til samme projekt"
         circular_dependency: "Denne relation vil skabe et afhængighedsforhold"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
       template:
         header:
@@ -926,3 +927,11 @@ da:
   notice_unable_delete_time_entry: Unable to delete time log entry.
   label_overall_spent_time: Overall spent time
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
+

config/locales/de.yml

@@ -68,10 +68,11 @@ de:
         other: "fast {{count}} Jahren"
 
   number:
+    # Default format for numbers
     format:
-      precision: 2
       separator: ','
       delimiter: '.'
+      precision: 2
     currency:
       format:
         unit: '€'
@@ -214,6 +215,7 @@ de:
   mail_body_wiki_content_added: "Die Wiki-Seite '{{page}}' wurde von {{author}} hinzugefügt."
   mail_subject_wiki_content_updated: "Wiki-Seite '{{page}}' erfolgreich aktualisiert"
   mail_body_wiki_content_updated: "Die Wiki-Seite '{{page}}' wurde von {{author}} aktualisiert."
+
   gui_validation_error: 1 Fehler
   gui_validation_error_plural: "{{count}} Fehler"
 
@@ -252,7 +254,7 @@ de:
   field_priority: Priorität
   field_fixed_version: Zielversion
   field_user: Benutzer
-  field_principal: Principal
+  field_principal: Auftraggeber
   field_role: Rolle
   field_homepage: Projekt-Homepage
   field_is_public: Öffentlich
@@ -297,6 +299,7 @@ de:
   field_redirect_existing_links: Existierende Links umleiten
   field_estimated_hours: Geschätzter Aufwand
   field_column_names: Spalten
+  field_time_entries: Logzeit
   field_time_zone: Zeitzone
   field_searchable: Durchsuchbar
   field_default_value: Standardwert
@@ -428,6 +431,8 @@ de:
   project_module_wiki: Wiki
   project_module_repository: Projektarchiv
   project_module_boards: Foren
+  project_module_calendar: Kalender
+  project_module_gantt: Gantt
   
   label_user: Benutzer
   label_user_plural: Benutzer
@@ -485,7 +490,7 @@ de:
   label_my_page: Meine Seite
   label_my_account: Mein Konto
   label_my_projects: Meine Projekte
-  label_my_page_block: My page block
+  label_my_page_block: Bereich "Meine Seite"
   label_administration: Administration
   label_login: Anmelden
   label_logout: Abmelden
@@ -499,7 +504,7 @@ de:
   label_user_activity: "Aktivität von {{value}}"
   label_new: Neu
   label_logged_as: Angemeldet als
-  label_environment: Environment
+  label_environment: Umgebung
   label_authentication: Authentifizierung
   label_auth_source: Authentifizierungs-Modus
   label_auth_source_new: Neuer Authentifizierungs-Modus
@@ -831,7 +836,7 @@ de:
   button_quote: Zitieren
   button_duplicate: Duplizieren
   button_show: Anzeigen
-
+  
   status_active: aktiv
   status_registered: angemeldet
   status_locked: gesperrt
@@ -927,4 +932,8 @@ de:
   enumeration_activities: Aktivitäten (Zeiterfassung)
   enumeration_system_activity: System-Aktivität
 
-  field_time_entries: Log time
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
+

config/locales/el.yml

@@ -119,6 +119,7 @@ el:
         greater_than_start_date: "πρέπει να είναι αργότερα από την ημερομηνία έναρξης"
         not_same_project: "δεν ανήκει στο ίδιο έργο"
         circular_dependency: "Αυτή η σχέση θα δημιουργήσει κυκλικές εξαρτήσεις"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   actionview_instancetag_blank_option: Παρακαλώ επιλέξτε
   
@@ -910,3 +911,11 @@ el:
   notice_unable_delete_time_entry: Unable to delete time log entry.
   label_overall_spent_time: Overall spent time
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
+

config/locales/en-GB.yml

@@ -122,6 +122,7 @@ en-GB:
         greater_than_start_date: "must be greater than start date"
         not_same_project: "doesn't belong to the same project"
         circular_dependency: "This relation would create a circular dependency"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   actionview_instancetag_blank_option: Please select
   
@@ -914,3 +915,11 @@ en-GB:
   notice_failed_to_save_members: "Failed to save member(s): {{errors}}."
   label_project_copy_notifications: Send email notifications during the project copy
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
+

config/locales/en.yml

@@ -293,6 +293,9 @@ en:
   field_group_by: Group results by
   field_sharing: Sharing
   field_parent_issue: Parent task
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  field_text: Text field
   
   setting_app_title: Application title
   setting_app_subtitle: Application subtitle
@@ -412,6 +415,8 @@ en:
   project_module_wiki: Wiki
   project_module_repository: Repository
   project_module_boards: Boards
+  project_module_calendar: Calendar
+  project_module_gantt: Gantt
   
   label_user: User
   label_user_plural: Users
@@ -833,6 +838,7 @@ en:
   text_subprojects_destroy_warning: "Its subproject(s): {{value}} will be also deleted."
   text_workflow_edit: Select a role and a tracker to edit the workflow
   text_are_you_sure: Are you sure ?
+  text_are_you_sure_with_children: "Delete issue and all child issues?"
   text_journal_changed: "{{label}} changed from {{old}} to {{new}}"
   text_journal_set_to: "{{label}} set to {{value}}"
   text_journal_deleted: "{{label}} deleted ({{old}})"

config/locales/es.yml

@@ -132,6 +132,7 @@ es:
         greater_than_start_date: "debe ser posterior a la fecha de comienzo"
         not_same_project: "no pertenece al mismo proyecto"
         circular_dependency: "Esta relación podría crear una dependencia circular"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
         # Append your own errors here or at the model/attributes scope.
 
@@ -950,3 +951,11 @@ es:
   notice_unable_delete_time_entry: Fue imposible eliminar la entrada de tiempo dedicado.
   label_overall_spent_time: Tiempo total dedicado
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
+

config/locales/eu.yml

@@ -121,6 +121,7 @@ eu:
         greater_than_start_date: "hasiera data baino handiagoa izan behar du"
         not_same_project: "ez dago proiektu berdinean"
         circular_dependency: "Erlazio honek mendekotasun zirkular bat sortuko luke"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   actionview_instancetag_blank_option: Hautatu mesedez
   
@@ -914,3 +915,10 @@ eu:
   notice_unable_delete_time_entry: Unable to delete time log entry.
   label_overall_spent_time: Overall spent time
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/fi.yml

@@ -147,7 +147,7 @@ fi:
         greater_than_start_date: "tulee olla aloituspäivän jälkeinen"
         not_same_project: "ei kuulu samaan projektiin"
         circular_dependency: "Tämä suhde loisi kehän."
-
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
   
   actionview_instancetag_blank_option: Valitse, ole hyvä
   
@@ -936,3 +936,10 @@ fi:
   notice_unable_delete_time_entry: Unable to delete time log entry.
   label_overall_spent_time: Overall spent time
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/fr.yml

@@ -422,6 +422,8 @@ fr:
   project_module_wiki: Wiki
   project_module_repository: Dépôt de sources
   project_module_boards: Forums de discussion
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
   
   label_user: Utilisateur
   label_user_plural: Utilisateurs
@@ -929,4 +931,9 @@ fr:
   notice_unable_delete_time_entry: Impossible de supprimer le temps passé.
   label_overall_spent_time: Temps passé global
   field_time_entries: Log time
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Modifier la page de Wiki associée: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
 

config/locales/gl.yml

@@ -150,6 +150,7 @@ gl:
         greater_than_start_date: "debe ser posterior á data de comezo"
         not_same_project: "non pertence ao mesmo proxecto"
         circular_dependency: "Esta relación podería crear unha dependencia circular"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   actionview_instancetag_blank_option: Por favor seleccione
   
@@ -926,3 +927,11 @@ gl:
   notice_unable_delete_time_entry: Unable to delete time log entry.
   label_overall_spent_time: Overall spent time
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
+

config/locales/he.yml

@@ -123,6 +123,7 @@ he:
         greater_than_start_date: "חייב להיות מאוחר יותר מתאריך ההתחלה"
         not_same_project: "לא שייך לאותו הפרויקט"
         circular_dependency: "הקשר הזה יצור תלות מעגלית"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   actionview_instancetag_blank_option: בחר בבקשה
 
@@ -915,3 +916,10 @@ he:
   enumeration_activities: פעילויות (מעקב אחר זמנים)
   enumeration_system_activity: פעילות מערכת
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/hr.yml

@@ -117,6 +117,7 @@ hr:
         greater_than_start_date: "mora biti veci nego pocetni datum"
         not_same_project: "ne pripada istom projektu"
         circular_dependency: "Ovaj relacija stvara kružnu ovisnost"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   actionview_instancetag_blank_option: Molimo odaberite
   
@@ -917,3 +918,10 @@ hr:
   notice_unable_delete_time_entry: Unable to delete time log entry.
   label_overall_spent_time: Overall spent time
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/hu.yml

@@ -143,6 +143,7 @@
         greater_than_start_date: "nagyobbnak kell lennie, mint az indítás dátuma"
         not_same_project: "nem azonos projekthez tartozik"
         circular_dependency: "Ez a kapcsolat egy körkörös függőséget eredményez"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   actionview_instancetag_blank_option: Kérem válasszon
   
@@ -933,3 +934,10 @@
   notice_unable_delete_time_entry: Az időrögzítés nem törölhető
   label_overall_spent_time: Összes rászánt idő
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/id.yml

@@ -119,6 +119,7 @@ id:
         greater_than_start_date: "harus lebih besar dari tanggal mulai"
         not_same_project: "tidak tergabung dalam proyek yang sama"
         circular_dependency: "kaitan ini akan menghasilkan circular dependency"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   actionview_instancetag_blank_option: Silakan pilih
   
@@ -918,3 +919,10 @@ id:
   notice_unable_delete_time_entry: Unable to delete time log entry.
   label_overall_spent_time: Overall spent time
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/it.yml

@@ -126,6 +126,7 @@ it:
         greater_than_start_date: "deve essere maggiore della data di partenza"
         not_same_project: "non appartiene allo stesso progetto"
         circular_dependency: "Questa relazione creerebbe una dipendenza circolare"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   actionview_instancetag_blank_option: Scegli
   
@@ -914,3 +915,10 @@ it:
   notice_unable_delete_time_entry: Impossibile eliminare il valore time log.
   label_overall_spent_time: Totale tempo impiegato
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/ja.yml

@@ -144,6 +144,7 @@ ja:
         greater_than_start_date: "を開始日より後にしてください"
         not_same_project: "同じプロジェクトに属していません"
         circular_dependency: "この関係では、循環依存になります"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   actionview_instancetag_blank_option: 選んでください
   
@@ -305,6 +306,7 @@ ja:
   field_redirect_existing_links: 既存のリンクをリダイレクトする
   field_estimated_hours: 予定工数
   field_column_names: 項目
+  field_time_entries: 時間を記録
   field_time_zone: タイムゾーン
   field_searchable: 検索条件に設定可能とする
   field_default_value: デフォルト値
@@ -317,6 +319,9 @@ ja:
   field_group_by: グループ条件
   field_sharing: 共有
   field_parent_issue: 親チケット
+  field_member_of_group: 担当者のグループ
+  field_assigned_to_role: 担当者のロール
+  field_text: テキスト
   
   setting_app_title: アプリケーションのタイトル
   setting_app_subtitle: アプリケーションのサブタイトル
@@ -436,6 +441,8 @@ ja:
   project_module_wiki: Wiki
   project_module_repository: リポジトリ
   project_module_boards: フォーラム
+  project_module_gantt: ガントチャート
+  project_module_calendar: カレンダー
   
   label_user: ユーザ
   label_user_plural: ユーザ
@@ -806,6 +813,7 @@ ja:
   button_create_and_continue: 連続作成
   button_test: テスト
   button_edit: 編集
+  button_edit_associated_wikipage: "関連するWikiページを編集: {{page_title}}"
   button_add: 追加
   button_change: 変更
   button_apply: 適用
@@ -857,6 +865,7 @@ ja:
   text_subprojects_destroy_warning: "サブプロジェクト {{value}} も削除されます。"
   text_workflow_edit: ワークフローを編集するロールとトラッカーを選んでください
   text_are_you_sure: よろしいですか？
+  text_are_you_sure_with_children: チケットとその子チケット全てを削除しますか?
   text_journal_changed: "{{label}} を {{old}} から {{new}} に変更"
   text_journal_set_to: "{{label}} を {{value}} にセット"
   text_journal_deleted: "{{label}} を削除 ({{old}})"
@@ -934,4 +943,3 @@ ja:
   enumeration_doc_categories: 文書カテゴリ
   enumeration_activities: 作業分類 (時間トラッキング)
   enumeration_system_activity: システム作業分類
-  field_time_entries: Log time

config/locales/ko.yml

@@ -173,6 +173,7 @@ ko:
         greater_than_start_date: "는 시작날짜보다 커야 합니다"
         not_same_project: "는 같은 프로젝트에 속해 있지 않습니다"
         circular_dependency: "이 관계는 순환 의존관계를 만들 수 있습니다"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   actionview_instancetag_blank_option: 선택하세요
   
@@ -961,8 +962,15 @@ ko:
   field_principal: Principal
   label_my_page_block: My page block
   notice_failed_to_save_members: "Failed to save member(s): {{errors}}."
-  text_zoom_out: Zoom out
-  text_zoom_in: Zoom in
-  notice_unable_delete_time_entry: Unable to delete time log entry.
-  label_overall_spent_time: Overall spent time
-  field_time_entries: Log time
+  text_zoom_out: 더 작게
+  text_zoom_in: 더 크게
+  notice_unable_delete_time_entry: 시간 기록 항목을 삭제할 수 없습니다.
+  label_overall_spent_time: 총 소요시간
+  field_time_entries: 기록된 시간
+  project_module_gantt: Gantt 챠트
+  project_module_calendar: 달력
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/lt.yml

@@ -143,7 +143,7 @@ lt:
           other:  "Išsaugant objektą {{model}} rastos {{count}} klaidos"
         body: "Šiuose laukuose yra klaidų:"
 
-      pranešimus:
+      messages:
         inclusion: "nenumatyta reikšmė"
         exclusion: "užimtas"
         invalid: "neteisingas"
@@ -179,6 +179,7 @@ lt:
         greater_than_start_date: "turi būti didesnė negu pradžios data"
         not_same_project: "nepriklauso tam pačiam projektui"
         circular_dependency: "Šis ryšys sukurtų ciklinę priklausomybę"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
     
   actionview_instancetag_blank_option: prašom parinkti
   
@@ -974,3 +975,10 @@ lt:
   notice_unable_delete_time_entry: Unable to delete time log entry.
   label_overall_spent_time: Overall spent time
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/lv.yml

@@ -113,6 +113,7 @@ lv:
         greater_than_start_date: "jābūt vēlākam par sākuma datumu"
         not_same_project: "nepieder pie tā paša projekta"
         circular_dependency: "Šī relācija radītu ciklisku atkarību"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   actionview_instancetag_blank_option: Izvēlieties
   
@@ -905,3 +906,10 @@ lv:
   notice_unable_delete_time_entry: Unable to delete time log entry.
   label_overall_spent_time: Overall spent time
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/mk.yml

@@ -0,0 +1,920 @@
+mk:
+  # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
+  direction: ltr
+  date:
+    formats:
+      # Use the strftime parameters for formats.
+      # When no format has been given, it uses default.
+      # You can provide other formats here if you like!
+      default: "%d/%m/%Y"
+      short: "%d %b"
+      long: "%d %B, %Y"
+
+    day_names: [недела, понеделник, вторник, среда, четврток, петок, сабота]
+    abbr_day_names: [нед, пон, вто, сре, чет, пет, саб]
+
+    # Don't forget the nil at the beginning; there's no such thing as a 0th month
+    month_names: [~, јануари, февруари, март, април, мај, јуни, јули, август, септември, октомври, ноември, декември]
+    abbr_month_names: [~, јан, фев, мар, апр, мај, јун, јул, авг, сеп, окт, ное, дек]
+    # Used in date_select and datime_select.
+    order: [ :day, :month, :year ]
+
+  time:
+    formats:
+      default: "%d/%m/%Y %H:%M"
+      time: "%H:%M"
+      short: "%d %b %H:%M"
+      long: "%d %B, %Y %H:%M"
+    am: "предпладне"
+    pm: "попладне"
+
+  datetime:
+    distance_in_words:
+      half_a_minute: "пола минута"
+      less_than_x_seconds:
+        one:   "помалку од 1 секунда"
+        other: "помалку од {{count}} секунди"
+      x_seconds:
+        one:   "1 секунда"
+        other: "{{count}} секунди"
+      less_than_x_minutes:
+        one:   "помалку од 1 минута"
+        other: "помалку од {{count}} минути"
+      x_minutes:
+        one:   "1 минута"
+        other: "{{count}} минути"
+      about_x_hours:
+        one:   "околу 1 час"
+        other: "околу {{count}} часа"
+      x_days:
+        one:   "1 ден"
+        other: "{{count}} дена"
+      about_x_months:
+        one:   "околу 1 месец"
+        other: "околу {{count}} месеци"
+      x_months:
+        one:   "1 месец"
+        other: "{{count}} месеци"
+      about_x_years:
+        one:   "околу 1 година"
+        other: "околу {{count}} години"
+      over_x_years:
+        one:   "преку 1 година"
+        other: "преку {{count}} години"
+      almost_x_years:
+        one:   "скоро 1 година"
+        other: "скоро {{count}} години"
+
+  number:
+    # Default format for numbers
+    format:
+      separator: "."
+      delimiter: ""
+      precision: 3
+    human:
+      format:
+        delimiter: ""
+        precision: 1
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
+
+
+# Used in array.to_sentence.
+  support:
+    array:
+      sentence_connector: "и"
+      skip_last_comma: false
+
+  activerecord:
+    errors:
+      messages:
+        inclusion: "не е вклучено во листата"
+        exclusion: "е резервирано"
+        invalid: "е невалидно"
+        confirmation: "не се совпаѓа со потврдата"
+        accepted: "мора да е прифатено"
+        empty: "неможе да е празно"
+        blank: "неможе да е празно"
+        too_long: "е предолго (макс. {{count}} знаци)"
+        too_short: "е прекратко (мин. {{count}} знаци)"
+        wrong_length: "е погрешна должина (треба да е  {{count}} знаци)"
+        taken: "е веќе зафатено"
+        not_a_number: "не е број"
+        not_a_date: "не е валидна дата"
+        greater_than: "мора да е поголемо од {{count}}"
+        greater_than_or_equal_to: "мора да е поголемо или еднакво на {{count}}"
+        equal_to: "мора да е еднакво на {{count}}"
+        less_than: "мора да е помало од {{count}}"
+        less_than_or_equal_to: "мора да е помало или еднакво на {{count}}"
+        odd: "мора да е непарно"
+        even: "мора да е парно"
+        greater_than_start_date: "мора да е поголема од почетната дата"
+        not_same_project: "не припаѓа на истиот проект"
+        circular_dependency: "Оваа врска ќе креира кружна зависност"
+        cant_link_an_issue_with_a_descendant: "Задача неможе да се поврзе со една од нејзините подзадачи"
+
+  actionview_instancetag_blank_option: Изберете
+
+  general_text_No: 'Не'
+  general_text_Yes: 'Да'
+  general_text_no: 'не'
+  general_text_yes: 'да'
+  general_lang_name: 'Macedonian (Македонски)'
+  general_csv_separator: ','
+  general_csv_decimal_separator: '.'
+  general_csv_encoding: UTF-8
+  general_pdf_encoding: UTF-8
+  general_first_day_of_week: '1'
+
+  notice_account_updated: Профилот е успешно ажуриран.
+  notice_account_invalid_creditentials: Неточен корисник или лозинка
+  notice_account_password_updated: Лозинката е успешно ажурирана.
+  notice_account_wrong_password: Погрешна лозинка
+  notice_account_register_done: Профилот е успешно креиран. За активација, клкнете на врската што ви е пратена по е-пошта.
+  notice_account_unknown_email: Непознат корисник.
+  notice_can_t_change_password: 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: Успешно креирање.
+  notice_successful_update: Успешно ажурирање.
+  notice_successful_delete: Успешно бришење.
+  notice_successful_connection: Успешна конекција.
+  notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
+  notice_locking_conflict: Data has been updated by another user.
+  notice_not_authorized: You are not authorized to access this page.
+  notice_email_sent: "Е-порака е пратена на {{value}}"
+  notice_email_error: "Се случи грешка при праќање на е-пораката ({{value}})"
+  notice_feeds_access_key_reseted: Вашиот RSS клуч за пристап е reset.
+  notice_api_access_key_reseted: Вашиот API клуч за пристап е reset.
+  notice_failed_to_save_issues: "Failed to save {{count}} issue(s) on {{total}} selected: {{ids}}."
+  notice_failed_to_save_members: "Failed to save member(s): {{errors}}."
+  notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
+  notice_account_pending: "Your account was created and is now pending administrator approval."
+  notice_default_data_loaded: Default configuration successfully loaded.
+  notice_unable_delete_version: Unable to delete version.
+  notice_unable_delete_time_entry: Unable to delete time log entry.
+  notice_issue_done_ratios_updated: Issue done ratios updated.
+
+  error_can_t_load_default_data: "Default configuration could not be loaded: {{value}}"
+  error_scm_not_found: "The entry or revision was not found in the repository."
+  error_scm_command_failed: "An error occurred when trying to access the repository: {{value}}"
+  error_scm_annotate: "The entry does not exist or can not be annotated."
+  error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+  error_no_tracker_in_project: 'No tracker is associated to this project. Please check the Project settings.'
+  error_no_default_issue_status: 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
+  error_can_not_delete_custom_field: Unable to delete custom field
+  error_can_not_delete_tracker: "This tracker contains issues and can't be deleted."
+  error_can_not_remove_role: "This role is in use and can not be deleted."
+  error_can_not_reopen_issue_on_closed_version: 'An issue assigned to a closed version can not be reopened'
+  error_can_not_archive_project: This project can not be archived
+  error_issue_done_ratios_not_updated: "Issue done ratios not updated."
+  error_workflow_copy_source: 'Please select a source tracker or role'
+  error_workflow_copy_target: 'Please select target tracker(s) and role(s)'
+  error_unable_delete_issue_status: 'Unable to delete issue status'
+  error_unable_to_connect: "Unable to connect ({{value}})"
+  warning_attachments_not_saved: "{{count}} file(s) could not be saved."
+
+  mail_subject_lost_password: "Вашата {{value}} лозинка"
+  mail_body_lost_password: 'To change your password, click on the following link:'
+  mail_subject_register: "Your {{value}} account activation"
+  mail_body_register: 'To activate your account, click on the following link:'
+  mail_body_account_information_external: "You can use your {{value}} account to log in."
+  mail_body_account_information: Your account information
+  mail_subject_account_activation_request: "{{value}} account activation request"
+  mail_body_account_activation_request: "Нов корисник ({{value}}) е регистриран. The account is pending your approval:"
+  mail_subject_reminder: "{{count}} issue(s) due in the next {{days}} days"
+  mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:"
+  mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
+  mail_body_wiki_content_added: "The '{{page}}' wiki page has been added by {{author}}."
+  mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
+  mail_body_wiki_content_updated: "The '{{page}}' wiki page has been updated by {{author}}."
+
+  gui_validation_error: 1 грешка
+  gui_validation_error_plural: "{{count}} грешки"
+
+  field_name: Име
+  field_description: Опис
+  field_summary: Краток опис
+  field_is_required: Задолжително
+  field_firstname: Име
+  field_lastname: Презиме
+  field_mail: Е-пошта
+  field_filename: Датотека
+  field_filesize: Големина
+  field_downloads: Превземања
+  field_author: Автор
+  field_created_on: Креиран
+  field_updated_on: Ажурирано
+  field_field_format: Формат
+  field_is_for_all: За сите проекти
+  field_possible_values: Можни вредности
+  field_regexp: Regular expression
+  field_min_length: Минимална должина
+  field_max_length: Максимална должина
+  field_value: Вредност
+  field_category: Категорија
+  field_title: Наслов
+  field_project: Проект
+  field_issue: Задача
+  field_status: Статус
+  field_notes: Белешки
+  field_is_closed: Задачата е затворена
+  field_is_default: Default value
+  field_tracker: Tracker
+  field_subject: Наслов
+  field_due_date: Краен рок
+  field_assigned_to: Доделена на
+  field_priority: Приоритет
+  field_fixed_version: Target version
+  field_user: Корисник
+  field_principal: Principal
+  field_role: Улога
+  field_homepage: Веб страна
+  field_is_public: Јавен
+  field_parent: Подпроект на
+  field_is_in_roadmap: Issues displayed in roadmap
+  field_login: Корисник
+  field_mail_notification: Известувања по e-пошта
+  field_admin: Администратор
+  field_last_login_on: Последна најава
+  field_language: Јазик
+  field_effective_date: Дата
+  field_password: Лозинка
+  field_new_password: Нова лозинка
+  field_password_confirmation: Потврда
+  field_version: Верзија
+  field_type: Тип
+  field_host: Хост
+  field_port: Порт
+  field_account: 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) креирање на корисници
+  field_start_date: Почеток
+  field_done_ratio: % Завршено
+  field_auth_source: Режим на автентикација
+  field_hide_mail: Криј ја мојата адреса на е-пошта
+  field_comments: Коментар
+  field_url: URL
+  field_start_page: Почетна страна
+  field_subproject: Подпроект
+  field_hours: Часови
+  field_activity: Активност
+  field_spent_on: Дата
+  field_identifier: Идентификатор
+  field_is_filter: Користи како филтер
+  field_issue_to: Поврзана задача
+  field_delay: Доцнење
+  field_assignable: На оваа улога може да се доделуваат задачи
+  field_redirect_existing_links: Пренасочи ги постоечките врски
+  field_estimated_hours: Проценето време
+  field_column_names: Колони
+  field_time_entries: Бележи време
+  field_time_zone: Временска зона
+  field_searchable: Може да се пребарува
+  field_default_value: Default value
+  field_comments_sorting: Прикажувај коментари
+  field_parent_title: Parent page
+  field_editable: Може да се уредува
+  field_watcher: Watcher
+  field_identity_url: OpenID URL
+  field_content: Содржина
+  field_group_by: Групирај ги резултатите според
+  field_sharing: Споделување
+  field_parent_issue: Parent task
+
+  setting_app_title: Наслов на апликацијата
+  setting_app_subtitle: Поднаслов на апликацијата
+  setting_welcome_text: Текст за добредојде
+  setting_default_language: Default јазик
+  setting_login_required: Задолжителна автентикација
+  setting_self_registration: Само-регистрација
+  setting_attachment_max_size: Макс. големина на прилог
+  setting_issues_export_limit: Issues export limit
+  setting_mail_from: Emission email address
+  setting_bcc_recipients: Blind carbon copy recipients (bcc)
+  setting_plain_text_mail: Текстуални е-пораки (без HTML)
+  setting_host_name: Име на хост и патека
+  setting_text_formatting: Форматирање на текст
+  setting_wiki_compression: Компресија на историјата на вики
+  setting_feeds_limit: Feed content limit
+  setting_default_projects_public: Новите проекти се иницијално јавни
+  setting_autofetch_changesets: Autofetch commits
+  setting_sys_api_enabled: Enable WS for repository management
+  setting_commit_ref_keywords: Referencing keywords
+  setting_commit_fix_keywords: Fixing keywords
+  setting_autologin: Автоматска најава
+  setting_date_format: Формат на дата
+  setting_time_format: Формат на време
+  setting_cross_project_issue_relations: Дозволи релации на задачи меѓу проекти
+  setting_issue_list_default_columns: Default columns displayed on the issue list
+  setting_repositories_encodings: Repositories encodings
+  setting_commit_logs_encoding: Commit messages encoding
+  setting_emails_footer: Emails footer
+  setting_protocol: Протокол
+  setting_per_page_options: Objects per page options
+  setting_user_format: Приказ на корисниците
+  setting_activity_days_default: Денови прикажана во активноста на проектот
+  setting_display_subprojects_issues: Прикажи ги задачите на подпроектите во главните проекти
+  setting_enabled_scm: Овозможи SCM
+  setting_mail_handler_body_delimiters: "Truncate emails after one of these lines"
+  setting_mail_handler_api_enabled: Enable WS for incoming emails
+  setting_mail_handler_api_key: API клуч
+  setting_sequential_project_identifiers: Генерирај последователни идентификатори на проекти
+  setting_gravatar_enabled: Користи Gravatar кориснички икони
+  setting_gravatar_default: Default Gravatar image
+  setting_diff_max_lines_displayed: Max number of diff lines displayed
+  setting_file_max_size_displayed: Max size of text files displayed inline
+  setting_repository_log_display_limit: Maximum number of revisions displayed on file log
+  setting_openid: Дозволи OpenID најава и регистрација
+  setting_password_min_length: Мин. должина на лозинка
+  setting_new_project_user_role_id: Улога доделена на неадминистраторски корисник кој креира проект
+  setting_default_projects_modules: Default enabled modules for new projects
+  setting_issue_done_ratio: Calculate the issue done ratio with
+  setting_issue_done_ratio_issue_field: Use the issue field
+  setting_issue_done_ratio_issue_status: Use the issue status
+  setting_start_of_week: Start calendars on
+  setting_rest_api_enabled: Enable REST web service
+  setting_cache_formatted_text: Cache formatted text
+
+  permission_add_project: Креирај проекти
+  permission_add_subprojects: Креирај подпроекти
+  permission_edit_project: Уреди проект
+  permission_select_project_modules: Изберете модули за проект
+  permission_manage_members: Manage members
+  permission_manage_project_activities: Manage project activities
+  permission_manage_versions: Manage versions
+  permission_manage_categories: Manage issue categories
+  permission_view_issues: Прегледај задачи
+  permission_add_issues: Додавај задачи
+  permission_edit_issues: Уредувај задачи
+  permission_manage_issue_relations: Manage issue relations
+  permission_add_issue_notes: Додавај белешки
+  permission_edit_issue_notes: Уредувај белешки
+  permission_edit_own_issue_notes: Уредувај сопствени белешки
+  permission_move_issues: Преместувај задачи
+  permission_delete_issues: Бриши задачи
+  permission_manage_public_queries: Manage public queries
+  permission_save_queries: Save queries
+  permission_view_gantt: View gantt chart
+  permission_view_calendar: View calendar
+  permission_view_issue_watchers: View watchers list
+  permission_add_issue_watchers: Add watchers
+  permission_delete_issue_watchers: Delete watchers
+  permission_log_time: Бележи потрошено време
+  permission_view_time_entries: Прегледај потрошено време
+  permission_edit_time_entries: Уредувај белешки за потрошено време
+  permission_edit_own_time_entries: Уредувај сопствени белешки за потрошено време
+  permission_manage_news: Manage news
+  permission_comment_news: Коментирај на вести
+  permission_manage_documents: Manage documents
+  permission_view_documents: Прегледувај документи
+  permission_manage_files: Manage files
+  permission_view_files: Прегледувај датотеки
+  permission_manage_wiki: Manage wiki
+  permission_rename_wiki_pages: Преименувај вики страници
+  permission_delete_wiki_pages: Бриши вики страници
+  permission_view_wiki_pages: Прегледувај вики
+  permission_view_wiki_edits: Прегледувај вики историја
+  permission_edit_wiki_pages: Уредувај вики страници
+  permission_delete_wiki_pages_attachments: Бриши прилози
+  permission_protect_wiki_pages: Заштитувај вики страници
+  permission_manage_repository: Manage repository
+  permission_browse_repository: Browse repository
+  permission_view_changesets: View changesets
+  permission_commit_access: Commit access
+  permission_manage_boards: Manage boards
+  permission_view_messages: View messages
+  permission_add_messages: Post messages
+  permission_edit_messages: Уредувај пораки
+  permission_edit_own_messages: Уредувај сопствени пораки
+  permission_delete_messages: Бриши пораки
+  permission_delete_own_messages: Бриши сопствени пораки
+  permission_export_wiki_pages: Export wiki pages
+  permission_manage_subtasks: Manage subtasks
+
+  project_module_issue_tracking: Следење на задачи
+  project_module_time_tracking: Следење на време
+  project_module_news: Вести
+  project_module_documents: Документи
+  project_module_files: Датотеки
+  project_module_wiki: Вики
+  project_module_repository: Repository
+  project_module_boards: Форуми
+  project_module_calendar: Календар
+  project_module_gantt: Gantt
+
+  label_user: Корисник
+  label_user_plural: Корисници
+  label_user_new: Нов корисник
+  label_user_anonymous: Анонимен
+  label_project: Проект
+  label_project_new: Нов проект
+  label_project_plural: Проекти
+  label_x_projects:
+    zero:  нема проекти
+    one:   1 проект
+    other: "{{count}} проекти"
+  label_project_all: Сите проекти
+  label_project_latest: Последните проекти
+  label_issue: Задача
+  label_issue_new: Нова задача
+  label_issue_plural: Задачи
+  label_issue_view_all: Прегледај ги сите задачи
+  label_issues_by: "Задачи по {{value}}"
+  label_issue_added: Задачата е додадена
+  label_issue_updated: Задачата е ажурирана
+  label_document: Документ
+  label_document_new: Нов документ
+  label_document_plural: Документи
+  label_document_added: Документот е додаден
+  label_role: Улога
+  label_role_plural: Улоги
+  label_role_new: Нова улога
+  label_role_and_permissions: Улоги и овластувања
+  label_member: Член
+  label_member_new: Нов член
+  label_member_plural: Членови
+  label_tracker: Tracker
+  label_tracker_plural: Trackers
+  label_tracker_new: New tracker
+  label_workflow: Workflow
+  label_issue_status: Статус на задача
+  label_issue_status_plural: Статуси на задачи
+  label_issue_status_new: Нов статус
+  label_issue_category: Категорија на задача
+  label_issue_category_plural: Категории на задачи
+  label_issue_category_new: Нова категорија
+  label_custom_field: Прилагодено поле
+  label_custom_field_plural: Прилагодени полиња
+  label_custom_field_new: Ново прилагодено поле
+  label_enumerations: Enumerations
+  label_enumeration_new: Нова вредност
+  label_information: Информација
+  label_information_plural: Информации
+  label_please_login: Најави се
+  label_register: Регистрирај се
+  label_login_with_open_id_option: или најави се со OpenID
+  label_password_lost: Изгубена лозинка
+  label_home: Почетна
+  label_my_page: Мојата страна
+  label_my_account: Мојот профил
+  label_my_projects: Мои проекти
+  label_my_page_block: Блок елемент
+  label_administration: Администрација
+  label_login: Најави се
+  label_logout: Одјави се
+  label_help: Помош
+  label_reported_issues: Пријавени задачи
+  label_assigned_to_me_issues: Задачи доделени на мене
+  label_last_login: Последна најава
+  label_registered_on: Регистриран на
+  label_activity: Активност
+  label_overall_activity: Севкупна активност
+  label_user_activity: "Активност на {{value}}"
+  label_new: Нова
+  label_logged_as: Најавени сте како
+  label_environment: Опкружување
+  label_authentication: Автентикација
+  label_auth_source: Режим на автентикација
+  label_auth_source_new: Нов режим на автентикација
+  label_auth_source_plural: Режими на автентикација
+  label_subproject_plural: Подпроекти
+  label_subproject_new: Нов подпроект
+  label_and_its_subprojects: "{{value}} и неговите подпроекти"
+  label_min_max_length: Мин. - Макс. должина
+  label_list: Листа
+  label_date: Дата
+  label_integer: Integer
+  label_float: Float
+  label_boolean: Boolean
+  label_string: Текст
+  label_text: Долг текст
+  label_attribute: Атрибут
+  label_attribute_plural: Атрибути
+  label_download: "{{count}} превземање"
+  label_download_plural: "{{count}} превземања"
+  label_no_data: Нема податоци за прикажување
+  label_change_status: Промени статус
+  label_history: Историја
+  label_attachment: Датотека
+  label_attachment_new: Нова датотека
+  label_attachment_delete: Избриши датотека
+  label_attachment_plural: Датотеки
+  label_file_added: Датотеката е додадена
+  label_report: Извештај
+  label_report_plural: Извештаи
+  label_news: Новост
+  label_news_new: Додади новост
+  label_news_plural: Новости
+  label_news_latest: Последни новости
+  label_news_view_all: Прегледај ги сите новости
+  label_news_added: Новостта е додадена
+  label_settings: Settings
+  label_overview: Преглед
+  label_version: Верзија
+  label_version_new: Нова верзија
+  label_version_plural: Верзии
+  label_close_versions: Затвори ги завршените врзии
+  label_confirmation: Потврда
+  label_export_to: 'Достапно и во:'
+  label_read: Прочитај...
+  label_public_projects: Јавни проекти
+  label_open_issues: отворена
+  label_open_issues_plural: отворени
+  label_closed_issues: затворена
+  label_closed_issues_plural: затворени
+  label_x_open_issues_abbr_on_total:
+    zero:  0 отворени / {{total}}
+    one:   1 отворена / {{total}}
+    other: "{{count}} отворени / {{total}}"
+  label_x_open_issues_abbr:
+    zero:  0 отворени
+    one:   1 отворена
+    other: "{{count}} отворени"
+  label_x_closed_issues_abbr:
+    zero:  0 затворени
+    one:   1 затворена
+    other: "{{count}} затворени"
+  label_total: Вкупно
+  label_permissions: Овластувања
+  label_current_status: Моментален статус
+  label_new_statuses_allowed: Дозволени нови статуси
+  label_all: сите
+  label_none: ниеден
+  label_nobody: никој
+  label_next: Следно
+  label_previous: Претходно
+  label_used_by: Користено од
+  label_details: Детали
+  label_add_note: Додади белешка
+  label_per_page: По страна
+  label_calendar: Календар
+  label_months_from: месеци од
+  label_gantt: Gantt
+  label_internal: Internal
+  label_last_changes: "последни {{count}} промени"
+  label_change_view_all: Прегледај ги сите промени
+  label_personalize_page: Прилагоди ја странава
+  label_comment: Коментар
+  label_comment_plural: Коментари
+  label_x_comments:
+    zero: нема коментари
+    one: 1 коментар
+    other: "{{count}} коментари"
+  label_comment_add: Додади коментар
+  label_comment_added: Коментарот е додаден
+  label_comment_delete: Избриши коментари
+  label_query: Custom query
+  label_query_plural: Custom queries
+  label_query_new: New query
+  label_filter_add: Додади филтер
+  label_filter_plural: Филтри
+  label_equals: е
+  label_not_equals: не е
+  label_in_less_than: за помалку од
+  label_in_more_than: за повеќе од
+  label_greater_or_equal: '>='
+  label_less_or_equal: '<='
+  label_in: во
+  label_today: денес
+  label_all_time: цело време
+  label_yesterday: вчера
+  label_this_week: оваа недела
+  label_last_week: минатата недела
+  label_last_n_days: "последните {{count}} дена"
+  label_this_month: овој месец
+  label_last_month: минатиот месец
+  label_this_year: оваа година
+  label_date_range: Date range
+  label_less_than_ago: пред помалку од денови
+  label_more_than_ago: пред повеќе од денови
+  label_ago: пред денови
+  label_contains: содржи
+  label_not_contains: не содржи
+  label_day_plural: денови
+  label_repository: Складиште
+  label_repository_plural: Складишта
+  label_browse: Прелистувај
+  label_modification: "{{count}} промени"
+  label_modification_plural: "{{count}} промени"
+  label_branch: Гранка
+  label_tag: Tag
+  label_revision: Ревизија
+  label_revision_plural: Ревизии
+  label_revision_id: "Ревизија {{value}}"
+  label_associated_revisions: Associated revisions
+  label_added: added
+  label_modified: modified
+  label_copied: copied
+  label_renamed: renamed
+  label_deleted: deleted
+  label_latest_revision: Последна ревизија
+  label_latest_revision_plural: Последни ревизии
+  label_view_revisions: Прегледај ги ревизиите
+  label_view_all_revisions: Прегледај ги сите ревизии
+  label_max_size: Макс. големина
+  label_sort_highest: Премести најгоре
+  label_sort_higher: Премести нагоре
+  label_sort_lower: Премести надоле
+  label_sort_lowest: Премести најдоле
+  label_roadmap: Roadmap
+  label_roadmap_due_in: "Due in {{value}}"
+  label_roadmap_overdue: "Касни {{value}}"
+  label_roadmap_no_issues: Нема задачи за оваа верзија
+  label_search: Барај
+  label_result_plural: Резултати
+  label_all_words: Сите зборови
+  label_wiki: Вики
+  label_wiki_edit: Вики уредување
+  label_wiki_edit_plural: Вики уредувања
+  label_wiki_page: Вики страница
+  label_wiki_page_plural: Вики страници
+  label_index_by_title: Индекс по наслов
+  label_index_by_date: Индекс по дата
+  label_current_version: Current version
+  label_preview: Preview
+  label_feed_plural: Feeds
+  label_changes_details: Детали за сите промени
+  label_issue_tracking: Следење на задачи
+  label_spent_time: Потрошено време
+  label_overall_spent_time: Вкупно потрошено време
+  label_f_hour: "{{value}} час"
+  label_f_hour_plural: "{{value}} часа"
+  label_time_tracking: Следење на време
+  label_change_plural: Промени
+  label_statistics: Статистики
+  label_commits_per_month: Commits per month
+  label_commits_per_author: Commits per author
+  label_view_diff: View differences
+  label_diff_inline: inline
+  label_diff_side_by_side: side by side
+  label_options: Опции
+  label_copy_workflow_from: Copy workflow from
+  label_permissions_report: Permissions report
+  label_watched_issues: Watched issues
+  label_related_issues: Поврзани задачи
+  label_applied_status: Applied status
+  label_loading: Loading...
+  label_relation_new: Нова релација
+  label_relation_delete: Избриши релација
+  label_relates_to: related to
+  label_duplicates: дупликати
+  label_duplicated_by: duplicated by
+  label_blocks: blocks
+  label_blocked_by: блокирано од
+  label_precedes: претходи
+  label_follows: следи
+  label_end_to_start: крај до почеток
+  label_end_to_end: крај до крај
+  label_start_to_start: почеток до почеток
+  label_start_to_end: почеток до крај
+  label_stay_logged_in: Останете најавени
+  label_disabled: disabled
+  label_show_completed_versions: Show completed versions
+  label_me: јас
+  label_board: Форум
+  label_board_new: Нов форум
+  label_board_plural: Форуми
+  label_board_locked: Заклучен
+  label_board_sticky: Sticky
+  label_topic_plural: Теми
+  label_message_plural: Пораки
+  label_message_last: Последна порака
+  label_message_new: Нова порака
+  label_message_posted: Поракате е додадена
+  label_reply_plural: Одговори
+  label_send_information: Испрати ги информациите за профилот на корисникот
+  label_year: Година
+  label_month: Месец
+  label_week: Недела
+  label_date_from: Од
+  label_date_to: До
+  label_language_based: Според јазикот на корисникот
+  label_sort_by: "Подреди според {{value}}"
+  label_send_test_email: Испрати тест е-порака
+  label_feeds_access_key: RSS клуч за пристап
+  label_missing_feeds_access_key: Недостика RSS клуч за пристап
+  label_feeds_access_key_created_on: "RSS клучот за пристап креиран пред {{value}}"
+  label_module_plural: Модули
+  label_added_time_by: "Додадено од {{author}} пред {{age}}"
+  label_updated_time_by: "Ажурирано од {{author}} пред {{age}}"
+  label_updated_time: "Ажурирано пред {{value}}"
+  label_jump_to_a_project: Префрли се на проект...
+  label_file_plural: Датотеки
+  label_changeset_plural: Changesets
+  label_default_columns: Основни колони
+  label_no_change_option: (Без промена)
+  label_bulk_edit_selected_issues: Групно уредување на задачи
+  label_theme: Тема
+  label_default: Default
+  label_search_titles_only: Пребарувај само наслови
+  label_user_mail_option_all: "За било кој настан во сите мои проекти"
+  label_user_mail_option_selected: "За било кој настан само во избраните проекти..."
+  label_user_mail_option_none: "Само за работите кои ги следам или од кои сум дел"
+  label_user_mail_no_self_notified: "Не ме известувај за промените што јас ги правам"
+  label_registration_activation_by_email: активација на профил преку е-пошта
+  label_registration_manual_activation: мануелна активација на профил
+  label_registration_automatic_activation: автоматска активација на профил
+  label_display_per_page: "По страна: {{value}}"
+  label_age: Age
+  label_change_properties: Change properties
+  label_general: Општо
+  label_more: Повеќе
+  label_scm: SCM
+  label_plugins: Додатоци
+  label_ldap_authentication: LDAP автентикација
+  label_downloads_abbr: Превземања
+  label_optional_description: Опис (незадолжително)
+  label_add_another_file: Додади уште една датотека
+  label_preferences: Preferences
+  label_chronological_order: Во хронолошки ред
+  label_reverse_chronological_order: In reverse chronological order
+  label_planning: Планирање
+  label_incoming_emails: Дојдовни е-пораки
+  label_generate_key: Генерирај клуч
+  label_issue_watchers: Watchers
+  label_example: Пример
+  label_display: Прикажи
+  label_sort: Подреди
+  label_ascending: Растечки
+  label_descending: Опаѓачки
+  label_date_from_to: Од {{start}} до {{end}}
+  label_wiki_content_added: Вики страница додадена
+  label_wiki_content_updated: Вики страница ажурирана
+  label_group: Група
+  label_group_plural: Групи
+  label_group_new: Нова група
+  label_time_entry_plural: Потрошено време
+  label_version_sharing_none: Не споделено
+  label_version_sharing_descendants: Со сите подпроекти
+  label_version_sharing_hierarchy: Со хиерархијата на проектот
+  label_version_sharing_tree: Со дрвото на проектот
+  label_version_sharing_system: Со сите проекти
+  label_update_issue_done_ratios: Update issue done ratios
+  label_copy_source: Извор
+  label_copy_target: Дестинација
+  label_copy_same_as_target: Исто како дестинацијата
+  label_display_used_statuses_only: Only display statuses that are used by this tracker
+  label_api_access_key: API клуч за пристап
+  label_missing_api_access_key: Недостига API клуч за пристап
+  label_api_access_key_created_on: "API клучот за пристап е креиран пред {{value}}"
+  label_profile: Профил
+  label_subtask_plural: Подзадачи
+  label_project_copy_notifications: Праќај известувања по е-пошта при копирање на проект
+
+  button_login: Најави се
+  button_submit: Испрати
+  button_save: Зачувај
+  button_check_all: Штиклирај ги сите
+  button_uncheck_all: Одштиклирај ги сите
+  button_delete: Избриши
+  button_create: Креирај
+  button_create_and_continue: Креирај и продолжи
+  button_test: Тест
+  button_edit: Уреди
+  button_add: Додади
+  button_change: Промени
+  button_apply: Примени
+  button_clear: Избриши
+  button_lock: Заклучи
+  button_unlock: Отклучи
+  button_download: Превземи
+  button_list: List
+  button_view: Прегледај
+  button_move: Премести
+  button_move_and_follow: Премести и следи
+  button_back: Back
+  button_cancel: Откажи
+  button_activate: Активирај
+  button_sort: Подреди
+  button_log_time: Бележи време
+  button_rollback: Rollback to this version
+  button_watch: Следи
+  button_unwatch: Не следи
+  button_reply: Одговори
+  button_archive: Архивирај
+  button_unarchive: Одархивирај
+  button_reset: Reset
+  button_rename: Преименувај
+  button_change_password: Промени лозинка
+  button_copy: Копирај
+  button_copy_and_follow: Копирај и следи
+  button_annotate: Annotate
+  button_update: Ажурирај
+  button_configure: Конфигурирај
+  button_quote: Цитирај
+  button_duplicate: Копирај
+  button_show: Show
+
+  status_active: активни
+  status_registered: регистрирани
+  status_locked: заклучени
+
+  version_status_open: отворени
+  version_status_locked: заклучени
+  version_status_closed: затворени
+
+  field_active: Active
+
+  text_select_mail_notifications: Изберете за кои настани да се праќаат известувања по е-пошта да се праќаат.
+  text_regexp_info: eg. ^[A-Z0-9]+$
+  text_min_max_length_info: 0 значи без ограничување
+  text_project_destroy_confirmation: Дали сте сигурни дека сакате да го избришете проектот и сите поврзани податоци?
+  text_subprojects_destroy_warning: "Неговите подпроекти: {{value}} исто така ќе бидат избришани."
+  text_workflow_edit: Select a role and a tracker to edit the workflow
+  text_are_you_sure: Дали сте сигурни?
+  text_journal_changed: "{{label}} променето од {{old}} во {{new}}"
+  text_journal_set_to: "{{label}} set to {{value}}"
+  text_journal_deleted: "{{label}} избришан ({{old}})"
+  text_journal_added: "{{label}} {{value}} додаден"
+  text_tip_task_begin_day: задачи што почнуваат овој ден
+  text_tip_task_end_day: задачи што завршуваат овој ден
+  text_tip_task_begin_end_day: задачи што почнуваат и завршуваат овој ден
+  text_project_identifier_info: 'Само мали букви (a-z), бројки и dashes се дозволени<br />По зачувувањето, идентификаторот неможе да се смени.'
+  text_caracters_maximum: "{{count}} знаци максимум."
+  text_caracters_minimum: "Мора да е најмалку {{count}} знаци долго."
+  text_length_between: "Должина помеѓу {{min}} и {{max}} знаци."
+  text_tracker_no_workflow: No workflow defined for this tracker
+  text_unallowed_characters: Недозволени знаци
+  text_comma_separated: Дозволени се повеќе вредности (разделени со запирка).
+  text_line_separated: Дозволени се повеќе вредности (една линија за секоја вредност).
+  text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
+  text_issue_added: "Задачата {{id}} е пријавена од {{author}}."
+  text_issue_updated: "Зачата {{id}} е ажурирана од {{author}}."
+  text_wiki_destroy_confirmation: Дали сте сигурни дека сакате да го избришете ова вики и целата негова содржина?
+  text_issue_category_destroy_question: "Некои задачи ({{count}}) се доделени на оваа категорија. Што сакате да правите?"
+  text_issue_category_destroy_assignments: Remove category assignments
+  text_issue_category_reassign_to: Додели ги задачите на оваа категорија
+  text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
+  text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+  text_load_default_configuration: Load the default configuration
+  text_status_changed_by_changeset: "Applied in changeset {{value}}."
+  text_issues_destroy_confirmation: 'Дали сте сигурни дека сакате да ги избришете избраните задачи?'
+  text_select_project_modules: 'Изберете модули за овој проект:'
+  text_default_administrator_account_changed: Default administrator account changed
+  text_file_repository_writable: Во папката за прилози може да се запишува
+  text_plugin_assets_writable: Во папката за додатоци може да се запишува
+  text_rmagick_available: RMagick available (незадолжително)
+  text_destroy_time_entries_question: "{{hours}} hours were reported on the issues you are about to delete. What do you want to do ?"
+  text_destroy_time_entries: Delete reported hours
+  text_assign_time_entries_to_project: Додели ги пријавените часови на проектот
+  text_reassign_time_entries: 'Reassign reported hours to this issue:'
+  text_user_wrote: "{{value}} напиша:"
+  text_enumeration_destroy_question: "{{count}} objects are assigned to this value."
+  text_enumeration_category_reassign_to: 'Reassign them to this value:'
+  text_email_delivery_not_configured: "Доставата по е-пошта не е конфигурирана, и известувањата се оневозможени.\nКонфигурирајте го Вашиот  SMTP сервер во config/email.yml и рестартирајте ја апликацијата."
+  text_repository_usernames_mapping: "Select or update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
+  text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
+  text_custom_field_possible_values_info: 'One line for each value'
+  text_wiki_page_destroy_question: "This page has {{descendants}} child page(s) and descendant(s). What do you want to do?"
+  text_wiki_page_nullify_children: "Keep child pages as root pages"
+  text_wiki_page_destroy_children: "Delete child pages and all their descendants"
+  text_wiki_page_reassign_children: "Reassign child pages to this parent page"
+  text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?"
+  text_zoom_in: Zoom in
+  text_zoom_out: Zoom out
+
+  default_role_manager: Менаџер
+  default_role_developer: Developer
+  default_role_reporter: Reporter
+  default_tracker_bug: Грешка
+  default_tracker_feature: Функционалност
+  default_tracker_support: Поддршка
+  default_issue_status_new: Нова
+  default_issue_status_in_progress: Во прогрес
+  default_issue_status_resolved: Разрешена
+  default_issue_status_feedback: Feedback
+  default_issue_status_closed: Затворена
+  default_issue_status_rejected: Одбиена
+  default_doc_category_user: Корисничка документација
+  default_doc_category_tech: Техничка документација
+  default_priority_low: Низок
+  default_priority_normal: Нормален
+  default_priority_high: Висок
+  default_priority_urgent: Итно
+  default_priority_immediate: Веднаш
+  default_activity_design: Дизајн
+  default_activity_development: Развој
+
+  enumeration_issue_priorities: Приоритети на задача
+  enumeration_doc_categories: Категории на документ
+  enumeration_activities: Активности (следење на време)
+  enumeration_system_activity: Системска активност
+
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/mn.yml

@@ -117,6 +117,7 @@ mn:
         greater_than_start_date: "must be greater than start date"
         not_same_project: "нэг ижил төсөлд хамаарахгүй байна"
         circular_dependency: "Энэ харьцаа нь гинжин(рекурсив) харьцаа үүсгэх юм байна"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   actionview_instancetag_blank_option: Сонгоно уу
   
@@ -911,3 +912,10 @@ mn:
   notice_unable_delete_time_entry: Unable to delete time log entry.
   label_overall_spent_time: Overall spent time
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/nl.yml

@@ -116,6 +116,7 @@ nl:
         greater_than_start_date: "moet na de startdatum liggen"
         not_same_project: "hoort niet bij hetzelfde project"
         circular_dependency: "Deze relatie zou een circulaire afhankelijkheid tot gevolg hebben"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   actionview_instancetag_blank_option: Selecteer
   
@@ -701,7 +702,7 @@ nl:
   setting_date_format: Datumformaat
   setting_default_language: Standaard taal
   setting_default_projects_public: Nieuwe projecten zijn standaard publiek
-  setting_diff_max_lines_displayed: Max number of diff lines displayed
+  setting_diff_max_lines_displayed: Max aantal diff regels weer te geven
   setting_display_subprojects_issues: Standaard issues van subproject tonen
   setting_emails_footer: E-mails footer
   setting_enabled_scm: SCM ingeschakeld
@@ -709,7 +710,7 @@ nl:
   setting_gravatar_enabled: Gebruik Gravatar gebruikersiconen
   setting_host_name: Hostnaam
   setting_issue_list_default_columns: Standaardkolommen getoond op de lijst met issues
-  setting_issues_export_limit: Limiet export issues
+  setting_issues_export_limit: Max aantal te exporteren issues 
   setting_login_required: Authenticatie vereist
   setting_mail_from: Afzender e-mail adres
   setting_mail_handler_api_enabled: Schakel WS in voor inkomende mail.
@@ -727,7 +728,7 @@ nl:
   setting_welcome_text: Welkomsttekst
   setting_wiki_compression: Wikigeschiedenis comprimeren
   status_active: actief
-  status_locked: gelockt
+  status_locked: vergrendeld
   status_registered: geregistreerd
   text_are_you_sure: Weet u het zeker?
   text_assign_time_entries_to_project: Gerapporteerde uren toevoegen aan dit project
@@ -753,7 +754,7 @@ nl:
   text_load_default_configuration: Laad de standaardconfiguratie
   text_min_max_length_info: 0 betekent geen restrictie
   text_no_configuration_data: "Rollen, trackers, issue statussen en workflows zijn nog niet geconfigureerd.\nHet is ten zeerste aangeraden om de standaard configuratie in te laden. U kunt deze aanpassen nadat deze is ingeladen."
-  text_plugin_assets_writable: Plugin assets directory writable
+  text_plugin_assets_writable: Plugin assets directory beschrijfbaar
   text_project_destroy_confirmation: Weet u zeker dat u dit project en alle gerelateerde gegevens wilt verwijderen?
   text_project_identifier_info: 'kleine letters (a-z), cijfers en liggende streepjes toegestaan.<br />Eenmaal bewaard kan de identificatiecode niet meer worden gewijzigd.'
   text_reassign_time_entries: 'Gerapporteerde uren opnieuw toewijzen:'
@@ -778,7 +779,7 @@ nl:
   text_custom_field_possible_values_info: 'Per lijn een waarde'
   label_display: Toon
   field_editable: Bewerkbaar
-  setting_repository_log_display_limit: Maximum hoeveelheid van revisies zichbaar 
+  setting_repository_log_display_limit: Max aantal revisies zichbaar 
   setting_file_max_size_displayed: Max grootte van tekst bestanden inline zichtbaar
   field_watcher: Watcher
   setting_openid: Sta OpenID login en registratie toe
@@ -824,7 +825,7 @@ nl:
   version_status_closed: gesloten
   version_status_locked: vergrendeld
   version_status_open: open
-  error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened
+  error_can_not_reopen_issue_on_closed_version: Een issue toegewezen aan een gesloten versie kan niet heropend worden
   label_user_anonymous: Anoniem
   button_move_and_follow: Verplaats en volg
   setting_default_projects_modules: Standaard geactiveerde modules voor nieuwe projecten
@@ -833,36 +834,36 @@ nl:
   label_version_sharing_hierarchy: Met project hiërarchie
   label_version_sharing_system: Met alle projecten
   label_version_sharing_descendants: Met subprojecten
-  label_version_sharing_tree: With project tree
+  label_version_sharing_tree: Met project boom
   label_version_sharing_none: Niet gedeeld
   error_can_not_archive_project: Dit project kan niet worden gearchiveerd
   button_duplicate: Dupliceer
   button_copy_and_follow: Kopiëer en volg
   label_copy_source: Bron
-  setting_issue_done_ratio: Bereken issue done ratio met
+  setting_issue_done_ratio: Bereken issue percentage voldaan met
   setting_issue_done_ratio_issue_status: Gebruik de issue status
-  error_issue_done_ratios_not_updated: Issue done ratios niet geupdate.
+  error_issue_done_ratios_not_updated: Issue percentage voldaan niet geupdate.
   error_workflow_copy_target: Selecteer tracker(s) en rol(len)
   setting_issue_done_ratio_issue_field: Gebruik het issue veld
   label_copy_same_as_target: Zelfde als doel
   label_copy_target: Doel
-  notice_issue_done_ratios_updated: Issue done ratios updated.
+  notice_issue_done_ratios_updated: Issue percentage voldaan geupdate.
   error_workflow_copy_source: Selecteer een bron tracker of rol
-  label_update_issue_done_ratios: Update issue done ratios
+  label_update_issue_done_ratios: Update issue percentage voldaan
   setting_start_of_week: Week begint op
   permission_view_issues: Bekijk Issues
   label_display_used_statuses_only: Laat alleen statussen zien die gebruikt worden door deze tracker
-  label_revision_id: Revision {{value}}
+  label_revision_id: Revisie {{value}}
   label_api_access_key: API access key
   label_api_access_key_created_on: API access key gemaakt {{value}} geleden
   label_feeds_access_key: RSS access key
   notice_api_access_key_reseted: Uw API access key was gereset.
-  setting_rest_api_enabled: Enable REST web service
+  setting_rest_api_enabled: Activeer REST web service
   label_missing_api_access_key: Geen API access key
   label_missing_feeds_access_key: Geen RSS access key
   button_show: Laat zien
   text_line_separated: Meerdere waarden toegestaan (elke regel is een waarde).
-  setting_mail_handler_body_delimiters: Truncate emails after one of these lines
+  setting_mail_handler_body_delimiters: Breek email verwerking af na een van deze regels
   permission_add_subprojects: Maak subprojecten
   label_subproject_new: Nieuw subproject
   text_own_membership_delete_confirmation: |-
@@ -873,10 +874,10 @@ nl:
   label_board_locked: Vergrendeld
   permission_export_wiki_pages: Exporteer wiki pagina's
   setting_cache_formatted_text: Cache opgemaakte tekst
-  permission_manage_project_activities: Manage project activities
+  permission_manage_project_activities: Beheer project activiteiten
   error_unable_delete_issue_status: Verwijderen van issue status niet gelukt
   label_profile: Profiel
-  permission_manage_subtasks: Manage subtasks
+  permission_manage_subtasks: Beheer subtasks
   field_parent_issue: Parent task
   label_subtask_plural: Subtasks
   label_project_copy_notifications: Stuur email notificaties voor de project kopie
@@ -891,4 +892,11 @@ nl:
   text_zoom_in: Zoom in
   notice_unable_delete_time_entry: Verwijderen niet mogelijk van tijd log invoer.
   label_overall_spent_time: Totaal bestede tijd
-  field_time_entries: Log time
+  field_time_entries: Log tijd
+  project_module_gantt: Gantt
+  project_module_calendar: Kalender
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/no.yml

@@ -111,6 +111,7 @@
         greater_than_start_date: "må være større enn startdato"
         not_same_project: "hører ikke til samme prosjekt"
         circular_dependency: "Denne relasjonen ville lagd en sirkulær avhengighet"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   
   actionview_instancetag_blank_option: Vennligst velg
@@ -901,3 +902,10 @@
   notice_unable_delete_time_entry: Unable to delete time log entry.
   label_overall_spent_time: Overall spent time
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/pl.yml

@@ -129,6 +129,7 @@ pl:
         greater_than_start_date: "musi być większe niż początkowa data"
         not_same_project: "nie należy do tego samego projektu"
         circular_dependency: "Ta relacja może wytworzyć kołową zależność"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
       
   support:
     array:
@@ -912,22 +913,29 @@ pl:
   label_board_locked: Zamknięta
   permission_export_wiki_pages: Eksport stron wiki
   permission_manage_project_activities: Zarządzanie aktywnościami projektu
-  setting_cache_formatted_text: Cache formatted text
-  error_unable_delete_issue_status: Unable to delete issue status
-  label_profile: Profile
-  permission_manage_subtasks: Manage subtasks
-  field_parent_issue: Parent task
-  label_subtask_plural: Subtasks
-  label_project_copy_notifications: Send email notifications during the project copy
-  error_can_not_delete_custom_field: Unable to delete custom field
-  error_unable_to_connect: Unable to connect ({{value}})
-  error_can_not_remove_role: This role is in use and can not be deleted.
-  error_can_not_delete_tracker: This tracker contains issues and can't be deleted.
-  field_principal: Principal
-  label_my_page_block: My page block
-  notice_failed_to_save_members: "Failed to save member(s): {{errors}}."
-  text_zoom_out: Zoom out
-  text_zoom_in: Zoom in
-  notice_unable_delete_time_entry: Unable to delete time log entry.
-  label_overall_spent_time: Overall spent time
-  field_time_entries: Log time
+  setting_cache_formatted_text: Buforuj sformatowany tekst
+  error_unable_delete_issue_status: Nie można usunąć statusu zagadnienia
+  label_profile: Profil
+  permission_manage_subtasks: Zarządzanie podzagadnieniami
+  field_parent_issue: Zagadnienie nadrzędne
+  label_subtask_plural: Podzagadnienia
+  label_project_copy_notifications: Wyślij powiadomienia mailowe przy kopiowaniu projektu
+  error_can_not_delete_custom_field: Nie można usunąć tego pola
+  error_unable_to_connect: Nie można połączyć ({{value}})
+  error_can_not_remove_role: Ta rola przypisana jest niektórym użytkownikom i nie może zostać usunięta.
+  error_can_not_delete_tracker: Ten typ przypisany jest do części zagadnień i nie może zostać usunięty.
+  field_principal: Przełożony
+  label_my_page_block: Elementy
+  notice_failed_to_save_members: "Nie można zapisać uczestników: {{errors}}."
+  text_zoom_out: Zmniejsz czcionkę
+  text_zoom_in: Powiększ czcionkę
+  notice_unable_delete_time_entry: Nie można usunąć wpisu z dziennika.
+  label_overall_spent_time: Przepracowany czas
+  field_time_entries: Dziennik
+  project_module_gantt: Diagram Gantta
+  project_module_calendar: Kalendarz
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/pt-BR.yml

@@ -143,6 +143,7 @@ pt-BR:
         greater_than_start_date: "deve ser maior que a data inicial"
         not_same_project: "não pertence ao mesmo projeto"
         circular_dependency: "Esta relação geraria uma dependência circular"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   actionview_instancetag_blank_option: Selecione
 
@@ -916,7 +917,7 @@ pt-BR:
   permission_export_wiki_pages: Exportar páginas wiki
   setting_cache_formatted_text: Realizar cache de texto formatado
   permission_manage_project_activities: Gerenciar atividades do projeto
-  error_unable_delete_issue_status: Impossível excluir situação da tarefa
+  error_unable_delete_issue_status: Não foi possível excluir situação da tarefa
   label_profile: Perfil
   permission_manage_subtasks: Gerenciar subtarefas
   field_parent_issue: Tarefa pai
@@ -934,3 +935,10 @@ pt-BR:
   notice_unable_delete_time_entry: Não foi possível excluir a entrada no registro de horas trabalhadas.
   label_overall_spent_time: Tempo gasto geral
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendário
+  field_member_of_group: Mebro do grupo
+  field_assigned_to_role: Membro com o papel
+  button_edit_associated_wikipage: "Editar páginas wiki relacionadas: {{page_title}}"
+  text_are_you_sure_with_children: Excluir a tarefa e suas subtarefas?
+  field_text: Campo de texto

config/locales/pt.yml

@@ -128,6 +128,7 @@ pt:
         greater_than_start_date: "deve ser maior que a data inicial"
         not_same_project: "não pertence ao mesmo projecto"
         circular_dependency: "Esta relação iria criar uma dependência circular"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   ## Translated by: Pedro Araújo <phcrva19@hotmail.com>
   actionview_instancetag_blank_option: Seleccione
@@ -918,3 +919,10 @@ pt:
   notice_unable_delete_time_entry: Unable to delete time log entry.
   label_overall_spent_time: Overall spent time
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/ro.yml

@@ -110,6 +110,7 @@ ro:
         greater_than_start_date: "trebuie să fie după data de început"
         not_same_project: "trebuie să aparțină aceluiași proiect"
         circular_dependency: "Această relație ar crea o dependență circulară"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   actionview_instancetag_blank_option: Selectați
   
@@ -903,3 +904,10 @@ ro:
   notice_unable_delete_time_entry: Unable to delete time log entry.
   label_overall_spent_time: Overall spent time
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/ru.yml

@@ -192,11 +192,12 @@ ru:
         equal_to: "может иметь лишь значение, равное {{count}}"
         less_than: "может иметь значение меньшее чем {{count}}"
         less_than_or_equal_to: "может иметь значение меньшее или равное {{count}}"
-        odd: "может иметь лишь четное значение"
-        even: "может иметь лишь нечетное значение"
+        odd: "может иметь лишь нечетное значение"
+        even: "может иметь лишь четное значение"
         greater_than_start_date: "должна быть позднее даты начала"
-        not_same_project: "не относятся к одному проекту"
+        not_same_project: "не относится к одному проекту"
         circular_dependency: "Такая связь приведет к циклической зависимости"
+        cant_link_an_issue_with_a_descendant: "Задача не может быть связана со своей подзадачей"
 
   support:
     array:
@@ -229,6 +230,7 @@ ru:
   button_delete: Удалить
   button_download: Загрузить
   button_edit: Редактировать
+  button_edit_associated_wikipage: "Редактировать связанную wiki-страницу: {{page_title}}"
   button_list: Список
   button_lock: Заблокировать
   button_login: Вход
@@ -367,6 +369,7 @@ ru:
   field_subject: Тема
   field_subproject: Подпроект
   field_summary: Сводка
+  field_text: Текстовое поле
   field_time_entries: Затраченное время
   field_time_zone: Часовой пояс
   field_title: Название
@@ -845,6 +848,8 @@ ru:
   project_module_repository: Хранилище
   project_module_time_tracking: Учет времени
   project_module_wiki: Wiki
+  project_module_gantt: Диаграмма Ганта
+  project_module_calendar: Календарь
 
   setting_activity_days_default: Количество дней, отображаемых в Активности
   setting_app_subtitle: Подзаголовок приложения
@@ -893,7 +898,8 @@ ru:
   status_active: активен
   status_locked: заблокирован
   status_registered: зарегистрирован
-
+  
+  text_are_you_sure_with_children: Удалить задачу и все ее подзадачи?
   text_are_you_sure: Подтвердите
   text_assign_time_entries_to_project: Прикрепить зарегистрированное время к проекту
   text_caracters_maximum: "Максимум {{count}} символов(а)."
@@ -1026,3 +1032,6 @@ ru:
   text_zoom_in: Приблизить
   notice_unable_delete_time_entry: Невозможно удалить запись журнала.
   label_overall_spent_time: Всего затрачено времени
+
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role

config/locales/sk.yml

@@ -112,6 +112,7 @@ sk:
         greater_than_start_date: "musí byť neskôr ako počiatočný dátum"
         not_same_project: "nepatrí rovnakému projektu"
         circular_dependency: "Tento vzťah by vytvoril cyklickú závislosť"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   # SK translation by Stanislav Pach | stano.pach@seznam.cz
   
@@ -905,3 +906,10 @@ sk:
   notice_unable_delete_time_entry: Unable to delete time log entry.
   label_overall_spent_time: Overall spent time
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/sl.yml

@@ -116,6 +116,7 @@ sl:
         greater_than_start_date: "mora biti kasnejši kot začeten datum"
         not_same_project: "ne pripada istemu projektu"
         circular_dependency: "Ta odnos bi povzročil krožno odvisnost"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   actionview_instancetag_blank_option: Prosimo izberite
   
@@ -906,3 +907,10 @@ sl:
   notice_unable_delete_time_entry: Unable to delete time log entry.
   label_overall_spent_time: Overall spent time
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/sr-YU.yml

@@ -910,4 +910,11 @@ sr-YU:
   enumeration_activities: Aktivnosti (praćenje vremena)
   enumeration_system_activity: Sistemska aktivnost
   
-  field_time_entries: Log time
+  field_time_entries: Vreme evidencije
+  project_module_gantt: Gantov dijagram
+  project_module_calendar: Kalendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/sr.yml

@@ -910,4 +910,12 @@ sr:
   enumeration_activities: Активности (праћење времена)
   enumeration_system_activity: Системска активност
   
-  field_time_entries: Log time
+  field_time_entries: Време евиденције
+  project_module_gantt: Гантов дијаграм
+  project_module_calendar: Календар
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/sv.yml

@@ -130,6 +130,7 @@ sv:
         greater_than_start_date: "måste vara senare än startdatumet"
         not_same_project: "tillhör inte samma projekt"
         circular_dependency: "Denna relation skulle skapa ett cirkulärt beroende"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   direction: ltr
   date:
@@ -325,6 +326,7 @@ sv:
   field_redirect_existing_links: Omdirigera existerande länkar
   field_estimated_hours: Estimerad tid
   field_column_names: Kolumner
+  field_time_entries: Spenderad tid
   field_time_zone: Tidszon
   field_searchable: Sökbar
   field_default_value: Standardvärde
@@ -456,6 +458,8 @@ sv:
   project_module_wiki: Wiki
   project_module_repository: Versionsarkiv
   project_module_boards: Forum
+  project_module_calendar: Kalender
+  project_module_gantt: Gantt
   
   label_user: Användare
   label_user_plural: Användare
@@ -857,7 +861,7 @@ sv:
   button_update: Uppdatera
   button_configure: Konfigurera
   button_quote: Citera
-  button_duplicate: Duplisera
+  button_duplicate: Duplicera
   button_show: Visa
   
   status_active: aktiv
@@ -954,4 +958,8 @@ sv:
   enumeration_doc_categories: Dokumentkategorier
   enumeration_activities: Aktiviteter (tidsuppföljning)
   enumeration_system_activity: Systemaktivitet
-  field_time_entries: Log time
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/th.yml

@@ -116,6 +116,7 @@ th:
         greater_than_start_date: "ต้องมากกว่าวันเริ่ม"
         not_same_project: "ไม่ได้อยู่ในโครงการเดียวกัน"
         circular_dependency: "ความสัมพันธ์อ้างอิงเป็นวงกลม"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   actionview_instancetag_blank_option: กรุณาเลือก
   
@@ -907,3 +908,10 @@ th:
   notice_unable_delete_time_entry: Unable to delete time log entry.
   label_overall_spent_time: Overall spent time
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/tr.yml

@@ -143,6 +143,7 @@ tr:
         greater_than_start_date: "başlangıç tarihinden büyük olmalı"
         not_same_project: "aynı projeye ait değil"
         circular_dependency: "Bu ilişki döngüsel bağımlılık meydana getirecektir"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
       models:
   
   actionview_instancetag_blank_option: Lütfen Seçin
@@ -933,3 +934,10 @@ tr:
   notice_unable_delete_time_entry: Unable to delete time log entry.
   label_overall_spent_time: Overall spent time
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/uk.yml

@@ -116,6 +116,7 @@ uk:
         greater_than_start_date: "повинна бути пізніша за дату початку"
         not_same_project: "не відносяться до одного проекту"
         circular_dependency: "Такий зв'язок приведе до циклічної залежності"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   actionview_instancetag_blank_option: Оберіть
   
@@ -906,3 +907,10 @@ uk:
   notice_unable_delete_time_entry: Unable to delete time log entry.
   label_overall_spent_time: Overall spent time
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/vi.yml

@@ -139,6 +139,7 @@ vi:
         greater_than_start_date: "phải đi sau ngày bắt đầu"
         not_same_project: "không thuộc cùng dự án"
         circular_dependency: "quan hệ có thể gây ra lặp vô tận"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   direction: ltr
   date:
@@ -965,3 +966,10 @@ vi:
   notice_unable_delete_time_entry: Unable to delete time log entry.
   label_overall_spent_time: Overall spent time
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/locales/zh-TW.yml

@@ -177,6 +177,7 @@
         greater_than_start_date: "必須在起始日期之後"
         not_same_project: "不屬於同一個專案"
         circular_dependency: "這個關聯會導致環狀相依"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
       # You can define own errors for models or model attributes.
       # The values :model, :attribute and :value are always available for interpolation.
@@ -365,6 +366,7 @@
   field_redirect_existing_links: 重新導向現有連結
   field_estimated_hours: 預估工時
   field_column_names: 欄位
+  field_time_entries: 耗用工時
   field_time_zone: 時區
   field_searchable: 可用做搜尋條件
   field_default_value: 預設值
@@ -377,8 +379,10 @@
   field_group_by: 結果分組方式
   field_sharing: 共用
   field_parent_issue: 父工作項目
-  field_time_entries: 耗用工時
-    
+  field_member_of_group: 所屬群組
+  field_assigned_to_role: 所屬角色
+  field_text: 內容文字
+  
   setting_app_title: 標題
   setting_app_subtitle: 副標題
   setting_welcome_text: 歡迎詞
@@ -497,6 +501,8 @@
   project_module_wiki: Wiki
   project_module_repository: 版本控管
   project_module_boards: 討論區
+  project_module_calendar: 日曆
+  project_module_gantt: 甘特圖
   
   label_user: 用戶
   label_user_plural: 用戶清單
@@ -514,7 +520,7 @@
   label_issue: 項目
   label_issue_new: 建立新項目
   label_issue_plural: 項目清單
-  label_issue_view_all: 檢視全部的項目
+  label_issue_view_all: 檢視所有項目
   label_issues_by: "項目按 {{value}} 分組顯示"
   label_issue_added: 項目已新增
   label_issue_updated: 項目已更新
@@ -564,7 +570,7 @@
   label_last_login: 最近一次連線
   label_registered_on: 註冊於
   label_activity: 活動
-  label_overall_activity: 檢視整體活動
+  label_overall_activity: 整體活動
   label_user_activity: "{{value}} 的活動"
   label_new: 建立新的...
   label_logged_as: 目前登入
@@ -867,6 +873,7 @@
   button_create_and_continue: 繼續建立
   button_test: 測試
   button_edit: 編輯
+  button_edit_associated_wikipage: "編輯相關 Wiki 頁面: {{page_title}}"
   button_add: 新增
   button_change: 修改
   button_apply: 套用
@@ -918,6 +925,7 @@
   text_subprojects_destroy_warning: "下列子專案： {{value}} 將一併被刪除。"
   text_workflow_edit: 選擇角色與追蹤標籤以設定其工作流程
   text_are_you_sure: 確定執行？
+  text_are_you_sure_with_children: "確定刪除此工作項目及其子項目？"
   text_journal_changed: "{{label}} 從 {{old}} 變更為 {{new}}"
   text_journal_set_to: "{{label}} 設定為 {{value}}"
   text_journal_deleted: "{{label}} 已刪除 ({{old}})"

config/locales/zh.yml

@@ -137,6 +137,7 @@ zh:
         greater_than_start_date: "必须在起始日期之后"
         not_same_project: "不属于同一个项目"
         circular_dependency: "此关联将导致循环依赖"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
 
   actionview_instancetag_blank_option: 请选择
   
@@ -928,3 +929,10 @@ zh:
   notice_unable_delete_time_entry: 无法删除工时记录。
   label_overall_spent_time: 所有项目耗用工时
   field_time_entries: Log time
+  project_module_gantt: Gantt
+  project_module_calendar: Calendar
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field

config/routes.rb

@@ -108,6 +108,7 @@ ActionController::Routing::Routes.draw do |map|
   # TODO: would look nicer as /issues/:id/preview
   map.preview_issue '/issues/preview/:id', :controller => 'previews', :action => 'issue'
   map.issues_context_menu '/issues/context_menu', :controller => 'context_menus', :action => 'issues'
+  map.issue_changes '/issues/changes', :controller => 'journals', :action => 'index'
   
   map.with_options :controller => 'issues' do |issues_routes|
     issues_routes.with_options :conditions => {:method => :get} do |issues_views|
@@ -131,6 +132,7 @@ ActionController::Routing::Routes.draw do |map|
       issues_actions.connect 'issues/:id/quoted', :controller => 'journals', :action => 'new', :id => /\d+/
       issues_actions.connect 'issues/:id/:action', :action => /edit|destroy/, :id => /\d+/
       issues_actions.connect 'issues.:format', :action => 'create', :format => /xml/
+      issues_actions.connect 'issues/bulk_edit', :action => 'bulk_update'
     end
     issues_routes.with_options :conditions => {:method => :put} do |issues_actions|
       issues_actions.connect 'issues/:id/edit', :action => 'update', :id => /\d+/
@@ -194,16 +196,16 @@ ActionController::Routing::Routes.draw do |map|
     projects.with_options :conditions => {:method => :get} do |project_views|
       project_views.connect 'projects', :action => 'index'
       project_views.connect 'projects.:format', :action => 'index'
-      project_views.connect 'projects/new', :action => 'add'
+      project_views.connect 'projects/new', :action => 'new'
       project_views.connect 'projects/:id', :action => 'show'
       project_views.connect 'projects/:id.:format', :action => 'show'
-      project_views.connect 'projects/:id/:action', :action => /roadmap|destroy|settings/
-      project_views.connect 'projects/:id/files', :action => 'list_files'
-      project_views.connect 'projects/:id/files/new', :action => 'add_file'
+      project_views.connect 'projects/:id/:action', :action => /destroy|settings/
+      project_views.connect 'projects/:id/files', :controller => 'files', :action => 'index'
+      project_views.connect 'projects/:id/files/new', :controller => 'files', :action => 'new'
       project_views.connect 'projects/:id/settings/:tab', :action => 'settings'
     end
 
-    projects.with_options :action => 'activity', :conditions => {:method => :get} do |activity|
+    projects.with_options :controller => 'activities', :action => 'index', :conditions => {:method => :get} do |activity|
       activity.connect 'projects/:id/activity'
       activity.connect 'projects/:id/activity.:format'
       activity.connect 'activity', :id => nil
@@ -211,27 +213,33 @@ ActionController::Routing::Routes.draw do |map|
     end
     
     projects.with_options :conditions => {:method => :post} do |project_actions|
-      project_actions.connect 'projects/new', :action => 'add'
-      project_actions.connect 'projects', :action => 'add'
-      project_actions.connect 'projects.:format', :action => 'add', :format => /xml/
-      project_actions.connect 'projects/:id/:action', :action => /edit|destroy|archive|unarchive/
-      project_actions.connect 'projects/:id/files/new', :action => 'add_file'
-      project_actions.connect 'projects/:id/activities/save', :action => 'save_activities'
+      project_actions.connect 'projects/new', :action => 'create'
+      project_actions.connect 'projects', :action => 'create'
+      project_actions.connect 'projects.:format', :action => 'create', :format => /xml/
+      project_actions.connect 'projects/:id/edit', :action => 'update'
+      project_actions.connect 'projects/:id/:action', :action => /destroy|archive|unarchive/
+      project_actions.connect 'projects/:id/files/new', :controller => 'files', :action => 'new'
+      project_actions.connect 'projects/:id/activities/save', :controller => 'project_enumerations', :action => 'save'
     end
 
     projects.with_options :conditions => {:method => :put} do |project_actions|
-      project_actions.conditions 'projects/:id.:format', :action => 'edit', :format => /xml/
+      project_actions.conditions 'projects/:id.:format', :action => 'update', :format => /xml/
     end
 
     projects.with_options :conditions => {:method => :delete} do |project_actions|
       project_actions.conditions 'projects/:id.:format', :action => 'destroy', :format => /xml/
-      project_actions.conditions 'projects/:id/reset_activities', :action => 'reset_activities'
+      project_actions.conditions 'projects/:id/reset_activities', :controller => 'project_enumerations', :action => 'destroy'
     end
   end
   
   map.with_options :controller => 'versions' do |versions|
     versions.connect 'projects/:project_id/versions/new', :action => 'new'
+    versions.connect 'projects/:project_id/roadmap', :action => 'index'
+    versions.connect 'versions/:action/:id', :conditions => {:method => :get}
+    
     versions.with_options :conditions => {:method => :post} do |version_actions|
+      version_actions.connect 'projects/:project_id/versions', :action => 'create'
+      version_actions.connect 'versions/update/:id', :action => 'update'
       version_actions.connect 'projects/:project_id/versions/close_completed', :action => 'close_completed'
     end
   end

doc/CHANGELOG

@@ -4,6 +4,62 @@ Redmine - project management software
 Copyright (C) 2006-2010  Jean-Philippe Lang
 http://www.redmine.org/
 
+== 2010-09-26 v1.0.2
+
+* #2285: issue-refinement: pressing enter should result to an "apply"
+* #3411: Allow mass status update trough context menu
+* #5929: https-enabled gravatars when called over https
+* #6189: Japanese Translation for r4011
+* #6197: Traditional Chinese language file (to r4036)
+* #6198: Updated german translation
+* #6208: Macedonian translation
+* #6210: Swedish Translation for r4039
+* #6248: nl translation update for r4050
+* #6263: Catalan translation update
+* #6275: After submitting a related issue, the Issue field should be re-focused
+* #6289: Checkboxes in issues list shouldn't be displayed when printing
+* #6290: Make journals theming easier
+* #6291: User#allowed_to? is not tested
+* #6306: Traditional Chinese language file (to r4061)
+* #6307: Korean translation update for 4066(4061)
+* #6316: pt_BR update
+* #6339: SERBIAN Updated
+* #6358: Updated Polish translation
+* #6363: Japanese Translation for r4080
+* #6365: Traditional Chinese language file (to r4081)
+* #6382: Issue PDF export variable usage
+* #6428: Interim solution for i18n >= 0.4
+* #6441: Japanese Translation for r4162
+* #6451: Traditional Chinese language file (to r4167)
+* #6465: Japanese Translation for r4171
+* #6466: Traditional Chinese language file (to r4171)
+* #6490: pt-BR translation for 1.0.2
+* Fixed #3935: stylesheet_link_tag with plugin doesn't take into account relative_url_root
+* Fixed #4998: Global issue list's context menu has enabled options for parent menus but there are no valid selections
+* Fixed #5170: Done ratio can not revert to 0% if status is used for done ratio
+* Fixed #5608: broken with i18n 0.4.0
+* Fixed #6054: Error 500 on filenames with whitespace in git reposities
+* Fixed #6135: Default logger configuration grows without bound.
+* Fixed #6191: Deletion of a main task deletes all subtasks
+* Fixed #6195: Missing move issues between projects
+* Fixed #6242: can't switch between inline and side-by-side diff
+* Fixed #6249: Create and continue returns 404
+* Fixed #6267: changing the authentication mode from ldap to internal with setting the password
+* Fixed #6270: diff coderay malformed in the "news" page
+* Fixed #6278: missing "cant_link_an_issue_with_a_descendant"from locale files
+* Fixed #6333: Create and continue results in a 404 Error
+* Fixed #6346: Age column on repository view is skewed for git, probably CVS too
+* Fixed #6351: Context menu on roadmap broken
+* Fixed #6388: New Subproject leads to a 404
+* Fixed #6392: Updated/Created links to activity broken
+* Fixed #6413: Error in SQL
+* Fixed #6443: Redirect to project settings after Copying a Project
+* Fixed #6448: Saving a wiki page with no content has a translation missing
+* Fixed #6452: Unhandled exception on creating File
+* Fixed #6471: Typo in label_report in Czech translation
+* Fixed #6479: Changing tracker type will lose watchers
+* Fixed #6499: Files with leading or trailing whitespace are not shown in git.
+
 == 2010-08-22 v1.0.1
 
 * #819: Add a body ID and class to all pages