Tagging 1.0.2

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/tags/1.0.2@4213 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-26 22:43:11 +00:00
122 changed files with 5142 additions and 5769 deletions
--- a/app/controllers/calendars_controller.rb
+++ b/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
--- a/app/controllers/issue_moves_controller.rb
+++ b/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
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -26,7 +26,7 @@ class IssuesController < ApplicationController
  before_filter :find_optional_project, :only => [:index]
  before_filter :check_for_default_issue_status, :only => [:new, :create]
  before_filter :build_new_issue_from_params, :only => [:new, :create]
-  accept_key_auth :index, :show, :create, :update, :destroy
+  accept_key_auth :index, :show

  rescue_from Query::StatementInvalid, :with => :query_statement_invalid
  
@@ -300,7 +300,6 @@ 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?
@@ -308,6 +307,7 @@ private
      end
    end
    @issue.author = User.current
+    @issue.start_date ||= Date.today
    @priorities = IssuePriority.all
    @allowed_statuses = @issue.new_statuses_allowed_to(User.current, true)
  end
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -19,7 +19,6 @@ class JournalsController < ApplicationController
  before_filter :find_journal, :only => [:edit]
  before_filter :find_issue, :only => [:new]
  before_filter :find_optional_project, :only => [:index]
-  before_filter :authorize, :only => [:new, :edit]
  accept_key_auth :index

  helper :issues
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -24,7 +24,7 @@ class ProjectsController < ApplicationController
  before_filter :authorize, :except => [ :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy]
  before_filter :authorize_global, :only => [:new, :create]
  before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
-  accept_key_auth :index, :show, :create, :update, :destroy
+  accept_key_auth :index

  after_filter :only => [:create, :edit, :update, :archive, :unarchive, :destroy] do |controller|
    if controller.request.post?
@@ -93,7 +93,7 @@ class ProjectsController < ApplicationController
          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) }
+        format.xml  { head :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
      end
    else
      respond_to do |format|
--- a/app/controllers/versions_controller.rb
+++ b/app/controllers/versions_controller.rb
@@ -109,10 +109,6 @@ class VersionsController < ApplicationController
      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
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -34,11 +34,25 @@ module ApplicationHelper
  # 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 [Hash, String] options Hash params or url for the link target (passed to link_to).
+  #        This will checked by authorize_for to see if the user is authorized
  # @param [optional, Hash] html_options Options passed to link_to
  # @param [optional, Hash] parameters_for_method_reference Extra parameters for link_to
  def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
-    link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action])
+    if options.is_a?(String)
+      begin
+        route = ActionController::Routing::Routes.recognize_path(options.gsub(/\?.*/,''), :method => options[:method] || :get)
+        link_controller = route[:controller]
+        link_action = route[:action]
+      rescue ActionController::RoutingError # Parse failed, not a route
+        link_controller, link_action = nil, nil
+      end
+    else
+      link_controller = options[:controller] || params[:controller]
+      link_action = options[:action]
+    end
+
+    link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(link_controller, link_action)
  end

  # Display a link to remote if user is authorized
--- a/app/models/board.rb
+++ b/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
--- a/app/models/group.rb
+++ b/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)
--- a/app/models/issue.rb
+++ b/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
    
@@ -365,9 +365,7 @@ class Issue < ActiveRecord::Base
  
  # 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
--- a/app/models/issue_relation.rb
+++ b/app/models/issue_relation.rb
@@ -84,15 +84,14 @@ class IssueRelation < ActiveRecord::Base
  
  def set_issue_to_dates
    soonest_start = self.successor_soonest_start
-    if soonest_start && issue_to
+    if soonest_start
      issue_to.reschedule_after(soonest_start)
    end
  end
  
  def successor_soonest_start
-    if (TYPE_PRECEDES == self.relation_type) && delay && issue_from && (issue_from.start_date || issue_from.due_date)
-      (issue_from.due_date || issue_from.start_date) + 1 + delay
-    end
+    return nil unless (TYPE_PRECEDES == self.relation_type) && (issue_from.start_date || issue_from.due_date)
+    (issue_from.due_date || issue_from.start_date) + 1 + delay
  end
  
  def <=>(relation)
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -368,15 +368,15 @@ class Query < ActiveRecord::Base
  
  # Returns true if the query is a grouped query
  def grouped?
-    !group_by_column.nil?
+    !group_by.blank?
  end
  
  def group_by_column
-    groupable_columns.detect {|c| c.groupable && c.name.to_s == group_by}
+    groupable_columns.detect {|c| c.name.to_s == group_by}
  end
  
  def group_by_statement
-    group_by_column.try(:groupable)
+    group_by_column.groupable
  end
  
  def project_statement
--- a/app/views/calendars/show.html.erb
+++ b/app/views/calendars/show.html.erb
@@ -36,9 +36,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 %>

--- a/app/views/context_menus/issues.html.erb
+++ b/app/views/context_menus/issues.html.erb
@@ -9,7 +9,7 @@
 	        :class => 'icon-edit', :disabled => !@can[:edit] %></li>
 <% end %>

-  <% if @allowed_statuses.present? %>
+  <% unless @allowed_statuses.empty? %>
 	<li class="folder">			
 		<a href="#" class="submenu" onclick="return false;"><%= l(:field_status) %></a>
 		<ul>
@@ -58,7 +58,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>
--- a/app/views/groups/_users.html.erb
+++ b/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,
--- a/app/views/issue_categories/_form.rhtml
+++ b/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>
--- a/app/views/issue_moves/new.rhtml
+++ b/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>

--- a/app/views/issues/_action_menu.rhtml
+++ b/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_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 => (@issue.leaf? ? l(:text_are_you_sure) : l(:text_are_you_sure_with_children)), :method => :post, :class => 'icon icon-del' %>
 </div>
--- a/app/views/issues/_form.rhtml
+++ b/app/views/issues/_form.rhtml
@@ -8,8 +8,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 %>
@@ -26,11 +26,11 @@
 </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 -%>
--- a/app/views/issues/new.rhtml
+++ b/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} %>
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -47,7 +47,7 @@
 <hr />

 <div class="contextual">
-<%= link_to_remote_if_authorized(l(:button_quote), { :url => {:controller => 'journals', :action => 'new', :id => @issue} }, :class => 'icon icon-comment') unless @issue.description.blank? %>
+<%= link_to_remote_if_authorized(l(:button_quote), { :url => {:action => 'reply', :id => @issue} }, :class => 'icon icon-comment') unless @issue.description.blank? %>
 </div>
                              
 <p><strong><%=l(:field_description)%></strong></p>
--- a/app/views/my/page_layout.rhtml
+++ b/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() {
--- a/app/views/projects/settings/_members.rhtml
+++ b/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,
--- a/app/views/projects/settings/_versions.rhtml
+++ b/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' %>
--- a/app/views/settings/_authentication.rhtml
+++ b/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"],
--- a/app/views/settings/_general.rhtml
+++ b/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>

--- a/app/views/users/_general.rhtml
+++ b/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 %>
--- a/app/views/versions/show.rhtml
+++ b/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>

--- a/app/views/workflows/index.rhtml
+++ b/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 %>
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -106,17 +106,5 @@ module Rails
  end
 end

-# TODO: Workaround for #7013 to be removed for 1.2.0
-# Loads i18n 0.4.2 before Rails loads any more recent gem
-# 0.5.0 is not compatible with the old interpolation syntax
-# Plugins will have to migrate to the new syntax for 1.2.0
-require 'rubygems'
-begin
-  gem 'i18n', '0.4.2'
-rescue Gem::LoadError => load_error
-  $stderr.puts %(Missing the i18n 0.4.2 gem. Please `gem install -v=0.4.2 i18n`)
-  exit 1
-end
-
 # All that for this:
 Rails.boot!
--- a/config/initializers/10-patches.rb
+++ b/config/initializers/10-patches.rb
@@ -84,9 +84,9 @@ ActionMailer::Base.send :include, AsynchronousMailer
 module I18n
  module Backend
    module Base
-      def warn_syntax_deprecation!(*args)
+      def warn_syntax_deprecation!
        return if @skip_syntax_deprecation
-        warn "The {{key}} interpolation syntax in I18n messages is deprecated and will be removed in Redmine 1.2. Please use %{key} instead, see http://www.redmine.org/issues/7013 for more information."
+        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
--- a/config/locales/bg.yml
+++ b/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,16 +106,17 @@ 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: "Тази релация ще доведе до безкрайна зависимост"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"

  actionview_instancetag_blank_option: Изберете
  
@@ -170,7 +171,7 @@ bg:
  field_mail: Email
  field_filename: Файл
  field_filesize: Големина
-  field_downloads: Изтеглени файлове
+  field_downloads: Downloads
  field_author: Автор
  field_created_on: От дата
  field_updated_on: Обновена
@@ -185,10 +186,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,10 +217,10 @@ 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: % Прогрес
@@ -248,12 +249,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: Отбелязващи ключови думи
@@ -269,9 +270,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: Задача
@@ -292,9 +293,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: Нова категория
@@ -322,14 +323,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: Целочислен
@@ -338,10 +339,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: Нов файл
@@ -368,21 +369,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: Следващ
@@ -393,7 +394,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: Виж всички промени
@@ -401,9 +402,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: Изтриване на коментари
@@ -452,13 +453,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: Отделено време
@@ -477,7 +478,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: Изтриване на релация
@@ -487,10 +488,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: Показване на реализирани версии
@@ -533,7 +534,7 @@ bg:
  button_clear: Изчисти
  button_lock: Заключване
  button_unlock: Отключване
-  button_download: Изтегляне
+  button_download: Download
  button_list: Списък
  button_view: Преглед
  button_move: Преместване
@@ -543,8 +544,8 @@ bg:
  button_sort: Сортиране
  button_log_time: Отделяне на време
  button_rollback: Върни се към тази ревизия
-  button_watch: Наблюдаване
-  button_unwatch: Край на наблюдението
+  button_watch: Наблюдавай
+  button_unwatch: Спри наблюдението
  button_reply: Отговор
  button_archive: Архивиране
  button_unarchive: Разархивиране
@@ -581,11 +582,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: Затворена
@@ -647,7 +648,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: Промяна на настройки
@@ -706,217 +707,209 @@ 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 страницата '{{page}}' не беше обновена"
-  label_wiki_content_added: Wiki страница беше добавена
-  mail_subject_wiki_content_added: "Wiki страницата '{{page}}' беше добавена"
-  mail_body_wiki_content_added: Wiki страницата '{{page}}' беше добавена от {{author}}.
-  label_wiki_content_updated: Wiki страница беше обновена
-  mail_body_wiki_content_updated: Wiki страницата '{{page}}' беше обновена от {{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: Текстово поле
-  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: Календар
-  text_tip_issue_begin_day: задача, започваща този ден
-  button_edit_associated_wikipage: "Редактиране на асоциираната Wiki страница: {{page_title}}"
-  field_assigned_to_role: Assignee's role
-  label_principal_search: "Търсене на потребител или група:"
-  label_user_search: "Търсене на потребител:"
-  field_visible: Видим
-  setting_emails_header: Emails header
+  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
+
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -750,9 +750,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."
@@ -932,5 +932,4 @@ bs:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
+
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -842,9 +842,9 @@ ca:
  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."
@@ -920,5 +920,4 @@ ca:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
+
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -655,9 +655,9 @@ cs:
  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_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é."
@@ -918,5 +918,3 @@ cs:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -250,7 +250,7 @@ da:
  field_attr_lastname: Efternavn attribut
  field_attr_mail: Email attribut
  field_onthefly: løbende brugeroprettelse
-  field_start_date: Start date
+  field_start_date: Start
  field_done_ratio: % Færdig
  field_auth_source: Sikkerhedsmetode
  field_hide_mail: Skjul min email
@@ -371,7 +371,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
@@ -442,7 +442,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
@@ -538,7 +538,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
@@ -548,7 +548,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
@@ -657,9 +657,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."
@@ -871,8 +871,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
@@ -897,14 +897,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
@@ -915,24 +915,23 @@ 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
+  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: 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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
+  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
+
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -792,8 +792,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
@@ -802,7 +800,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
@@ -833,7 +831,7 @@ 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
@@ -860,9 +858,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."
@@ -938,8 +936,4 @@ de:
  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.
-  field_member_of_group: Assignee's group
-  field_assigned_to_role: Assignee's role
-  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -761,9 +761,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}} χαρακτήρες."
@@ -918,5 +918,4 @@ el:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
+
--- a/config/locales/en-GB.yml
+++ b/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"
@@ -257,7 +257,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 +825,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."
@@ -922,6 +922,4 @@ en-GB:
  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:"
+
--- a/config/locales/en.yml
+++ b/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
@@ -776,8 +776,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 +820,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
@@ -846,9 +843,9 @@ en:
  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."
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -636,8 +636,8 @@ 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_selected: "Para cualquier evento de los proyectos seleccionados..."
  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
  label_version: Versión
@@ -821,9 +821,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)."
@@ -952,15 +952,10 @@ es:
  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
-  setting_default_notification_option: Opcion de notificacion por defecto
-  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.
-  label_principal_search: "Buscar por usuario o grupo:"
-  label_user_search: "Buscar por usuario:"
-  field_visible: Visible
-  setting_emails_header: Encabezado de Correos
+  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
+
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -636,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ä."
@@ -943,5 +943,3 @@ fi:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -775,8 +775,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
@@ -837,9 +835,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."
@@ -933,11 +931,9 @@ fr:
  notice_unable_delete_time_entry: Impossible de supprimer le temps passé.
  label_overall_spent_time: Temps passé global
  field_time_entries: Log time
-  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
-  setting_default_notification_option: Option de notification par défaut
-  field_member_of_group: Groupe de l'assigné
-  field_assigned_to_role: Rôle de l'assigné
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Modifier la page de Wiki associée: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
+
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -798,9 +798,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)."
@@ -934,5 +934,4 @@ gl:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
+
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -104,7 +104,7 @@ he:
        inclusion: "לא נכלל ברשימה"
        exclusion: "לא זמין"
        invalid: "לא ולידי"
-        confirmation: "לא תואם לאישור"
+        confirmation: "לא תואם לאישורו"
        accepted: "חייב באישור"
        empty: "חייב להכלל"
        blank: "חייב להכלל"
@@ -122,8 +122,8 @@ he:
        even: "חייב להיות זוגי"
        greater_than_start_date: "חייב להיות מאוחר יותר מתאריך ההתחלה"
        not_same_project: "לא שייך לאותו הפרויקט"
-        circular_dependency: "קשר זה יצור תלות מעגלית"
-        cant_link_an_issue_with_a_descendant: "לא ניתן לקשר נושא לתת־משימה שלו"
+        circular_dependency: "הקשר הזה יצור תלות מעגלית"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"

  actionview_instancetag_blank_option: בחר בבקשה

@@ -144,7 +144,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 +154,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 +168,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 +194,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 +248,7 @@ he:
  field_login: שם משתמש
  field_mail_notification: הודעות דוא"ל
  field_admin: ניהול
-  field_last_login_on: התחברות אחרונה
+  field_last_login_on: חיבור אחרון
  field_language: שפה
  field_effective_date: תאריך
  field_password: סיסמה
@@ -268,7 +267,7 @@ he:
  field_onthefly: יצירת משתמשים זריזה
  field_start_date: תאריך התחלה
  field_done_ratio: % גמור
-  field_auth_source: מקור הזדהות
+  field_auth_source: מצב אימות
  field_hide_mail: החבא את כתובת הדוא"ל שלי
  field_comments: הערות
  field_url: URL
@@ -285,7 +284,6 @@ he:
  field_redirect_existing_links: העבר קישורים קיימים
  field_estimated_hours: זמן משוער
  field_column_names: עמודות
-  field_time_entries: רישום זמנים
  field_time_zone: איזור זמן
  field_searchable: ניתן לחיפוש
  field_default_value: ערך ברירת מחדל
@@ -298,16 +296,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: כתובת שליחת דוא"ל
@@ -315,14 +310,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: הרשה קישור נושאים בין פרויקטים
@@ -344,18 +339,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: יצירת תתי־פרויקט
@@ -382,9 +376,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: ניהול מסמכים
@@ -401,7 +395,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: צפיה בהודעות
@@ -421,8 +415,6 @@ he:
  project_module_wiki: Wiki
  project_module_repository: מאגר
  project_module_boards: לוחות
-  project_module_calendar: לוח שנה
-  project_module_gantt: גאנט

  label_user: משתמש
  label_user_plural: משתמשים
@@ -447,7 +439,7 @@ he:
  label_document: מסמך
  label_document_new: מסמך חדש
  label_document_plural: מסמכים
-  label_document_added: מסמך נוסף
+  label_document_added: מוסמך נוסף
  label_role: תפקיד
  label_role_plural: תפקידים
  label_role_new: תפקיד חדש
@@ -472,7 +464,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: אבדה הסיסמה?
@@ -487,7 +479,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: פעילות כוללת
@@ -495,10 +487,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}} וכל תתי־הפרויקטים שלו"
@@ -529,7 +521,7 @@ he:
  label_news_plural: חדשות
  label_news_latest: חדשות אחרונות
  label_news_view_all: צפה בכל החדשות
-  label_news_added: חדשות נוספו
+  label_news_added: חדשות הוספו
  label_settings: הגדרות
  label_overview: מבט רחב
  label_version: גירסה
@@ -583,7 +575,7 @@ he:
    one: הערה אחת
    other: "{{count}} הערות"
  label_comment_add: הוסף תגובה
-  label_comment_added: תגובה נוספה
+  label_comment_added: תגובה הוספה
  label_comment_delete: מחק תגובות
  label_query: שאילתה אישית
  label_query_plural: שאילתות אישיות
@@ -601,7 +593,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: חודש שעבר
@@ -620,19 +612,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: הזז למעלה
@@ -646,10 +638,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: גירסה נוכחית
@@ -702,7 +694,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: שנה
@@ -711,18 +703,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: ערוך את הנושאים המסומנים
@@ -743,7 +735,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: הוסף עוד קובץ
@@ -760,8 +752,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: קבוצה חדשה
@@ -793,7 +785,6 @@ he:
  button_create_and_continue: צור ופתח חדש
  button_test: בדוק
  button_edit: ערוך
-  button_edit_associated_wikipage: "ערוך דף wiki מקושר: {{page_title}}"
  button_add: הוסף
  button_change: שנה
  button_apply: החל
@@ -809,8 +800,8 @@ he:
  button_cancel: בטל
  button_activate: הפעל
  button_sort: מיין
-  button_log_time: רישום זמנים
-  button_rollback: חזור למהדורה זו
+  button_log_time: זמן לוג
+  button_rollback: חזור לגירסה זו
  button_watch: צפה
  button_unwatch: בטל צפיה
  button_reply: השב
@@ -818,7 +809,7 @@ he:
  button_unarchive: הוצא מהארכיון
  button_reset: אפס
  button_rename: שנה שם
-  button_change_password: שנה סיסמה
+  button_change_password: שנה סיסמא
  button_copy: העתק
  button_copy_and_follow: העתק ועקוב
  button_annotate: הוסף תיאור מסגרת
@@ -845,14 +836,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}} תווים."
@@ -862,8 +852,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: הסר הצבת קטגוריה
@@ -885,7 +875,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: שורה אחת לכל ערך
@@ -925,7 +915,11 @@ he:
  enumeration_doc_categories: קטגוריות מסמכים
  enumeration_activities: פעילויות (מעקב אחר זמנים)
  enumeration_system_activity: פעילות מערכת
-  field_member_of_group: Assignee's group
-  field_assigned_to_role: Assignee's role
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
+  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
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -815,9 +815,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."
@@ -925,5 +925,3 @@ hr:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -682,9 +682,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."
@@ -941,5 +941,3 @@
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -796,9 +796,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."
@@ -926,5 +926,3 @@ id:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -572,9 +572,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."
@@ -922,5 +922,3 @@ it:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -175,7 +175,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アクセスキーを初期化しました。
@@ -323,7 +322,6 @@ ja:
  field_member_of_group: 担当者のグループ
  field_assigned_to_role: 担当者のロール
  field_text: テキスト
-  field_visible: 表示
  
  setting_app_title: アプリケーションのタイトル
  setting_app_subtitle: アプリケーションのサブタイトル
@@ -353,7 +351,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 +376,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: サブプロジェクトの追加
@@ -705,7 +701,7 @@ ja:
  label_relation_delete: 関連の削除
  label_relates_to: 関係している
  label_duplicates: 重複している
-  label_duplicated_by: 重複されている
+  label_duplicated_by: 重複している
  label_blocks: ブロックしている
  label_blocked_by: ブロックされている
  label_precedes: 先行する
@@ -756,7 +752,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_none: "ウォッチまたは関係している事柄のみ"
  label_user_mail_no_self_notified: 自分自身による変更の通知は不要
  label_registration_activation_by_email: メールでアカウントを有効化
  label_registration_manual_activation: 手動でアカウントを有効化
@@ -806,8 +802,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: 変更
@@ -876,9 +870,9 @@ ja:
  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}}文字の長さが必要です"
@@ -949,5 +943,3 @@ ja:
  enumeration_doc_categories: 文書カテゴリ
  enumeration_activities: 作業分類 (時間トラッキング)
  enumeration_system_activity: システム作業分類
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -810,9 +810,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}} 글자 이상이어야 합니다."
@@ -974,5 +974,3 @@ ko:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -852,9 +852,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."
@@ -982,5 +982,3 @@ lt:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -765,9 +765,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)."
@@ -900,5 +900,3 @@ nl:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -654,9 +654,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."
@@ -909,5 +909,3 @@
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -797,10 +797,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ł:"
@@ -939,5 +939,3 @@ pl:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -696,9 +696,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."
@@ -937,11 +937,8 @@ pt-BR:
  field_time_entries: Log time
  project_module_gantt: Gantt
  project_module_calendar: Calendário
-  field_member_of_group: Membro do grupo
+  field_member_of_group: Mebro do grupo
  field_assigned_to_role: Membro com o papel
-  button_edit_associated_wikipage: "Editar página wiki relacionada: {{page_title}}"
+  button_edit_associated_wikipage: "Editar páginas wiki relacionadas: {{page_title}}"
  text_are_you_sure_with_children: Excluir a tarefa e suas subtarefas?
  field_text: Campo de texto
-  setting_default_notification_option: Opção padrão de notificação
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -128,7 +128,7 @@ pt:
        greater_than_start_date: "deve ser maior que a data inicial"
        not_same_project: "não pertence ao mesmo projecto"
        circular_dependency: "Esta relação iria criar uma dependência circular"
-        cant_link_an_issue_with_a_descendant: "Não é possível ligar uma tarefa a uma sub-tarefa que lhe é pertencente"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"

  ## Translated by: Pedro Araújo <phcrva19@hotmail.com>
  actionview_instancetag_blank_option: Seleccione
@@ -152,7 +152,7 @@ pt:
  notice_account_unknown_email: Utilizador desconhecido.
  notice_can_t_change_password: Esta conta utiliza uma fonte de autenticação externa. Não é possível alterar a palavra-chave.
  notice_account_lost_email_sent: Foi-lhe enviado um e-mail com as instruções para escolher uma nova palavra-chave.
-  notice_account_activated: A sua conta foi activada. É agora possível autenticar-se.
+  notice_account_activated: A sua conta foi activada. Já pode autenticar-se.
  notice_successful_create: Criado com sucesso.
  notice_successful_update: Alterado com sucesso.
  notice_successful_delete: Apagado com sucesso.
@@ -176,9 +176,9 @@ pt:
  error_issue_not_found_in_project: 'A tarefa não foi encontrada ou não pertence a este projecto.'
  
  mail_subject_lost_password: "Palavra-chave de {{value}}"
-  mail_body_lost_password: 'Para mudar a sua palavra-chave, clique na ligação abaixo:'
+  mail_body_lost_password: 'Para mudar a sua palavra-chave, clique no link abaixo:'
  mail_subject_register: "Activação de conta de {{value}}"
-  mail_body_register: 'Para activar a sua conta, clique na ligação abaixo:'
+  mail_body_register: 'Para activar a sua conta, clique no link abaixo:'
  mail_body_account_information_external: "Pode utilizar a conta {{value}} para autenticar-se."
  mail_body_account_information: Informação da sua conta
  mail_subject_account_activation_request: "Pedido de activação da conta {{value}}"
@@ -224,7 +224,7 @@ pt:
  field_priority: Prioridade
  field_fixed_version: Versão
  field_user: Utilizador
-  field_role: Função
+  field_role: Papel
  field_homepage: Página
  field_is_public: Público
  field_parent: Sub-projecto de
@@ -264,8 +264,8 @@ pt:
  field_is_filter: Usado como filtro
  field_issue_to: Tarefa relacionada
  field_delay: Atraso
-  field_assignable: As tarefas podem ser associados a esta função
-  field_redirect_existing_links: Redireccionar ligações existentes
+  field_assignable: As tarefas podem ser associados a este papel
+  field_redirect_existing_links: Redireccionar links existentes
  field_estimated_hours: Tempo estimado
  field_column_names: Colunas
  field_time_zone: Fuso horário
@@ -343,17 +343,17 @@ pt:
  label_document_new: Novo documento
  label_document_plural: Documentos
  label_document_added: Documento adicionado
-  label_role: Função
-  label_role_plural: Funções
-  label_role_new: Nova função
-  label_role_and_permissions: Funções e permissões
+  label_role: Papel
+  label_role_plural: Papéis
+  label_role_new: Novo papel
+  label_role_and_permissions: Papéis e permissões
  label_member: Membro
  label_member_new: Novo membro
  label_member_plural: Membros
  label_tracker: Tipo
  label_tracker_plural: Tipos
  label_tracker_new: Novo tipo
-  label_workflow: Fluxo de trabalho
+  label_workflow: Workflow
  label_issue_status: Estado da tarefa
  label_issue_status_plural: Estados da tarefa
  label_issue_status_new: Novo estado
@@ -553,7 +553,7 @@ pt:
  label_diff_inline: inline
  label_diff_side_by_side: lado a lado
  label_options: Opções
-  label_copy_workflow_from: Copiar fluxo de trabalho de
+  label_copy_workflow_from: Copiar workflow de
  label_permissions_report: Relatório de permissões
  label_watched_issues: Tarefas observadas
  label_related_issues: Tarefas relacionadas
@@ -681,16 +681,16 @@ pt:
  text_min_max_length_info: 0 siginifica sem restrição
  text_project_destroy_confirmation: Tem a certeza que deseja apagar o projecto e todos os dados relacionados?
  text_subprojects_destroy_warning: "O(s) seu(s) sub-projecto(s): {{value}} também será/serão apagado(s)."
-  text_workflow_edit: Seleccione uma função e um tipo de tarefa para editar o fluxo de trabalho
+  text_workflow_edit: Seleccione um papel e um tipo de tarefa para editar o workflow
  text_are_you_sure: Tem a certeza?
-  text_tip_issue_begin_day: tarefa a começar neste dia
-  text_tip_issue_end_day: tarefa a acabar neste dia
-  text_tip_issue_begin_end_day: tarefa a começar e acabar neste dia
+  text_tip_task_begin_day: tarefa a começar neste dia
+  text_tip_task_end_day: tarefa a acabar neste dia
+  text_tip_task_begin_end_day: tarefa a começar e acabar neste dia
  text_project_identifier_info: 'Apenas são permitidos letras minúsculas (a-z), números e hífens.<br />Uma vez guardado, o identificador não poderá ser alterado.'
  text_caracters_maximum: "máximo {{count}} caracteres."
  text_caracters_minimum: "Deve ter pelo menos {{count}} caracteres."
  text_length_between: "Deve ter entre {{min}} e {{max}} caracteres."
-  text_tracker_no_workflow: Sem fluxo de trabalho definido para este tipo de tarefa.
+  text_tracker_no_workflow: Sem workflow definido para este tipo de tarefa.
  text_unallowed_characters: Caracteres não permitidos
  text_comma_separated: Permitidos múltiplos valores (separados por vírgula).
  text_issues_ref_in_commit_messages: Referenciando e fechando tarefas em mensagens de commit
@@ -701,7 +701,7 @@ pt:
  text_issue_category_destroy_assignments: Remover as atribuições à categoria
  text_issue_category_reassign_to: Re-atribuir as tarefas para esta categoria
  text_user_mail_option: "Para projectos não seleccionados, apenas receberá notificações acerca de coisas que está a observar ou está envolvido (ex. tarefas das quais foi o criador ou lhes foram atribuídas)."
-  text_no_configuration_data: "Perfis, tipos de tarefas, estados das tarefas e workflows ainda não foram configurados.\nÉ extremamente recomendado carregar as configurações padrão. Será capaz de as modificar depois de estarem carregadas."
+  text_no_configuration_data: "Papeis, tipos de tarefas, estados das tarefas e workflows ainda não foram configurados.\nÉ extremamente recomendado carregar as configurações padrão. Será capaz de as modificar depois de estarem carregadas."
  text_load_default_configuration: Carregar as configurações padrão
  text_status_changed_by_changeset: "Aplicado no changeset {{value}}."
  text_issues_destroy_confirmation: 'Tem a certeza que deseja apagar a(s) tarefa(s) seleccionada(s)?'
@@ -725,7 +725,7 @@ pt:
  default_tracker_feature: Funcionalidade
  default_tracker_support: Suporte
  default_issue_status_new: Novo
-  default_issue_status_in_progress: Em curso
+  default_issue_status_in_progress: In Progress
  default_issue_status_resolved: Resolvido
  default_issue_status_feedback: Feedback
  default_issue_status_closed: Fechado
@@ -790,7 +790,7 @@ pt:
  permission_rename_wiki_pages: Renomear páginas de wiki
  permission_edit_time_entries: Editar entradas de tempo
  permission_edit_own_issue_notes: Editar as prórpias notas
-  setting_gravatar_enabled: Utilizar ícones Gravatar
+  setting_gravatar_enabled: Utilizar icons Gravatar
  label_example: Exemplo
  text_repository_usernames_mapping: "Seleccionar ou actualizar o utilizador de Redmine mapeado a cada nome de utilizador encontrado no repositório.\nUtilizadores com o mesmo nome de utilizador ou email no Redmine e no repositório são mapeados automaticamente."
  permission_edit_own_messages: Editar as próprias mensagens
@@ -799,132 +799,130 @@ pt:
  label_updated_time_by: "Actualizado por {{author}} há {{age}}"
  text_diff_truncated: '... Este diff foi truncado porque excede o tamanho máximo que pode ser mostrado.'
  setting_diff_max_lines_displayed: Número máximo de linhas de diff mostradas
-  text_plugin_assets_writable: Escrita na pasta de activos dos módulos de extensão possível
-  warning_attachments_not_saved: "Não foi possível gravar {{count}} ficheiro(s) ."
-  button_create_and_continue: Criar e continuar
-  text_custom_field_possible_values_info: 'Uma linha para cada valor'
-  label_display: Mostrar
-  field_editable: Editável
-  setting_repository_log_display_limit: Número máximo de revisões exibido no relatório de ficheiro
-  setting_file_max_size_displayed: Tamanho máximo dos ficheiros de texto exibidos inline
-  field_watcher: Observador
-  setting_openid: Permitir início de sessão e registo com OpenID
-  field_identity_url: URL do OpenID
-  label_login_with_open_id_option: ou início de sessão com OpenID
-  field_content: Conteúdo
-  label_descending: Descendente
-  label_sort: Ordenar
-  label_ascending: Ascendente
-  label_date_from_to: De {{start}} a {{end}}
+  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: 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: 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: Esta página tem {{descendants}} página(s) subordinada(s) e descendente(s). O que deseja fazer?
-  text_wiki_page_reassign_children: Reatribuir páginas subordinadas a esta página principal
-  text_wiki_page_nullify_children: Manter páginas subordinadas como páginas raíz
-  text_wiki_page_destroy_children: Apagar as páginas subordinadas e todos os seus descendentes
-  setting_password_min_length: Tamanho mínimo de palavra-chave
-  field_group_by: Agrupar resultados por
-  mail_subject_wiki_content_updated: "A página Wiki '{{page}}' foi actualizada"
-  label_wiki_content_added: Página Wiki adicionada
-  mail_subject_wiki_content_added: "A página Wiki '{{page}}' foi adicionada"
-  mail_body_wiki_content_added: A página Wiki '{{page}}' foi adicionada por {{author}}.
-  label_wiki_content_updated: Página Wiki actualizada
-  mail_body_wiki_content_updated: A página Wiki '{{page}}' foi actualizada por {{author}}.
-  permission_add_project: Criar projecto
-  setting_new_project_user_role_id: Função atribuída a um utilizador não-administrador que cria um projecto
-  label_view_all_revisions: Ver todas as revisões
-  label_tag: Etiqueta
-  label_branch: Ramo
-  error_no_tracker_in_project: Este projecto não tem associado nenhum tipo de tarefas. Verifique as definições do projecto.
-  error_no_default_issue_status: Não está definido um estado padrão para as tarefas. Verifique a sua configuração (dirija-se a "Administração -> Estados da tarefa").
-  label_group_plural: Grupos
-  label_group: Grupo
-  label_group_new: Novo grupo
-  label_time_entry_plural: Tempo registado
-  text_journal_changed: "{{label}} alterado de {{old}} para {{new}}"
-  text_journal_set_to: "{{label}} configurado como {{value}}"
-  text_journal_deleted: "{{label}} apagou ({{old}})"
-  text_journal_added: "{{label}} {{value}} adicionado"
-  field_active: Activo
-  enumeration_system_activity: Actividade de sistema
-  permission_delete_issue_watchers: Apagar observadores
-  version_status_closed: fechado
-  version_status_locked: protegido
-  version_status_open: aberto
-  error_can_not_reopen_issue_on_closed_version: Não é possível voltar a abrir uma tarefa atribuída a uma versão fechada
-  label_user_anonymous: Anónimo
-  button_move_and_follow: Mover e seguir
-  setting_default_projects_modules: Módulos activos por predefinição para novos projectos
-  setting_gravatar_default: Imagem Gravatar predefinida
-  field_sharing: Partilha
-  label_version_sharing_hierarchy: Com hierarquia do projecto
-  label_version_sharing_system: Com todos os projectos
-  label_version_sharing_descendants: Com os sub-projectos
-  label_version_sharing_tree: Com árvore do projecto
-  label_version_sharing_none: Não partilhado
-  error_can_not_archive_project: Não é possível arquivar este projecto
-  button_duplicate: Duplicar
-  button_copy_and_follow: Copiar e seguir
-  label_copy_source: Origem
-  setting_issue_done_ratio: Calcular a percentagem de progresso da tarefa 
-  setting_issue_done_ratio_issue_status: Através do estado da tarefa
-  error_issue_done_ratios_not_updated: Percentagens de progresso da tarefa não foram actualizadas.
-  error_workflow_copy_target: Seleccione os tipos de tarefas e funções desejadas
-  setting_issue_done_ratio_issue_field: Através do campo da tarefa
-  label_copy_same_as_target: Mesmo que o alvo
-  label_copy_target: Alvo
-  notice_issue_done_ratios_updated: Percentagens de progresso da tarefa actualizadas.
-  error_workflow_copy_source: Seleccione um tipo de tarefa ou função de origem
-  label_update_issue_done_ratios: Actualizar percentagens de progresso da tarefa
-  setting_start_of_week: Iniciar calendários a
-  permission_view_issues: Ver tarefas
-  label_display_used_statuses_only: Só exibir estados empregues por este tipo de tarefa
-  label_revision_id: Revisão {{value}}
-  label_api_access_key: Chave de acesso API
-  label_api_access_key_created_on: Chave de acesso API criada há {{value}}
-  label_feeds_access_key: Chave de acesso RSS
-  notice_api_access_key_reseted: A sua chave de acesso API foi reinicializada.
-  setting_rest_api_enabled: Activar serviço Web REST
-  label_missing_api_access_key: Chave de acesso API em falta
-  label_missing_feeds_access_key: Chave de acesso RSS em falta
-  button_show: Mostrar
-  text_line_separated: Vários valores permitidos (uma linha para cada valor).
-  setting_mail_handler_body_delimiters: Truncar mensagens de correio electrónico após uma destas linhas
-  permission_add_subprojects: Criar sub-projectos
-  label_subproject_new: Novo sub-projecto
+  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").
+  label_group_plural: Groups
+  label_group: Group
+  label_group_new: New group
+  label_time_entry_plural: Spent time
+  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"
+  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: |-
-    Está prestes a eliminar parcial ou totalmente as suas permissões. É possível que não possa editar o projecto após esta acção.
-    Tem a certeza de que deseja continuar?
-  label_close_versions: Fechar versões completas
-  label_board_sticky: Fixar mensagem
-  label_board_locked: Proteger
-  permission_export_wiki_pages: Exportar páginas Wiki
-  setting_cache_formatted_text: Colocar formatação do texto na memória cache
-  permission_manage_project_activities: Gerir actividades do projecto
-  error_unable_delete_issue_status: Não foi possível apagar o estado da tarefa
-  label_profile: Perfil
-  permission_manage_subtasks: Gerir sub-tarefas
-  field_parent_issue: Tarefa principal
-  label_subtask_plural: Sub-tarefa
-  label_project_copy_notifications: Enviar notificações por e-mail durante a cópia do projecto
-  error_can_not_delete_custom_field: Não foi possível apagar o campo personalizado
-  error_unable_to_connect: Não foi possível ligar ({{value}})
-  error_can_not_remove_role: Esta função está actualmente em uso e não pode ser apagada.
-  error_can_not_delete_tracker: Existem ainda tarefas nesta categoria. Não é possível apagar este tipo de tarefa.
+    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: Bloco da minha página
-  notice_failed_to_save_members: "Erro ao guardar o(s) membro(s): {{errors}}."
-  text_zoom_out: Ampliar
-  text_zoom_in: Reduzir
-  notice_unable_delete_time_entry: Não foi possível apagar a entrada de tempo registado.
-  label_overall_spent_time: Total de tempo registado
-  field_time_entries: Tempo registado
+  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
  project_module_gantt: Gantt
-  project_module_calendar: Calendário
-  field_member_of_group: Membro do Grupo
-  field_assigned_to_role: Membro do Perfil
-  button_edit_associated_wikipage: "Editar página Wiki associada: {{page_title}}"
-  text_are_you_sure_with_children: Apagar tarefa e todas as sub-tarefas?
+  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -737,9 +737,9 @@ ro:
  text_subprojects_destroy_warning: "Se vor șterge și sub-proiectele: {{value}}."
  text_workflow_edit: Selectați un rol și un tip de tichet pentru a edita modul de lucru
  text_are_you_sure: Sunteți sigur(ă)?
-  text_tip_issue_begin_day: sarcină care începe în această zi
-  text_tip_issue_end_day: sarcină care se termină în această zi
-  text_tip_issue_begin_end_day: sarcină care începe și se termină în această zi
+  text_tip_task_begin_day: sarcină care începe în această zi
+  text_tip_task_end_day: sarcină care se termină în această zi
+  text_tip_task_begin_end_day: sarcină care începe și se termină în această zi
  text_project_identifier_info: 'Sunt permise doar litere mici (a-z), numere și cratime.<br />Odată salvat, identificatorul nu mai poate fi modificat.'
  text_caracters_maximum: "maxim {{count}} caractere."
  text_caracters_minimum: "Trebuie să fie minim {{count}} caractere."
@@ -911,5 +911,3 @@ ro:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -382,9 +382,9 @@ ru:
  field_version: Версия
  field_watcher: Наблюдатель

-  general_csv_decimal_separator: ','
+  general_csv_decimal_separator: '.'
  general_csv_encoding: UTF-8
-  general_csv_separator: ';'
+  general_csv_separator: ','
  general_first_day_of_week: '1'
  general_lang_name: 'Russian (Русский)'
  general_pdf_encoding: UTF-8
@@ -865,7 +865,6 @@ ru:
  setting_cross_project_issue_relations: Разрешить пересечение задач по проектам
  setting_date_format: Формат даты
  setting_default_language: Язык по умолчанию
-  setting_default_notification_option: Способ оповещения по умолчанию
  setting_default_projects_public: Новые проекты являются общедоступными
  setting_diff_max_lines_displayed: Максимальное число строк для diff
  setting_display_subprojects_issues: Отображение подпроектов по умолчанию
@@ -940,9 +939,9 @@ ru:
  text_select_project_modules: 'Выберите модули, которые будут использованы в проекте:'
  text_status_changed_by_changeset: "Реализовано в {{value}} редакции."
  text_subprojects_destroy_warning: "Подпроекты: {{value}} также будут удалены."
-  text_tip_issue_begin_day: дата начала задачи
-  text_tip_issue_begin_end_day: начало задачи и окончание ее в этот день
-  text_tip_issue_end_day: дата завершения задачи
+  text_tip_task_begin_day: дата начала задачи
+  text_tip_task_begin_end_day: начало задачи и окончание ее в этот день
+  text_tip_task_end_day: дата завершения задачи
  text_tracker_no_workflow: Для этого трекера последовательность действий не определена
  text_unallowed_characters: Запрещенные символы
  text_user_mail_option: "Для невыбранных проектов, Вы будете получать уведомления только о том что просматриваете или в чем участвуете (например, вопросы, автором которых Вы являетесь или которые Вам назначены)."
@@ -1033,9 +1032,6 @@ ru:
  text_zoom_in: Приблизить
  notice_unable_delete_time_entry: Невозможно удалить запись журнала.
  label_overall_spent_time: Всего затрачено времени
-  field_member_of_group: Группа назначенного
-  field_assigned_to_role: Роль назначенного
-  notice_not_authorized_archived_project: Запрашиваемый проект был архивирован.

-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -649,9 +649,9 @@ sk:
  text_project_destroy_confirmation: Ste si istý, že chcete odstránit tento projekt a všetky súvisiace dáta ?
  text_workflow_edit: Vyberte rolu a frontu k úprave workflow
  text_are_you_sure: Ste si istý?
-  text_tip_issue_begin_day: úloha začína v tento deň
-  text_tip_issue_end_day: úloha končí v tento deň
-  text_tip_issue_begin_end_day: úloha začína a končí v tento deň
+  text_tip_task_begin_day: úloha začína v tento deň
+  text_tip_task_end_day: úloha končí v tento deň
+  text_tip_task_begin_end_day: úloha začína a končí v tento deň
  text_project_identifier_info: 'Povolené znaky sú malé písmena (a-z), čísla a pomlčka.<br />Po uložení už nieje možné identifikátor zmeniť.'
  text_caracters_maximum: "{{count}} znakov maximálne."
  text_caracters_minimum: "Musí byť aspoň {{count}} znaky/ov dlhé."
@@ -913,5 +913,3 @@ sk:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -725,9 +725,9 @@ sl:
  text_subprojects_destroy_warning: "Njegov(i) podprojekt(i): {{value}} bodo prav tako izbrisani."
  text_workflow_edit: Izberite vlogo in zahtevek za urejanje poteka dela
  text_are_you_sure: Ali ste prepričani?
-  text_tip_issue_begin_day: naloga z začetkom na ta dan
-  text_tip_issue_end_day: naloga z zaključkom na ta dan
-  text_tip_issue_begin_end_day: naloga ki se začne in konča ta dan
+  text_tip_task_begin_day: naloga z začetkom na ta dan
+  text_tip_task_end_day: naloga z zaključkom na ta dan
+  text_tip_task_begin_end_day: naloga ki se začne in konča ta dan
  text_project_identifier_info: 'Dovoljene so samo male črke (a-z), številke in vezaji.<br />Enkrat shranjen identifikator ne more biti spremenjen.'
  text_caracters_maximum: "največ {{count}} znakov."
  text_caracters_minimum: "Mora biti vsaj dolg vsaj {{count}} znakov."
@@ -914,5 +914,3 @@ sl:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -836,9 +836,9 @@ sr-YU:
  text_journal_set_to: "{{label}} postavljen u {{value}}"
  text_journal_deleted: "{{label}} izbrisano ({{old}})"
  text_journal_added: "{{label}} {{value}} dodato"
-  text_tip_issue_begin_day: zadatak počinje ovog dana
-  text_tip_issue_end_day: zadatak se završava ovog dana
-  text_tip_issue_begin_end_day: zadatak počinje i završava ovog dana
+  text_tip_task_begin_day: zadatak počinje ovog dana
+  text_tip_task_end_day: zadatak se završava ovog dana
+  text_tip_task_begin_end_day: zadatak počinje i završava ovog dana
  text_project_identifier_info: 'Dozvoljena su samo mala slova (a-š), brojevi i crtice.<br />Jednom snimljen identifikator više se ne može promeniti.'
  text_caracters_maximum: "Najviše {{count}} znak(ova)."
  text_caracters_minimum: "Broj znakova mora biti najmanje {{count}}."
@@ -918,5 +918,3 @@ sr-YU:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -836,9 +836,9 @@ sr:
  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-ш), бројеви и цртице.<br />Једном снимљен идентификатор више се не може променити.'
  text_caracters_maximum: "Највише {{count}} знак(ова)."
  text_caracters_minimum: "Број знакова мора бити најмање {{count}}."
@@ -919,5 +919,3 @@ sr:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -195,7 +195,6 @@ sv:
  notice_file_not_found: Sidan du försökte komma åt existerar inte eller är borttagen.
  notice_locking_conflict: Data har uppdaterats av en annan användare.
  notice_not_authorized: Du saknar behörighet att komma åt den här sidan.
-  notice_not_authorized_archived_project: Projektet du försöker komma åt har arkiverats.
  notice_email_sent: "Ett mail skickades till {{value}}"
  notice_email_error: "Ett fel inträffade när mail skickades ({{value}})"
  notice_feeds_access_key_reseted: Din RSS-nyckel återställdes.
@@ -308,7 +307,7 @@ sv:
  field_attr_lastname: Efternamnsattribut
  field_attr_mail: Mailattribut
  field_onthefly: Skapa användare on-the-fly
-  field_start_date: Startdatum
+  field_start_date: Start
  field_done_ratio: % Klart
  field_auth_source: Autentiseringsläge
  field_hide_mail: Dölj min mailadress
@@ -340,9 +339,6 @@ sv:
  field_group_by: Gruppera resultat efter
  field_sharing: Delning
  field_parent_issue: Förälderaktivitet
-  field_member_of_group: Tilldelad användares grupp
-  field_assigned_to_role: Tilldelad användares roll
-  field_text: Textfält
  
  setting_app_title: Applikationsrubrik
  setting_app_subtitle: Applikationsunderrubrik
@@ -397,7 +393,6 @@ sv:
  setting_start_of_week: Första dagen i veckan
  setting_rest_api_enabled: Aktivera REST webbtjänst
  setting_cache_formatted_text: Cacha formaterad text
-  setting_default_notification_option: Standard notifieringsalternativ
  
  permission_add_project: Skapa projekt
  permission_add_subprojects: Skapa underprojekt
@@ -573,7 +568,7 @@ sv:
  label_news_view_all: Visa alla nyheter
  label_news_added: Nyhet tillagd
  label_settings: Inställningar
-  label_overview: Översikt
+  label_overview: Överblick
  label_version: Version
  label_version_new: Ny version
  label_version_plural: Versioner
@@ -824,8 +819,6 @@ sv:
  label_profile: Profil
  label_subtask_plural: Underaktiviteter
  label_project_copy_notifications: Skicka mailnotifieringar när projektet kopieras
-  label_principal_search: "Sök efter användare eller grupp:"
-  label_user_search: "Sök efter användare:"
  
  button_login: Logga in
  button_submit: Skicka
@@ -837,7 +830,6 @@ sv:
  button_create_and_continue: Skapa och fortsätt
  button_test: Testa
  button_edit: Ändra
-  button_edit_associated_wikipage: "Ändra associerad Wikisida: {{page_title}}"
  button_add: Lägg till
  button_change: Ändra
  button_apply: Verkställ
@@ -889,14 +881,13 @@ sv:
  text_subprojects_destroy_warning: "Alla underprojekt: {{value}} kommer också tas bort."
  text_workflow_edit: Välj en roll och en ärendetyp för att ändra arbetsflöde
  text_are_you_sure: Är du säker ?
-  text_are_you_sure_with_children: Ta bort ärende och alla underärenden?
  text_journal_changed: "{{label}} ändrad från {{old}} till {{new}}"
  text_journal_set_to: "{{label}} satt till {{value}}"
  text_journal_deleted: "{{label}} borttagen ({{old}})"
  text_journal_added: "{{label}} {{value}} tillagd"
-  text_tip_issue_begin_day: ärende som börjar denna dag
-  text_tip_issue_end_day: ärende som slutar denna dag
-  text_tip_issue_begin_end_day: ärende som börjar och slutar denna dag
+  text_tip_task_begin_day: arbetsuppgift som börjar denna dag
+  text_tip_task_end_day: arbetsuppgift som slutar denna dag
+  text_tip_task_begin_end_day: arbetsuppgift börjar och slutar denna dag
  text_project_identifier_info: 'Små bokstäver (a-z), siffror och streck tillåtna.<br />När den är sparad kan identifieraren inte ändras.'
  text_caracters_maximum: "max {{count}} tecken."
  text_caracters_minimum: "Måste vara minst {{count}} tecken lång."
@@ -972,5 +963,3 @@ sv:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -655,9 +655,9 @@ th:
  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), ตัวเลข(0-9) และขีด (-) เท่านั้น.<br />เมื่อจัดเก็บแล้ว, ชื่อเฉพาะไม่สามารถเปลี่ยนแปลงได้'
  text_caracters_maximum: "สูงสุด {{count}} ตัวอักษร."
  text_caracters_minimum: "ต้องยาวอย่างน้อย {{count}} ตัวอักษร."
@@ -915,5 +915,3 @@ th:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -680,9 +680,9 @@ tr:
  text_subprojects_destroy_warning: "Ayrıca {{value}} alt proje silinecek."
  text_workflow_edit: İşakışını düzenlemek için bir rol ve takipçi seçin
  text_are_you_sure: Emin misiniz ?
-  text_tip_issue_begin_day: Bugün başlayan görevler
-  text_tip_issue_end_day: Bugün sona eren görevler
-  text_tip_issue_begin_end_day: Bugün başlayan ve sona eren görevler
+  text_tip_task_begin_day: Bugün başlayan görevler
+  text_tip_task_end_day: Bugün sona eren görevler
+  text_tip_task_begin_end_day: Bugün başlayan ve sona eren görevler
  text_project_identifier_info: 'Küçük harfler (a-z), sayılar ve noktalar kabul edilir.<br />Bir kere kaydedildiğinde,tanımlayıcı değiştirilemez.'
  text_caracters_maximum: "En çok {{count}} karakter."
  text_caracters_minimum: "En az {{count}} karakter uzunluğunda olmalı."
@@ -941,5 +941,3 @@ tr:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -597,9 +597,9 @@ uk:
  text_project_destroy_confirmation: Ви наполягаєте на видаленні цього проекту і всієї інформації, що відноситься до нього?
  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}} символів(а) у довжину."
@@ -914,5 +914,3 @@ uk:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -728,9 +728,9 @@ vi:
  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: Bạn chắc chứ?
-  text_tip_issue_begin_day: ngày bắt đầu
-  text_tip_issue_end_day: ngày kết thúc
-  text_tip_issue_begin_end_day: bắt đầu và kết thúc cùng ngày
+  text_tip_task_begin_day: ngày bắt đầu
+  text_tip_task_end_day: ngày kết thúc
+  text_tip_task_begin_end_day: bắt đầu và kết thúc cùng ngày
  text_project_identifier_info: 'Chỉ cho phép chữ cái thường (a-z), con số và dấu gạch ngang.<br />Sau khi lưu, chỉ số ID không thể thay đổi.'
  text_caracters_maximum: "Tối đa {{count}} ký tự."
  text_caracters_minimum: "Phải gồm ít nhất {{count}} ký tự."
@@ -973,5 +973,3 @@ vi:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -174,10 +174,10 @@
        odd: "必須是奇數"
        even: "必須是偶數"
        # Append your own errors here or at the model/attributes scope.
-        greater_than_start_date: "必須在開始日期之後"
+        greater_than_start_date: "必須在起始日期之後"
        not_same_project: "不屬於同一個專案"
        circular_dependency: "這個關聯會導致環狀相依"
-        cant_link_an_issue_with_a_descendant: "項目無法被連結至自己的子項目"
+        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"

      # You can define own errors for models or model attributes.
      # The values :model, :attribute and :value are always available for interpolation.
@@ -235,7 +235,6 @@
  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 存取金鑰已被重新設定。
@@ -380,10 +379,9 @@
  field_group_by: 結果分組方式
  field_sharing: 共用
  field_parent_issue: 父工作項目
-  field_member_of_group: "被指派者的群組"
-  field_assigned_to_role: "被指派者的角色"
+  field_member_of_group: 所屬群組
+  field_assigned_to_role: 所屬角色
  field_text: 內容文字
-  field_visible: 可被看見
  
  setting_app_title: 標題
  setting_app_subtitle: 副標題
@@ -412,7 +410,6 @@
  setting_issue_list_default_columns: 預設顯示於項目清單的欄位
  setting_repositories_encodings: 版本庫編碼
  setting_commit_logs_encoding: 送交訊息編碼
-  setting_emails_header: 電子郵件前頭說明
  setting_emails_footer: 電子郵件附帶說明
  setting_protocol: 協定
  setting_per_page_options: 每頁顯示個數選項
@@ -439,8 +436,7 @@
  setting_start_of_week: 週的第一天
  setting_rest_api_enabled: 啟用 REST 網路服務技術（Web Service）
  setting_cache_formatted_text: 快取已格式化文字
-  setting_default_notification_option: 預設通知選項
-  
+
  permission_add_project: 建立專案
  permission_add_subprojects: 建立子專案
  permission_edit_project: 編輯專案
@@ -815,7 +811,7 @@
  label_search_titles_only: 僅搜尋標題
  label_user_mail_option_all: "提醒與我的專案有關的全部事件"
  label_user_mail_option_selected: "只提醒我所選擇專案中的事件..."
-  label_user_mail_option_none: "取消提醒"
+  label_user_mail_option_none: "只提醒我觀察中或參與中的事件"
  label_user_mail_no_self_notified: "不提醒我自己所做的變更"
  label_registration_activation_by_email: 透過電子郵件啟用帳戶
  label_registration_manual_activation: 手動啟用帳戶
@@ -866,8 +862,6 @@
  label_profile: 配置概況
  label_subtask_plural: 子工作項目
  label_project_copy_notifications: 在複製專案的過程中，傳送通知郵件
-  label_principal_search: "搜尋用戶或群組："
-  label_user_search: "搜尋用戶："

  button_login: 登入
  button_submit: 送出
@@ -936,9 +930,9 @@
  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}} 個字元."
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -835,9 +835,9 @@ zh:
  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}} 个字符。"
@@ -936,5 +936,3 @@ zh:
  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
-  label_principal_search: "Search for user or group:"
-  label_user_search: "Search for user:"
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,83 +4,6 @@ Redmine - project management software
 Copyright (C) 2006-2010  Jean-Philippe Lang
 http://www.redmine.org/

-== 2010-12-23 v1.0.5
-
-* #6656: Mercurial adapter loses seconds of commit times
-* #6996: Migration trac(sqlite3) -> redmine(postgresql) doesnt escape ' char
-* #7013: v-1.0.4 trunk - see {{count}} in page display rather than value
-* #7016: redundant 'field_start_date' in ja.yml
-* #7018: 'undefined method `reschedule_after' for nil:NilClass' on new issues
-* #7024: E-mail notifications about Wiki changes.
-* #7033: 'class' attribute of <pre> tag shouldn't be truncate
-* #7035: CSV value separator in russian
-* #7122: Issue-description Quote-button missing
-* #7144: custom queries making use of deleted custom fields cause a 500 error
-* #7162: Multiply defined label in french translation
-
-== 2010-11-28 v1.0.4
-
-* #5324: Git not working if color.ui is enabled
-* #6447: Issues API doesn't allow full key auth for all actions
-* #6457: Edit User group problem
-* #6575: start date being filled with current date even when blank value is submitted
-* #6740: Max attachment size, incorrect usage of 'KB'
-* #6760: Select box sorted by ID instead of name in Issue Category
-* #6766: Changing target version name can cause an internal error
-* #6784: Redmine not working with i18n gem 0.4.2
-* #6839: Hardcoded absolute links in my/page_layout
-* #6841: Projects API doesn't allow full key auth for all actions
-* #6860: svn: Write error: Broken pipe when browsing repository
-* #6874: API should return XML description when creating a project
-* #6932: submitting wrong parent task input creates a 500 error
-* #6966: Records of Forums are remained, deleting project
-* #6990: Layout problem in workflow overview
-* #5117: mercurial_adapter should ensure the right LANG environment variable
-* #6782: Traditional Chinese language file (to r4352)
-* #6783: Swedish Translation for r4352
-* #6804: Bugfix: spelling fixes
-* #6814: Japanese Translation for r4362
-* #6948: Bulgarian translation
-* #6973: Update es.yml
-
-== 2010-10-31 v1.0.3
-
-* #4065: Redmine.pm doesn't work with LDAPS and a non-standard port
-* #4416: Link from version details page to edit the wiki.
-* #5484: Add new issue as subtask to an existing ticket
-* #5948: Update help/wiki_syntax_detailed.html with more link options
-* #6494: Typo in pt_BR translation for 1.0.2
-* #6508: Japanese translation update
-* #6509: Localization pt-PT (new strings)
-* #6511: Rake task to test email
-* #6525: Traditional Chinese language file (to r4225)
-* #6536: Patch for swedish translation
-* #6548: Rake tasks to add/remove i18n strings
-* #6569: Updated Hebrew translation
-* #6570: Japanese Translation for r4231
-* #6596: pt-BR translation updates
-* #6629: Change field-name of issues start date
-* #6669: Bulgarian translation
-* #6731: Macedonian translation fix
-* #6732: Japanese Translation for r4287
-* #6735: Add user-agent to reposman
-* #6736: Traditional Chinese language file (to r4288)
-* #6739: Swedish Translation for r4288
-* #6765: Traditional Chinese language file (to r4302)
-* Fixed #5324: Git not working if color.ui is enabled
-* Fixed #5652: Bad URL parsing in the wiki when it ends with right-angle-bracket(greater-than mark).
-* Fixed #5803: Precedes/Follows Relationships Broke
-* Fixed #6435: Links to wikipages bound to versions do not respect version-sharing in Settings -> Versions
-* Fixed #6438: Autologin cannot be disabled again once it's enabled
-* Fixed #6513: "Move" and "Copy" are not displayed when deployed in subdirectory
-* Fixed #6521: Tooltip/label for user "search-refinment" field on group/project member list
-* Fixed #6563: i18n-issues on calendar view
-* Fixed #6598: Wrong caption for button_create_and_continue in German language file
-* Fixed #6607: Unclear caption for german button_update
-* Fixed #6612: SortHelper missing from CalendarsController
-* Fixed #6740: Max attachment size, incorrect usage of 'KB'
-* Fixed #6750: ActionView::TemplateError (undefined method `empty?' for nil:NilClass) on line #12 of app/views/context_menus/issues.html.erb:
-
 == 2010-09-26 v1.0.2

 * #2285: issue-refinement: pressing enter should result to an "apply"
@@ -1151,7 +1074,7 @@ http://www.redmine.org/
 * Search engines now supports pagination. Results are sorted in reverse chronological order
 * Added "Estimated hours" attribute on issues
 * A category with assigned issue can now be deleted. 2 options are proposed: remove assignments or reassign issues to another category
-* Forum notifications are now also sent to the authors of the thread, even if they don<EFBFBD>t watch the board
+* Forum notifications are now also sent to the authors of the thread, even if they don’t watch the board
 * Added an application setting to specify the application protocol (http or https) used to generate urls in emails
 * Gantt chart: now starts at the current month by default
 * Gantt chart: month count and zoom factor are automatically saved as user preferences
@@ -1159,7 +1082,7 @@ http://www.redmine.org/
 * Added wiki index by date
 * Added preview on add/edit issue form
 * Emails footer can now be customized from the admin interface (Admin -> Email notifications)
-* Default encodings for repository files can now be set in application settings (used to convert files content and diff to UTF-8 so that they<EFBFBD>re properly displayed)
+* Default encodings for repository files can now be set in application settings (used to convert files content and diff to UTF-8 so that they’re properly displayed)
 * Calendar: first day of week can now be set in lang files
 * Automatic closing of duplicate issues
 * Added a cross-project issue list
@@ -1171,7 +1094,7 @@ http://www.redmine.org/
 * Added some accesskeys
 * Added "Float" as a custom field format
 * Added basic Theme support
-* Added the ability to set the <EFBFBD>done ratio<EFBFBD> of issues fixed by commit (Nikolay Solakov)
+* Added the ability to set the “done ratio” of issues fixed by commit (Nikolay Solakov)
 * Added custom fields in issue related mail notifications
 * Email notifications are now sent in plain text and html
 * Gantt chart can now be exported to a graphic file (png). This functionality is only available if RMagick is installed.
@@ -1204,7 +1127,7 @@ http://www.redmine.org/
 * Added Korean translation (Choi Jong Yoon)
 * Fixed: the link to delete issue relations is displayed even if the user is not authorized to delete relations
 * Performance improvement on calendar and gantt
-* Fixed: wiki preview doesn<EFBFBD>t work on long entries
+* Fixed: wiki preview doesn’t work on long entries
 * Fixed: queries with multiple custom fields return no result
 * Fixed: Can not authenticate user against LDAP if its DN contains non-ascii characters
 * Fixed: URL with ~ broken in wiki formatting
@@ -1215,7 +1138,7 @@ http://www.redmine.org/

 * per project forums added
 * added the ability to archive projects
-* added <EFBFBD>Watch<EFBFBD> functionality on issues. It allows users to receive notifications about issue changes
+* added “Watch” functionality on issues. It allows users to receive notifications about issue changes
 * custom fields for issues can now be used as filters on issue list
 * added per user custom queries
 * commit messages are now scanned for referenced or fixed issue IDs (keywords defined in Admin -> Settings)
@@ -1256,7 +1179,7 @@ http://www.redmine.org/
 * added swedish translation (Thomas Habets)
 * italian translation update (Alessio Spadaro)
 * japanese translation update (Satoru Kurashiki)
-* fixed: error on history atom feed when there<EFBFBD>s no notes on an issue change
+* fixed: error on history atom feed when there’s no notes on an issue change
 * fixed: error in journalizing an issue with longtext custom fields (Postgresql)
 * fixed: creation of Oracle schema
 * fixed: last day of the month not included in project activity
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -9,16 +9,14 @@ http://www.redmine.org/

 * Ruby 1.8.6 or 1.8.7

-* RubyGems 1.3.1
-
 * Ruby on Rails 2.3.5 (official downloadable Redmine releases are packaged with
  the appropriate Rails version)

-* Rack 1.0.1 gem
+* Rack 1.0.1

-* Rake 0.8.3 gem
+* RubyGems 1.3.1

-* I18n 0.4.2 gem
+* Rake 0.8.3

 * A database:
  * MySQL (tested with MySQL 5)
--- a/doc/git.rdoc
+++ b/doc/git.rdoc
@@ -1,40 +0,0 @@
-= Contributing to Redmine with git and github
-
-(This is a beta document. If you can improve it, fork it and send a patch/pull request.)
-
-The official repository is at http://github.com/edavis10/redmine
-
-Official branches:
-
-* master - is automatically mirrored to svn trunk. DO NOT COMMIT OR MERGE INTO THIS BRANCH
-* [0.6, 0.7, 0.8, 0.9, 1.0,...]-stable - is automatically mirrored to svn release branches. DO NOT COMMIT OR MERGE INTO THIS BRANCH
-* integration-to-svn-trunk - this branch is a git-only branch that will track master (trunk). Any code in here will be eventually merged into master but it may be rebased as any time (git-svn needs to rebase to commit to svn)
-* integration-to-svn-stable-1.0 - this branch is a git-only branch that will track the 1.0-stable branch in svn.  Any code in here will be eventually merged into master and 1.0-stable but it may be rebased as any time (git-svn needs to rebase to commit to svn)
-
-I (edavis10) might have some other branches on the repository for work in progress.
-
-== Branch naming standards
-
-Redmine has two kinds of development:
-
-* bug fixes
-* new feature development
-
-Both bug fixes and new feature development should be done in a branch named after the issue number on Redmine.org.  So if you are fixing Issue #6244 your branch should be named:
-
-* 6244
-* 6244-sort-people-by-display-name (optional description)
-* issue/6244 (optional "issue" prefix)
-* issue/6244-sort-people-by-display-name (optional prefix and description)
-
-That way when the branch is merged into the Redmine core, the correct issue can be updated.
-
-Longer term feature development might require multiple branches.  Just your best judgment and try to keep the issue id in the name.
-
-If you don't have an issue for your patch, create an issue on redmine.org and say it's a placeholder issue for your work. Better yet, add a brief overview of what you are working on to the issue and you might get some help with it.
-
-== Coding Standards
-
-Follow the coding standards on the Redmine wiki: http://www.redmine.org/wiki/redmine/Coding_Standards#Commits.  Make sure you commit logs conform to the standards, otherwise someone else will have to rewrite them for you and you might lose attribution during the conversion to svn.
-
-
--- a/extra/svn/Redmine.pm
+++ b/extra/svn/Redmine.pm
@@ -331,7 +331,7 @@ sub is_member {
          $sthldap->execute($auth_source_id);
          while (my @rowldap = $sthldap->fetchrow_array) {
            my $ldap = Authen::Simple::LDAP->new(
-                host    =>      ($rowldap[2] eq "1" || $rowldap[2] eq "t") ? "ldaps://$rowldap[0]:$rowldap[1]" : $rowldap[0],
+                host    =>      ($rowldap[2] eq "1" || $rowldap[2] eq "t") ? "ldaps://$rowldap[0]" : $rowldap[0],
                port    =>      $rowldap[1],
                basedn  =>      $rowldap[5],
                binddn  =>      $rowldap[3] ? $rowldap[3] : "",
--- a/extra/svn/reposman.rb
+++ b/extra/svn/reposman.rb
@@ -180,9 +180,7 @@ rescue LoadError
  log("This script requires activeresource.\nRun 'gem install activeresource' to install it.", :exit => true)
 end

-class Project < ActiveResource::Base
-  self.headers["User-agent"] = "Redmine repository manager/#{Version}"
-end
+class Project < ActiveResource::Base; end

 log("querying Redmine for projects...", :level => 1);

--- a/lib/redcloth3.rb
+++ b/lib/redcloth3.rb
@@ -1078,7 +1078,7 @@ class RedCloth3 < String
                        line = "<redpre##{ @pre_list.length }>"
                        first.match(/<#{ OFFTAGS }([^>]*)>/)
                        tag = $1
-                        $2.to_s.match(/(class\=("[^"]+"|'[^']+'))/i)
+                        $2.to_s.match(/(class\=\S+)/i)
                        tag << " #{$1}" if $1
                        @pre_list << "<#{ tag }>#{ aftertag }"
                    end
--- a/lib/redmine/i18n.rb
+++ b/lib/redmine/i18n.rb
@@ -37,7 +37,7 @@ module Redmine

    def format_date(date)
      return nil unless date
-      Setting.date_format.blank? ? ::I18n.l(date.to_date) : date.strftime(Setting.date_format)
+      Setting.date_format.blank? ? ::I18n.l(date.to_date, :count => date.strftime('%d')) : date.strftime(Setting.date_format)
    end
    
    def format_time(time, include_date = true)
@@ -45,7 +45,7 @@ module Redmine
      time = time.to_time if time.is_a?(String)
      zone = User.current.time_zone
      local = zone ? time.in_time_zone(zone) : (time.utc? ? time.localtime : time)
-      Setting.time_format.blank? ? ::I18n.l(local, :format => (include_date ? :default : :time)) : 
+      Setting.time_format.blank? ? ::I18n.l(local, :count => local.strftime('%d'), :format => (include_date ? :default : :time)) : 
                                   ((include_date ? "#{format_date(time)} " : "") + "#{local.strftime(Setting.time_format)}")
    end

--- a/lib/redmine/plugin.rb
+++ b/lib/redmine/plugin.rb
@@ -89,13 +89,6 @@ module Redmine #:nodoc:
    def self.clear
      @registered_plugins = {}
    end
-
-    # Checks if a plugin is installed
-    #
-    # @param [String] id name of the plugin
-    def self.installed?(id)
-      registered_plugins[id.to_sym].present?
-    end
    
    def initialize(id)
      @id = id.to_sym
--- a/lib/redmine/scm/adapters/bazaar_adapter.rb
+++ b/lib/redmine/scm/adapters/bazaar_adapter.rb
@@ -74,10 +74,10 @@ module Redmine
    
        def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
          path ||= ''
-          identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : 'last:1'
-          identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : 1
+          identifier_from = 'last:1' unless identifier_from and identifier_from.to_i > 0
+          identifier_to = 1 unless identifier_to and identifier_to.to_i > 0
          revisions = Revisions.new
-          cmd = "#{BZR_BIN} log -v --show-ids -r#{identifier_to}..#{identifier_from} #{target(path)}"
+          cmd = "#{BZR_BIN} log -v --show-ids -r#{identifier_to.to_i}..#{identifier_from} #{target(path)}"
          shellout(cmd) do |io|
            revision = nil
            parsing = nil
@@ -140,9 +140,6 @@ module Redmine
          else
            identifier_to = identifier_from.to_i - 1
          end
-          if identifier_from
-            identifier_from = identifier_from.to_i
-          end
          cmd = "#{BZR_BIN} diff -r#{identifier_to}..#{identifier_from} #{target(path)}"
          diff = []
          shellout(cmd) do |io|
--- a/lib/redmine/scm/adapters/cvs_adapter.rb
+++ b/lib/redmine/scm/adapters/cvs_adapter.rb
@@ -63,7 +63,7 @@ module Redmine
          logger.debug "<cvs> entries '#{path}' with identifier '#{identifier}'"
          path_with_project="#{url}#{with_leading_slash(path)}"
          entries = Entries.new
-          cmd = "#{CVS_BIN} -d #{shell_quote root_url} rls -e"
+          cmd = "#{CVS_BIN} -d #{root_url} rls -e"
          cmd << " -D \"#{time_to_cvstime(identifier)}\"" if identifier
          cmd << " #{shell_quote path_with_project}"
          shellout(cmd) do |io|
@@ -108,7 +108,7 @@ module Redmine
          logger.debug "<cvs> revisions path:'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}"
          
          path_with_project="#{url}#{with_leading_slash(path)}"
-          cmd = "#{CVS_BIN} -d #{shell_quote root_url} rlog"
+          cmd = "#{CVS_BIN} -d #{root_url} rlog"
          cmd << " -d\">#{time_to_cvstime(identifier_from)}\"" if identifier_from
          cmd << " #{shell_quote path_with_project}"
          shellout(cmd) do |io|
@@ -229,7 +229,7 @@ module Redmine
        def diff(path, identifier_from, identifier_to=nil)
          logger.debug "<cvs> diff path:'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}"
          path_with_project="#{url}#{with_leading_slash(path)}"
-          cmd = "#{CVS_BIN} -d #{shell_quote root_url} rdiff -u -r#{identifier_to.to_i} -r#{identifier_from.to_i} #{shell_quote path_with_project}"
+          cmd = "#{CVS_BIN} -d #{root_url} rdiff -u -r#{identifier_to} -r#{identifier_from} #{shell_quote path_with_project}"
          diff = []
          shellout(cmd) do |io|
            io.each_line do |line|
@@ -244,7 +244,7 @@ module Redmine
          identifier = (identifier) ? identifier : "HEAD"
          logger.debug "<cvs> cat path:'#{path}',identifier #{identifier}"
          path_with_project="#{url}#{with_leading_slash(path)}"
-          cmd = "#{CVS_BIN} -d #{shell_quote root_url} co"
+          cmd = "#{CVS_BIN} -d #{root_url} co"
          cmd << " -D \"#{time_to_cvstime(identifier)}\"" if identifier
          cmd << " -p #{shell_quote path_with_project}"
          cat = nil
@@ -256,10 +256,10 @@ module Redmine
        end  

        def annotate(path, identifier=nil)
-          identifier = (identifier) ? identifier.to_i : "HEAD"
+          identifier = (identifier) ? identifier : "HEAD"
          logger.debug "<cvs> annotate path:'#{path}',identifier #{identifier}"
          path_with_project="#{url}#{with_leading_slash(path)}"
-          cmd = "#{CVS_BIN} -d #{shell_quote root_url} rannotate -r#{identifier} #{shell_quote path_with_project}"
+          cmd = "#{CVS_BIN} -d #{root_url} rannotate -r#{identifier} #{shell_quote path_with_project}"
          blame = Annotate.new
          shellout(cmd) do |io|
            io.each_line do |line|
--- a/lib/redmine/scm/adapters/darcs_adapter.rb
+++ b/lib/redmine/scm/adapters/darcs_adapter.rb
@@ -66,7 +66,7 @@ module Redmine
          path_prefix = (path.blank? ? '' : "#{path}/")
          path = '.' if path.blank?
          entries = Entries.new          
-          cmd = "#{DARCS_BIN} annotate --repodir #{shell_quote @url} --xml-output"
+          cmd = "#{DARCS_BIN} annotate --repodir #{@url} --xml-output"
          cmd << " --match #{shell_quote("hash #{identifier}")}" if identifier
          cmd << " #{shell_quote path}"
          shellout(cmd) do |io|
@@ -90,7 +90,7 @@ module Redmine
        def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
          path = '.' if path.blank?
          revisions = Revisions.new
-          cmd = "#{DARCS_BIN} changes --repodir #{shell_quote @url} --xml-output"
+          cmd = "#{DARCS_BIN} changes --repodir #{@url} --xml-output"
          cmd << " --from-match #{shell_quote("hash #{identifier_from}")}" if identifier_from
          cmd << " --last #{options[:limit].to_i}" if options[:limit]
          shellout(cmd) do |io|
@@ -116,7 +116,7 @@ module Redmine
        
        def diff(path, identifier_from, identifier_to=nil)
          path = '*' if path.blank?
-          cmd = "#{DARCS_BIN} diff --repodir #{shell_quote @url}"
+          cmd = "#{DARCS_BIN} diff --repodir #{@url}"
          if identifier_to.nil?
            cmd << " --match #{shell_quote("hash #{identifier_from}")}"
          else
@@ -135,7 +135,7 @@ module Redmine
        end
        
        def cat(path, identifier=nil)
-          cmd = "#{DARCS_BIN} show content --repodir #{shell_quote @url}"
+          cmd = "#{DARCS_BIN} show content --repodir #{@url}"
          cmd << " --match #{shell_quote("hash #{identifier}")}" if identifier
          cmd << " #{shell_quote path}"
          cat = nil
@@ -170,7 +170,7 @@ module Redmine
        
        # Retrieve changed paths for a single patch
        def get_paths_for_patch(hash)
-          cmd = "#{DARCS_BIN} annotate --repodir #{shell_quote @url} --summary --xml-output"
+          cmd = "#{DARCS_BIN} annotate --repodir #{@url} --summary --xml-output"
          cmd << " --match #{shell_quote("hash #{hash}")} "
          paths = []
          shellout(cmd) do |io|
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -35,7 +35,7 @@ module Redmine
        def branches
          return @branches if @branches
          @branches = []
-          cmd = "#{GIT_BIN} --git-dir #{target('')} branch --no-color"
+          cmd = "#{GIT_BIN} --git-dir #{target('')} branch"
          shellout(cmd) do |io|
            io.each_line do |line|
              @branches << line.match('\s*\*?\s*(.*)$')[1]
@@ -86,7 +86,7 @@ module Redmine

        def lastrev(path,rev)
          return nil if path.nil?
-          cmd = "#{GIT_BIN} --git-dir #{target('')} log --no-color --date=iso --pretty=fuller --no-merges -n 1 "
+          cmd = "#{GIT_BIN} --git-dir #{target('')} log --date=iso --pretty=fuller --no-merges -n 1 "
          cmd << " #{shell_quote rev} " if rev 
          cmd <<  "-- #{shell_quote path} " unless path.empty?
          shellout(cmd) do |io|
@@ -114,10 +114,10 @@ module Redmine
        def revisions(path, identifier_from, identifier_to, options={})
          revisions = Revisions.new

-          cmd = "#{GIT_BIN} --git-dir #{target('')} log --no-color --raw --date=iso --pretty=fuller "
+          cmd = "#{GIT_BIN} --git-dir #{target('')} log --raw --date=iso --pretty=fuller "
          cmd << " --reverse " if options[:reverse]
          cmd << " --all " if options[:all]
-          cmd << " -n #{options[:limit].to_i} " if options[:limit]
+          cmd << " -n #{options[:limit]} " if options[:limit]
          cmd << "#{shell_quote(identifier_from + '..')}" if identifier_from
          cmd << "#{shell_quote identifier_to}" if identifier_to
          cmd << " --since=#{shell_quote(options[:since].strftime("%Y-%m-%d %H:%M:%S"))}" if options[:since]
@@ -209,9 +209,9 @@ module Redmine
          path ||= ''

          if identifier_to
-            cmd = "#{GIT_BIN} --git-dir #{target('')} diff --no-color #{shell_quote identifier_to} #{shell_quote identifier_from}" 
+            cmd = "#{GIT_BIN} --git-dir #{target('')} diff #{shell_quote identifier_to} #{shell_quote identifier_from}" 
          else
-            cmd = "#{GIT_BIN} --git-dir #{target('')} show --no-color #{shell_quote identifier_from}"
+            cmd = "#{GIT_BIN} --git-dir #{target('')} show #{shell_quote identifier_from}"
          end

          cmd << " -- #{shell_quote path}" unless path.empty?
@@ -255,7 +255,7 @@ module Redmine
          if identifier.nil?
            identifier = 'HEAD'
          end
-          cmd = "#{GIT_BIN} --git-dir #{target('')} show --no-color #{shell_quote(identifier + ':' + path)}"
+          cmd = "#{GIT_BIN} --git-dir #{target('')} show #{shell_quote(identifier + ':' + path)}"
          cat = nil
          shellout(cmd) do |io|
            io.binmode
--- a/lib/redmine/scm/adapters/mercurial/hg-template-1.0.tmpl
+++ b/lib/redmine/scm/adapters/mercurial/hg-template-1.0.tmpl
@@ -1,7 +1,7 @@
 changeset = 'This template must be used with --debug option\n'
 changeset_quiet =  'This template must be used with --debug option\n'
 changeset_verbose = 'This template must be used with --debug option\n'
-changeset_debug = '<logentry revision="{rev}" node="{node|short}">\n<author>{author|escape}</author>\n<date>{date|isodatesec}</date>\n<paths>\n{file_mods}{file_adds}{file_dels}{file_copies}</paths>\n<msg>{desc|escape}</msg>\n{tags}</logentry>\n\n'
+changeset_debug = '<logentry revision="{rev}" node="{node|short}">\n<author>{author|escape}</author>\n<date>{date|isodate}</date>\n<paths>\n{file_mods}{file_adds}{file_dels}{file_copies}</paths>\n<msg>{desc|escape}</msg>\n{tags}</logentry>\n\n'

 file_mod = '<path action="M">{file_mod|escape}</path>\n'
 file_add = '<path action="A">{file_add|escape}</path>\n'
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -38,13 +38,13 @@ module Redmine
            # release number (eg 0.9.5 or 1.0) or as a revision
            # id composed of 12 hexa characters.
            theversion = hgversion_from_command_line
-            if m = theversion.match(%r{\A(.*?)((\d+\.)+\d+)})
-              m[2].scan(%r{\d+}).collect(&:to_i)
+            if theversion.match(/^\d+(\.\d+)+/)
+              theversion.split(".").collect(&:to_i)
            end
          end
          
          def hgversion_from_command_line
-            shellout("#{HG_BIN} --version") { |io| io.read }.to_s
+            %x{#{HG_BIN} --version}.match(/\(version (.*)\)/)[1]
          end
          
          def template_path
@@ -80,7 +80,7 @@ module Redmine
          path ||= ''
          entries = Entries.new
          cmd = "#{HG_BIN} -R #{target('')} --cwd #{target('')} locate"
-          cmd << " -r " + shell_quote(identifier ? identifier.to_s : "tip")
+          cmd << " -r " + (identifier ? identifier.to_s : "tip")
          cmd << " " + shell_quote("path:#{path}") unless path.empty?
          shellout(cmd) do |io|
            io.each_line do |line|
@@ -112,7 +112,7 @@ module Redmine
            cmd << " -r #{identifier_from.to_i}:"
          end
          cmd << " --limit #{options[:limit].to_i}" if options[:limit]
-          cmd << " #{shell_quote path}" unless path.blank?
+          cmd << " #{path}" if path
          shellout(cmd) do |io|
            begin
              # HG doesn't close the XML Document...
@@ -157,9 +157,6 @@ module Redmine
          else
            identifier_to = identifier_from.to_i - 1
          end
-          if identifier_from
-            identifier_from = identifier_from.to_i
-          end
          cmd = "#{HG_BIN} -R #{target('')} diff -r #{identifier_to} -r #{identifier_from} --nodates"
          cmd << " -I #{target(path)}" unless path.empty?
          diff = []
@@ -174,7 +171,7 @@ module Redmine
        
        def cat(path, identifier=nil)
          cmd = "#{HG_BIN} -R #{target('')} cat"
-          cmd << " -r " + shell_quote(identifier ? identifier.to_s : "tip")
+          cmd << " -r " + (identifier ? identifier.to_s : "tip")
          cmd << " #{target(path)}"
          cat = nil
          shellout(cmd) do |io|
@@ -189,7 +186,7 @@ module Redmine
          path ||= ''
          cmd = "#{HG_BIN} -R #{target('')}"
          cmd << " annotate -n -u"
-          cmd << " -r " + shell_quote(identifier ? identifier.to_s : "tip")
+          cmd << " -r " + (identifier ? identifier.to_s : "tip")
          cmd << " -r #{identifier.to_i}" if identifier
          cmd << " #{target(path)}"
          blame = Annotate.new
--- a/lib/redmine/scm/adapters/subversion_adapter.rb
+++ b/lib/redmine/scm/adapters/subversion_adapter.rb
@@ -36,8 +36,8 @@ module Redmine
            version = nil
            shellout(cmd) do |io|
              # Read svn version in first returned line
-              if m = io.read.to_s.match(%r{\A(.*?)((\d+\.)+\d+)})
-                version = m[2].scan(%r{\d+}).collect(&:to_i)
+              if m = io.gets.to_s.match(%r{((\d+\.)+\d+)})
+                version = m[0].scan(%r{\d+}).collect(&:to_i)
              end
            end
            return nil if $? && $?.exitstatus != 0
@@ -135,8 +135,8 @@ module Redmine
        
        def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
          path ||= ''
-          identifier_from = (identifier_from && identifier_from.to_i > 0) ? identifier_from.to_i : "HEAD"
-          identifier_to = (identifier_to && identifier_to.to_i > 0) ? identifier_to.to_i : 1
+          identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : "HEAD"
+          identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : 1
          revisions = Revisions.new
          cmd = "#{SVN_BIN} log --xml -r #{identifier_from}:#{identifier_to}"
          cmd << credentials_string
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -4,7 +4,7 @@ module Redmine
  module VERSION #:nodoc:
    MAJOR = 1
    MINOR = 0
-    TINY  = 5
+    TINY  = 2
    
    # Branch values:
    # * official release: nil
--- a/lib/redmine/wiki_formatting/textile/formatter.rb
+++ b/lib/redmine/wiki_formatting/textile/formatter.rb
@@ -121,7 +121,7 @@ module Redmine
                          (\S+?)                   # url
                          (\/)?                    # slash
                        )
-                        ((?:&gt;)?|[^\w\=\/;\(\)]*?)               # post
+                        ([^\w\=\/;\(\)]*?)               # post
                        (?=<|\s|$)
                       }x unless const_defined?(:AUTO_LINK_RE)
  
--- a/lib/tasks/email.rake
+++ b/lib/tasks/email.rake
@@ -165,22 +165,5 @@ END_DESC
      
      Redmine::POP3.check(pop_options, options)
    end
-    
-    desc "Send a test email to the user with the provided login name"
-    task :test, :login, :needs => :environment do |task, args|
-      include Redmine::I18n
-      abort l(:notice_email_error, "Please include the user login to test with. Example: login=examle-login") if args[:login].blank?
-
-      user = User.find_by_login(args[:login])
-      abort l(:notice_email_error, "User #{args[:login]} not found") unless user.logged?
-      
-      ActionMailer::Base.raise_delivery_errors = true
-      begin
-        Mailer.deliver_test(User.current)
-        puts l(:notice_email_sent, user.mail)
-      rescue Exception => e
-        abort l(:notice_email_error, e.message)
-      end
-    end
  end
 end
--- a/lib/tasks/locales.rake
+++ b/lib/tasks/locales.rake
@@ -28,62 +28,4 @@ namespace :locales do
      lang.close
    end
  end
-
-  desc <<-END_DESC
-Removes a translation string from all locale file (only works for top-level childless non-multiline keys, probably doesn\'t work on windows).
-
-Options:
-  key=key_1,key_2    Comma-separated list of keys to delete
-  skip=en,de         Comma-separated list of locale files to ignore (filename without extension)
-END_DESC
-
-  task :remove_key do
-    dir = ENV['DIR'] || './config/locales'
-    files = Dir.glob(File.join(dir,'*.yml'))
-    skips = ENV['skip'] ? Regexp.union(ENV['skip'].split(',')) : nil
-    deletes = ENV['key'] ? Regexp.union(ENV['key'].split(',')) : nil
-    # Ignore multiline keys (begin with | or >) and keys with children (nothing meaningful after :)
-    delete_regex = /\A  #{deletes}: +[^\|>\s#].*\z/
-    
-    files.each do |path|
-      # Skip certain locales
-      (puts "Skipping #{path}"; next) if File.basename(path, ".yml") =~ skips
-      puts "Deleting selected keys from #{path}"
-      orig_content = File.open(path, 'r') {|file| file.read}
-      File.open(path, 'w') {|file| orig_content.each_line {|line| file.puts line unless line.chomp =~ delete_regex}}
-    end
-  end
-  
-  desc <<-END_DESC
-Adds a new top-level translation string to all locale file (only works for childless keys, probably doesn\'t work on windows, doesn't check for duplicates).
-
-Options:
-  key="some_key=foo"
-  key1="another_key=bar"
-  key_fb="foo=bar"         Keys to add in the form key=value, every option of the form key[,\\d,_*] will be recognised
-  skip=en,de               Comma-separated list of locale files to ignore (filename without extension)
-END_DESC
-
-  task :add_key do
-    dir = ENV['DIR'] || './config/locales'
-    files = Dir.glob(File.join(dir,'*.yml'))
-    skips = ENV['skip'] ? Regexp.union(ENV['skip'].split(',')) : nil
-    keys_regex = /\Akey(\d+|_.+)?\z/
-    adds = ENV.reject {|k,v| !(k =~ keys_regex)}.values.collect {|v| Array.new v.split("=",2)}
-    key_list = adds.collect {|v| v[0]}.join(", ")
-
-    files.each do |path|
-      # Skip certain locales
-      (puts "Skipping #{path}"; next) if File.basename(path, ".yml") =~ skips
-      # TODO: Check for dupliate/existing keys
-      puts "Adding #{key_list} to #{path}"
-      File.open(path, 'a') do |file|
-        adds.each do |kv|
-          Hash[*kv].to_yaml.each_line do |line|
-            file.puts "  #{line}" unless (line =~ /^---/ || line.empty?)
-          end
-        end
-      end
-    end
-  end
 end
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -167,7 +167,7 @@ namespace :redmine do
        has_many :attachments, :class_name => "TracAttachment",
                               :finder_sql => "SELECT DISTINCT attachment.* FROM #{TracMigrate::TracAttachment.table_name}" +
                                              " WHERE #{TracMigrate::TracAttachment.table_name}.type = 'ticket'" +
-                                              ' AND #{TracMigrate::TracAttachment.table_name}.id = \'#{TracMigrate::TracAttachment.connection.quote_string(id.to_s)}\''
+                                              ' AND #{TracMigrate::TracAttachment.table_name}.id = \'#{id}\''
        has_many :customs, :class_name => "TracTicketCustom", :foreign_key => :ticket

        def ticket_type
@@ -207,7 +207,7 @@ namespace :redmine do
        has_many :attachments, :class_name => "TracAttachment",
                               :finder_sql => "SELECT DISTINCT attachment.* FROM #{TracMigrate::TracAttachment.table_name}" +
                                      " WHERE #{TracMigrate::TracAttachment.table_name}.type = 'wiki'" +
-                                      ' AND #{TracMigrate::TracAttachment.table_name}.id = \'#{TracMigrate::TracAttachment.connection.quote_string(id.to_s)}\''
+                                      ' AND #{TracMigrate::TracAttachment.table_name}.id = \'#{id}\''

        def self.columns
          # Hides readonly Trac field to prevent clash with AR readonly? method (Rails 2.0)
--- a/public/help/wiki_syntax_detailed.html
+++ b/public/help/wiki_syntax_detailed.html
@@ -66,7 +66,7 @@

        <p>Wiki links are displayed in red if the page doesn't exist yet, eg: <a href="#" class="wiki-page new">Nonexistent page</a>.</p>

-        <p>Links to other resources:</p>
+        <p>Links to others resources (0.7):</p>

        <ul>
            <li>Documents:
@@ -74,7 +74,6 @@
                    <li><strong>document#17</strong> (link to document with id 17)</li>
                    <li><strong>document:Greetings</strong> (link to the document with title "Greetings")</li>
                    <li><strong>document:"Some document"</strong> (double quotes can be used when document title contains spaces)</li>
-                    <li><strong>document:some_project:"Some document"</strong> (link to a document with title "Some document" in other project "some_project")
                </ul></li>
        </ul>

@@ -96,36 +95,19 @@
        </ul>

        <ul>
-             <li>Repository files:
+             <li>Repository files
                <ul>
-                    <li><strong>source:some/file</strong>           (link to the file located at /some/file in the project's repository)</li>
-                    <li><strong>source:some/file@52</strong>        (link to the file's revision 52)</li>
-                    <li><strong>source:some/file#L120</strong>      (link to line 120 of the file)</li>
-                    <li><strong>source:some/file@52#L120</strong>   (link to line 120 of the file's revision 52)</li>
-                    <li><strong>source:"some file@52#L120"</strong> (use double quotes when the URL contains spaces</li>
-                    <li><strong>export:some/file</strong>           (force the download of the file)</li>
-                </ul></li>
+                    <li><strong>source:some/file</strong>          -- Link to the file located at /some/file in the project's repository</li>
+                    <li><strong>source:some/file@52</strong>       -- Link to the file's revision 52</li>
+                    <li><strong>source:some/file#L120</strong>     -- Link to line 120 of the file</li>
+                    <li><strong>source:some/file@52#L120</strong>  -- Link to line 120 of the file's revision 52</li>
+                    <li><strong>export:some/file</strong>          -- Force the download of the file</li>
+            </ul></li>
        </ul>
+        
+        <p>Escaping (0.7):</p>

        <ul>
-            <li>Forum messages:
-                <ul>
-                    <li><strong>message#1218</strong> (link to message with id 1218)</li>
-                </ul></li>
-        </ul>
-
-        <ul>
-            <li>Projects:
-                <ul>
-                    <li><strong>project#3</strong> (link to project with id 3)</li>
-                    <li><strong>project:someproject</strong> (link to project named "someproject")</li>
-                </ul></li>
-        </ul>
-
-
-        <p>Escaping:</p>
-
-        <ul>
            <li>You can prevent Redmine links from being parsed by preceding them with an exclamation mark: !</li>
        </ul>

@@ -237,7 +219,7 @@ To go live, all you need to add is a database and a web server.

    <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>

-    <p>Code highlightment relies on <a href="http://coderay.rubychan.de/" class="external">CodeRay</a>, a fast syntax highlighting library written completely in Ruby. It currently supports c, cpp, css, delphi, groovy, html, java, javascript, json, php, python, rhtml, ruby, scheme, sql, xml and yaml languages.</p>
+    <p>Code highlightment relies on <a href="http://coderay.rubychan.de/" class="external">CodeRay</a>, a fast syntax highlighting library written completely in Ruby. It currently supports c, html, javascript, rhtml, ruby, scheme, xml languages.</p>

    <p>You can highlight code in your wiki page using this syntax:</p>

--- a/test/fixtures/attachments.yml
+++ b/test/fixtures/attachments.yml
@@ -145,15 +145,3 @@ attachments_012:
  filename: version_file.zip
  author_id: 2
  content_type: application/octet-stream
-attachments_013:
-  created_on: 2006-07-19 21:07:27 +02:00
-  container_type: Message
-  container_id: 1
-  downloads: 0
-  disk_filename: 060719210727_foo.zip
-  digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
-  id: 13
-  filesize: 452
-  filename: foo.zip
-  author_id: 2
-  content_type: application/octet-stream
--- a/test/fixtures/repositories/git_repository.tar.gz
+++ b/test/fixtures/repositories/git_repository.tar.gz
--- a/test/functional/calendars_controller_test.rb
+++ b/test/functional/calendars_controller_test.rb
@@ -16,16 +16,6 @@ class CalendarsControllerTest < ActionController::TestCase
    assert_template 'calendar'
    assert_not_nil assigns(:calendar)
  end
-
-  context "GET :show" do
-    should "run custom queries" do
-      @query = Query.generate_default!
-      
-      get :show, :query_id => @query.id
-      assert_response :success
-    end
-    
-  end
  
  def test_week_number_calculation
    Setting.start_of_week = 7
--- a/test/functional/issue_moves_controller_test.rb
+++ b/test/functional/issue_moves_controller_test.rb
@@ -40,31 +40,6 @@ class IssueMovesControllerTest < ActionController::TestCase
    assert_equal 2, Issue.find(2).tracker_id
  end

-  context "#create via bulk move" do
-    setup do
-      @request.session[:user_id] = 2
-    end
-    
-    should "allow changing the issue priority" do
-      post :create, :ids => [1, 2], :priority_id => 6
-
-      assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook'
-      assert_equal 6, Issue.find(1).priority_id
-      assert_equal 6, Issue.find(2).priority_id
-
-    end
-
-    should "allow adding a note when moving" do
-      post :create, :ids => [1, 2], :notes => 'Moving two issues'
-
-      assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook'
-      assert_equal 'Moving two issues', Issue.find(1).journals.last.notes
-      assert_equal 'Moving two issues', Issue.find(2).journals.last.notes
-
-    end
-    
-  end
-
  def test_bulk_copy_to_another_project
    @request.session[:user_id] = 2
    assert_difference 'Issue.count', 2 do
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -250,9 +250,6 @@ class IssuesControllerTest < ActionController::TestCase
    get :show, :id => 1
    assert_response :success
    
-    assert_tag :tag => 'a',
-      :content => /Quote/
-    
    assert_tag :tag => 'form',
               :descendant => { :tag => 'fieldset',
                                :child => { :tag => 'legend', 
@@ -385,7 +382,6 @@ class IssuesControllerTest < ActionController::TestCase
                            :subject => 'This is the test_new issue',
                            :description => 'This is the description',
                            :priority_id => 5,
-                            :start_date => '2010-11-07',
                            :estimated_hours => '',
                            :custom_field_values => {'2' => 'Value for field 2'}}
    end
@@ -396,33 +392,12 @@ class IssuesControllerTest < ActionController::TestCase
    assert_equal 2, issue.author_id
    assert_equal 3, issue.tracker_id
    assert_equal 2, issue.status_id
-    assert_equal Date.parse('2010-11-07'), issue.start_date
    assert_nil issue.estimated_hours
    v = issue.custom_values.find(:first, :conditions => {:custom_field_id => 2})
    assert_not_nil v
    assert_equal 'Value for field 2', v.value
  end
  
-  def test_post_create_without_start_date
-    @request.session[:user_id] = 2
-    assert_difference 'Issue.count' do
-      post :create, :project_id => 1, 
-                 :issue => {:tracker_id => 3,
-                            :status_id => 2,
-                            :subject => 'This is the test_new issue',
-                            :description => 'This is the description',
-                            :priority_id => 5,
-                            :start_date => '',
-                            :estimated_hours => '',
-                            :custom_field_values => {'2' => 'Value for field 2'}}
-    end
-    assert_redirected_to :controller => 'issues', :action => 'show', :id => Issue.last.id
-    
-    issue = Issue.find_by_subject('This is the test_new issue')
-    assert_not_nil issue
-    assert_nil issue.start_date
-  end
-  
  def test_post_create_and_continue
    @request.session[:user_id] = 2
    post :create, :project_id => 1, 
@@ -501,20 +476,6 @@ class IssuesControllerTest < ActionController::TestCase
    assert_not_nil issue
    assert_equal Issue.find(2), issue.parent
  end
-
-  def test_post_create_subissue_with_non_numeric_parent_id
-    @request.session[:user_id] = 2
-    
-    assert_difference 'Issue.count' do
-      post :create, :project_id => 1, 
-                 :issue => {:tracker_id => 1,
-                            :subject => 'This is a child issue',
-                            :parent_issue_id => 'ABC'}
-    end
-    issue = Issue.find_by_subject('This is a child issue')
-    assert_not_nil issue
-    assert_nil issue.parent
-  end
  
  def test_post_create_should_send_a_notification
    ActionMailer::Base.deliveries.clear
--- a/Show More
+++ b/Show More