Tagging 1.0.1

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

app/controllers/activities_controller.rb

@@ -1,59 +0,0 @@
-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/calendars_controller.rb

@@ -8,8 +8,6 @@ class CalendarsController < ApplicationController
   helper :projects
   helper :queries
   include QueriesHelper
-  helper :sort
-  include SortHelper
 
   def show
     if params[:year] and params[:year].to_i > 1900

app/controllers/context_menus_controller.rb

@@ -6,15 +6,9 @@ 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

@@ -1,37 +0,0 @@
-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/issue_moves_controller.rb

@@ -18,7 +18,6 @@ class IssueMovesController < ApplicationController
       @issues.each do |issue|
         issue.reload
         issue.init_journal(User.current)
-        issue.current_journal.notes = @notes if @notes.present?
         call_hook(:controller_issues_move_before_save, { :params => params, :issue => issue, :target_project => @target_project, :copy => !!@copy })
         if r = issue.move_to_project(@target_project, new_tracker, {:copy => @copy, :attributes => extract_changed_attributes_for_move(params)})
           moved_issues << r
@@ -51,13 +50,11 @@ class IssueMovesController < ApplicationController
     @target_project ||= @project    
     @trackers = @target_project.trackers
     @available_statuses = Workflow.available_statuses(@project)
-    @notes = params[:notes]
-    @notes ||= ''
   end
 
   def extract_changed_attributes_for_move(params)
     changed_attributes = {}
-    [:assigned_to_id, :status_id, :start_date, :due_date, :priority_id].each do |valid_attribute|
+    [:assigned_to_id, :status_id, :start_date, :due_date].each do |valid_attribute|
       unless params[valid_attribute].blank?
         changed_attributes[valid_attribute] = (params[valid_attribute] == 'none' ? nil : params[valid_attribute])
       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, :bulk_update, :move, :perform_move, :destroy]
+  before_filter :find_issues, :only => [:bulk_edit, :move, :perform_move, :destroy]
   before_filter :find_project, :only => [:new, :create]
-  before_filter :authorize, :except => [:index]
-  before_filter :find_optional_project, :only => [:index]
+  before_filter :authorize, :except => [:index, :changes]
+  before_filter :find_optional_project, :only => [:index, :changes]
   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, :create, :update, :destroy
+  accept_key_auth :index, :show, :changes
 
   rescue_from Query::StatementInvalid, :with => :query_statement_invalid
   
@@ -54,7 +54,6 @@ 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
@@ -96,6 +95,21 @@ 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}
@@ -110,7 +124,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 :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
+      format.atom { render :action => 'changes', :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
@@ -133,7 +147,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', :project_id => @project, :issue => {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?} } :
+          redirect_to(params[:continue] ? { :action => 'new', :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) }
@@ -192,28 +206,29 @@ 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
@@ -270,7 +285,7 @@ private
     @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
     @time_entry = TimeEntry.new
     
-    @notes = params[:notes] || (params[:issue].present? ? params[:issue][:notes] : nil)
+    @notes = params[:notes]
     @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]
@@ -283,7 +298,6 @@ 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
@@ -300,14 +314,12 @@ private
       render_error l(:error_no_tracker_in_project)
       return false
     end
-    @issue.start_date ||= Date.today
     if params[:issue].is_a?(Hash)
       @issue.safe_attributes = params[:issue]
-      if User.current.allowed_to?(:add_issue_watchers, @project) && @issue.new_record?
-        @issue.watcher_user_ids = params[:issue]['watcher_user_ids']
-      end
+      @issue.watcher_user_ids = params[:issue]['watcher_user_ids'] if User.current.allowed_to?(:add_issue_watchers, @project)
     end
     @issue.author = User.current
+    @issue.start_date ||= Date.today
     @priorities = IssuePriority.all
     @allowed_statuses = @issue.new_statuses_allowed_to(User.current, true)
   end
@@ -318,11 +330,4 @@ 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,29 +18,6 @@
 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

@@ -1,26 +0,0 @@
-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, :new, :create, :copy ]
-  before_filter :authorize, :except => [ :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy]
-  before_filter :authorize_global, :only => [:new, :create]
+  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 :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
-  accept_key_auth :index, :show, :create, :update, :destroy
-
-  after_filter :only => [:create, :edit, :update, :archive, :unarchive, :destroy] do |controller|
+  accept_key_auth :activity, :index
+  
+  after_filter :only => [:add, :edit, :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,45 +63,40 @@ class ProjectsController < ApplicationController
     end
   end
   
-  def new
+  # Add a new project
+  def add
     @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
     @trackers = Tracker.all
     @project = Project.new(params[:project])
-
-    @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
-      respond_to do |format|
-        format.html { 
-          flash[:notice] = l(:notice_successful_create)
-          redirect_to :controller => 'projects', :action => 'settings', :id => @project
-        }
-        format.xml  { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
-      end
+    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
-      respond_to do |format|
-        format.html { render :action => 'new' }
-        format.xml  { render :xml => @project.errors, :status => :unprocessable_entity }
+      @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
       end
-    end
-    
+    end	
   end
   
   def copy
@@ -125,13 +120,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 => 'projects', :action => 'settings'
+          redirect_to :controller => 'admin', :action => 'projects'
         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 => 'projects', :action => 'settings'
+          redirect_to :controller => 'admin', :action => 'projects'
         end
       end
     end
@@ -182,27 +177,28 @@ class ProjectsController < ApplicationController
     @wiki ||= @project.wiki
   end
   
+  # Edit @project
   def edit
-  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
+    if request.get?
     else
-      respond_to do |format|
-        format.html { 
-          settings
-          render :action => 'settings'
-        }
-        format.xml  { render :xml => @project.errors, :status => :unprocessable_entity }
+      @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
       end
     end
   end
@@ -245,6 +241,120 @@ 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]
@@ -254,6 +364,14 @@ 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.earilest_date_for_project(@project) || Date.today)
-    @to   ||= (TimeEntry.latest_date_for_project(@project) || Date.today)
+    @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)
   end
 
   def load_available_criterias

app/controllers/users_controller.rb

@@ -95,9 +95,7 @@ class UsersController < ApplicationController
     if request.post?
       @user.admin = params[:user][:admin] if params[:user][:admin]
       @user.login = params[:user][:login] if params[:user][:login]
-      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.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless params[:password].nil? or params[:password].empty? or @user.auth_source_id
       @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,37 +18,13 @@
 class VersionsController < ApplicationController
   menu_item :roadmap
   model_object Version
-  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 :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 :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,
@@ -63,17 +39,6 @@ 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|
@@ -90,7 +55,7 @@ class VersionsController < ApplicationController
         end
       else
         respond_to do |format|
-          format.html { render :action => 'new' }
+          format.html
           format.js do
             render(:update) {|page| page.alert(@version.errors.full_messages.join('\n')) }
           end
@@ -98,21 +63,14 @@ class VersionsController < ApplicationController
       end
     end
   end
-
-  def edit
-  end
   
-  def update
+  def edit
     if request.post? && params[:version]
       attributes = params[:version].dup
       attributes.delete('sharing') unless @version.allowed_sharings.include?(attributes['sharing'])
       if @version.update_attributes(attributes)
         flash[:notice] = l(:notice_successful_update)
         redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
-      else
-        respond_to do |format|
-          format.html { render :action => 'edit' }
-        end
       end
     end
   end
@@ -147,13 +105,4 @@ 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,4 +20,12 @@ 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,11 +32,6 @@ module ApplicationHelper
   end
 
   # Display a link if user is authorized
-  #
-  # @param [String] name Anchor text (passed to link_to)
-  # @param [Hash] options Hash params. 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])
   end
@@ -307,7 +302,7 @@ module ApplicationHelper
   def time_tag(time)
     text = distance_of_time_in_words(Time.now, time)
     if @project
-      link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => time.to_date}, :title => format_time(time))
+      link_to(text, {:controller => 'projects', :action => 'activity', :id => @project, :from => time.to_date}, :title => format_time(time))
     else
       content_tag('acronym', text, :title => format_time(time))
     end
@@ -810,7 +805,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 => (defined?(request) && request.ssl?), :default => Setting.gravatar_default})
+      options.merge!({:ssl => Setting.protocol == 'https', :default => Setting.gravatar_default})
       email = nil
       if user.respond_to?(:mail)
         email = user.mail

app/helpers/calendars_helper.rb

@@ -1,38 +0,0 @@
-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,16 +28,7 @@ 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/board.rb

@@ -18,7 +18,7 @@
 class Board < ActiveRecord::Base
   belongs_to :project
   has_many :topics, :class_name => 'Message', :conditions => "#{Message.table_name}.parent_id IS NULL", :order => "#{Message.table_name}.created_on DESC"
-  has_many :messages, :dependent => :destroy, :order => "#{Message.table_name}.created_on DESC"
+  has_many :messages, :dependent => :delete_all, :order => "#{Message.table_name}.created_on DESC"
   belongs_to :last_message, :class_name => 'Message', :foreign_key => :last_message_id
   acts_as_list :scope => :project_id
   acts_as_watchable

app/models/group.rb

@@ -31,7 +31,6 @@ class Group < Principal
   
   def user_added(user)
     members.each do |member|
-      next if member.project.nil?
       user_member = Member.find_by_project_id_and_user_id(member.project_id, user.id) || Member.new(:project_id => member.project_id, :user_id => user.id)
       member.member_roles.each do |member_role|
         user_member.member_roles << MemberRole.new(:role => member_role.role, :inherited_from => member_role.id)

app/models/issue.rb

@@ -68,8 +68,8 @@ class Issue < ActiveRecord::Base
                                   :conditions => ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"]
 
   before_create :default_assign
-  before_save :close_duplicates, :update_done_ratio_from_issue_status
-  after_save :reschedule_following_issues, :update_nested_set_attributes, :update_parent_attributes, :create_journal
+  before_save :reschedule_following_issues, :close_duplicates, :update_done_ratio_from_issue_status
+  after_save :update_nested_set_attributes, :update_parent_attributes, :create_journal
   after_destroy :destroy_children
   after_destroy :update_parent_attributes
   
@@ -237,7 +237,7 @@ class Issue < ActiveRecord::Base
       if !user.allowed_to?(:manage_subtasks, project)
         attrs.delete('parent_issue_id')
       elsif !attrs['parent_issue_id'].blank?
-        attrs.delete('parent_issue_id') unless Issue.visible(user).exists?(attrs['parent_issue_id'].to_i)
+        attrs.delete('parent_issue_id') unless Issue.visible(user).exists?(attrs['parent_issue_id'])
       end
     end
     
@@ -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,17 +357,10 @@ 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
-    users = project.assignable_users
-    users << author if author
-    users.uniq.sort
+    project.assignable_users
   end
   
   # Versions that the issue can be assigned to
@@ -691,7 +684,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
@@ -828,7 +821,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} j
+                                                  #{Issue.table_name} i, #{IssueStatus.table_name} s, #{joins} as j
                                               where 
                                                 i.status_id=s.id 
                                                 and #{where}

app/models/journal.rb

@@ -65,12 +65,4 @@ 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,8 +15,6 @@
 # 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
@@ -308,16 +306,13 @@ 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,11 +33,7 @@ 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,15 +412,7 @@ 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')
@@ -449,15 +441,6 @@ 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,20 +81,4 @@ 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,12 +352,6 @@ 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 => 'new'}, :class => 'icon icon-add' %>
+<%= link_to l(:label_project_new), {:controller => 'projects', :action => 'add'}, :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") %> <%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
+  <tr class="<%= cycle("odd", "even") %> <%= css_project_classes(project) %> <%= 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 => 'activities', :action => 'index', :id => @project, :show_messages => 1, :key => User.current.rss_key} %>
+	<%= f.link_to 'Atom', :url => {:controller => 'projects', :action => 'activity', :id => @project, :show_messages => 1, :key => User.current.rss_key} %>
 <% end %>
 
 <% content_for :header_tags do %>
-  <%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :show_messages => 1, :key => User.current.rss_key}) %>
+  <%= auto_discovery_link_tag(:atom, {:controller => 'projects', :action => 'activity', :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,7 +9,14 @@
 </fieldset>
 
 <p style="float:right;">
-  <%= link_to_previous_month(@year, @month) %> | <%= link_to_next_month(@year, @month) %>
+<%= 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))}
+                        %>
 </p>
 
 <p class="buttons">
@@ -36,9 +43,9 @@
 <%= render :partial => 'common/calendar', :locals => {:calendar => @calendar} %>
 
 <p class="legend cal">
-	<span class="starting"><%= l(:text_tip_issue_begin_day) %></span>
-	<span class="ending"><%= l(:text_tip_issue_end_day) %></span>
-	<span class="starting ending"><%= l(:text_tip_issue_begin_end_day) %></span>
+	<span class="starting"><%= l(:text_tip_task_begin_day) %></span>
+	<span class="ending"><%= l(:text_tip_task_end_day) %></span>
+	<span class="starting ending"><%= l(:text_tip_task_begin_end_day) %></span>
 </p>
 <% end %>
 

app/views/context_menus/issues.html.erb

@@ -4,22 +4,19 @@
 <% if !@issue.nil? -%>
 	<li><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue},
 	        :class => 'icon-edit', :disabled => !@can[:edit] %></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 %>
-
-  <% if @allowed_statuses.present? %>
 	<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>
+		    <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>
-  <% end %>
+<% 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 @trackers.nil? %>
 	<li class="folder">			
@@ -32,8 +29,6 @@
 		</ul>
 	</li>
 	<% end %>
-
-  <% if @projects.size == 1 %>
 	<li class="folder">			
 		<a href="#" class="submenu"><%= l(:field_priority) %></a>
 		<ul>
@@ -43,8 +38,6 @@
 		<% end -%>
 		</ul>
 	</li>
-  <% end %>
-
 	<% unless @project.nil? || @project.shared_versions.open.empty? -%>
 	<li class="folder">			
 		<a href="#" class="submenu"><%= l(:field_fixed_version) %></a>
@@ -58,7 +51,7 @@
 		</ul>
 	</li>
 	<% end %>
-	<% if @assignables.present? -%>
+	<% unless @assignables.nil? || @assignables.empty? -%>
 	<li class="folder">			
 		<a href="#" class="submenu"><%= l(:field_assigned_to) %></a>
 		<ul>
@@ -84,8 +77,7 @@
 		</ul>
 	</li>
 	<% end -%>
-
-  <% if Issue.use_field_for_done_ratio? && @projects.size == 1 %>
+  <% if Issue.use_field_for_done_ratio? %>
 	<li class="folder">
 		<a href="#" class="submenu"><%= l(:field_done_ratio) %></a>
 		<ul>
@@ -96,7 +88,6 @@
 		</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/groups/_users.html.erb

@@ -29,7 +29,7 @@
   <% remote_form_for(:group, @group, :url => {:controller => 'groups', :action => 'add_users', :id => @group}, :method => :post) do |f| %>
     <fieldset><legend><%=l(:label_user_new)%></legend>
     
-		<p><%= label_tag "user_search", l(:label_user_search) %><%= text_field_tag 'user_search', nil %></p>
+		<p><%= text_field_tag 'user_search', nil %></p>
 		<%= observe_field(:user_search,
                  :frequency => 0.5,
                  :update => :users,

app/views/issue_categories/_form.rhtml

@@ -2,5 +2,5 @@
 
 <div class="box">
 <p><%= f.text_field :name, :size => 30, :required => true %></p>
-<p><%= f.select :assigned_to_id, @project.users.sort.collect{|u| [u.name, u.id]}, :include_blank => true %></p>
+<p><%= f.select :assigned_to_id, @project.users.collect{|u| [u.name, u.id]}, :include_blank => true %></p>
 </div>

app/views/issue_moves/new.rhtml

@@ -33,11 +33,6 @@
   <%= select_tag('status_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_statuses, :id, :name)) %>
 </p>
 
-<p>
-  <label><%= l(:field_priority) %></label>
-  <%= select_tag('priority_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(IssuePriority.all, :id, :name)) %>
-</p>
-
 <p>
   <label><%= l(:field_start_date) %></label>
   <%= text_field_tag 'start_date', '', :size => 10 %><%= calendar_for('start_date') %>
@@ -48,11 +43,6 @@
   <%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %>
 </p>
 
-<fieldset><legend><%= l(:field_notes) %></legend>
-<%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>
-<%= wikitoolbar_for 'notes' %>
-</fieldset>
-
 <%= call_hook(:view_issues_move_bottom, :issues => @issues, :target_project => @target_project, :copy => !!@copy) %>
 </div>
 

app/views/issues/_action_menu.rhtml

@@ -4,7 +4,7 @@
 <% replace_watcher ||= 'watcher' %>
 <%= watcher_tag(@issue, User.current, {:id => replace_watcher, :replace => ['watcher','watcher2']}) %>
 <%= 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), {:controller => 'issue_moves', :action => 'new', :id => @issue, :copy_options => {:copy => 't'}}, :class => 'icon icon-copy' %>
-<%= link_to_if_authorized l(:button_move), {:controller => 'issue_moves', :action => 'new', :id => @issue}, :class => 'icon icon-move' %>
-<%= 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' %>
+<%= 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' %>
 </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 => 'create', :project_id => @project},
+                     {:controller => 'versions', :action => 'new', :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 => 'issues/form_custom_fields' %>
+<%= render :partial => 'form_custom_fields' %>
 
 <% end %>

app/views/issues/_form.rhtml

@@ -1,5 +1,3 @@
-<%= 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 },
@@ -8,8 +6,8 @@
 
 <p><%= f.text_field :subject, :size => 80, :required => true %></p>
                                      
-<% if User.current.allowed_to?(:manage_subtasks, @project) %>
-<p id="parent_issue"><%= f.text_field :parent_issue_id, :size => 10 %></p>
+<% unless (@issue.new_record? && @issue.parent_issue_id.nil?) || !User.current.allowed_to?(:manage_subtasks, @project) %>
+<p><%= f.text_field :parent_issue_id, :size => 10 %></p>
 <div id="parent_issue_candidates" class="autocomplete"></div>
 <%= javascript_tag "observeParentIssueField('#{auto_complete_issues_path(:id => @issue, :project_id => @project) }')" %>
 <% end %>
@@ -22,15 +20,15 @@
 </div>
 
 <div id="attributes" class="attributes">
-	<%= render :partial => 'issues/attributes' %>
+	<%= render :partial => 'attributes' %>
 </div>
 
 <% if @issue.new_record? %>
-<p id="attachments_form"><%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form' %></p>
+<p><%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form' %></p>
 <% end %>
 
 <% if @issue.new_record? && User.current.allowed_to?(:add_issue_watchers, @project) -%>
-<p id="watchers_form"><label><%= l(:label_issue_watchers) %></label>
+<p><label><%= l(:label_issue_watchers) %></label>
 <% @issue.project.users.sort.each do |user| -%>
 <label class="floating"><%= check_box_tag 'issue[watcher_user_ids][]', user.id, @issue.watched_by?(user) %> <%=h user %></label>
 <% end -%>

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.css_classes %>">
+  <div id="change-<%= journal.id %>" class="journal">
     <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 class="checkbox hide-when-print"><%= link_to image_tag('toggle_check.png'), {}, :onclick => 'toggleIssuesSelection(Element.up(this, "form")); return false;',
+        <th><%= 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 hide-when-print"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td>
+	    <td class="checkbox"><%= 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,7 +28,6 @@
 <% 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(:action => 'bulk_update') do %>
+<% form_tag() do %>
 <%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join %>
 <div class="box tabular">
 <fieldset class="attributes">

app/views/issues/index.rhtml

@@ -39,7 +39,6 @@
                        { :url => { :set_filter => 1 },
                          :before => 'selectAllOptions("selected_columns");',
                          :update => "content",
-                         :complete => "apply_filters_observer()",
                          :with => "Form.serialize('query_form')"
                        }, :class => 'icon icon-checked' %>
                        
@@ -79,7 +78,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, {:controller => 'journals', :action => 'index', :query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_changes_details)) %>
+    <%= auto_discovery_link_tag(:atom, {:action => 'changes', :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/issues/new.rhtml

@@ -1,7 +1,7 @@
 <h2><%=l(:label_issue_new)%></h2>
 
 <% labelled_tabular_form_for :issue, @issue, :url => {:controller => 'issues', :action => 'create', :project_id => @project},
-                             :html => {:multipart => true, :id => 'issue-form', :class => 'tabular new-issue-form'} do |f| %>
+                             :html => {:multipart => true, :id => 'issue-form'} do |f| %>
     <%= error_messages_for 'issue' %>
     <div class="box">
     <%= render :partial => 'issues/form', :locals => {:f => f} %>

app/views/my/page_layout.rhtml

@@ -5,9 +5,9 @@ function recreateSortables() {
     Sortable.destroy('list-left');
     Sortable.destroy('list-right');
     
-	Sortable.create("list-top", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('<%= url_for(:controller => 'my', :action => 'order_blocks', :group => 'top') %>', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-top")})}, only:'mypage-box', tag:'div'})
-	Sortable.create("list-left", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('<%= url_for(:controller => 'my', :action => 'order_blocks', :group => 'left') %>', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-left")})}, only:'mypage-box', tag:'div'})
-	Sortable.create("list-right", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('<%= url_for(:controller => 'my', :action => 'order_blocks', :group => 'right') %>', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-right")})}, only:'mypage-box', tag:'div'})
+	Sortable.create("list-top", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('/my/order_blocks?group=top', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-top")})}, only:'mypage-box', tag:'div'})
+	Sortable.create("list-left", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('/my/order_blocks?group=left', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-left")})}, only:'mypage-box', tag:'div'})
+	Sortable.create("list-right", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('/my/order_blocks?group=right', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-right")})}, only:'mypage-box', tag:'div'})
 }
 
 function updateSelect() {

app/views/news/edit.rhtml

@@ -12,7 +12,3 @@
                    }, :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,7 +45,6 @@
 
 <% 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 => "update", :id => @project } do |f| %>
+<% labelled_tabular_form_for :project, @project, :url => { :action => "edit", :id => @project } do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
 <% end %>

app/views/projects/add.rhtml

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

app/views/projects/add_file.rhtml

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

app/views/projects/index.rhtml

@@ -3,10 +3,10 @@
 <% end %>
 
 <div class="contextual">
-    <%= 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_project_new), {:controller => 'projects', :action => 'add'}, :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 => 'activities', :action => 'index' }%>
+    <%= link_to l(:label_overall_activity), { :controller => 'projects', :action => 'activity' }%>
 </div>
 
 <h2><%=l(:label_project_plural)%></h2>

app/views/projects/list_files.rhtml

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

app/views/projects/roadmap.rhtml

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

app/views/projects/settings/_activities.rhtml

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

app/views/projects/settings/_members.rhtml

@@ -58,7 +58,7 @@
   <% remote_form_for(:member, @member, :url => {:controller => 'members', :action => 'new', :id => @project}, :method => :post) do |f| %>
     <fieldset><legend><%=l(:label_member_new)%></legend>
     
-		<p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
+		<p><%= text_field_tag 'principal_search', nil %></p>
 		<%= observe_field(:principal_search,
                  :frequency => 0.5,
                  :update => :principals,

app/views/projects/settings/_versions.rhtml

@@ -6,7 +6,7 @@
     <th><%= l(:field_description) %></th>
     <th><%= l(:field_status) %></th>
     <th><%= l(:field_sharing) %></th>
-    <th><%= l(:label_wiki_page) %></th>
+    <th><%= l(:label_wiki_page) unless @project.wiki.nil? %></th>
     <th style="width:15%"></th>
     </tr></thead>
 	<tbody>
@@ -17,7 +17,7 @@
     <td class="description"><%=h version.description %></td>
     <td class="status"><%= l("version_status_#{version.status}") %></td>
     <td class="sharing"><%=h format_version_sharing(version.sharing) %></td>
-    <td><%= link_to_if_authorized(h(version.wiki_page_title), {:controller => 'wiki', :action => 'index', :id => version.project, :page => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %></td>
+    <td><%= link_to(h(version.wiki_page_title), :controller => 'wiki', :page => Wiki.titleize(version.wiki_page_title)) unless version.wiki_page_title.blank? || @project.wiki.nil? %></td>
     <td class="buttons">
     	<% if version.project == @project %>
     		<%= link_to_if_authorized l(:button_edit),   {:controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %>

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

app/views/queries/_filters.rhtml

@@ -53,18 +53,6 @@ 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 => to_path_param(@path)}, :method => 'get') do %>
+<% form_tag({:path => @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/settings/_authentication.rhtml

@@ -3,7 +3,7 @@
 <div class="box tabular settings">
 <p><%= setting_check_box :login_required %></p>
 
-<p><%= setting_select :autologin, [[l(:label_disabled), 0]] + [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]} %></p>
+<p><%= setting_select :autologin, [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]}, :blank => :label_disabled %></p>
 
 <p><%= setting_select :self_registration, [[l(:label_disabled), "0"],
 							                             [l(:label_registration_activation_by_email), "1"],

app/views/settings/_general.rhtml

@@ -6,7 +6,7 @@
 <p><%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
 <%= wikitoolbar_for 'settings_welcome_text' %>
 
-<p><%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
+<p><%= setting_text_field :attachment_max_size, :size => 6 %> KB</p>
 
 <p><%= setting_text_field :per_page_options, :size => 20 %><br />
 <em><%= l(:text_comma_separated) %></em></p>
@@ -26,7 +26,7 @@
 
 <p><%= setting_text_field :feeds_limit, :size => 6 %></p>
 
-<p><%= setting_text_field :file_max_size_displayed, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
+<p><%= setting_text_field :file_max_size_displayed, :size => 6 %> KB</p>
 
 <p><%= setting_text_field :diff_max_lines_displayed, :size => 6 %></p>
 

app/views/users/_general.rhtml

@@ -1,7 +1,7 @@
 <% labelled_tabular_form_for :user, @user, :url => { :controller => 'users', :action => "edit", :tab => nil }, :html => { :class => nil } do |f| %>
 	<%= render :partial => 'form', :locals => { :f => f } %>
 	<% if @user.active? -%>
-		<p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p>
+		<p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label>
 	<% end -%>
 	<p><%= submit_tag l(:button_save) %></p>
 <% end %>

app/views/users/show.rhtml

@@ -35,7 +35,7 @@
 <div class="splitcontentright">
 
 <% unless @events_by_day.empty? %>
-<h3><%= link_to l(:label_activity), :controller => 'activities', :action => 'index', :id => nil, :user_id => @user, :from => @events_by_day.keys.first %></h3>
+<h3><%= link_to l(:label_activity), :controller => 'projects', :action => 'activity', :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 => 'activities', :action => 'index', :id => nil, :user_id => @user, :key => User.current.rss_key} %>
+	<%= f.link_to 'Atom', :url => {:controller => 'projects', :action => 'activity', :id => nil, :user_id => @user, :key => User.current.rss_key} %>
 <% end %>
 
 <% content_for :header_tags do %>
-		<%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :user_id => @user, :format => :atom, :key => User.current.rss_key) %>
+		<%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :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 => 'update', :id => @version } do |f| %>
+<% labelled_tabular_form_for :version, @version, :url => { :action => 'edit' } do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
 <% end %>

app/views/versions/new.html.erb

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

app/views/versions/show.rhtml

@@ -1,6 +1,5 @@
 <div class="contextual">
 <%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => @version}, :class => 'icon icon-edit' %>
-<%= link_to_if_authorized(l(:button_edit_associated_wikipage, :page_title => @version.wiki_page_title), {:controller => 'wiki', :action => 'edit', :id => @version.project, :page => Wiki.titleize(@version.wiki_page_title)}, :class => 'icon icon-edit') unless @version.wiki_page_title.blank? || @version.project.wiki.nil? %>
 <%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
 </div>
 

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 => 'activities', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
+<%= auto_discovery_link_tag(:atom, {:controller => 'projects', :action => 'activity', :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 => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
+	<%= f.link_to 'Atom', :url => {:controller => 'projects', :action => 'activity', :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 => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
+<%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :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 => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
+	<%= f.link_to 'Atom', :url => {:controller => 'projects', :action => 'activity', :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 => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
+<%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
 <% end %>

app/views/workflows/index.rhtml

@@ -5,7 +5,6 @@
 <% if @workflow_counts.empty? %>
 <p class="nodata"><%= l(:label_no_data) %></p>
 <% else %>
-<div class="autoscroll">
 <table class="list">
 <thead>
     <tr>
@@ -31,5 +30,4 @@
 <% end -%>
 </tbody>
 </table>
-</div>
 <% end %>

config/environments/production.rb

@@ -4,17 +4,9 @@
 # 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,17 +78,3 @@ 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!(*args)
-        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

@@ -9,12 +9,12 @@ bg:
       short: "%b %d"
       long: "%B %d, %Y"
       
-    day_names: [Неделя, Понеделник, Вторник, Сряда, Четвъртък, Петък, Събота]
-    abbr_day_names: [Нед, Пон, Вто, Сря, Чет, Пет, Съб]
+    day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
+    abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
       
     # Don't forget the nil at the beginning; there's no such thing as a 0th month
-    month_names: [~, Януари, Февруари, Март, Април, Май, Юни, Юли, Август, Септември, Октомври, Ноември, Декември]
-    abbr_month_names: [~, Яну, Фев, Мар, Апр, Май, Юни, Юли, Авг, Сеп, Окт, Ное, Дек]
+    month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
+    abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
     # Used in date_select and datime_select.
     order: [ :year, :month, :day ]
 
@@ -31,38 +31,38 @@ bg:
     distance_in_words:
       half_a_minute: "half a minute"
       less_than_x_seconds:
-        one:   "по-малко от 1 секунда"
-        other: "по-малко от {{count}} секунди"
+        one:   "less than 1 second"
+        other: "less than {{count}} seconds"
       x_seconds:
-        one:   "1 секунда"
-        other: "{{count}} секунди"
+        one:   "1 second"
+        other: "{{count}} seconds"
       less_than_x_minutes:
-        one:   "по-малко от 1 минута"
-        other: "по-малко от {{count}} минути"
+        one:   "less than a minute"
+        other: "less than {{count}} minutes"
       x_minutes:
-        one:   "1 минута"
-        other: "{{count}} минути"
+        one:   "1 minute"
+        other: "{{count}} minutes"
       about_x_hours:
-        one:   "около 1 час"
-        other: "около {{count}} часа"
+        one:   "about 1 hour"
+        other: "about {{count}} hours"
       x_days:
-        one:   "1 ден"
-        other: "{{count}} дена"
+        one:   "1 day"
+        other: "{{count}} days"
       about_x_months:
-        one:   "около 1 месец"
-        other: "около {{count}} месеца"
+        one:   "about 1 month"
+        other: "about {{count}} months"
       x_months:
-        one:   "1 месец"
-        other: "{{count}} месеца"
+        one:   "1 month"
+        other: "{{count}} months"
       about_x_years:
-        one:   "около 1 година"
-        other: "около {{count}} години"
+        one:   "about 1 year"
+        other: "about {{count}} years"
       over_x_years:
-        one:   "над 1 година"
-        other: "над {{count}} години"
+        one:   "over 1 year"
+        other: "over {{count}} years"
       almost_x_years:
-        one:   "почти 1 година"
-        other: "почти {{count}} години"
+        one:   "almost 1 year"
+        other: "almost {{count}} years"
 
   number:
     format:
@@ -87,7 +87,7 @@ bg:
 # Used in array.to_sentence.
   support:
     array:
-      sentence_connector: "и"
+      sentence_connector: "and"
       skip_last_comma: false
       
   activerecord:
@@ -106,13 +106,13 @@ bg:
         taken: "вече съществува"
         not_a_number: "не е число"
         not_a_date: "е невалидна дата"
-        greater_than: "трябва да бъде по-голям[a/о] от {{count}}"
-        greater_than_or_equal_to: "трябва да бъде по-голям[a/о] от или равен[a/o] на {{count}}"
-        equal_to: "трябва да бъде равен[a/o] на {{count}}"
-        less_than: "трябва да бъде по-малък[a/o] от {{count}}"
-        less_than_or_equal_to: "трябва да бъде по-малък[a/o] от или равен[a/o] на {{count}}"
-        odd: "трябва да бъде нечетен[a/o]"
-        even: "трябва да бъде четен[a/o]"
+        greater_than: "must be greater than {{count}}"
+        greater_than_or_equal_to: "must be greater than or equal to {{count}}"
+        equal_to: "must be equal to {{count}}"
+        less_than: "must be less than {{count}}"
+        less_than_or_equal_to: "must be less than or equal to {{count}}"
+        odd: "must be odd"
+        even: "must be even"
         greater_than_start_date: "трябва да е след началната дата"
         not_same_project: "не е от същия проект"
         circular_dependency: "Тази релация ще доведе до безкрайна зависимост"
@@ -170,7 +170,7 @@ bg:
   field_mail: Email
   field_filename: Файл
   field_filesize: Големина
-  field_downloads: Изтеглени файлове
+  field_downloads: Downloads
   field_author: Автор
   field_created_on: От дата
   field_updated_on: Обновена
@@ -185,10 +185,10 @@ bg:
   field_title: Заглавие
   field_project: Проект
   field_issue: Задача
-  field_status: Състояние
+  field_status: Статус
   field_notes: Бележка
   field_is_closed: Затворена задача
-  field_is_default: Състояние по подразбиране
+  field_is_default: Статус по подразбиране
   field_tracker: Тракер
   field_subject: Относно
   field_due_date: Крайна дата
@@ -216,11 +216,12 @@ bg:
   field_port: Порт
   field_account: Профил
   field_base_dn: Base DN
-  field_attr_login: Атрибут Login 
-  field_attr_firstname: Атрибут Първо име (Firstname)
-  field_attr_lastname: Атрибут Фамилия (Lastname)
-  field_attr_mail: Атрибут Email
+  field_attr_login: Login attribute
+  field_attr_firstname: Firstname attribute
+  field_attr_lastname: Lastname attribute
+  field_attr_mail: Email attribute
   field_onthefly: Динамично създаване на потребител
+  field_start_date: Начална дата
   field_done_ratio: % Прогрес
   field_auth_source: Начин на оторизация
   field_hide_mail: Скрий e-mail адреса ми
@@ -247,12 +248,12 @@ bg:
   setting_login_required: Изискване за вход в системата
   setting_self_registration: Регистрация от потребители
   setting_attachment_max_size: Максимална големина на прикачен файл
-  setting_issues_export_limit: Максимален брой задачи за експорт
+  setting_issues_export_limit: Лимит за експорт на задачи
   setting_mail_from: E-mail адрес за емисии
   setting_host_name: Хост
   setting_text_formatting: Форматиране на текста
   setting_wiki_compression: Wiki компресиране на историята
-  setting_feeds_limit: Максимален брой за емисии
+  setting_feeds_limit: Лимит на Feeds
   setting_autofetch_changesets: Автоматично обработване на ревизиите
   setting_sys_api_enabled: Разрешаване на WS за управление
   setting_commit_ref_keywords: Отбелязващи ключови думи
@@ -268,9 +269,9 @@ bg:
   label_project_new: Нов проект
   label_project_plural: Проекти
   label_x_projects:
-    zero:  0 проекти
-    one:   1 проект
-    other: "{{count}} проекта"
+    zero:  no projects
+    one:   1 project
+    other: "{{count}} projects"
   label_project_all: Всички проекти
   label_project_latest: Последни проекти
   label_issue: Задача
@@ -291,9 +292,9 @@ bg:
   label_tracker_plural: Тракери
   label_tracker_new: Нов тракер
   label_workflow: Работен процес
-  label_issue_status: Състояние на задача
-  label_issue_status_plural: Състояния на задачи
-  label_issue_status_new: Ново състояние
+  label_issue_status: Статус на задача
+  label_issue_status_plural: Статуси на задачи
+  label_issue_status_new: Нов статус
   label_issue_category: Категория задача
   label_issue_category_plural: Категории задачи
   label_issue_category_new: Нова категория
@@ -321,14 +322,14 @@ bg:
   label_registered_on: Регистрация
   label_activity: Дейност
   label_new: Нов
-  label_logged_as: Здравейте,
+  label_logged_as: Логнат като
   label_environment: Среда
   label_authentication: Оторизация
   label_auth_source: Начин на оторозация
   label_auth_source_new: Нов начин на оторизация
   label_auth_source_plural: Начини на оторизация
   label_subproject_plural: Подпроекти
-  label_min_max_length: Минимална - максимална дължина
+  label_min_max_length: Мин. - Макс. дължина
   label_list: Списък
   label_date: Дата
   label_integer: Целочислен
@@ -337,10 +338,10 @@ bg:
   label_text: Дълъг текст
   label_attribute: Атрибут
   label_attribute_plural: Атрибути
-  label_download: "{{count}} изтегляне"
-  label_download_plural: "{{count}} изтегляния"
+  label_download: "{{count}} Download"
+  label_download_plural: "{{count}} Downloads"
   label_no_data: Няма изходни данни
-  label_change_status: Промяна на състоянието
+  label_change_status: Промяна на статуса
   label_history: История
   label_attachment: Файл
   label_attachment_new: Нов файл
@@ -367,21 +368,21 @@ bg:
   label_closed_issues: затворена
   label_closed_issues_plural: затворени
   label_x_open_issues_abbr_on_total:
-    zero:  0 отворени / {{total}}
-    one:   1 отворена / {{total}}
-    other: "{{count}} отворени / {{total}}"
+    zero:  0 open / {{total}}
+    one:   1 open / {{total}}
+    other: "{{count}} open / {{total}}"
   label_x_open_issues_abbr:
-    zero:  0 отворени
-    one:   1 отворена
-    other: "{{count}} отворени"
+    zero:  0 open
+    one:   1 open
+    other: "{{count}} open"
   label_x_closed_issues_abbr:
-    zero:  0 затворени
-    one:   1 затворена
-    other: "{{count}} затворени"
+    zero:  0 closed
+    one:   1 closed
+    other: "{{count}} closed"
   label_total: Общо
   label_permissions: Права
-  label_current_status: Текущо състояние
-  label_new_statuses_allowed: Позволени състояния
+  label_current_status: Текущ статус
+  label_new_statuses_allowed: Позволени статуси
   label_all: всички
   label_none: никакви
   label_next: Следващ
@@ -392,7 +393,7 @@ bg:
   label_per_page: На страница
   label_calendar: Календар
   label_months_from: месеца от
-  label_gantt: Мрежов график
+  label_gantt: Gantt
   label_internal: Вътрешен
   label_last_changes: "последни {{count}} промени"
   label_change_view_all: Виж всички промени
@@ -400,9 +401,9 @@ bg:
   label_comment: Коментар
   label_comment_plural: Коментари
   label_x_comments:
-    zero: 0 коментари
-    one: 1 коментар
-    other: "{{count}} коментари"
+    zero: no comments
+    one: 1 comment
+    other: "{{count}} comments"
   label_comment_add: Добавяне на коментар
   label_comment_added: Добавен коментар
   label_comment_delete: Изтриване на коментари
@@ -451,13 +452,13 @@ bg:
   label_wiki: Wiki
   label_wiki_edit: Wiki редакция
   label_wiki_edit_plural: Wiki редакции
-  label_wiki_page: Wiki страница
-  label_wiki_page_plural: Wiki страници
+  label_wiki_page: Wiki page
+  label_wiki_page_plural: Wiki pages
   label_index_by_title: Индекс
   label_index_by_date: Индекс по дата
   label_current_version: Текуща версия
   label_preview: Преглед
-  label_feed_plural: Емисии
+  label_feed_plural: Feeds
   label_changes_details: Подробни промени
   label_issue_tracking: Тракинг
   label_spent_time: Отделено време
@@ -476,7 +477,7 @@ bg:
   label_permissions_report: Справка за права
   label_watched_issues: Наблюдавани задачи
   label_related_issues: Свързани задачи
-  label_applied_status: Установено състояние
+  label_applied_status: Промени статуса на
   label_loading: Зареждане...
   label_relation_new: Нова релация
   label_relation_delete: Изтриване на релация
@@ -486,10 +487,10 @@ bg:
   label_blocked_by: блокирана от
   label_precedes: предшества
   label_follows: изпълнява се след
-  label_end_to_start: край към начало
-  label_end_to_end: край към край
-  label_start_to_start: начало към начало
-  label_start_to_end: начало към край
+  label_end_to_start: end to start
+  label_end_to_end: end to end
+  label_start_to_start: start to start
+  label_start_to_end: start to end
   label_stay_logged_in: Запомни ме
   label_disabled: забранено
   label_show_completed_versions: Показване на реализирани версии
@@ -532,7 +533,7 @@ bg:
   button_clear: Изчисти
   button_lock: Заключване
   button_unlock: Отключване
-  button_download: Изтегляне
+  button_download: Download
   button_list: Списък
   button_view: Преглед
   button_move: Преместване
@@ -542,8 +543,8 @@ bg:
   button_sort: Сортиране
   button_log_time: Отделяне на време
   button_rollback: Върни се към тази ревизия
-  button_watch: Наблюдаване
-  button_unwatch: Край на наблюдението
+  button_watch: Наблюдавай
+  button_unwatch: Спри наблюдението
   button_reply: Отговор
   button_archive: Архивиране
   button_unarchive: Разархивиране
@@ -580,11 +581,11 @@ bg:
   default_role_manager: Мениджър
   default_role_developer: Разработчик
   default_role_reporter: Публикуващ
-  default_tracker_bug: Грешка
+  default_tracker_bug: Бъг
   default_tracker_feature: Функционалност
   default_tracker_support: Поддръжка
   default_issue_status_new: Нова
-  default_issue_status_in_progress: Изпълнение
+  default_issue_status_in_progress: In Progress
   default_issue_status_resolved: Приключена
   default_issue_status_feedback: Обратна връзка
   default_issue_status_closed: Затворена
@@ -646,7 +647,7 @@ bg:
   label_age: Възраст
   notice_default_data_loaded: Примерната информацията е успешно заредена.
   text_load_default_configuration: Зареждане на примерна информация
-  text_no_configuration_data: "Все още не са конфигурирани Роли, тракери, състояния на задачи и работен процес.\nСтрого се препоръчва зареждането на примерната информация. Веднъж заредена ще имате възможност да я редактирате."
+  text_no_configuration_data: "Все още не са конфигурирани Роли, тракери, статуси на задачи и работен процес.\nСтрого се препоръчва зареждането на примерната информация. Веднъж заредена ще имате възможност да я редактирате."
   error_can_t_load_default_data: "Грешка при зареждане на примерната информация: {{value}}"
   button_update: Обновяване
   label_change_properties: Промяна на настройки
@@ -705,221 +706,201 @@ bg:
   setting_default_projects_public: Новите проекти са публични по подразбиране
   error_scm_annotate: "Обектът не съществува или не може да бъде анотиран."
   label_planning: Планиране
-  text_subprojects_destroy_warning: "Неговите подпроекти: {{value}} също ще бъдат изтрити."
-  label_and_its_subprojects: "{{value}} и неговите подпроекти"
-  mail_body_reminder: "{{count}} задачи, назначени на вас са с краен срок в следващите {{days}} дни:"
-  mail_subject_reminder: "{{count}} задачи с краен срок с следващите {{days}} дни"
-  text_user_wrote: "{{value}} написа:"
-  label_duplicated_by: дублирана от
-  setting_enabled_scm: Разрешена SCM
-  text_enumeration_category_reassign_to: 'Пресвържете ги към тази стойност:'
-  text_enumeration_destroy_question: "{{count}} обекта са свързани с тази стойност."
-  label_incoming_emails: Входящи e-mail-и
-  label_generate_key: Генериране на ключ
-  setting_mail_handler_api_enabled: Разрешаване на WS за входящи e-mail-и
-  setting_mail_handler_api_key: API ключ
-  text_email_delivery_not_configured: "Изпращането на e-mail-и не е конфигурирано и известията не са разрешени.\nКонфигурирайте вашия SMTP сървър в config/email.yml и рестартирайте Redmine, за да ги разрешите."
-  field_parent_title: Родителска страница
-  label_issue_watchers: Наблюдатели
-  setting_commit_logs_encoding: Кодова таблица на съобщенията при поверяване
-  button_quote: Цитат
-  setting_sequential_project_identifiers: Генериране на последователни проектни идентификатори
-  notice_unable_delete_version: Невъзможност за изтриване на версия
-  label_renamed: преименуван
-  label_copied: копиран
-  setting_plain_text_mail: само чист текст (без HTML)
-  permission_view_files: Разглеждане на файлове
-  permission_edit_issues: Редактиране на задачи
-  permission_edit_own_time_entries: Редактиране на собствените time logs
-  permission_manage_public_queries: Управление на публичните заявки
-  permission_add_issues: Добавяне на задачи
+  text_subprojects_destroy_warning: "Its subproject(s): {{value}} will be also deleted."
+  label_and_its_subprojects: "{{value}} and its subprojects"
+  mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:"
+  mail_subject_reminder: "{{count}} issue(s) due in the next {{days}} days"
+  text_user_wrote: "{{value}} wrote:"
+  label_duplicated_by: duplicated by
+  setting_enabled_scm: Enabled SCM
+  text_enumeration_category_reassign_to: 'Reassign them to this value:'
+  text_enumeration_destroy_question: "{{count}} objects are assigned to this value."
+  label_incoming_emails: Incoming emails
+  label_generate_key: Generate a key
+  setting_mail_handler_api_enabled: Enable WS for incoming emails
+  setting_mail_handler_api_key: API key
+  text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+  field_parent_title: Parent page
+  label_issue_watchers: Watchers
+  setting_commit_logs_encoding: Commit messages encoding
+  button_quote: Quote
+  setting_sequential_project_identifiers: Generate sequential project identifiers
+  notice_unable_delete_version: Unable to delete version
+  label_renamed: renamed
+  label_copied: copied
+  setting_plain_text_mail: plain text only (no HTML)
+  permission_view_files: View files
+  permission_edit_issues: Edit issues
+  permission_edit_own_time_entries: Edit own time logs
+  permission_manage_public_queries: Manage public queries
+  permission_add_issues: Add issues
   permission_log_time: Log spent time
-  permission_view_changesets: Разглеждане на changesets
-  permission_view_time_entries: Разглеждане на изразходваното време
-  permission_manage_versions: Управление на версиите
-  permission_manage_wiki: Управление на wiki
-  permission_manage_categories: Управление на категориите задачи
-  permission_protect_wiki_pages: Заключване на wiki страници
-  permission_comment_news: Коментиране на новини
-  permission_delete_messages: Изтриване на съобщения
-  permission_select_project_modules: Избор на проектни модули
-  permission_manage_documents: Управление на документи
-  permission_edit_wiki_pages: Редактиране на wiki страници
-  permission_add_issue_watchers: Добавяне на наблюдатели
-  permission_view_gantt: Разглеждане на мрежов график
-  permission_move_issues: Преместване на задачи
-  permission_manage_issue_relations: Управление на връзките между задачите
-  permission_delete_wiki_pages: Изтриване на wiki страници
-  permission_manage_boards: Управление на boards
-  permission_delete_wiki_pages_attachments: Изтриване на прикачени файлове
-  permission_view_wiki_edits: Разглеждане на wiki история
-  permission_add_messages: Публикуване на съобщения
-  permission_view_messages: Разглеждане на съобщения
-  permission_manage_files: Управление на файлове
-  permission_edit_issue_notes: Редактиране на бележки
-  permission_manage_news: Управление на новини
-  permission_view_calendar: Разглеждане на календари
-  permission_manage_members: Управление на членовете (на екип)
-  permission_edit_messages: Редактиране на съобщения
-  permission_delete_issues: Изтриване на задачи
-  permission_view_issue_watchers: Разглеждане на списък с наблюдатели
-  permission_manage_repository: Управление на хранилища
-  permission_commit_access: Поверяване
-  permission_browse_repository: Разглеждане на хранилища
-  permission_view_documents: Разглеждане на документи
-  permission_edit_project: Редактиране на проект
-  permission_add_issue_notes: Добаване на бележки
-  permission_save_queries: Запис на запитвания (queries)
-  permission_view_wiki_pages: Разглеждане на wiki
-  permission_rename_wiki_pages: Преименуване на wiki страници
-  permission_edit_time_entries: Редактиране на time logs
-  permission_edit_own_issue_notes: Редактиране на собствени бележки
-  setting_gravatar_enabled: Използване на портребителски икони от Gravatar
-  label_example: Пример
+  permission_view_changesets: View changesets
+  permission_view_time_entries: View spent time
+  permission_manage_versions: Manage versions
+  permission_manage_wiki: Manage wiki
+  permission_manage_categories: Manage issue categories
+  permission_protect_wiki_pages: Protect wiki pages
+  permission_comment_news: Comment news
+  permission_delete_messages: Delete messages
+  permission_select_project_modules: Select project modules
+  permission_manage_documents: Manage documents
+  permission_edit_wiki_pages: Edit wiki pages
+  permission_add_issue_watchers: Add watchers
+  permission_view_gantt: View gantt chart
+  permission_move_issues: Move issues
+  permission_manage_issue_relations: Manage issue relations
+  permission_delete_wiki_pages: Delete wiki pages
+  permission_manage_boards: Manage boards
+  permission_delete_wiki_pages_attachments: Delete attachments
+  permission_view_wiki_edits: View wiki history
+  permission_add_messages: Post messages
+  permission_view_messages: View messages
+  permission_manage_files: Manage files
+  permission_edit_issue_notes: Edit notes
+  permission_manage_news: Manage news
+  permission_view_calendar: View calendrier
+  permission_manage_members: Manage members
+  permission_edit_messages: Edit messages
+  permission_delete_issues: Delete issues
+  permission_view_issue_watchers: View watchers list
+  permission_manage_repository: Manage repository
+  permission_commit_access: Commit access
+  permission_browse_repository: Browse repository
+  permission_view_documents: View documents
+  permission_edit_project: Edit project
+  permission_add_issue_notes: Add notes
+  permission_save_queries: Save queries
+  permission_view_wiki_pages: View wiki
+  permission_rename_wiki_pages: Rename wiki pages
+  permission_edit_time_entries: Edit time logs
+  permission_edit_own_issue_notes: Edit own notes
+  setting_gravatar_enabled: Use Gravatar user icons
+  label_example: Example
   text_repository_usernames_mapping: "Select ou 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."
-  permission_edit_own_messages: Редактиране на собствени съобщения
-  permission_delete_own_messages: Изтриване на собствени съобщения
-  label_user_activity: "Активност на {{value}}"
-  label_updated_time_by: "Обновена от {{author}} преди {{age}}"
-  text_diff_truncated: '... Този diff не е пълен, понеже е надхвърля максималния размер, който може да бъде показан.'
-  setting_diff_max_lines_displayed: Максимален брой показани diff редове
-  text_plugin_assets_writable: Папката на приставките е разрешена за запис
-  warning_attachments_not_saved: "{{count}} файла не бяха записани."
-  button_create_and_continue: Създаване и продължаване
-  text_custom_field_possible_values_info: 'Една стойност на ред'
+  permission_edit_own_messages: Edit own messages
+  permission_delete_own_messages: Delete own messages
+  label_user_activity: "{{value}}'s activity"
+  label_updated_time_by: "Updated by {{author}} {{age}} ago"
+  text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
+  setting_diff_max_lines_displayed: Max number of diff lines displayed
+  text_plugin_assets_writable: Plugin assets directory writable
+  warning_attachments_not_saved: "{{count}} file(s) could not be saved."
+  button_create_and_continue: Create and continue
+  text_custom_field_possible_values_info: 'One line for each value'
   label_display: Display
   field_editable: Editable
-  setting_repository_log_display_limit: Максимален брой на показванете ревизии в лог файла
-  setting_file_max_size_displayed: Максимален размер на текстовите файлове, показвани inline
-  field_watcher: Наблюдател
-  setting_openid: Рарешаване на OpenID вход и регистрация
+  setting_repository_log_display_limit: Maximum number of revisions displayed on file log
+  setting_file_max_size_displayed: Max size of text files displayed inline
+  field_watcher: Watcher
+  setting_openid: Allow OpenID login and registration
   field_identity_url: OpenID URL
-  label_login_with_open_id_option: или вход чрез OpenID
-  field_content: Съдържание
-  label_descending: Намаляващ
-  label_sort: Сортиране
-  label_ascending: Нарастващ
-  label_date_from_to: От {{start}} до {{end}}
+  label_login_with_open_id_option: or login with OpenID
+  field_content: Content
+  label_descending: Descending
+  label_sort: Sort
+  label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}
   label_greater_or_equal: ">="
   label_less_or_equal: <=
-  text_wiki_page_destroy_question: Тази страница има {{descendants}} страници деца и descendant(s). Какво желаете да правите?
-  text_wiki_page_reassign_children: Преназначаване на страниците деца на тази родителска страница
-  text_wiki_page_nullify_children: Запазване на тези страници като коренни страници
-  text_wiki_page_destroy_children: Изтриване на страниците деца и всички техни descendants
-  setting_password_min_length: Минимална дължина на парола
-  field_group_by: Групиране на резултатите по
-  mail_subject_wiki_content_updated: "Wiki страницата '{{id}}' не беше обновена"
-  label_wiki_content_added: Wiki страница беше добавена
-  mail_subject_wiki_content_added: "Wiki страницата '{{id}}' беше добавена"
-  mail_body_wiki_content_added: Wiki страницата '{{id}}' беше добавена от {{author}}.
-  label_wiki_content_updated: Wiki страница беше обновена
-  mail_body_wiki_content_updated: Wiki страницата '{{id}}' беше обновена от {{author}}.
-  permission_add_project: Създаване на проект
-  setting_new_project_user_role_id: Роля, давана на потребител, създаващ проекти, който не е администратор
-  label_view_all_revisions: Разглеждане на всички ревизии
-  label_tag: Версия
-  label_branch: работен вариант
-  error_no_tracker_in_project: Няма асоциирани тракери с този проект. Проверете настройките на проекта.
-  error_no_default_issue_status: Няма установено подразбиращо се състояние за задачите. Моля проверете вашата конфигурация (Вижте "Администрация -> Състояния на задачи").
-  text_journal_changed: "{{label}} променен от {{old}} на {{new}}"
-  text_journal_set_to: "{{label}} установен на {{value}}"
-  text_journal_deleted: "{{label}} изтрит ({{old}})"
-  label_group_plural: Групи
-  label_group: Група
-  label_group_new: Нова група
-  label_time_entry_plural: Използвано време
-  text_journal_added: "Добавено {{label}} {{value}}"
-  field_active: Активен
-  enumeration_system_activity: Системна активност
-  permission_delete_issue_watchers: Изтриване на наблюдатели
-  version_status_closed: затворена
-  version_status_locked: заключена
-  version_status_open: отворена
-  error_can_not_reopen_issue_on_closed_version: Задача, асоциирана със затворена версия не може да бъде отворена отново
-  label_user_anonymous: Анонимен
-  button_move_and_follow: Преместване и продължаване
-  setting_default_projects_modules: Активирани модули по подразбиране за нов проект
-  setting_gravatar_default: Подразбиращо се изображение от Gravatar
+  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: С проектна йерархия
-  label_version_sharing_system: С всички проекти
-  label_version_sharing_descendants: С подпроекти
-  label_version_sharing_tree: С дърво на проектите
-  label_version_sharing_none: Не споделен
-  error_can_not_archive_project: Този проект не може да бъде архивиран
-  button_duplicate: Дублиране
-  button_copy_and_follow: Копиране и продължаване
-  label_copy_source: Източник
-  setting_issue_done_ratio: Изчисление на процента на готови задачи с
-  setting_issue_done_ratio_issue_status: Използване на състоянието на задачите
-  error_issue_done_ratios_not_updated: Процентът на завършените задачи не е обновен.
-  error_workflow_copy_target: Моля изберете тракер(и) и роля (роли).
-  setting_issue_done_ratio_issue_field: Използване на поле 'задача'
-  label_copy_same_as_target: Също като целта
-  label_copy_target: Цел
-  notice_issue_done_ratios_updated: Обновен процент на завършените задачи.
-  error_workflow_copy_source: Моля изберете source тракер или роля
-  label_update_issue_done_ratios: Обновяване на процента на завършените задачи
-  setting_start_of_week: Първи ден на седмицата
-  permission_view_issues: Разглеждане на задачите
-  label_display_used_statuses_only: Показване само на състоянията, използвани от този тракер
-  label_revision_id: Ревизия {{value}}
-  label_api_access_key: API ключ за достъп
-  label_api_access_key_created_on: API ключ за достъп е създаден преди {{value}}
-  label_feeds_access_key: RSS access ключ
-  notice_api_access_key_reseted: Вашият API ключ за достъп беше изчистен.
-  setting_rest_api_enabled: Разрешаване на REST web сървис
-  label_missing_api_access_key: Липсващ API ключ
-  label_missing_feeds_access_key: Липсващ RSS ключ за достъп
-  button_show: Показване
-  text_line_separated: Позволени са много стойности (по едно на ред).
-  setting_mail_handler_body_delimiters: Отрязване на e-mail-ите след един от тези редове
-  permission_add_subprojects: Създаване на подпроекти
-  label_subproject_new: Нов подпроект
+  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: |-
-    Вие сте на път да премахнете някои или всички ваши разрешения и е възможно след това на да не можете да редатирате този проект.
-    Сигурен ли сте, че искате да продължите?
-  label_close_versions: Затваряне на завършените версии
+    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: Заключена
-  permission_export_wiki_pages: Експорт на wiki страници
+  label_board_locked: Locked
+  permission_export_wiki_pages: Export wiki pages
   setting_cache_formatted_text: Cache formatted text
-  permission_manage_project_activities: Управление на дейностите на проекта
-  error_unable_delete_issue_status: Невъзможност за изтриване на състояние на задача
-  label_profile: Профил
-  permission_manage_subtasks: Управление на подзадачите
-  field_parent_issue: Родителска задача
-  label_subtask_plural: Подзадачи
-  label_project_copy_notifications: Изпращане на Send e-mail известия по време на копирането на проекта
-  error_can_not_delete_custom_field: Невъзможност за изтриване на потребителско поле
-  error_unable_to_connect: Невъзможност за свързване с ({{value}})
-  error_can_not_remove_role: Тази роля се използва и не може да бъде изтрита.
-  error_can_not_delete_tracker: Този тракер съдържа задачи и не може да бъде изтрит.
+  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: Блокове в личната страница
-  notice_failed_to_save_members: "Невъзможност за запис на член(ове): {{errors}}."
-  text_zoom_out: Намаляване
-  text_zoom_in: Увеличаване
-  notice_unable_delete_time_entry: Невъзможност за изтриване на запис на time log.
-  label_overall_spent_time: Общо употребено време
+  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
-  notice_not_authorized_archived_project: Проектът, който се опитвате да видите е архивиран.
-  text_tip_issue_end_day: задача, завършваща този ден
-  field_text: Текстово поле
-  label_user_mail_option_only_owner: Само за неща, на които аз съм собственик
-  field_member_of_group: Член на група
-  project_module_gantt: Мрежов график
-  text_are_you_sure_with_children: Изтриване на задачата и нейните подзадачи?
-  text_tip_issue_begin_end_day: задача, започваща и завършваща този ден
-  setting_default_notification_option: Подразбиращ се начин за известяване
-  project_module_calendar: Календар
-  label_user_mail_option_only_my_events: Само за неща, в които съм включен/а
-  text_tip_issue_begin_day: задача, започваща този ден
-  label_user_mail_option_only_assigned: Само за неща, назначени на мен
-  button_edit_associated_wikipage: "Редактиране на асоциираната Wiki страница: {{page_title}}"
-  field_assigned_to_role: Assignee's role
-  field_start_date: Начална дата
-  label_principal_search: "Търсене на потребител или група:"
-  label_user_search: "Търсене на потребител:"
-  field_visible: Видим
-  setting_emails_header: Emails header

config/locales/bs.yml

@@ -130,7 +130,6 @@ 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
   
@@ -252,6 +251,7 @@ bs:
   field_attr_lastname: Atribut za prezime
   field_attr_mail: Atribut za email
   field_onthefly: 'Kreiranje korisnika "On-the-fly"'
+  field_start_date: Početak
   field_done_ratio: % Realizovano
   field_auth_source: Mod za authentifikaciju
   field_hide_mail: Sakrij moju email adresu
@@ -749,9 +749,9 @@ bs:
   text_subprojects_destroy_warning: "Podprojekt(i): {{value}} će takođe biti izbrisani."
   text_workflow_edit: Odaberite ulogu i područje aktivnosti za ispravku toka promjena na aktivnosti
   text_are_you_sure: Da li ste sigurni ?
-  text_tip_issue_begin_day: zadatak počinje danas
-  text_tip_issue_end_day: zadatak završava danas
-  text_tip_issue_begin_end_day: zadatak započinje i završava danas
+  text_tip_task_begin_day: zadatak počinje danas
+  text_tip_task_end_day: zadatak završava danas
+  text_tip_task_begin_end_day: zadatak započinje i završava danas
   text_project_identifier_info: 'Samo mala slova (a-z), brojevi i crtice su dozvoljeni.<br />Nakon snimanja, identifikator se ne može mijenjati.'
   text_caracters_maximum: "maksimum {{count}} karaktera."
   text_caracters_minimum: "Dužina mora biti najmanje {{count}} znakova."
@@ -924,14 +924,3 @@ 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
-
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"

config/locales/ca.yml

@@ -1,8 +1,4 @@
-# Redmine catalan translation: 
-# by Joan Duran
-
 ca:
-  # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
   direction: ltr
   date:
     formats:
@@ -69,7 +65,6 @@ ca:
         other: "almost {{count}} years"
 
   number:
-    # Default format for numbers
     format:
       separator: "."
       delimiter: ""
@@ -88,7 +83,6 @@ ca:
           mb: "MB"
           gb: "GB"
           tb: "TB"
-
         
 # Used in array.to_sentence.
   support:
@@ -122,7 +116,6 @@ 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
   
@@ -156,33 +149,18 @@ 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}}"
@@ -195,10 +173,6 @@ 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"
@@ -238,7 +212,6 @@ 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
@@ -264,6 +237,7 @@ ca:
   field_attr_lastname: Atribut del cognom
   field_attr_mail: Atribut del correu electrònic
   field_onthefly: "Creació de l'usuari «al vol»"
+  field_start_date: Inici
   field_done_ratio: % realitzat
   field_auth_source: "Mode d'autenticació"
   field_hide_mail: "Oculta l'adreça de correu electrònic"
@@ -282,7 +256,6 @@ 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
@@ -292,9 +265,6 @@ 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ó"
@@ -330,35 +300,20 @@ 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
@@ -373,7 +328,6 @@ 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
@@ -403,8 +357,6 @@ 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
@@ -414,13 +366,10 @@ 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
@@ -467,13 +416,12 @@ 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
@@ -493,7 +441,6 @@ 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
@@ -528,9 +475,8 @@ 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
@@ -587,8 +533,6 @@ 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
@@ -611,21 +555,17 @@ 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_copied: copiat
   label_renamed: reanomenat
+  label_copied: copiat
   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
@@ -651,7 +591,6 @@ 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
@@ -689,8 +628,6 @@ 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
@@ -706,8 +643,6 @@ 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}}"
@@ -753,28 +688,6 @@ 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
@@ -796,12 +709,11 @@ 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: "Registre de temps"
+  button_log_time: "Hora d'entrada"
   button_rollback: Torna a aquesta versió
   button_watch: Vigila
   button_unwatch: No vigilis
@@ -812,24 +724,15 @@ 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ó
@@ -837,13 +740,9 @@ 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_issue_begin_day: "tasca que s'inicia aquest dia"
-  text_tip_issue_end_day: tasca que finalitza aquest dia
-  text_tip_issue_begin_end_day: "tasca que s'inicia i finalitza aquest dia"
+  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"
   text_project_identifier_info: "Es permeten lletres en minúscules (a-z), números i guions.<br />Un cop desat, l'identificador no es pot modificar."
   text_caracters_maximum: "{{count}} caràcters com a màxim."
   text_caracters_minimum: "Com a mínim ha de tenir {{count}} caràcters."
@@ -851,7 +750,6 @@ 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}}."
@@ -872,21 +770,14 @@ 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_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
+  text_custom_field_possible_values_info: 'Una línia per a cada valor'
   
   default_role_manager: Gestor
   default_role_developer: Desenvolupador
@@ -913,13 +804,106 @@ ca:
   enumeration_issue_priorities: Prioritat dels assumptes
   enumeration_doc_categories: Categories del document
   enumeration_activities: Activitats (seguidor de temps)
-  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
-
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
+  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

config/locales/cs.yml

@@ -24,8 +24,8 @@ cs:
       time: "%H:%M"
       short: "%d %b %H:%M"
       long: "%B %d, %Y %H:%M"
-    am: "dop."
-    pm: "odp."
+    am: "am"
+    pm: "pm"
     
   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:   "témeř 1 rok"
-        other: "téměř {{count}} roky"
+        one:   "almost 1 year"
+        other: "almost {{count}} years"
 
   number:
     format:
@@ -116,7 +116,6 @@ 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
@@ -150,19 +149,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: Záznam a/nebo revize neexistuje v repozitáři.
+  notice_scm_error: Entry and/or revision doesn't exist in the repository.
   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: "Chyba při uložení {{count}} úkolu(ů) z {{total}} vybraných: {{ids}}."
+  notice_failed_to_save_issues: "Failed to save {{count}} issue(s) on {{total}} selected: {{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 repozitáři."
-  error_scm_command_failed: "Při pokusu o přístup k repozitáři došlo k chybě: {{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_issue_not_found_in_project: 'Úkol nebyl nalezen nebo nepatří k tomuto projektu'
   
   mail_subject_lost_password: "Vaše heslo ({{value}})"
@@ -210,10 +209,10 @@ cs:
   field_due_date: Uzavřít do
   field_assigned_to: Přiřazeno
   field_priority: Priorita
-  field_fixed_version: Cílová verze
+  field_fixed_version: Přiřazeno k verzi
   field_user: Uživatel
   field_role: Role
-  field_homepage: Domovská stránka
+  field_homepage: Homepage
   field_is_public: Veřejný
   field_parent: Nadřazený projekt
   field_is_in_roadmap: Úkoly zobrazené v plánu
@@ -237,6 +236,7 @@ cs:
   field_attr_lastname: Příjemní (atribut)
   field_attr_mail: Email (atribut)
   field_onthefly: Automatické vytváření uživatelů
+  field_start_date: Začátek
   field_done_ratio: % Hotovo
   field_auth_source: Autentifikační mód
   field_hide_mail: Nezobrazovat můj email
@@ -264,18 +264,18 @@ cs:
   setting_app_subtitle: Podtitulek aplikace
   setting_welcome_text: Uvítací text
   setting_default_language: Výchozí jazyk
-  setting_login_required: Autentifikace vyžadována
+  setting_login_required: Auten. 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: Jméno serveru
+  setting_host_name: Host name
   setting_text_formatting: Formátování textu
-  setting_wiki_compression: Komprese historie Wiki
-  setting_feeds_limit: Limit obsahu příspěvků
+  setting_wiki_compression: Komperese historie Wiki
+  setting_feeds_limit: Feed content limit
   setting_default_projects_public: Nové projekty nastavovat jako veřejné
-  setting_autofetch_changesets: Automaticky stahovat commity
+  setting_autofetch_changesets: Autofetch commits
   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 +289,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: Dny zobrazené v činnosti projektu
-  setting_display_subprojects_issues: Automaticky zobrazit úkoly podprojektu v hlavním projektu
+  setting_activity_days_default: Days displayed on project activity
+  setting_display_subprojects_issues: Display subprojects issues on main projects by default
   
   project_module_issue_tracking: Sledování úkolů
   project_module_time_tracking: Sledování času
@@ -298,7 +298,7 @@ cs:
   project_module_documents: Dokumenty
   project_module_files: Soubory
   project_module_wiki: Wiki
-  project_module_repository: Repozitář
+  project_module_repository: Repository
   project_module_boards: Diskuse
   
   label_user: Uživatel
@@ -308,16 +308,16 @@ cs:
   label_project_new: Nový projekt
   label_project_plural: Projekty
   label_x_projects:
-    zero:  žádné projekty
-    one:   1 projekt
-    other: "{{count}} projekty(ů)"
+    zero:  no projects
+    one:   1 project
+    other: "{{count}} projects"
   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 podle {{value}}"
+  label_issues_by: "Úkoly od uživatele {{value}}"
   label_issue_added: Úkol přidán
   label_issue_updated: Úkol aktualizován
   label_document: Dokument
@@ -334,7 +334,7 @@ cs:
   label_tracker: Fronta
   label_tracker_plural: Fronty
   label_tracker_new: Nová fronta
-  label_workflow: Průběh práce
+  label_workflow: Workflow
   label_issue_status: Stav úkolu
   label_issue_status_plural: Stavy úkolů
   label_issue_status_new: Nový stav
@@ -377,14 +377,14 @@ cs:
   label_list: Seznam
   label_date: Datum
   label_integer: Celé číslo
-  label_float: Desetinné číslo
+  label_float: Desetiné číslo
   label_boolean: Ano/Ne
   label_string: Text
   label_text: Dlouhý text
   label_attribute: Atribut
   label_attribute_plural: Atributy
-  label_download: "{{count}} stažení"
-  label_download_plural: "{{count}} stažení"
+  label_download: "{{count}} Download"
+  label_download_plural: "{{count}} Downloads"
   label_no_data: Žádné položky
   label_change_status: Změnit stav
   label_history: Historie
@@ -393,7 +393,7 @@ cs:
   label_attachment_delete: Odstranit soubor
   label_attachment_plural: Soubory
   label_file_added: Soubor přidán
-  label_report: Přehled
+  label_report: Přeheled
   label_report_plural: Přehledy
   label_news: Novinky
   label_news_new: Přidat novinku
@@ -415,17 +415,17 @@ cs:
   label_closed_issues: uzavřený
   label_closed_issues_plural: uzavřené
   label_x_open_issues_abbr_on_total:
-    zero:  0 otevřených / {{total}}
-    one:   1 otevřený / {{total}}
-    other: "{{count}} otevřených / {{total}}"
+    zero:  0 open / {{total}}
+    one:   1 open / {{total}}
+    other: "{{count}} open / {{total}}"
   label_x_open_issues_abbr:
-    zero:  0 otevřených
-    one:   1 otevřený
-    other: "{{count}} otevřených"
+    zero:  0 open
+    one:   1 open
+    other: "{{count}} open"
   label_x_closed_issues_abbr:
-    zero:  0 uzavřených
-    one:   1 uzavřený
-    other: "{{count}} uzavřených"
+    zero:  0 closed
+    one:   1 closed
+    other: "{{count}} closed"
   label_total: Celkem
   label_permissions: Práva
   label_current_status: Aktuální stav
@@ -449,9 +449,9 @@ cs:
   label_comment: Komentář
   label_comment_plural: Komentáře
   label_x_comments:
-    zero: žádné komentáře
-    one: 1 komentář
-    other: "{{count}} komentářů"
+    zero: no comments
+    one: 1 comment
+    other: "{{count}} comments"
   label_comment_add: Přidat komentáře
   label_comment_added: Komentář přidán
   label_comment_delete: Odstranit komentář
@@ -481,8 +481,8 @@ cs:
   label_contains: obsahuje
   label_not_contains: neobsahuje
   label_day_plural: dny
-  label_repository: Repozitář
-  label_repository_plural: Repozitáře
+  label_repository: Repository
+  label_repository_plural: Repository
   label_browse: Procházet
   label_modification: "{{count}} změna"
   label_modification_plural: "{{count}} změn"
@@ -531,7 +531,7 @@ cs:
   label_diff_inline: uvnitř
   label_diff_side_by_side: vedle sebe
   label_options: Nastavení
-  label_copy_workflow_from: Kopírovat průběh práce z
+  label_copy_workflow_from: Kopírovat workflow z
   label_permissions_report: Přehled práv
   label_watched_issues: Sledované úkoly
   label_related_issues: Související úkoly
@@ -552,7 +552,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: já
+  label_me: mě
   label_board: Fórum
   label_board_new: Nové fórum
   label_board_plural: Fóra
@@ -575,12 +575,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: Vyberte projekt...
+  label_jump_to_a_project: Zvolit 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: Hromadná úprava vybraných úkolů
+  label_bulk_edit_selected_issues: Bulk edit selected issues
   label_theme: Téma
   label_default: Výchozí
   label_search_titles_only: Vyhledávat pouze v názvech
@@ -599,7 +599,7 @@ cs:
   label_scm: SCM
   label_plugins: Doplňky
   label_ldap_authentication: Autentifikace LDAP
-  label_downloads_abbr: Staž.
+  label_downloads_abbr: D/L
   label_optional_description: Volitelný popis
   label_add_another_file: Přidat další soubor
   label_preferences: Nastavení
@@ -652,33 +652,33 @@ 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 průběhu práce
+  text_workflow_edit: Vyberte roli a frontu k editaci workflow
   text_are_you_sure: Jste si jisti?
-  text_tip_issue_begin_day: úkol začíná v tento den
-  text_tip_issue_end_day: úkol končí v tento den
-  text_tip_issue_begin_end_day: úkol začíná a končí v tento den
+  text_tip_task_begin_day: úkol začíná v tento den
+  text_tip_task_end_day: úkol končí v tento den
+  text_tip_task_begin_end_day: úkol začíná a končí v tento den
   text_project_identifier_info: 'Jsou povolena malá písmena (a-z), čísla a pomlčky.<br />Po uložení již není možné identifikátor změnit.'
   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ý průběh práce
+  text_tracker_no_workflow: Pro tuto frontu není definován žádný workflow
   text_unallowed_characters: Nepovolené znaky
   text_comma_separated: Povoleno více hodnot (oddělěné čárkou).
-  text_issues_ref_in_commit_messages: Odkazování a opravování úkolů ve zprávách commitů
+  text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
   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 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_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_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 adresáře ukládání souborů
+  text_file_repository_writable: Povolen zápis do repository
   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 +692,7 @@ cs:
   default_tracker_feature: Požadavek
   default_tracker_support: Podpora
   default_issue_status_new: Nový
-  default_issue_status_in_progress: Ve vývoji
+  default_issue_status_in_progress: In Progress
   default_issue_status_resolved: Vyřešený
   default_issue_status_feedback: Čeká se
   default_issue_status_closed: Uzavřený
@@ -704,7 +704,7 @@ cs:
   default_priority_high: Vysoká
   default_priority_urgent: Urgentní
   default_priority_immediate: Okamžitá
-  default_activity_design: Návhr
+  default_activity_design: Design
   default_activity_development: Vývoj
   
   enumeration_issue_priorities: Priority úkolů
@@ -717,8 +717,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: duplikováno od
-  setting_enabled_scm: Povolené SCM
+  label_duplicated_by: duplicated by
+  setting_enabled_scm: Povoleno 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 +744,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 +771,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 přístup
+  permission_commit_access: Commit access
   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živatelský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živateslký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: Možnost zápisu do adresáře plugin assets
+  text_plugin_assets_writable: Plugin assets directory writable
   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,114 +809,104 @@ cs:
   label_date_from_to: Od {{start}} do {{end}}
   label_greater_or_equal: ">="
   label_less_or_equal: <=
-  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
+  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: Žá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
+  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: |-
-    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
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
+    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

config/locales/da.yml

@@ -130,7 +130,6 @@ 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:
@@ -250,6 +249,7 @@ da:
   field_attr_lastname: Efternavn attribut
   field_attr_mail: Email attribut
   field_onthefly: løbende brugeroprettelse
+  field_start_date: Start
   field_done_ratio: % Færdig
   field_auth_source: Sikkerhedsmetode
   field_hide_mail: Skjul min email
@@ -370,7 +370,7 @@ da:
   label_reported_issues: Rapporterede sager
   label_assigned_to_me_issues: Sager tildelt mig
   label_last_login: Sidste login tidspunkt
-  label_registered_on: Registreret den
+  label_registered_on: Registeret den
   label_activity: Aktivitet
   label_new: Ny
   label_logged_as: Registreret som
@@ -441,7 +441,7 @@ da:
   label_none: intet
   label_nobody: ingen
   label_next: Næste
-  label_previous: Forrige
+  label_previous: Forrig
   label_used_by: Brugt af
   label_details: Detaljer
   label_add_note: Tilføj note
@@ -537,7 +537,7 @@ da:
   label_view_diff: Vis forskelle
   label_diff_inline: inline
   label_diff_side_by_side: side om side
-  label_options: Formatering
+  label_options: Optioner
   label_copy_workflow_from: Kopier arbejdsgang fra
   label_permissions_report: Godkendelsesrapport
   label_watched_issues: Overvågede sager
@@ -547,7 +547,7 @@ da:
   label_relation_new: Ny relation
   label_relation_delete: Slet relation
   label_relates_to: relaterer til
-  label_duplicates: duplikater
+  label_duplicates: kopierer
   label_blocks: blokerer
   label_blocked_by: blokeret af
   label_precedes: kommer før
@@ -656,9 +656,9 @@ da:
   text_project_destroy_confirmation: Er du sikker på at du vil slette dette projekt og alle relaterede data?
   text_workflow_edit: Vælg en rolle samt en type, for at redigere arbejdsgangen
   text_are_you_sure: Er du sikker?
-  text_tip_issue_begin_day: opgaven begynder denne dag
-  text_tip_issue_end_day: opaven slutter denne dag
-  text_tip_issue_begin_end_day: opgaven begynder og slutter denne dag
+  text_tip_task_begin_day: opgaven begynder denne dag
+  text_tip_task_end_day: opaven slutter denne dag
+  text_tip_task_begin_end_day: opgaven begynder og slutter denne dag
   text_project_identifier_info: 'Små bogstaver (a-z), numre og bindestreg er tilladt.<br />Denne er en unik identifikation for projektet, og kan defor ikke rettes senere.'
   text_caracters_maximum: "max {{count}} karakterer."
   text_caracters_minimum: "Skal være mindst {{count}} karakterer lang."
@@ -870,8 +870,8 @@ da:
   label_version_sharing_tree: Med projekt træ
   label_version_sharing_none: Ikke delt
   error_can_not_archive_project: Dette projekt kan ikke arkiveres
-  button_duplicate: Duplikér
-  button_copy_and_follow: Kopiér og overvåg
+  button_duplicate: Kopier
+  button_copy_and_follow: Kopier og overvåg
   label_copy_source: Kilde
   setting_issue_done_ratio: Beregn sagsløsning ratio
   setting_issue_done_ratio_issue_status: Benyt sags status
@@ -896,14 +896,14 @@ da:
   label_missing_feeds_access_key: Mangler en RSS nøgle
   button_show: Vis
   text_line_separated: Flere væredier tilladt (en linje for hver værdi).
-  setting_mail_handler_body_delimiters: Trunkér emails efter en af disse linjer
+  setting_mail_handler_body_delimiters: Trunker emails efter en af disse linjer
   permission_add_subprojects: Lav underprojekter
   label_subproject_new: Nyt underprojekt
   text_own_membership_delete_confirmation: |-
     Du er ved at fjerne en eller flere af dine rettigheder, og kan muligvis ikke redigere projektet bagefter.
     Er du sikker på du ønsker at fortsætte?
   label_close_versions: Luk færdige versioner
-  label_board_sticky: Klistret
+  label_board_sticky: Sticky
   label_board_locked: Låst
   permission_export_wiki_pages: Eksporter wiki sider
   setting_cache_formatted_text: Cache formatteret tekst
@@ -914,26 +914,15 @@ da:
   field_parent_issue: Hoved opgave
   label_subtask_plural: Under opgaver
   label_project_copy_notifications: Send email notifikationer, mens projektet kopieres
-  error_can_not_delete_custom_field: Kan ikke slette brugerdefineret felt
-  error_unable_to_connect: Kan ikke forbinde ({{value}})
-  error_can_not_remove_role: Denne rolle er i brug og kan ikke slettes.
-  error_can_not_delete_tracker: Denne type indeholder sager og kan ikke slettes.
+  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: blok
-  notice_failed_to_save_members: "Fejl under lagring af medlem(mer): {{errors}}."
-  text_zoom_out: Zoom ud
+  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: Kan ikke slette tidsregistrering.
-  label_overall_spent_time: Overordnet forbrug af tid
-  field_time_entries: Log tid
-  project_module_gantt: Gantt
-  project_module_calendar: Kalender
-  field_member_of_group: Medlem af Gruppe
-  field_assigned_to_role: Medlem af Rolle
-  button_edit_associated_wikipage: "Redigér tilknyttet Wiki side: {{page_title}}"
-  text_are_you_sure_with_children: Slet sag og alle undersager?
-  field_text: Tekstfelt
-
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
+  notice_unable_delete_time_entry: Unable to delete time log entry.
+  label_overall_spent_time: Overall spent time
+  field_time_entries: Log time

config/locales/de.yml

@@ -68,11 +68,10 @@ de:
         other: "fast {{count}} Jahren"
 
   number:
-    # Default format for numbers
     format:
+      precision: 2
       separator: ','
       delimiter: '.'
-      precision: 2
     currency:
       format:
         unit: '€'
@@ -215,7 +214,6 @@ 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"
 
@@ -254,7 +252,7 @@ de:
   field_priority: Priorität
   field_fixed_version: Zielversion
   field_user: Benutzer
-  field_principal: Auftraggeber
+  field_principal: Principal
   field_role: Rolle
   field_homepage: Projekt-Homepage
   field_is_public: Öffentlich
@@ -280,6 +278,7 @@ de:
   field_attr_lastname: Name-Attribut
   field_attr_mail: E-Mail-Attribut
   field_onthefly: On-the-fly-Benutzererstellung
+  field_start_date: Beginn
   field_done_ratio: % erledigt
   field_auth_source: Authentifizierungs-Modus
   field_hide_mail: E-Mail-Adresse nicht anzeigen
@@ -298,7 +297,6 @@ 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
@@ -430,8 +428,6 @@ 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
@@ -489,7 +485,7 @@ de:
   label_my_page: Meine Seite
   label_my_account: Mein Konto
   label_my_projects: Meine Projekte
-  label_my_page_block: Bereich "Meine Seite"
+  label_my_page_block: My page block
   label_administration: Administration
   label_login: Anmelden
   label_logout: Abmelden
@@ -503,7 +499,7 @@ de:
   label_user_activity: "Aktivität von {{value}}"
   label_new: Neu
   label_logged_as: Angemeldet als
-  label_environment: Umgebung
+  label_environment: Environment
   label_authentication: Authentifizierung
   label_auth_source: Authentifizierungs-Modus
   label_auth_source_new: Neuer Authentifizierungs-Modus
@@ -791,8 +787,6 @@ de:
   label_profile: Profil
   label_subtask_plural: Unteraufgaben
   label_project_copy_notifications: Sende Mailbenachrichtigungen beim Kopieren des Projekts.
-  label_principal_search: "Nach Benutzer oder Gruppe suchen:"
-  label_user_search: "Nach Benutzer suchen:"
   
   button_login: Anmelden
   button_submit: OK
@@ -801,7 +795,7 @@ de:
   button_uncheck_all: Alles abwählen
   button_delete: Löschen
   button_create: Anlegen
-  button_create_and_continue: Anlegen und weiter
+  button_create_and_continue: Anlegen + nächstes Ticket
   button_test: Testen
   button_edit: Bearbeiten
   button_add: Hinzufügen
@@ -832,12 +826,12 @@ de:
   button_copy: Kopieren
   button_copy_and_follow: Kopieren und Ticket anzeigen
   button_annotate: Annotieren
-  button_update: Bearbeiten
+  button_update: Aktualisieren
   button_configure: Konfigurieren
   button_quote: Zitieren
   button_duplicate: Duplizieren
   button_show: Anzeigen
-  
+
   status_active: aktiv
   status_registered: angemeldet
   status_locked: gesperrt
@@ -859,9 +853,9 @@ de:
   text_journal_set_to: "{{label}} wurde auf {{value}} gesetzt"
   text_journal_deleted: "{{label}} {{old}} wurde gelöscht"
   text_journal_added: "{{label}} {{value}} wurde hinzugefügt"
-  text_tip_issue_begin_day: Aufgabe, die an diesem Tag beginnt
-  text_tip_issue_end_day: Aufgabe, die an diesem Tag endet
-  text_tip_issue_begin_end_day: Aufgabe, die an diesem Tag beginnt und endet
+  text_tip_task_begin_day: Aufgabe, die an diesem Tag beginnt
+  text_tip_task_end_day: Aufgabe, die an diesem Tag endet
+  text_tip_task_begin_end_day: Aufgabe, die an diesem Tag beginnt und endet
   text_project_identifier_info: 'Kleinbuchstaben (a-z), Ziffern und Bindestriche erlaubt.<br />Einmal gespeichert, kann die Kennung nicht mehr geändert werden.'
   text_caracters_maximum: "Max. {{count}} Zeichen."
   text_caracters_minimum: "Muss mindestens {{count}} Zeichen lang sein."
@@ -933,15 +927,4 @@ de:
   enumeration_activities: Aktivitäten (Zeiterfassung)
   enumeration_system_activity: System-Aktivität
 
-  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
-  setting_default_notification_option: Default notification option
-  notice_not_authorized_archived_project: The project you're trying to access has been archived.
-  label_user_mail_option_none: "Only for things I watch or I'm involved in"
-  field_member_of_group: Assignee's group
-  field_assigned_to_role: Assignee's role
-
-  field_start_date: Start date
-  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  field_time_entries: Log time

config/locales/el.yml

@@ -119,7 +119,6 @@ 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: Παρακαλώ επιλέξτε
   
@@ -247,6 +246,7 @@ el:
   field_attr_lastname:  Ιδιότητα επωνύμου
   field_attr_mail: Ιδιότητα email
   field_onthefly: Άμεση δημιουργία χρήστη
+  field_start_date: Εκκίνηση
   field_done_ratio: % επιτεύχθη
   field_auth_source: Τρόπος πιστοποίησης
   field_hide_mail: Απόκρυψη διεύθυνσης email
@@ -760,9 +760,9 @@ el:
   text_subprojects_destroy_warning: "Επίσης το(α) επιμέρους έργο(α): {{value}}  θα διαγραφούν."
   text_workflow_edit: Επιλέξτε ένα ρόλο και έναν ανιχνευτή για να επεξεργαστείτε  τη ροή εργασίας
   text_are_you_sure: Είστε σίγουρος ;
-  text_tip_issue_begin_day: καθήκοντα που ξεκινάνε σήμερα
-  text_tip_issue_end_day: καθήκοντα που τελειώνουν σήμερα
-  text_tip_issue_begin_end_day: καθήκοντα που ξεκινάνε και τελειώνουν σήμερα
+  text_tip_task_begin_day: καθήκοντα που ξεκινάνε σήμερα
+  text_tip_task_end_day: καθήκοντα που τελειώνουν σήμερα
+  text_tip_task_begin_end_day: καθήκοντα που ξεκινάνε και τελειώνουν σήμερα
   text_project_identifier_info: 'Επιτρέπονται μόνο μικρά πεζά γράμματα (a-z), αριθμοί και παύλες. <br /> Μετά την αποθήκευση, το αναγνωριστικό δεν μπορεί να αλλάξει.'
   text_caracters_maximum: "μέγιστος αριθμός {{count}} χαρακτήρες."
   text_caracters_minimum: "Πρέπει να περιέχει τουλάχιστον {{count}} χαρακτήρες."
@@ -910,14 +910,3 @@ 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
-
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"

config/locales/en-GB.yml

@@ -84,7 +84,7 @@ en-GB:
           byte:
             one: "Byte"
             other: "Bytes"
-          kb: "kB"
+          kb: "KB"
           mb: "MB"
           gb: "GB"
           tb: "TB"
@@ -122,7 +122,6 @@ 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
   
@@ -257,7 +256,7 @@ en-GB:
   field_attr_lastname: Lastname attribute
   field_attr_mail: Email attribute
   field_onthefly: On-the-fly user creation
-  field_start_date: Start Date
+  field_start_date: Start
   field_done_ratio: % Done
   field_auth_source: Authentication mode
   field_hide_mail: Hide my email address
@@ -825,9 +824,9 @@ en-GB:
   text_journal_set_to: "{{label}} set to {{value}}"
   text_journal_deleted: "{{label}} deleted ({{old}})"
   text_journal_added: "{{label}} {{value}} added"
-  text_tip_issue_begin_day: task beginning this day
-  text_tip_issue_end_day: task ending this day
-  text_tip_issue_begin_end_day: task beginning and ending this day
+  text_tip_task_begin_day: task beginning this day
+  text_tip_task_end_day: task ending this day
+  text_tip_task_begin_end_day: task beginning and ending this day
   text_project_identifier_info: 'Only lower case letters (a-z), numbers and dashes are allowed.<br />Once saved, the identifier can not be changed.'
   text_caracters_maximum: "{{count}} characters maximum."
   text_caracters_minimum: "Must be at least {{count}} characters long."
@@ -915,13 +914,3 @@ 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
-  notice_not_authorized_archived_project: The project you're trying to access has been archived.
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"

config/locales/en.yml

@@ -81,7 +81,7 @@ en:
           byte:
             one: "Byte"
             other: "Bytes"
-          kb: "kB"
+          kb: "KB"
           mb: "MB"
           gb: "GB"
           tb: "TB"
@@ -261,7 +261,7 @@ en:
   field_attr_lastname: Lastname attribute
   field_attr_mail: Email attribute
   field_onthefly: On-the-fly user creation
-  field_start_date: Start Date
+  field_start_date: Start
   field_done_ratio: % Done
   field_auth_source: Authentication mode
   field_hide_mail: Hide my email address
@@ -293,9 +293,6 @@ 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
@@ -415,8 +412,6 @@ 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
@@ -776,8 +771,6 @@ en:
   label_profile: Profile
   label_subtask_plural: Subtasks
   label_project_copy_notifications: Send email notifications during the project copy
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
   
   button_login: Login
   button_submit: Submit
@@ -822,7 +815,6 @@ en:
   button_quote: Quote
   button_duplicate: Duplicate
   button_show: Show
-  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   
   status_active: active
   status_registered: registered
@@ -841,14 +833,13 @@ 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}})"
   text_journal_added: "{{label}} {{value}} added"
-  text_tip_issue_begin_day: issue beginning this day
-  text_tip_issue_end_day: issue ending this day
-  text_tip_issue_begin_end_day: issue beginning and ending this day
+  text_tip_task_begin_day: task beginning this day
+  text_tip_task_end_day: task ending this day
+  text_tip_task_begin_end_day: task beginning and ending this day
   text_project_identifier_info: 'Only lower case letters (a-z), numbers and dashes are allowed.<br />Once saved, the identifier can not be changed.'
   text_caracters_maximum: "{{count}} characters maximum."
   text_caracters_minimum: "Must be at least {{count}} characters long."

config/locales/es.yml

@@ -132,7 +132,6 @@ 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.
 
@@ -313,6 +312,7 @@ es:
   field_role: Perfil
   field_searchable: Incluir en las búsquedas
   field_spent_on: Fecha
+  field_start_date: Fecha de inicio
   field_start_page: Página principal
   field_status: Estado
   field_subject: Tema
@@ -635,6 +635,7 @@ es:
   label_user_activity: "Actividad de {{value}}"
   label_user_mail_no_self_notified: "No quiero ser avisado de cambios hechos por mí"
   label_user_mail_option_all: "Para cualquier evento en todos mis proyectos"
+  label_user_mail_option_none: "Sólo para elementos monitorizados o relacionados conmigo"
   label_user_mail_option_selected: "Para cualquier evento de los proyectos seleccionados..."
   label_user_new: Nuevo usuario
   label_user_plural: Usuarios
@@ -819,9 +820,9 @@ es:
   text_select_project_modules: 'Seleccione los módulos a activar para este proyecto:'
   text_status_changed_by_changeset: "Aplicado en los cambios {{value}}"
   text_subprojects_destroy_warning: "Los proyectos secundarios: {{value}} también se eliminarán"
-  text_tip_issue_begin_day: tarea que comienza este día
-  text_tip_issue_begin_end_day: tarea que comienza y termina este día
-  text_tip_issue_end_day: tarea que termina este día
+  text_tip_task_begin_day: tarea que comienza este día
+  text_tip_task_begin_end_day: tarea que comienza y termina este día
+  text_tip_task_end_day: tarea que termina este día
   text_tracker_no_workflow: No hay ningún flujo de trabajo definido para este tipo de petición
   text_unallowed_characters: Caracteres no permitidos
   text_user_mail_option: "De los proyectos no seleccionados, sólo recibirá notificaciones sobre elementos monitorizados o elementos en los que esté involucrado (por ejemplo, peticiones de las que usted sea autor o asignadas a usted)."
@@ -853,12 +854,12 @@ es:
   text_wiki_page_destroy_children: Eliminar páginas hijas y todos sus descendientes
   setting_password_min_length: Longitud mínima de la contraseña
   field_group_by: Agrupar resultados por
-  mail_subject_wiki_content_updated: "La página wiki '{{id}}' ha sido actualizada"
+  mail_subject_wiki_content_updated: "La página wiki '{{page}}' ha sido actualizada"
   label_wiki_content_added: Página wiki añadida
-  mail_subject_wiki_content_added: "Se ha añadido la página wiki '{{id}}'."
-  mail_body_wiki_content_added: "{{author}} ha añadido la página wiki '{{id}}'."
+  mail_subject_wiki_content_added: "Se ha añadido la página wiki '{{page}}'."
+  mail_body_wiki_content_added: "{{author}} ha añadido la página wiki '{{page}}'."
   label_wiki_content_updated: Página wiki actualizada
-  mail_body_wiki_content_updated: La página wiki '{{id}}' ha sido actualizada por {{author}}.
+  mail_body_wiki_content_updated: La página wiki '{{page}}' ha sido actualizada por {{author}}.
   permission_add_project: Crear proyecto
   setting_new_project_user_role_id: Permiso asignado a un usuario no-administrador para crear proyectos
   label_view_all_revisions: Ver todas las revisiones
@@ -949,21 +950,3 @@ 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: Calendario
-  button_edit_associated_wikipage: "Editar paginas Wiki asociadas: {{page_title}}"
-  text_are_you_sure_with_children: ¿Borrar peticiones y todas sus peticiones hijas?
-  field_text: Campo de texto
-  label_user_mail_option_only_owner: Solo para objetos que soy propietario
-  setting_default_notification_option: Opcion de notificacion por defecto
-  label_user_mail_option_only_my_events: Solo para objetos que soy seguidor o estoy involucrado
-  label_user_mail_option_only_assigned: Solo para objetos que estoy asignado
-  label_user_mail_option_none: Sin eventos
-  field_member_of_group: Asignado al grupo
-  field_assigned_to_role: Asignado al perfil
-  notice_not_authorized_archived_project: El proyecto al que intenta acceder ha sido archivado.
-  field_start_date: Fecha de inicio
-  label_principal_search: "Buscar por usuario o grupo:"
-  label_user_search: "Buscar por usuario:"
-  field_visible: Visible
-  setting_emails_header: Encabezado de Correos

config/locales/eu.yml

@@ -121,7 +121,6 @@ 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
   
@@ -257,6 +256,7 @@ eu:
   field_attr_lastname: Abizenak atributua
   field_attr_mail: Eposta atributua
   field_onthefly: Zuzeneko erabiltzaile sorrera
+  field_start_date: Hasiera
   field_done_ratio: Egindako %
   field_auth_source: Autentikazio modua
   field_hide_mail: Nire eposta helbidea ezkutatu
@@ -820,9 +820,9 @@ eu:
   text_journal_set_to: "{{label}}-k {{value}} balioa hartu du"
   text_journal_deleted: "{{label}} ezabatuta ({{old}})"
   text_journal_added: "{{label}} {{value}} gehituta"
-  text_tip_issue_begin_day: gaur hasten diren atazak
-  text_tip_issue_end_day: gaur bukatzen diren atazak
-  text_tip_issue_begin_end_day: gaur hasi eta bukatzen diren atazak
+  text_tip_task_begin_day: gaur hasten diren atazak
+  text_tip_task_end_day: gaur bukatzen diren atazak
+  text_tip_task_begin_end_day: gaur hasi eta bukatzen diren atazak
   text_project_identifier_info: 'Letra xeheak (a-z), zenbakiak eta marrak erabil daitezke bakarrik.<br />Gorde eta gero identifikadorea ezin da aldatu.'
   text_caracters_maximum: "{{count}} karaktere gehienez."
   text_caracters_minimum: "Gutxienez {{count}} karaktereetako luzerakoa izan behar du."
@@ -914,13 +914,3 @@ 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
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"

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ä
   
@@ -262,6 +262,7 @@ fi:
   field_attr_lastname: Sukunimenmääre
   field_attr_mail: Sähköpostinmääre
   field_onthefly: Automaattinen käyttäjien luonti
+  field_start_date: Alku
   field_done_ratio: % Tehty
   field_auth_source: Varmennusmuoto
   field_hide_mail: Piiloita sähköpostiosoitteeni
@@ -635,9 +636,9 @@ fi:
   text_project_destroy_confirmation: Oletko varma että haluat poistaa tämän projektin ja kaikki siihen kuuluvat tiedot?
   text_workflow_edit: Valitse rooli ja tapahtuma muokataksesi työnkulkua
   text_are_you_sure: Oletko varma?
-  text_tip_issue_begin_day: tehtävä joka alkaa tänä päivänä
-  text_tip_issue_end_day: tehtävä joka loppuu tänä päivänä
-  text_tip_issue_begin_end_day: tehtävä joka alkaa ja loppuu tänä päivänä
+  text_tip_task_begin_day: tehtävä joka alkaa tänä päivänä
+  text_tip_task_end_day: tehtävä joka loppuu tänä päivänä
+  text_tip_task_begin_end_day: tehtävä joka alkaa ja loppuu tänä päivänä
   text_project_identifier_info: 'Pienet kirjaimet (a-z), numerot ja viivat ovat sallittu.<br />Tallentamisen jälkeen tunnistetta ei voi muuttaa.'
   text_caracters_maximum: "{{count}} merkkiä enintään."
   text_caracters_minimum: "Täytyy olla vähintään {{count}} merkkiä pitkä."
@@ -935,13 +936,3 @@ 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
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"

config/locales/fr.yml

@@ -271,6 +271,7 @@ fr:
   field_attr_lastname: Attribut Nom
   field_attr_mail: Attribut Email
   field_onthefly: Création des utilisateurs à la volée
+  field_start_date: Début
   field_done_ratio: % réalisé
   field_auth_source: Mode d'authentification
   field_hide_mail: Cacher mon adresse mail
@@ -421,8 +422,6 @@ 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
@@ -774,8 +773,6 @@ fr:
   label_profile: Profil
   label_subtask_plural: Sous-tâches
   label_project_copy_notifications: Envoyer les notifications durant la copie du projet
-  label_principal_search: "Rechercher un utilisateur ou un groupe :"
-  label_user_search: "Rechercher un utilisateur :"
   
   button_login: Connexion
   button_submit: Soumettre
@@ -836,9 +833,9 @@ fr:
   text_subprojects_destroy_warning: "Ses sous-projets : {{value}} seront également supprimés."
   text_workflow_edit: Sélectionner un tracker et un rôle pour éditer le workflow
   text_are_you_sure: Êtes-vous sûr ?
-  text_tip_issue_begin_day: tâche commençant ce jour
-  text_tip_issue_end_day: tâche finissant ce jour
-  text_tip_issue_begin_end_day: tâche commençant et finissant ce jour
+  text_tip_task_begin_day: tâche commençant ce jour
+  text_tip_task_end_day: tâche finissant ce jour
+  text_tip_task_begin_end_day: tâche commençant et finissant ce jour
   text_project_identifier_info: 'Seuls les lettres minuscules (a-z), chiffres et tirets sont autorisés.<br />Un fois sauvegardé, l''identifiant ne pourra plus être modifié.'
   text_caracters_maximum: "{{count}} caractères maximum."
   text_caracters_minimum: "{{count}} caractères minimum."
@@ -932,17 +929,4 @@ fr:
   notice_unable_delete_time_entry: Impossible de supprimer le temps passé.
   label_overall_spent_time: Temps passé global
   field_time_entries: Log time
-  project_module_gantt: Gantt
-  project_module_calendar: Calendrier
-  button_edit_associated_wikipage: "Modifier la page wiki associée: {{page_title}}"
-  text_are_you_sure_with_children: Supprimer la demande et toutes ses sous-demandes ?
-  field_text: Champ texte
-  label_user_mail_option_only_owner: Seulement pour ce que j'ai créé
-  setting_default_notification_option: Option de notification par défaut
-  label_user_mail_option_only_my_events: Seulement pour ce que je surveille
-  label_user_mail_option_only_assigned: Seulement pour ce qui m'est assigné
-  label_user_mail_option_none: Aucune notification
-  field_member_of_group: Groupe de l'assigné
-  field_assigned_to_role: Rôle de l'assigné
 
-  field_start_date: Start date

config/locales/gl.yml

@@ -150,7 +150,6 @@ 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
   
@@ -290,6 +289,7 @@ gl:
   field_role: Perfil
   field_searchable: Incluír nas búsquedas
   field_spent_on: Data
+  field_start_date: Data de inicio
   field_start_page: Páxina principal
   field_status: Estado
   field_subject: Tema
@@ -797,9 +797,9 @@ gl:
   text_select_project_modules: 'Seleccione os módulos a activar para este proxecto:'
   text_status_changed_by_changeset: "Aplicado nos cambios {{value}}"
   text_subprojects_destroy_warning: "Os proxectos secundarios: {{value}} tamén se eliminarán"
-  text_tip_issue_begin_day: tarefa que comeza este día
-  text_tip_issue_begin_end_day: tarefa que comeza e remata este día
-  text_tip_issue_end_day: tarefa que remata este día
+  text_tip_task_begin_day: tarefa que comeza este día
+  text_tip_task_begin_end_day: tarefa que comeza e remata este día
+  text_tip_task_end_day: tarefa que remata este día
   text_tracker_no_workflow: Non hai ningún fluxo de traballo definido para este tipo de petición
   text_unallowed_characters: Caracteres non permitidos
   text_user_mail_option: "Dos proxectos non seleccionados, só recibirá notificacións sobre elementos monitorizados ou elementos nos que estea involucrado (por exemplo, peticións das que vostede sexa autor ou asignadas a vostede)."
@@ -926,14 +926,3 @@ 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
-
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"

config/locales/he.yml

@@ -104,7 +104,7 @@ he:
         inclusion: "לא נכלל ברשימה"
         exclusion: "לא זמין"
         invalid: "לא ולידי"
-        confirmation: "לא תואם לאישור"
+        confirmation: "לא תואם לאישורו"
         accepted: "חייב באישור"
         empty: "חייב להכלל"
         blank: "חייב להכלל"
@@ -122,8 +122,7 @@ he:
         even: "חייב להיות זוגי"
         greater_than_start_date: "חייב להיות מאוחר יותר מתאריך ההתחלה"
         not_same_project: "לא שייך לאותו הפרויקט"
-        circular_dependency: "קשר זה יצור תלות מעגלית"
-        cant_link_an_issue_with_a_descendant: "לא ניתן לקשר נושא לתת־משימה שלו"
+        circular_dependency: "הקשר הזה יצור תלות מעגלית"
 
   actionview_instancetag_blank_option: בחר בבקשה
 
@@ -144,7 +143,7 @@ he:
   notice_account_wrong_password: סיסמה שגויה
   notice_account_register_done: החשבון נוצר בהצלחה. להפעלת החשבון לחץ על הקישור שנשלח לדוא"ל שלך.
   notice_account_unknown_email: משתמש לא מוכר.
-  notice_can_t_change_password: החשבון הזה משתמש במקור הזדהות חיצוני. שינוי סיסמה הינו בילתי אפשר
+  notice_can_t_change_password: החשבון הזה משתמש במקור אימות חיצוני. שינוי סיסמה הינו בילתי אפשר
   notice_account_lost_email_sent: דוא"ל עם הוראות לבחירת סיסמה חדשה נשלח אליך.
   notice_account_activated: חשבונך הופעל. אתה יכול להתחבר כעת.
   notice_successful_create: יצירה מוצלחת.
@@ -154,9 +153,8 @@ he:
   notice_file_not_found: הדף שאתה מנסה לגשת אליו אינו קיים או שהוסר.
   notice_locking_conflict: המידע עודכן על ידי משתמש אחר.
   notice_not_authorized: אינך מורשה לראות דף זה.
-  notice_not_authorized_archived_project: הפרויקט שאתה מנסה לגשת אליו נמצא בארכיון.
   notice_email_sent: "דואל נשלח לכתובת {{value}}"
-  notice_email_error: "ארעה שגיאה בעת שליחת הדואל ({{value}})"
+  notice_email_error: "ארעה שגיאה בעט שליחת הדואל ({{value}})"
   notice_feeds_access_key_reseted: מפתח ה־RSS שלך אופס.
   notice_api_access_key_reseted: מפתח הגישה שלך ל־API אופס.
   notice_failed_to_save_issues: "נכשרת בשמירת {{count}} נושא\ים ב {{total}} נבחרו: {{ids}}."
@@ -169,7 +167,7 @@ he:
   notice_issue_done_ratios_updated: אחוזי התקדמות לנושא עודכנו.
 
   error_can_t_load_default_data: "אפשרויות ברירת המחדל לא הצליחו להיטען: {{value}}"
-  error_scm_not_found: כניסה ו\או מהדורה אינם קיימים במאגר.
+  error_scm_not_found: כניסה ו\או גירסה אינם קיימים במאגר.
   error_scm_command_failed: "ארעה שגיאה בעת ניסון גישה למאגר: {{value}}"
   error_scm_annotate: "הכניסה לא קיימת או שלא ניתן לתאר אותה."
   error_issue_not_found_in_project: 'הנושאים לא נמצאו או אינם שיכים לפרויקט'
@@ -195,7 +193,7 @@ he:
   mail_body_account_information: פרטי החשבון שלך
   mail_subject_account_activation_request: "בקשת הפעלה לחשבון {{value}}"
   mail_body_account_activation_request: "משתמש חדש ({{value}}) נרשם. החשבון שלו מחכה לאישור שלך:"
-  mail_subject_reminder: "{{count}} נושאים מיועדים להגשה בימים הקרובים ({{days}})"
+  mail_subject_reminder: "{{count}} נושאים מיעדים להגשה בימים הקרובים ({{days}})"
   mail_body_reminder: "{{count}} נושאים שמיועדים אליך מיועדים להגשה בתוך {{days}} ימים:"
   mail_subject_wiki_content_added: "דף ה־wiki ‏'{{page}}' נוסף"
   mail_body_wiki_content_added: דף ה־wiki ‏'{{page}}' נוסף ע"י {{author}}.
@@ -249,7 +247,7 @@ he:
   field_login: שם משתמש
   field_mail_notification: הודעות דוא"ל
   field_admin: ניהול
-  field_last_login_on: התחברות אחרונה
+  field_last_login_on: חיבור אחרון
   field_language: שפה
   field_effective_date: תאריך
   field_password: סיסמה
@@ -266,8 +264,9 @@ he:
   field_attr_lastname: תכונת שם משפחה
   field_attr_mail: תכונת דוא"ל
   field_onthefly: יצירת משתמשים זריזה
+  field_start_date: תאריך התחלה
   field_done_ratio: % גמור
-  field_auth_source: מקור הזדהות
+  field_auth_source: מצב אימות
   field_hide_mail: החבא את כתובת הדוא"ל שלי
   field_comments: הערות
   field_url: URL
@@ -284,7 +283,6 @@ he:
   field_redirect_existing_links: העבר קישורים קיימים
   field_estimated_hours: זמן משוער
   field_column_names: עמודות
-  field_time_entries: רישום זמנים
   field_time_zone: איזור זמן
   field_searchable: ניתן לחיפוש
   field_default_value: ערך ברירת מחדל
@@ -297,16 +295,13 @@ he:
   field_group_by: קבץ את התוצאות לפי
   field_sharing: שיתוף
   field_parent_issue: משימת אב
-  field_member_of_group: חבר בקבוצה
-  field_assigned_to_role: בעל תפקיד
-  field_text: שדה טקסט
 
   setting_app_title: כותרת ישום
   setting_app_subtitle: תת־כותרת ישום
   setting_welcome_text: טקסט "ברוך הבא"
   setting_default_language: שפת ברירת מחדל
-  setting_login_required: דרושה הזדהות
-  setting_self_registration: אפשר הרשמה עצמית
+  setting_login_required: דרוש אימות
+  setting_self_registration: אפשר הרשמות עצמית
   setting_attachment_max_size: גודל דבוקה מקסימאלי
   setting_issues_export_limit: גבול יצוא נושאים
   setting_mail_from: כתובת שליחת דוא"ל
@@ -314,14 +309,14 @@ he:
   setting_plain_text_mail: טקסט פשוט בלבד (ללא HTML)
   setting_host_name: שם שרת
   setting_text_formatting: עיצוב טקסט
-  setting_wiki_compression: כיווץ היסטורית wiki
+  setting_wiki_compression: כיווץ היסטורית WIKI
   setting_feeds_limit: גבול תוכן הזנות
   setting_default_projects_public: פרויקטים חדשים הינם פומביים כברירת מחדל
-  setting_autofetch_changesets: משיכה אוטומטית של שינויים
+  setting_autofetch_changesets: משיכה אוטומטית של עידכונים
   setting_sys_api_enabled: אפשר שירות רשת לניהול המאגר
   setting_commit_ref_keywords: מילות מפתח מקשרות
   setting_commit_fix_keywords: מילות מפתח מתקנות
-  setting_autologin: התחברות אוטומטית
+  setting_autologin: חיבור אוטומטי
   setting_date_format: פורמט תאריך
   setting_time_format: פורמט זמן
   setting_cross_project_issue_relations: הרשה קישור נושאים בין פרויקטים
@@ -343,18 +338,17 @@ he:
   setting_gravatar_default: תמונת Gravatar ברירת מחדל
   setting_diff_max_lines_displayed: מספר מירבי של שורות בתצוגת שינויים
   setting_file_max_size_displayed: גודל מירבי של מלל המוצג בתוך השורה
-  setting_repository_log_display_limit: מספר מירבי של מהדורות המוצגות ביומן קובץ
+  setting_repository_log_display_limit: מספר מירבי של גירסאות המוצגות ביומן קובץ
   setting_openid: אפשר התחברות ורישום באמצעות OpenID
-  setting_password_min_length: אורך סיסמה מינימאלי
+  setting_password_min_length: אורך סיסמא מינימאלי
   setting_new_project_user_role_id: התפקיד שמוגדר למשתמש פשוט אשר יוצר פרויקט
   setting_default_projects_modules: מודולים מאופשרים בברירת מחדל עבור פרויקטים חדשים
   setting_issue_done_ratio: חשב אחוז התקדמות בנושא עם
   setting_issue_done_ratio_issue_field: השתמש בשדה הנושא
   setting_issue_done_ratio_issue_status: השתמש במצב הנושא
-  setting_start_of_week: השבוע מתחיל ביום
+  setting_start_of_week: התחל יומנים לפי
   setting_rest_api_enabled: אפשר שירות רשת REST
   setting_cache_formatted_text: שמור טקסט מעוצב במטמון
-  setting_default_notification_option: אפשרות התראה ברירת־מחדל
 
   permission_add_project: יצירת פרויקט
   permission_add_subprojects: יצירת תתי־פרויקט
@@ -381,9 +375,9 @@ he:
   permission_add_issue_watchers: הוספת צופים
   permission_delete_issue_watchers: הסרת צופים
   permission_log_time: תיעוד זמן שהושקע
-  permission_view_time_entries: צפיה ברישום זמנים
+  permission_view_time_entries: צפיה בזמן שהושקע
   permission_edit_time_entries: עריכת רישום זמנים
-  permission_edit_own_time_entries: עריכת רישום הזמנים של עצמו
+  permission_edit_own_time_entries: עריכת לוג הזמן של עצמו
   permission_manage_news: ניהול חדשות
   permission_comment_news: תגובה לחדשות
   permission_manage_documents: ניהול מסמכים
@@ -400,7 +394,7 @@ he:
   permission_protect_wiki_pages: הגנה על כל דפי wiki
   permission_manage_repository: ניהול מאגר
   permission_browse_repository: סיור במאגר
-  permission_view_changesets: צפיה בסדרות שינויים
+  permission_view_changesets: צפיה בקבוצות שינויים
   permission_commit_access: אישור הפקדות
   permission_manage_boards: ניהול לוחות
   permission_view_messages: צפיה בהודעות
@@ -420,8 +414,6 @@ he:
   project_module_wiki: Wiki
   project_module_repository: מאגר
   project_module_boards: לוחות
-  project_module_calendar: לוח שנה
-  project_module_gantt: גאנט
 
   label_user: משתמש
   label_user_plural: משתמשים
@@ -446,7 +438,7 @@ he:
   label_document: מסמך
   label_document_new: מסמך חדש
   label_document_plural: מסמכים
-  label_document_added: מסמך נוסף
+  label_document_added: מוסמך נוסף
   label_role: תפקיד
   label_role_plural: תפקידים
   label_role_new: תפקיד חדש
@@ -471,7 +463,7 @@ he:
   label_enumeration_new: ערך חדש
   label_information: מידע
   label_information_plural: מידע
-  label_please_login: נא התחבר
+  label_please_login: התחבר בבקשה
   label_register: הרשמה
   label_login_with_open_id_option: או התחבר באמצעות OpenID
   label_password_lost: אבדה הסיסמה?
@@ -486,7 +478,7 @@ he:
   label_help: עזרה
   label_reported_issues: נושאים שדווחו
   label_assigned_to_me_issues: נושאים שהוצבו לי
-  label_last_login: התחברות אחרונה
+  label_last_login: חיבור אחרון
   label_registered_on: נרשם בתאריך
   label_activity: פעילות
   label_overall_activity: פעילות כוללת
@@ -494,10 +486,10 @@ he:
   label_new: חדש
   label_logged_as: מחובר כ
   label_environment: סביבה
-  label_authentication: הזדהות
-  label_auth_source: מקור הזדהות
-  label_auth_source_new: מקור הזדהות חדש
-  label_auth_source_plural: מקורות הזדהות
+  label_authentication: אישור
+  label_auth_source: מצב אישור
+  label_auth_source_new: מצב אישור חדש
+  label_auth_source_plural: מצבי אישור
   label_subproject_plural: תת־פרויקטים
   label_subproject_new: תת־פרויקט חדש
   label_and_its_subprojects: "{{value}} וכל תתי־הפרויקטים שלו"
@@ -528,7 +520,7 @@ he:
   label_news_plural: חדשות
   label_news_latest: חדשות אחרונות
   label_news_view_all: צפה בכל החדשות
-  label_news_added: חדשות נוספו
+  label_news_added: חדשות הוספו
   label_settings: הגדרות
   label_overview: מבט רחב
   label_version: גירסה
@@ -582,7 +574,7 @@ he:
     one: הערה אחת
     other: "{{count}} הערות"
   label_comment_add: הוסף תגובה
-  label_comment_added: תגובה נוספה
+  label_comment_added: תגובה הוספה
   label_comment_delete: מחק תגובות
   label_query: שאילתה אישית
   label_query_plural: שאילתות אישיות
@@ -600,7 +592,7 @@ he:
   label_all_time: תמיד
   label_yesterday: אתמול
   label_this_week: השבוע
-  label_last_week: השבוע שעבר
+  label_last_week: שבוע שעבר
   label_last_n_days: "ב־{{count}} ימים אחרונים"
   label_this_month: החודש
   label_last_month: חודש שעבר
@@ -619,19 +611,19 @@ he:
   label_modification_plural: "{{count}} שינויים"
   label_branch: ענף
   label_tag: סימון
-  label_revision: מהדורה
-  label_revision_plural: מהדורות
-  label_revision_id: מהדורה {{value}}
-  label_associated_revisions: מהדורות קשורות
+  label_revision: גירסה
+  label_revision_plural: גירסאות
+  label_revision_id: גירסה {{value}}
+  label_associated_revisions: גירסאות קשורות
   label_added: נוסף
   label_modified: שונה
   label_copied: הועתק
   label_renamed: השם שונה
   label_deleted: נמחק
-  label_latest_revision: מהדורה אחרונה
-  label_latest_revision_plural: מהדורות אחרונות
-  label_view_revisions: צפה במהדורות
-  label_view_all_revisions: צפה בכל המהדורות
+  label_latest_revision: גירסה אחרונה
+  label_latest_revision_plural: גירסאות אחרונות
+  label_view_revisions: צפה בגירסאות
+  label_view_all_revisions: צפה בכל הגירסאות
   label_max_size: גודל מקסימאלי
   label_sort_highest: הזז לראשית
   label_sort_higher: הזז למעלה
@@ -645,10 +637,10 @@ he:
   label_result_plural: תוצאות
   label_all_words: כל המילים
   label_wiki: Wiki
-  label_wiki_edit: ערוך wiki
-  label_wiki_edit_plural: עריכות wiki
+  label_wiki_edit: ערוך Wiki
+  label_wiki_edit_plural: עריכות Wiki
   label_wiki_page: דף Wiki
-  label_wiki_page_plural: דפי wiki
+  label_wiki_page_plural: דפי Wiki
   label_index_by_title: סדר על פי כותרת
   label_index_by_date: סדר על פי תאריך
   label_current_version: גירסה נוכחית
@@ -701,7 +693,7 @@ he:
   label_message_plural: הודעות
   label_message_last: הודעה אחרונה
   label_message_new: הודעה חדשה
-  label_message_posted: הודעה נוספה
+  label_message_posted: הודעה הוספה
   label_reply_plural: השבות
   label_send_information: שלח מידע על חשבון למשתמש
   label_year: שנה
@@ -710,18 +702,18 @@ he:
   label_date_from: מתאריך
   label_date_to: עד
   label_language_based: מבוסס שפה
-  label_sort_by: "מיין לפי {{value}}"
+  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_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: סדרות שינויים
+  label_changeset_plural: אוסף שינוים
   label_default_columns: עמודת ברירת מחדל
   label_no_change_option: (אין שינוים)
   label_bulk_edit_selected_issues: ערוך את הנושאים המסומנים
@@ -731,9 +723,6 @@ he:
   label_user_mail_option_all: "לכל אירוע בכל הפרויקטים שלי"
   label_user_mail_option_selected: "לכל אירוע בפרויקטים שבחרתי בלבד..."
   label_user_mail_option_none: "רק לנושאים שאני צופה או קשור אליהם"
-  label_user_mail_option_only_my_events: עבור דברים שאני צופה או מעורב בהם בלבד
-  label_user_mail_option_only_assigned: עבור דברים שאני אחראי עליהם בלבד
-  label_user_mail_option_only_owner: עבור דברים שאני הבעלים שלהם בלבד
   label_user_mail_no_self_notified: "אני לא רוצה שיודיעו לי על שינויים שאני מבצע"
   label_registration_activation_by_email: הפעל חשבון באמצעות דוא"ל
   label_registration_manual_activation: הפעלת חשבון ידנית
@@ -745,7 +734,7 @@ he:
   label_more: עוד
   label_scm: מערכת ניהול תצורה
   label_plugins: תוספים
-  label_ldap_authentication: הזדהות LDAP
+  label_ldap_authentication: אימות LDAP
   label_downloads_abbr: D/L
   label_optional_description: תיאור רשות
   label_add_another_file: הוסף עוד קובץ
@@ -762,8 +751,8 @@ he:
   label_ascending: בסדר עולה
   label_descending: בסדר יורד
   label_date_from_to: 'מתאריך {{start}} ועד תאריך {{end}}'
-  label_wiki_content_added: נוסף דף ל־wiki
-  label_wiki_content_updated: דף wiki עודכן
+  label_wiki_content_added: הדף נוסף ל־wiki
+  label_wiki_content_updated: דף ה־wiki עודכן
   label_group: קבוצה
   label_group_plural: קבוצות
   label_group_new: קבוצה חדשה
@@ -795,7 +784,6 @@ he:
   button_create_and_continue: צור ופתח חדש
   button_test: בדוק
   button_edit: ערוך
-  button_edit_associated_wikipage: "ערוך דף wiki מקושר: {{page_title}}"
   button_add: הוסף
   button_change: שנה
   button_apply: החל
@@ -811,8 +799,8 @@ he:
   button_cancel: בטל
   button_activate: הפעל
   button_sort: מיין
-  button_log_time: רישום זמנים
-  button_rollback: חזור למהדורה זו
+  button_log_time: זמן לוג
+  button_rollback: חזור לגירסה זו
   button_watch: צפה
   button_unwatch: בטל צפיה
   button_reply: השב
@@ -820,7 +808,7 @@ he:
   button_unarchive: הוצא מהארכיון
   button_reset: אפס
   button_rename: שנה שם
-  button_change_password: שנה סיסמה
+  button_change_password: שנה סיסמא
   button_copy: העתק
   button_copy_and_follow: העתק ועקוב
   button_annotate: הוסף תיאור מסגרת
@@ -847,14 +835,13 @@ he:
   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}})"
   text_journal_added: "{{label}} {{value}} נוסף"
-  text_tip_issue_begin_day: מטלה המתחילה היום
-  text_tip_issue_end_day: מטלה המסתיימת היום
-  text_tip_issue_begin_end_day: מטלה המתחילה ומסתיימת היום
+  text_tip_task_begin_day: מטלה המתחילה היום
+  text_tip_task_end_day: מטלה המסתיימת היום
+  text_tip_task_begin_end_day: מטלה המתחילה ומסתיימת היום
   text_project_identifier_info: 'אותיות לטיניות (a-z), מספרים ומקפים.<br />ברגע שנשמר, לא ניתן לשנות את המזהה.'
   text_caracters_maximum: "מקסימום {{count}} תווים."
   text_caracters_minimum: "חייב להיות לפחות באורך של {{count}} תווים."
@@ -864,8 +851,8 @@ he:
   text_comma_separated: הכנסת ערכים מרובים מותרת (מופרדים בפסיקים).
   text_line_separated: ניתן להזין מספר ערכים (שורה אחת לכל ערך).
   text_issues_ref_in_commit_messages: קישור ותיקום נושאים בהודעות הפקדה
-  text_issue_added: "הנושא {{id}} דווח (בידי {{author}})."
-  text_issue_updated: "הנושא {{id}} עודכן (בידי {{author}})."
+  text_issue_added: "הנושא {{id}} דווח (by {{author}})."
+  text_issue_updated: "הנושא {{id}} עודכן (by {{author}})."
   text_wiki_destroy_confirmation: האם אתה בטוח שברצונך למחוק את הWIKI הזה ואת כל תוכנו?
   text_issue_category_destroy_question: "כמה נושאים ({{count}}) מוצבים לקטגוריה הזו. מה ברצונך לעשות?"
   text_issue_category_destroy_assignments: הסר הצבת קטגוריה
@@ -887,7 +874,7 @@ he:
   text_user_wrote: "{{value}} כתב:"
   text_enumeration_destroy_question: "{{count}} אוביקטים מוצבים לערך זה."
   text_enumeration_category_reassign_to: 'הצב מחדש לערך הזה:'
-  text_email_delivery_not_configured: 'לא נקבעה תצורה לשליחת דואר, וההתראות כבויות.\nקבע את תצורת שרת ה־SMTP בקובץ /etc/redmine/&lt;instance&gt;/email.yml והתחל את האפליקציה מחדש ע"מ לאפשר אותם.'
+  text_email_delivery_not_configured: 'לא נקבעה תצורה לשליחת דואר, וההתראות כבויות.\nקבע את תצורת שרת ה־SMTP בקובץ config/email.yml והתחל את האפליקציה מחדש ע"מ לאפשר אותם.'
   text_repository_usernames_mapping: "בחר או עדכן את משתמש Redmine הממופה לכל שם משתמש ביומן המאגר.\nמשתמשים בעלי שם או כתובת דואר זהה ב־Redmine ובמאגר ממופים באופן אוטומטי."
   text_diff_truncated: '... השינויים עוברים את מספר השורות המירבי לתצוגה, ולכן הם קוצצו.'
   text_custom_field_possible_values_info: שורה אחת לכל ערך
@@ -927,9 +914,4 @@ he:
   enumeration_doc_categories: קטגוריות מסמכים
   enumeration_activities: פעילויות (מעקב אחר זמנים)
   enumeration_system_activity: פעילות מערכת
-  label_user_mail_option_none: No events
-  field_member_of_group: Assignee's group
-  field_assigned_to_role: Assignee's role
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
+  field_time_entries: Log time

config/locales/hr.yml

@@ -117,7 +117,6 @@ 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
   
@@ -253,6 +252,7 @@ hr:
   field_attr_lastname: Atribut prezimena
   field_attr_mail: Atribut e-pošte
   field_onthefly: "Izrada korisnika \"u hodu\""
+  field_start_date: Pocetak
   field_done_ratio: % Učinjeno
   field_auth_source: Vrsta prijavljivanja
   field_hide_mail: Sakrij moju adresu e-pošte
@@ -814,9 +814,9 @@ hr:
   text_journal_set_to: "{{label}} postavi na {{value}}"
   text_journal_deleted: "{{label}} izbrisano ({{old}})"
   text_journal_added: "{{label}} {{value}} added"  
-  text_tip_issue_begin_day: Zadaci koji počinju ovog dana
-  text_tip_issue_end_day: zadaci koji se završavaju ovog dana
-  text_tip_issue_begin_end_day: Zadaci koji počinju i završavaju se ovog dana
+  text_tip_task_begin_day: Zadaci koji počinju ovog dana
+  text_tip_task_end_day: zadaci koji se završavaju ovog dana
+  text_tip_task_begin_end_day: Zadaci koji počinju i završavaju se ovog dana
   text_project_identifier_info: 'mala slova (a-z), brojevi i crtice su dozvoljeni.<br />Jednom snimljen identifikator se ne može mijenjati!'
   text_caracters_maximum: "Najviše {{count}} znakova."
   text_caracters_minimum: "Mora biti dugačko najmanje {{count}} znakova."
@@ -917,13 +917,3 @@ 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
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"

config/locales/hu.yml

@@ -143,7 +143,6 @@
         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
   
@@ -260,6 +259,7 @@
   field_attr_lastname: Vezetéknév
   field_attr_mail: E-mail
   field_onthefly: On-the-fly felhasználó létrehozás
+  field_start_date: Kezdés dátuma
   field_done_ratio: Elkészült (%)
   field_auth_source: Azonosítási mód
   field_hide_mail: Rejtse el az e-mail címem
@@ -681,9 +681,9 @@
   text_subprojects_destroy_warning: "Az alprojekt(ek): {{value}} szintén törlésre kerülnek."
   text_workflow_edit: Válasszon egy szerepkört, és egy feladat típust a workflow szerkesztéséhez
   text_are_you_sure: Biztos benne ?
-  text_tip_issue_begin_day: a feladat ezen a napon kezdődik
-  text_tip_issue_end_day: a feladat ezen a napon ér véget
-  text_tip_issue_begin_end_day: a feladat ezen a napon kezdődik és ér véget
+  text_tip_task_begin_day: a feladat ezen a napon kezdődik
+  text_tip_task_end_day: a feladat ezen a napon ér véget
+  text_tip_task_begin_end_day: a feladat ezen a napon kezdődik és ér véget
   text_project_identifier_info: 'Kis betűk (a-z), számok és kötőjel megengedett.<br />Mentés után az azonosítót megváltoztatni nem lehet.'
   text_caracters_maximum: "maximum {{count}} karakter."
   text_caracters_minimum: "Legkevesebb {{count}} karakter hosszúnek kell lennie."
@@ -933,13 +933,3 @@
   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
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"

config/locales/id.yml

@@ -119,7 +119,6 @@ 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
   
@@ -251,6 +250,7 @@ id:
   field_attr_lastname: Atribut nama belakang
   field_attr_mail: Atribut email
   field_onthefly: Pembuatan pengguna seketika
+  field_start_date: Mulai
   field_done_ratio: % Selesai
   field_auth_source: Mode otentikasi
   field_hide_mail: Sembunyikan email saya
@@ -795,9 +795,9 @@ id:
   text_journal_set_to: "{{label}} di set ke {{value}}"
   text_journal_deleted: "{{label}} dihapus ({{old}})"
   text_journal_added: "{{label}} {{value}} ditambahkan"
-  text_tip_issue_begin_day: tugas dimulai hari itu
-  text_tip_issue_end_day: tugas berakhir hari itu
-  text_tip_issue_begin_end_day: tugas dimulai dan berakhir hari itu
+  text_tip_task_begin_day: tugas dimulai hari itu
+  text_tip_task_end_day: tugas berakhir hari itu
+  text_tip_task_begin_end_day: tugas dimulai dan berakhir hari itu
   text_project_identifier_info: 'Yang diijinkan hanya huruf kecil (a-z), angka dan tanda minus.<br />Sekali disimpan, pengenal tidak bisa diubah.'
   text_caracters_maximum: "maximum {{count}} karakter."
   text_caracters_minimum: "Setidaknya harus sepanjang {{count}} karakter."
@@ -918,13 +918,3 @@ 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
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"

config/locales/it.yml

@@ -126,7 +126,6 @@ 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
   
@@ -232,6 +231,7 @@ it:
   field_attr_lastname: Attributo cognome
   field_attr_mail: Attributo email
   field_onthefly: Creazione utente "al volo"
+  field_start_date: Inizio
   field_done_ratio: % completato
   field_auth_source: Modalità di autenticazione
   field_hide_mail: Nascondi il mio indirizzo email
@@ -571,9 +571,9 @@ it:
   text_project_destroy_confirmation: Sei sicuro di voler eliminare il progetto e tutti i dati ad esso collegati?
   text_workflow_edit: Seleziona un ruolo ed un tracker per modificare il workflow
   text_are_you_sure: Sei sicuro ?
-  text_tip_issue_begin_day: attività che iniziano in questa giornata
-  text_tip_issue_end_day: attività che terminano in questa giornata
-  text_tip_issue_begin_end_day: attività che iniziano e terminano in questa giornata
+  text_tip_task_begin_day: attività che iniziano in questa giornata
+  text_tip_task_end_day: attività che terminano in questa giornata
+  text_tip_task_begin_end_day: attività che iniziano e terminano in questa giornata
   text_project_identifier_info: "Lettere minuscole (a-z), numeri e trattini permessi.<br />Una volta salvato, l'identificativo non può essere modificato."
   text_caracters_maximum: "massimo {{count}} caratteri."
   text_length_between: "Lunghezza compresa tra {{min}} e {{max}} caratteri."
@@ -914,13 +914,3 @@ 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
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"

config/locales/ja.yml

@@ -144,7 +144,6 @@ 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: 選んでください
   
@@ -175,7 +174,6 @@ ja:
   notice_file_not_found: アクセスしようとしたページは存在しないか削除されています。
   notice_locking_conflict: 別のユーザがデータを更新しています。
   notice_not_authorized: このページにアクセスするには認証が必要です。
-  notice_not_authorized_archived_project: プロジェクトは書庫に保存されています。
   notice_email_sent: "{{value}} 宛にメールを送信しました。"
   notice_email_error: "メール送信中にエラーが発生しました ({{value}})"
   notice_feeds_access_key_reseted: RSSアクセスキーを初期化しました。
@@ -307,7 +305,6 @@ ja:
   field_redirect_existing_links: 既存のリンクをリダイレクトする
   field_estimated_hours: 予定工数
   field_column_names: 項目
-  field_time_entries: 時間を記録
   field_time_zone: タイムゾーン
   field_searchable: 検索条件に設定可能とする
   field_default_value: デフォルト値
@@ -320,10 +317,6 @@ ja:
   field_group_by: グループ条件
   field_sharing: 共有
   field_parent_issue: 親チケット
-  field_member_of_group: 担当者のグループ
-  field_assigned_to_role: 担当者のロール
-  field_text: テキスト
-  field_visible: 表示
   
   setting_app_title: アプリケーションのタイトル
   setting_app_subtitle: アプリケーションのサブタイトル
@@ -353,7 +346,6 @@ ja:
   setting_issue_list_default_columns: チケットの一覧で表示する項目
   setting_repositories_encodings: リポジトリのエンコーディング
   setting_commit_logs_encoding: コミットメッセージのエンコーディング
-  setting_emails_header: メールのヘッダ
   setting_emails_footer: メールのフッタ
   setting_protocol: プロトコル
   setting_per_page_options: ページ毎の表示件数
@@ -379,7 +371,6 @@ ja:
   setting_issue_done_ratio_issue_status: チケットのステータスを使用する
   setting_start_of_week: 週の開始曜日
   setting_rest_api_enabled: RESTによるWebサービスを有効にする
-  setting_default_notification_option: デフォルトのメール通知オプション
   
   permission_add_project: プロジェクトの追加
   permission_add_subprojects: サブプロジェクトの追加
@@ -445,8 +436,6 @@ ja:
   project_module_wiki: Wiki
   project_module_repository: リポジトリ
   project_module_boards: フォーラム
-  project_module_gantt: ガントチャート
-  project_module_calendar: カレンダー
   
   label_user: ユーザ
   label_user_plural: ユーザ
@@ -705,7 +694,7 @@ ja:
   label_relation_delete: 関連の削除
   label_relates_to: 関係している
   label_duplicates: 重複している
-  label_duplicated_by: 重複されている
+  label_duplicated_by: 重複している
   label_blocks: ブロックしている
   label_blocked_by: ブロックされている
   label_precedes: 先行する
@@ -756,10 +745,7 @@ ja:
   label_search_titles_only: タイトルのみ
   label_user_mail_option_all: "参加しているプロジェクトの全ての通知"
   label_user_mail_option_selected: "選択したプロジェクトの全ての通知..."
-  label_user_mail_option_none: "通知しない"
-  label_user_mail_option_only_my_events: "ウォッチまたは関係している事柄のみ"
-  label_user_mail_option_only_assigned: "自分が担当している事柄のみ"
-  label_user_mail_option_only_owner: "自分が作成した事柄のみ"
+  label_user_mail_option_none: "ウォッチまたは関係している事柄のみ"
   label_user_mail_no_self_notified: 自分自身による変更の通知は不要
   label_registration_activation_by_email: メールでアカウントを有効化
   label_registration_manual_activation: 手動でアカウントを有効化
@@ -809,8 +795,6 @@ ja:
   label_api_access_key_created_on: "APIアクセスキーは{{value}}前に作成されました"
   label_subtask_plural: 子チケット
   label_project_copy_notifications: コピーしたチケットのメール通知を送信する
-  label_principal_search: "ユーザまたはグループの検索:"
-  label_user_search: "ユーザの検索:"
   
   button_login: ログイン
   button_submit: 変更
@@ -822,7 +806,6 @@ ja:
   button_create_and_continue: 連続作成
   button_test: テスト
   button_edit: 編集
-  button_edit_associated_wikipage: "関連するWikiページを編集: {{page_title}}"
   button_add: 追加
   button_change: 変更
   button_apply: 適用
@@ -874,14 +857,13 @@ 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}})"
   text_journal_added: "{{label}} {{value}} を追加"
-  text_tip_issue_begin_day: この日に開始するタスク
-  text_tip_issue_end_day: この日に終了するタスク
-  text_tip_issue_begin_end_day: この日のうちに開始して終了するタスク
+  text_tip_task_begin_day: この日に開始するタスク
+  text_tip_task_end_day: この日に終了するタスク
+  text_tip_task_begin_end_day: この日のうちに開始して終了するタスク
   text_project_identifier_info: '英小文字(a-z)と数字とダッシュ(-)が使えます。<br />一度保存すると、識別子は変更できません。'
   text_caracters_maximum: "最大{{count}}文字です。"
   text_caracters_minimum: "最低{{count}}文字の長さが必要です"
@@ -952,6 +934,4 @@ ja:
   enumeration_doc_categories: 文書カテゴリ
   enumeration_activities: 作業分類 (時間トラッキング)
   enumeration_system_activity: システム作業分類
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
+  field_time_entries: Log time

config/locales/ko.yml

@@ -173,7 +173,6 @@ 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: 선택하세요
   
@@ -299,6 +298,7 @@ ko:
   field_attr_lastname: 성 속성
   field_attr_mail: 메일 속성
   field_onthefly: 동적 사용자 생성
+  field_start_date: 시작시간
   field_done_ratio: 진척도
   field_auth_source: 인증 공급자
   field_hide_mail: 메일 주소 숨기기
@@ -809,9 +809,9 @@ ko:
   text_subprojects_destroy_warning: "하위 프로젝트({{value}})이(가) 자동으로 지워질 것입니다."
   text_workflow_edit: 업무흐름 수정하려면 역할과 일감유형을 선택하세요.
   text_are_you_sure: 계속 진행 하시겠습니까?
-  text_tip_issue_begin_day: 오늘 시작하는 업무(task)
-  text_tip_issue_end_day: 오늘 종료하는 업무(task)
-  text_tip_issue_begin_end_day: 오늘 시작하고 종료하는 업무(task)
+  text_tip_task_begin_day: 오늘 시작하는 업무(task)
+  text_tip_task_end_day: 오늘 종료하는 업무(task)
+  text_tip_task_begin_end_day: 오늘 시작하고 종료하는 업무(task)
   text_project_identifier_info: '영문 소문자(a-z) 및 숫자, 대쉬(-) 가능.<br />저장된후에는 식별자 변경 불가능.'
   text_caracters_maximum: "최대 {{count}} 글자 가능"
   text_caracters_minimum: "최소한 {{count}} 글자 이상이어야 합니다."
@@ -961,18 +961,8 @@ 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: 더 작게
-  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
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
+  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

config/locales/lt.yml

@@ -143,7 +143,7 @@ lt:
           other:  "Išsaugant objektą {{model}} rastos {{count}} klaidos"
         body: "Šiuose laukuose yra klaidų:"
 
-      messages:
+      pranešimus:
         inclusion: "nenumatyta reikšmė"
         exclusion: "užimtas"
         invalid: "neteisingas"
@@ -179,7 +179,6 @@ 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
   
@@ -310,6 +309,7 @@ lt:
   field_attr_lastname: Pavardės priskiria
   field_attr_mail: Elektroninio pašto požymis
   field_onthefly: Automatinis vartotojų registravimas
+  field_start_date: Pradėti
   field_done_ratio: % atlikta
   field_auth_source: Autentiškumo nustatymo būdas
   field_hide_mail: Paslėpkite mano elektroninio pašto adresą
@@ -851,9 +851,9 @@ lt:
   text_journal_set_to: "{{label}} pakeista į {{value}}"
   text_journal_deleted: "{{label}} ištrintas ({{old}})"
   text_journal_added: "{{label}} {{value}} pridėtas"
-  text_tip_issue_begin_day: užduotis, prasidedanti šią dieną
-  text_tip_issue_end_day: užduotis, pasibaigianti šią dieną
-  text_tip_issue_begin_end_day: užduotis, prasidedanti ir pasibaigianti šią dieną
+  text_tip_task_begin_day: užduotis, prasidedanti šią dieną
+  text_tip_task_end_day: užduotis, pasibaigianti šią dieną
+  text_tip_task_begin_end_day: užduotis, prasidedanti ir pasibaigianti šią dieną
   text_project_identifier_info: 'Mažosios raidės (a-z), skaičiai ir brūkšniai galimi.<br/>Išsaugojus, identifikuotojas negali būti keičiamas.'
   text_caracters_maximum: "{{count}} simbolių maksimumas."
   text_caracters_minimum: "Turi būti mažiausiai {{count}} simbolių ilgio."
@@ -974,13 +974,3 @@ 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
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"

config/locales/lv.yml

@@ -113,7 +113,6 @@ 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
   
@@ -248,6 +247,7 @@ lv:
   field_attr_lastname: Uzvārda atribūts
   field_attr_mail: "E-pasta atribūts"
   field_onthefly: "Lietotāja izveidošana on-the-fly"
+  field_start_date: Sākuma datums
   field_done_ratio: % padarīti
   field_auth_source: Pilnvarošanas režīms
   field_hide_mail: "Paslēpt manu e-pasta adresi"
@@ -815,9 +815,9 @@ lv:
   text_journal_set_to: "{{label}} iestatīts uz {{value}}"
   text_journal_deleted: "{{label}} dzēsts ({{old}})"
   text_journal_added: "{{label}} {{value}} pievienots"
-  text_tip_issue_begin_day: uzdevums sākas šodien
-  text_tip_issue_end_day: uzdevums beidzas šodien
-  text_tip_issue_begin_end_day: uzdevums sākas un beidzas šodien
+  text_tip_task_begin_day: uzdevums sākas šodien
+  text_tip_task_end_day: uzdevums beidzas šodien
+  text_tip_task_begin_end_day: uzdevums sākas un beidzas šodien
   text_project_identifier_info: 'Tikai mazie burti (a-z), cipari un domuzīmes ir atļauti.<br />Kad saglabāts, identifikators nevar tikt mainīts.'
   text_caracters_maximum: "{{count}} simboli maksimāli."
   text_caracters_minimum: "Jābūt vismaz {{count}} simbolu garumā."
@@ -905,13 +905,3 @@ 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
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"

config/locales/mk.yml

@@ -1,922 +0,0 @@
-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_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_issue_begin_day: задачи што почнуваат овој ден
-  text_tip_issue_end_day: задачи што завршуваат овој ден
-  text_tip_issue_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
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"

config/locales/mn.yml

@@ -117,7 +117,6 @@ 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: Сонгоно уу
   
@@ -252,6 +251,7 @@ mn:
   field_attr_lastname: Овог аттрибут
   field_attr_mail: Имэйл аттрибут
   field_onthefly: Хүссэн үедээ хэрэглэгч үүсгэх
+  field_start_date: Эхлэл
   field_done_ratio: %% Гүйцэтгэсэн
   field_auth_source: Нэвтрэх арга
   field_hide_mail: Миний имэйл хаягийг нуу
@@ -820,9 +820,9 @@ mn:
   text_journal_set_to: "{{label}} {{value}} болгож өөрчиллөө"
   text_journal_deleted: "{{label}} устсан ({{old}})"
   text_journal_added: "{{label}} {{value}} нэмэгдсэн"
-  text_tip_issue_begin_day: энэ өдөр эхлэх ажил
-  text_tip_issue_end_day: энэ өдөр дуусах ажил
-  text_tip_issue_begin_end_day: энэ өдөр эхлээд мөн дуусч байгаа ажил
+  text_tip_task_begin_day: энэ өдөр эхлэх ажил
+  text_tip_task_end_day: энэ өдөр дуусах ажил
+  text_tip_task_begin_end_day: энэ өдөр эхлээд мөн дуусч байгаа ажил
   text_project_identifier_info: 'Зөвхөн жижиг үсгүүд болон (a-z), тоо and дундуур зураас ашиглаж болно.<br />Нэгэнт хадгалсан хойно, төслийн глобал нэрийг өөрлчөх боломжгүй.'
   text_caracters_maximum: "дээд тал нь {{count}} үсэг."
   text_caracters_minimum: "Хамгийн багадаа ядаж {{count}} тэмдэгт байх."
@@ -911,13 +911,3 @@ 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
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"

config/locales/nl.yml

@@ -116,7 +116,6 @@ 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
   
@@ -256,6 +255,7 @@ nl:
   field_role: Rol
   field_searchable: Doorzoekbaar
   field_spent_on: Datum
+  field_start_date: Startdatum
   field_start_page: Startpagina
   field_status: Status
   field_subject: Onderwerp
@@ -701,7 +701,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 aantal diff regels weer te geven
+  setting_diff_max_lines_displayed: Max number of diff lines displayed
   setting_display_subprojects_issues: Standaard issues van subproject tonen
   setting_emails_footer: E-mails footer
   setting_enabled_scm: SCM ingeschakeld
@@ -709,7 +709,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: Max aantal te exporteren issues 
+  setting_issues_export_limit: Limiet export 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 +727,7 @@ nl:
   setting_welcome_text: Welkomsttekst
   setting_wiki_compression: Wikigeschiedenis comprimeren
   status_active: actief
-  status_locked: vergrendeld
+  status_locked: gelockt
   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 +753,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 beschrijfbaar
+  text_plugin_assets_writable: Plugin assets directory writable
   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:'
@@ -764,9 +764,9 @@ nl:
   text_select_project_modules: 'Selecteer de modules die u wilt gebruiken voor dit project:'
   text_status_changed_by_changeset: "Toegepast in changeset {{value}}."
   text_subprojects_destroy_warning: "De subprojecten: {{value}} zullen ook verwijderd worden."
-  text_tip_issue_begin_day: issue die op deze dag begint
-  text_tip_issue_begin_end_day: issue die op deze dag begint en eindigt
-  text_tip_issue_end_day: issue die op deze dag eindigt
+  text_tip_task_begin_day: taak die op deze dag begint
+  text_tip_task_begin_end_day: taak die op deze dag begint en eindigt
+  text_tip_task_end_day: taak die op deze dag eindigt
   text_tracker_no_workflow: Geen workflow gedefinieerd voor deze tracker
   text_unallowed_characters: Niet toegestane tekens
   text_user_mail_option: "Bij niet-geselecteerde projecten zult u enkel notificaties ontvangen voor issues die u monitort of waar u bij betrokken bent (als auteur of toegewezen persoon)."
@@ -778,7 +778,7 @@ nl:
   text_custom_field_possible_values_info: 'Per lijn een waarde'
   label_display: Toon
   field_editable: Bewerkbaar
-  setting_repository_log_display_limit: Max aantal revisies zichbaar 
+  setting_repository_log_display_limit: Maximum hoeveelheid van 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 +824,7 @@ nl:
   version_status_closed: gesloten
   version_status_locked: vergrendeld
   version_status_open: open
-  error_can_not_reopen_issue_on_closed_version: Een issue toegewezen aan een gesloten versie kan niet heropend worden
+  error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened
   label_user_anonymous: Anoniem
   button_move_and_follow: Verplaats en volg
   setting_default_projects_modules: Standaard geactiveerde modules voor nieuwe projecten
@@ -833,36 +833,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: Met project boom
+  label_version_sharing_tree: With project tree
   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 percentage voldaan met
+  setting_issue_done_ratio: Bereken issue done ratio met
   setting_issue_done_ratio_issue_status: Gebruik de issue status
-  error_issue_done_ratios_not_updated: Issue percentage voldaan niet geupdate.
+  error_issue_done_ratios_not_updated: Issue done ratios 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 percentage voldaan geupdate.
+  notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Selecteer een bron tracker of rol
-  label_update_issue_done_ratios: Update issue percentage voldaan
+  label_update_issue_done_ratios: Update issue done ratios
   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: Revisie {{value}}
+  label_revision_id: Revision {{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: Activeer REST web service
+  setting_rest_api_enabled: Enable 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: Breek email verwerking af na een van deze regels
+  setting_mail_handler_body_delimiters: Truncate emails after one of these lines
   permission_add_subprojects: Maak subprojecten
   label_subproject_new: Nieuw subproject
   text_own_membership_delete_confirmation: |-
@@ -873,10 +873,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: Beheer project activiteiten
+  permission_manage_project_activities: Manage project activities
   error_unable_delete_issue_status: Verwijderen van issue status niet gelukt
   label_profile: Profiel
-  permission_manage_subtasks: Beheer subtasks
+  permission_manage_subtasks: Manage subtasks
   field_parent_issue: Parent task
   label_subtask_plural: Subtasks
   label_project_copy_notifications: Stuur email notificaties voor de project kopie
@@ -891,14 +891,4 @@ 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 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
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
+  field_time_entries: Log time

config/locales/no.yml

@@ -111,7 +111,6 @@
         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
@@ -231,6 +230,7 @@
   field_attr_lastname: Etternavnsattributt
   field_attr_mail: E-post-attributt
   field_onthefly: On-the-fly brukeropprettelse
+  field_start_date: Start
   field_done_ratio: % Ferdig
   field_auth_source: Autentifikasjonsmodus
   field_hide_mail: Skjul min e-post-adresse
@@ -653,9 +653,9 @@
   text_subprojects_destroy_warning: "Underprojekt(ene): {{value}} vil også bli slettet."
   text_workflow_edit: Velg en rolle og en sakstype for å endre arbeidsflyten
   text_are_you_sure: Er du sikker ?
-  text_tip_issue_begin_day: oppgaven starter denne dagen
-  text_tip_issue_end_day: oppgaven avsluttes denne dagen
-  text_tip_issue_begin_end_day: oppgaven starter og avsluttes denne dagen
+  text_tip_task_begin_day: oppgaven starter denne dagen
+  text_tip_task_end_day: oppgaven avsluttes denne dagen
+  text_tip_task_begin_end_day: oppgaven starter og avsluttes denne dagen
   text_project_identifier_info: 'Små bokstaver (a-z), nummer og bindestrek tillatt.<br />Identifikatoren kan ikke endres etter den er lagret.'
   text_caracters_maximum: "{{count}} tegn maksimum."
   text_caracters_minimum: "Må være minst {{count}} tegn langt."
@@ -901,13 +901,3 @@
   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
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"

config/locales/pl.yml

@@ -129,7 +129,6 @@ 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:
@@ -277,6 +276,7 @@ pl:
   field_role: Rola
   field_searchable: Przeszukiwalne
   field_spent_on: Data
+  field_start_date: Start
   field_start_page: Strona startowa
   field_status: Status
   field_subject: Temat
@@ -796,10 +796,10 @@ pl:
   text_select_project_modules: 'Wybierz moduły do aktywacji w tym projekcie:'
   text_status_changed_by_changeset: "Zastosowane w zmianach {{value}}."
   text_subprojects_destroy_warning: "Podprojekt(y): {{value}} zostaną także usunięte."
-  text_tip_issue_begin_day: zadanie zaczynające się dzisiaj
-  text_tip_issue_begin_end_day: zadanie zaczynające i kończące się dzisiaj
-  text_tip_issue_end_day: zadanie kończące się dzisiaj
-  text_tracker_no_workflow: Brak przepływu zdefiniowanego dla tego typu zagadnienia
+  text_tip_task_begin_day: zadanie zaczynające się dzisiaj
+  text_tip_task_begin_end_day: zadanie zaczynające i kończące się dzisiaj
+  text_tip_task_end_day: zadanie kończące się dzisiaj
+  text_tracker_no_workflow: Brak przepływu zefiniowanego dla tego typu zagadnienia
   text_unallowed_characters: Niedozwolone znaki
   text_user_mail_option: "W przypadku niezaznaczonych projektów, będziesz otrzymywał powiadomienia tylko na temat zagadnien, które obserwujesz, lub w których bierzesz udział (np. jesteś autorem lub adresatem)."
   text_user_wrote: "{{value}} napisał:"
@@ -912,32 +912,22 @@ 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: 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
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
+  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

config/locales/pt-BR.yml

@@ -143,7 +143,6 @@ 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
 
@@ -264,6 +263,7 @@ pt-BR:
   field_attr_lastname: Atributo para sobrenome
   field_attr_mail: Atributo para e-mail
   field_onthefly: Criar usuários dinamicamente ("on-the-fly")
+  field_start_date: Início
   field_done_ratio: % Terminado
   field_auth_source: Modo de autenticação
   field_hide_mail: Ocultar meu e-mail
@@ -695,9 +695,9 @@ pt-BR:
   text_subprojects_destroy_warning: "Seu(s) subprojeto(s): {{value}} também serão excluídos."
   text_workflow_edit: Selecione um papel e um tipo de tarefa para editar o fluxo de trabalho
   text_are_you_sure: Você tem certeza?
-  text_tip_issue_begin_day: tarefa inicia neste dia
-  text_tip_issue_end_day: tarefa termina neste dia
-  text_tip_issue_begin_end_day: tarefa inicia e termina neste dia
+  text_tip_task_begin_day: tarefa inicia neste dia
+  text_tip_task_end_day: tarefa termina neste dia
+  text_tip_task_begin_end_day: tarefa inicia e termina neste dia
   text_project_identifier_info: 'Letras minúsculas (a-z), números e hífens permitidos.<br />Uma vez salvo, o identificador não poderá ser alterado.'
   text_caracters_maximum: "máximo {{count}} caracteres"
   text_caracters_minimum: "deve ter ao menos {{count}} caracteres."
@@ -916,7 +916,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: Não foi possível excluir situação da tarefa
+  error_unable_delete_issue_status: Impossível excluir situação da tarefa
   label_profile: Perfil
   permission_manage_subtasks: Gerenciar subtarefas
   field_parent_issue: Tarefa pai
@@ -934,17 +934,3 @@ 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: Membro do grupo
-  field_assigned_to_role: Membro com o papel
-  button_edit_associated_wikipage: "Editar página wiki relacionada: {{page_title}}"
-  text_are_you_sure_with_children: Excluir a tarefa e suas subtarefas?
-  field_text: Campo de texto
-  label_user_mail_option_only_owner: Somente para as coisas que eu criei
-  setting_default_notification_option: Opção padrão de notificação
-  label_user_mail_option_only_my_events: Somente para as coisas que eu esteja observando ou esteja envolvido
-  label_user_mail_option_only_assigned: Somente para as coisas que estejam atribuídas a mim
-  field_start_date: Start date
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"