From a628b0f186cf4d182ce5cee1a497ad42c5246406 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sat, 24 Jul 2010 00:19:32 +0000 Subject: [PATCH 001/222] Force-clear the default value for migration from :string to :text. #5846 #5771 This is a special case for MySQL in Win32. Contributed by Holger Just. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3860 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/change.rb | 5 +++-- .../20100705164950_change_changes_path_length_limit.rb | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/models/change.rb b/app/models/change.rb index e5c1585b4..657652c9d 100644 --- a/app/models/change.rb +++ b/app/models/change.rb @@ -19,12 +19,13 @@ class Change < ActiveRecord::Base belongs_to :changeset validates_presence_of :changeset_id, :action, :path + before_save :init_path def relative_path changeset.repository.relative_path(path) end - def before_save - path ||= "" + def init_path + self.path ||= "" end end diff --git a/db/migrate/20100705164950_change_changes_path_length_limit.rb b/db/migrate/20100705164950_change_changes_path_length_limit.rb index 62ba4ec22..62b8644a4 100644 --- a/db/migrate/20100705164950_change_changes_path_length_limit.rb +++ b/db/migrate/20100705164950_change_changes_path_length_limit.rb @@ -1,6 +1,9 @@ class ChangeChangesPathLengthLimit < ActiveRecord::Migration def self.up + # these are two steps to please MySQL 5 on Win32 + change_column :changes, :path, :text, :default => nil, :null => true change_column :changes, :path, :text, :null => false + change_column :changes, :from_path, :text end From 90490c92a0648a7bb389665c37b2ba5f4a1b7a08 Mon Sep 17 00:00:00 2001 From: Azamat Hackimov Date: Sat, 24 Jul 2010 09:47:31 +0000 Subject: [PATCH 002/222] Translation updates * fr (#5912) * ru * zh (#5910) git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3863 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/fr.yml | 20 ++++++++++---------- config/locales/ru.yml | 2 +- config/locales/zh.yml | 24 ++++++++++++------------ 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index fe4f4daf5..305dee7c0 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -916,14 +916,14 @@ fr: enumeration_system_activity: Activité système label_board_sticky: Sticky label_board_locked: Verrouillé - error_unable_delete_issue_status: Unable to delete issue status - 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. + error_unable_delete_issue_status: Impossible de supprimer le statut de demande + error_can_not_delete_custom_field: Impossible de supprimer le champ personnalisé + error_unable_to_connect: Connexion impossible ({{value}}) + error_can_not_remove_role: Ce rôle est utilisé et ne peut pas être supprimé. + error_can_not_delete_tracker: Ce tracker contient des demandes et ne peut pas être supprimé. field_principal: Principal - 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 + notice_failed_to_save_members: "Erreur lors de la sauvegarde des membres: {{errors}}." + text_zoom_out: Zoom arrière + text_zoom_in: Zoom avant + notice_unable_delete_time_entry: Impossible de supprimer le temps passé. + label_overall_spent_time: Temps passé global diff --git a/config/locales/ru.yml b/config/locales/ru.yml index cce123622..645db4de8 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1019,7 +1019,7 @@ ru: label_close_versions: Закрыть завершенные версии label_board_sticky: Прикреплена label_board_locked: Заблокирована - field_principal: Глава + field_principal: Имя text_zoom_out: Отдалить text_zoom_in: Приблизить notice_unable_delete_time_entry: Невозможно удалить запись журнала. diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 6fdb33f52..389707d5b 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -907,22 +907,22 @@ zh: label_board_sticky: 置顶 label_board_locked: 锁定 permission_export_wiki_pages: 导出 wiki 页面 - setting_cache_formatted_text: 缓存已格式化文字 + setting_cache_formatted_text: 缓存格式化文本 permission_manage_project_activities: 管理项目活动 error_unable_delete_issue_status: 无法删除问题状态 - label_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 + label_profile: 简介 + permission_manage_subtasks: 管理子任务 + field_parent_issue: 父任务 + label_subtask_plural: 子任务 + label_project_copy_notifications: 复制项目时发送邮件通知 error_can_not_delete_custom_field: 不能删除自定义属性 error_unable_to_connect: 不能连接到 ({{value}}) error_can_not_remove_role: 该角色正在使用中, 不能删除. error_can_not_delete_tracker: 该跟踪标签包含问题, 不能删除. field_principal: Principal - label_my_page_block: My page block - notice_failed_to_save_members: "Failed to save member(s): {{errors}}." - text_zoom_out: Zoom out - text_zoom_in: Zoom in - notice_unable_delete_time_entry: Unable to delete time log entry. - label_overall_spent_time: Overall spent time + label_my_page_block: 我的工作台模块 + notice_failed_to_save_members: "成员保存失败：{{errors}}。" + text_zoom_out: 缩小 + text_zoom_in: 放大 + notice_unable_delete_time_entry: 无法删除工时记录。 + label_overall_spent_time: 所有项目耗用工时 From 7f49f07e9a357a6290b05af79b75960e298bd41a Mon Sep 17 00:00:00 2001 From: Azamat Hackimov Date: Sat, 24 Jul 2010 10:26:53 +0000 Subject: [PATCH 003/222] Try to resolve bug #3922 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3864 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/en-GB.yml | 2 +- config/locales/en.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 2c19c4f49..42f173b82 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -221,7 +221,7 @@ en-GB: field_tracker: Tracker field_subject: Subject field_due_date: Due date - field_assigned_to: Assigned to + field_assigned_to: Assignee field_priority: Priority field_fixed_version: Target version field_user: User diff --git a/config/locales/en.yml b/config/locales/en.yml index 3ab257825..4ba6df5c5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -224,7 +224,7 @@ en: field_tracker: Tracker field_subject: Subject field_due_date: Due date - field_assigned_to: Assigned to + field_assigned_to: Assignee field_priority: Priority field_fixed_version: Target version field_user: User From a9a4e0d6b8f1c3c08e927a49d213f21931d4071f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 09:29:17 +0000 Subject: [PATCH 004/222] Moves code to controller. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3865 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/versions_controller.rb | 3 +++ app/views/versions/show.rhtml | 7 ++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb index 05c9743eb..a9470cb85 100644 --- a/app/controllers/versions_controller.rb +++ b/app/controllers/versions_controller.rb @@ -27,6 +27,9 @@ class VersionsController < ApplicationController helper :projects def show + @issues = @version.fixed_issues.find(:all, + :include => [:status, :tracker, :priority], + :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id") end def new diff --git a/app/views/versions/show.rhtml b/app/views/versions/show.rhtml index 18bc6bc45..79de5984b 100644 --- a/app/views/versions/show.rhtml +++ b/app/views/versions/show.rhtml @@ -32,13 +32,10 @@ <%= render :partial => 'versions/overview', :locals => {:version => @version} %> <%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %> -<% issues = @version.fixed_issues.find(:all, - :include => [:status, :tracker, :priority], - :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id") %> -<% if issues.size > 0 %> +<% if @issues.present? %>
<%= l(:label_related_issues) %>
    -<% issues.each do |issue| -%> +<% @issues.each do |issue| -%>
  • <%= link_to_issue(issue) %>
    • <% end -%>
From fe63eefc1f4a5c7c5823b0939f87f4433ef0f999 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 09:29:46 +0000 Subject: [PATCH 005/222] Adds missing visibility scope. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3866 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/versions_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb index a9470cb85..46b4778d4 100644 --- a/app/controllers/versions_controller.rb +++ b/app/controllers/versions_controller.rb @@ -27,7 +27,7 @@ class VersionsController < ApplicationController helper :projects def show - @issues = @version.fixed_issues.find(:all, + @issues = @version.fixed_issues.visible.find(:all, :include => [:status, :tracker, :priority], :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id") end From 379c0a1dd43c1c25faba5a0a1dea40f63384a010 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 09:38:54 +0000 Subject: [PATCH 006/222] Disable priority (#5925) and progress in context menu for parent issues. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3869 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/issues/context_menu.rhtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml index e8d67ce41..858f3b2e6 100644 --- a/app/views/issues/context_menu.rhtml +++ b/app/views/issues/context_menu.rhtml @@ -34,7 +34,7 @@
    <% @priorities.each do |p| -%>
  • <%= context_menu_link p.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'priority_id' => p}, :back_url => @back}, :method => :post, - :selected => (@issue && p == @issue.priority), :disabled => !@can[:edit] %>
    • + :selected => (@issue && p == @issue.priority), :disabled => (!@can[:edit] || !@issue.leaf?) %> <% end -%>
@@ -83,7 +83,7 @@
    <% (0..10).map{|x|x*10}.each do |p| -%>
  • <%= context_menu_link "#{p}%", {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'done_ratio' => p}, :back_url => @back}, :method => :post, - :selected => (@issue && p == @issue.done_ratio), :disabled => !@can[:edit] %>
    • + :selected => (@issue && p == @issue.done_ratio), :disabled => (!@can[:edit] || !@issue.leaf?) %> <% end -%>
From fd0623bf69a2354bada6eb679970d440fc1e00a1 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 09:47:37 +0000 Subject: [PATCH 007/222] Fixes broken status change in context menu (#5892). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3871 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/issues/context_menu.rhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml index 858f3b2e6..489896e09 100644 --- a/app/views/issues/context_menu.rhtml +++ b/app/views/issues/context_menu.rhtml @@ -8,7 +8,7 @@ <%= l(:field_status) %>
    <% @statuses.each do |s| -%> -
  • <%= context_menu_link s.name, {:controller => 'issues', :action => 'edit', :id => @issue, :issue => {:status_id => s}, :back_url => @back}, :method => :post, +
  • <%= context_menu_link s.name, {:controller => 'issues', :action => 'update', :id => @issue, :issue => {:status_id => s}, :back_url => @back}, :method => :put, :selected => (s == @issue.status), :disabled => !(@can[:update] && @allowed_statuses.include?(s)) %>
    • <% end -%>
From 66820dbed37f02a3371daa296c59a941c1f50a50 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 09:50:41 +0000 Subject: [PATCH 008/222] Strips user email (#5834). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3873 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/user.rb | 4 ++++ test/unit/user_test.rb | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/app/models/user.rb b/app/models/user.rb index 8148ae3a9..db18db49e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -79,6 +79,10 @@ class User < Principal super end + def mail=(arg) + write_attribute(:mail, arg.to_s.strip) + end + def identity_url=(url) if url.blank? write_attribute(:identity_url, '') diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index 5a0c9f87e..ea40ccff6 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -35,6 +35,12 @@ class UserTest < ActiveSupport::TestCase def test_truth assert_kind_of User, @jsmith end + + def test_mail_should_be_stripped + u = User.new + u.mail = " foo@bar.com " + assert_equal "foo@bar.com", u.mail + end def test_create user = User.new(:firstname => "new", :lastname => "user", :mail => "newuser@somenet.foo") From 72ce4f3ab95be1fc7b44a00a8e4f19844372c3fb Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 09:54:59 +0000 Subject: [PATCH 009/222] Harmonize french locale "zero" translation with other locales (#5937). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3875 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/fr.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 305dee7c0..ce247d24c 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -542,16 +542,16 @@ fr: label_closed_issues: fermé label_closed_issues_plural: fermés label_x_open_issues_abbr_on_total: - zero: zéro ouvert sur {{total}} - one: un ouvert sur {{total}} + zero: 0 ouvert sur {{total}} + one: 1 ouvert sur {{total}} other: "{{count}} ouverts sur {{total}}" label_x_open_issues_abbr: - zero: zéro ouvert - one: un ouvert + zero: 0 ouvert + one: 1 ouvert other: "{{count}} ouverts" label_x_closed_issues_abbr: - zero: zéro fermé - one: un fermé + zero: 0 fermé + one: 1 fermé other: "{{count}} fermés" label_total: Total label_permissions: Permissions From 91f7cbb79db053e9f10f87e82fe6348245d7dfd1 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 10:02:12 +0000 Subject: [PATCH 010/222] Fixed: Forum message permalinks don't take pagination into account (#5945). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3877 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/messages/show.rhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/messages/show.rhtml b/app/views/messages/show.rhtml index 5c949d48f..a27b5d114 100644 --- a/app/views/messages/show.rhtml +++ b/app/views/messages/show.rhtml @@ -30,7 +30,7 @@

<%= avatar(message.author, :size => "24") %> - <%= link_to h(message.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => @topic, :anchor => "message-#{message.id}" } %> + <%= link_to h(message.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => @topic, :r => message, :anchor => "message-#{message.id}" } %> - <%= authoring message.created_on, message.author %>

From 73d936803975a2f8edae1a3a2c4f7ae3943fde19 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 10:34:55 +0000 Subject: [PATCH 011/222] Fixed: Add Another file to ticket doesn't work in IE (broken by r3750). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3879 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/attachments/_form.rhtml | 3 +-- public/javascripts/application.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/views/attachments/_form.rhtml b/app/views/attachments/_form.rhtml index 7702f92e2..6d387d1c2 100644 --- a/app/views/attachments/_form.rhtml +++ b/app/views/attachments/_form.rhtml @@ -1,6 +1,5 @@ -<%= file_field_tag 'attachments[1][file]', :size => 30, :id => nil -%> -
diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 612739f5c..989065b3a 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -52,7 +52,7 @@ function addFileField() { d.type = "text"; d.name = "attachments[" + fileFieldCount + "][description]"; d.size = 60; - var dLabel = document.createElement("label"); + var dLabel = new Element('label'); dLabel.addClassName('inline'); // Pulls the languge value used for Optional Description dLabel.update($('attachment_description_label_content').innerHTML) From c47d23a87be4e9de873d57ec2b843e8e7efc2caa Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 10:48:27 +0000 Subject: [PATCH 012/222] Fixed: Deleting statuses doesn't delete all workflow entries (#5811). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3881 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/issue_status.rb | 9 ++++++++- test/unit/issue_status_test.rb | 8 +++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/models/issue_status.rb b/app/models/issue_status.rb index fdda12a8c..f376d5d15 100644 --- a/app/models/issue_status.rb +++ b/app/models/issue_status.rb @@ -17,8 +17,10 @@ class IssueStatus < ActiveRecord::Base before_destroy :check_integrity - has_many :workflows, :foreign_key => "old_status_id", :dependent => :delete_all + has_many :workflows, :foreign_key => "old_status_id" acts_as_list + + before_destroy :delete_workflows validates_presence_of :name validates_uniqueness_of :name @@ -89,4 +91,9 @@ private def check_integrity raise "Can't delete status" if Issue.find(:first, :conditions => ["status_id=?", self.id]) end + + # Deletes associated workflows + def delete_workflows + Workflow.delete_all(["old_status_id = :id OR new_status_id = :id", {:id => id}]) + end end diff --git a/test/unit/issue_status_test.rb b/test/unit/issue_status_test.rb index 2c0685cec..bcc50a480 100644 --- a/test/unit/issue_status_test.rb +++ b/test/unit/issue_status_test.rb @@ -32,10 +32,12 @@ class IssueStatusTest < ActiveSupport::TestCase end def test_destroy - count_before = IssueStatus.count status = IssueStatus.find(3) - assert status.destroy - assert_equal count_before - 1, IssueStatus.count + assert_difference 'IssueStatus.count', -1 do + assert status.destroy + end + assert_nil Workflow.first(:conditions => {:old_status_id => status.id}) + assert_nil Workflow.first(:conditions => {:new_status_id => status.id}) end def test_destroy_status_in_use From cb5e63d846b625f5c10d784121d53ab08fe2f235 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 11:10:08 +0000 Subject: [PATCH 013/222] Display project names in cross-project gantt PDF (#5904). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3883 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/export/pdf.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb index c24921653..9ff69bb71 100644 --- a/lib/redmine/export/pdf.rb +++ b/lib/redmine/export/pdf.rb @@ -325,7 +325,7 @@ module Redmine pdf.Ln pdf.SetFontStyle('B',9) - subject_width = 70 + subject_width = 100 header_heigth = 5 headers_heigth = header_heigth @@ -341,7 +341,7 @@ module Redmine end end - g_width = 210 + g_width = 280 - subject_width zoom = (g_width) / (gantt.date_to - gantt.date_from + 1) g_height = 120 t_height = g_height + headers_heigth @@ -416,15 +416,17 @@ module Redmine pdf.SetX(15) if i.is_a? Issue - pdf.Cell(subject_width-15, 5, "#{i.tracker} #{i.id}: #{i.subject}".sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)'), "LR") + text = "#{i.tracker} #{i.id}: #{i.subject}" + text = "#{i.project} - #{text}" unless project && project == i.project + pdf.Cell(subject_width-15, 5, text, "LR") else pdf.Cell(subject_width-15, 5, "#{l(:label_version)}: #{i.name}", "LR") end - pdf.SetY(top) + pdf.SetY(top + 0.2) pdf.SetX(subject_width) - pdf.Cell(g_width, 5, "", "LR") - + pdf.SetFillColor(255, 255, 255) + pdf.Cell(g_width, 4.6, "", "LR", 0, "", 1) pdf.SetY(top+1.5) if i.is_a? Issue From bdad35a736141a92b4b2106f845d63a7fe67d640 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 11:19:44 +0000 Subject: [PATCH 014/222] Display project names for versions too on PDF (#5904). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3884 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/export/pdf.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb index 9ff69bb71..9b1f2b8a2 100644 --- a/lib/redmine/export/pdf.rb +++ b/lib/redmine/export/pdf.rb @@ -415,13 +415,14 @@ module Redmine pdf.SetY(top) pdf.SetX(15) + text = "" if i.is_a? Issue text = "#{i.tracker} #{i.id}: #{i.subject}" - text = "#{i.project} - #{text}" unless project && project == i.project - pdf.Cell(subject_width-15, 5, text, "LR") else - pdf.Cell(subject_width-15, 5, "#{l(:label_version)}: #{i.name}", "LR") + text = i.name end + text = "#{i.project} - #{text}" unless project && project == i.project + pdf.Cell(subject_width-15, 5, text, "LR") pdf.SetY(top + 0.2) pdf.SetX(subject_width) From 701d2eaeacdfc18ede147702522f4325528b37bb Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 11:43:19 +0000 Subject: [PATCH 015/222] Display project names in cross-project gantt PNG (#5904). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3885 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/gantts_controller.rb | 2 +- lib/redmine/helpers/gantt.rb | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/controllers/gantts_controller.rb b/app/controllers/gantts_controller.rb index bc2d6350c..e762c19c8 100644 --- a/app/controllers/gantts_controller.rb +++ b/app/controllers/gantts_controller.rb @@ -37,7 +37,7 @@ class GanttsController < ApplicationController respond_to do |format| format.html { render :action => "show", :layout => !request.xhr? } - format.png { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => "#{basename}.png") } if @gantt.respond_to?('to_image') + format.png { send_data(@gantt.to_image(@project), :disposition => 'inline', :type => 'image/png', :filename => "#{basename}.png") } if @gantt.respond_to?('to_image') format.pdf { send_data(gantt_to_pdf(@gantt, @project), :type => 'application/pdf', :filename => "#{basename}.pdf") } end end diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb index 330b58ee7..96ba4db7c 100644 --- a/lib/redmine/helpers/gantt.rb +++ b/lib/redmine/helpers/gantt.rb @@ -91,12 +91,12 @@ module Redmine # Generates a gantt image # Only defined if RMagick is avalaible - def to_image(format='PNG') + def to_image(project, format='PNG') date_to = (@date_from >> @months)-1 show_weeks = @zoom > 1 show_days = @zoom > 2 - subject_width = 320 + subject_width = 400 header_heigth = 18 # width of one day in pixels zoom = @zoom*2 @@ -115,7 +115,14 @@ module Redmine gc.stroke('transparent') gc.stroke_width(1) events.each do |i| - gc.text(4, top + 2, (i.is_a?(Issue) ? i.subject : i.name)) + text = "" + if i.is_a? Issue + text = "#{i.tracker} #{i.id}: #{i.subject}" + else + text = i.name + end + text = "#{i.project} - #{text}" unless project && project == i.project + gc.text(4, top + 2, text) top = top + 20 end From e1c3415795dbf2a0c364741fc1913f0555a300b8 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 11:55:57 +0000 Subject: [PATCH 016/222] Fixes context menu broken by r3869 (#5925). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3887 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/issues/context_menu.rhtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml index 489896e09..d9e92a4f8 100644 --- a/app/views/issues/context_menu.rhtml +++ b/app/views/issues/context_menu.rhtml @@ -34,7 +34,7 @@
    <% @priorities.each do |p| -%>
  • <%= context_menu_link p.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'priority_id' => p}, :back_url => @back}, :method => :post, - :selected => (@issue && p == @issue.priority), :disabled => (!@can[:edit] || !@issue.leaf?) %>
    • + :selected => (@issue && p == @issue.priority), :disabled => (!@can[:edit] || @issues.detect {|i| !i.leaf?}) %> <% end -%>
@@ -83,7 +83,7 @@
    <% (0..10).map{|x|x*10}.each do |p| -%>
  • <%= context_menu_link "#{p}%", {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'done_ratio' => p}, :back_url => @back}, :method => :post, - :selected => (@issue && p == @issue.done_ratio), :disabled => (!@can[:edit] || !@issue.leaf?) %>
    • + :selected => (@issue && p == @issue.done_ratio), :disabled => (!@can[:edit] || @issues.detect {|i| !i.leaf?}) %> <% end -%>
From db55ea8cb3ae9da21ac5381d269d2c0ffea5794d Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 12:48:28 +0000 Subject: [PATCH 017/222] Moves LDAP entry in admin menu. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3889 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/admin/_menu.rhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/_menu.rhtml b/app/views/admin/_menu.rhtml index 4fc08d888..a8de88850 100644 --- a/app/views/admin/_menu.rhtml +++ b/app/views/admin/_menu.rhtml @@ -3,7 +3,6 @@
  • <%= link_to l(:label_project_plural), {:controller => 'admin', :action => 'projects'}, :class => 'projects' %>
  • <%= link_to l(:label_user_plural), {:controller => 'users'}, :class => 'users' %>
  • <%= link_to l(:label_group_plural), {:controller => 'groups'}, :class => 'groups' %>
    • -
  • <%= link_to l(:label_ldap_authentication), {:controller => 'ldap_auth_sources', :action => 'index'}, :class => 'server_authentication' %>
  • <%= link_to l(:label_role_and_permissions), {:controller => 'roles'}, :class => 'roles' %>
  • <%= link_to l(:label_tracker_plural), {:controller => 'trackers'}, :class => 'trackers' %>
  • <%= link_to l(:label_issue_status_plural), {:controller => 'issue_statuses'}, :class => 'issue_statuses' %>
    • @@ -11,6 +10,7 @@
  • <%= link_to l(:label_custom_field_plural), {:controller => 'custom_fields'}, :class => 'custom_fields' %>
  • <%= link_to l(:label_enumerations), {:controller => 'enumerations'}, :class => 'enumerations' %>
  • <%= link_to l(:label_settings), {:controller => 'settings'}, :class => 'settings' %>
    • +
  • <%= link_to l(:label_ldap_authentication), {:controller => 'ldap_auth_sources', :action => 'index'}, :class => 'server_authentication' %>
    • <% menu_items_for(:admin_menu) do |item| -%>
  • <%= link_to h(item.caption), item.url, item.html_options %>
    • <% end -%> From 4f2d1b74245f0cc1e519b6222b8f9ccf7c5ceb3e Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 12:56:57 +0000 Subject: [PATCH 018/222] Fixed: Vertical scrollbar always visible in Wiki "code" blocks in Chrome (#5861). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3891 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- public/stylesheets/application.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 60c50d2b2..b3dbfd7f2 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -697,6 +697,7 @@ div.wiki pre { border: 1px solid #dadada; width:auto; overflow-x: auto; + overflow-y: hidden; } div.wiki ul.toc { From 2a85a1cebf149aa5b4b85f7266f5c8f7c4be4b84 Mon Sep 17 00:00:00 2001 From: Azamat Hackimov Date: Wed, 28 Jul 2010 20:05:06 +0000 Subject: [PATCH 019/222] Translation updates * de (#5982) * he (#5972) * hu (#5962) * zh (#5910) git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3893 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/de.yml | 1 + config/locales/he.yml | 737 +++++++++++++++++++++--------------------- config/locales/hu.yml | 34 +- config/locales/zh.yml | 22 +- 4 files changed, 400 insertions(+), 394 deletions(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index 70ea45489..8e3c4455d 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -136,6 +136,7 @@ de: greater_than_start_date: "muss größer als Anfangsdatum sein" not_same_project: "gehört nicht zum selben Projekt" circular_dependency: "Diese Beziehung würde eine zyklische Abhängigkeit erzeugen" + cant_link_an_issue_with_a_descendant: "Ein Ticket kann nicht mit einer ihrer Unteraufgaben verlinkt werden" actionview_instancetag_blank_option: Bitte auswählen diff --git a/config/locales/he.yml b/config/locales/he.yml index 125f0265f..f84fd01fe 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -1,5 +1,6 @@ -# Hebrew translations for Ruby on Rails -# by Dotan Nahum (dipidi@gmail.com) +# Hebrew translation for Redmine +# Initiated by Dotan Nahum (dipidi@gmail.com) +# Jul 2010 - Updated by Orgad Shaneh (orgads@gmail.com) he: date: @@ -14,7 +15,7 @@ he: month_names: [~, ינואר, פברואר, מרץ, אפריל, מאי, יוני, יולי, אוגוסט, ספטמבר, אוקטובר, נובמבר, דצמבר] abbr_month_names: [~, יאנ, פבר, מרץ, אפר, מאי, יונ, יול, אוג, ספט, אוק, נוב, דצמ] order: [ :day, :month, :year ] - + time: formats: default: "%a %d/%m/%Y %H:%M:%S" @@ -22,28 +23,28 @@ he: short: "%d %b %H:%M" long: "%B %d, %Y %H:%M" only_second: "%S" - + datetime: formats: default: "%d-%m-%YT%H:%M:%S%Z" - + am: 'am' pm: 'pm' - + datetime: distance_in_words: half_a_minute: 'חצי דקה' less_than_x_seconds: - zero: 'פחות משניה אחת' - one: 'פחות משניה אחת' - other: 'פחות מ- {{count}} שניות' + zero: 'פחות משניה' + one: 'פחות משניה' + other: 'פחות מ־{{count}} שניות' x_seconds: one: 'שניה אחת' other: '{{count}} שניות' less_than_x_minutes: zero: 'פחות מדקה אחת' one: 'פחות מדקה אחת' - other: 'פחות מ- {{count}} דקות' + other: 'פחות מ־{{count}} דקות' x_minutes: one: 'דקה אחת' other: '{{count}} דקות' @@ -66,9 +67,9 @@ he: one: 'מעל שנה אחת' other: 'מעל {{count}} שנים' almost_x_years: - one: "almost 1 year" - other: "almost {{count}} years" - + one: "כמעט שנה" + other: "כמעט {{count}} שנים" + number: format: precision: 3 @@ -76,7 +77,7 @@ he: delimiter: ',' currency: format: - unit: 'שח' + unit: 'ש"ח' precision: 2 format: '%u %n' human: @@ -84,18 +85,18 @@ he: format: "%n %u" units: byte: - one: "Byte" - other: "Bytes" + one: "בייט" + other: "בתים" kb: "KB" mb: "MB" gb: "GB" tb: "TB" - + support: array: - sentence_connector: "and" - skip_last_comma: false - + sentence_connector: "וגם" + skip_last_comma: true + activerecord: errors: messages: @@ -106,16 +107,16 @@ he: accepted: "חייב באישור" empty: "חייב להכלל" blank: "חייב להכלל" - too_long: "יותר מדי ארוך (לא יותר מ- {{count}} תוים)" - too_short: "יותר מדי קצר (לא יותר מ- {{count}} תוים)" + too_long: "ארוך מדי (לא יותר מ־{{count}} תוים)" + too_short: "קצר מדי (לא יותר מ־{{count}} תוים)" wrong_length: "לא באורך הנכון (חייב להיות {{count}} תוים)" taken: "לא זמין" not_a_number: "הוא לא מספר" - greater_than: "חייב להיות גדול מ- {{count}}" - greater_than_or_equal_to: "חייב להיות גדול או שווה ל- {{count}}" - equal_to: "חייב להיות שווה ל- {{count}}" - less_than: "חייב להיות קטן מ- {{count}}" - less_than_or_equal_to: "חייב להיות קטן או שווה ל- {{count}}" + greater_than: "חייב להיות גדול מ־{{count}}" + greater_than_or_equal_to: "חייב להיות גדול או שווה ל־{{count}}" + equal_to: "חייב להיות שווה ל־{{count}}" + less_than: "חייב להיות קטן מ־{{count}}" + less_than_or_equal_to: "חייב להיות קטן או שווה ל־{{count}}" odd: "חייב להיות אי זוגי" even: "חייב להיות זוגי" greater_than_start_date: "חייב להיות מאוחר יותר מתאריך ההתחלה" @@ -123,7 +124,7 @@ he: circular_dependency: "הקשר הזה יצור תלות מעגלית" actionview_instancetag_blank_option: בחר בבקשה - + general_text_No: 'לא' general_text_Yes: 'כן' general_text_no: 'לא' @@ -131,10 +132,10 @@ he: general_lang_name: 'Hebrew (עברית)' general_csv_separator: ',' general_csv_decimal_separator: '.' - general_csv_encoding: ISO-8859-8-I - general_pdf_encoding: ISO-8859-8-I + general_csv_encoding: ISO-8859-8 + general_pdf_encoding: ISO-8859-8 general_first_day_of_week: '7' - + notice_account_updated: החשבון עודכן בהצלחה! notice_account_invalid_creditentials: שם משתמש או סיסמה שגויים notice_account_password_updated: הסיסמה עודכנה בהצלחה! @@ -148,26 +149,59 @@ he: notice_successful_update: עידכון מוצלח. notice_successful_delete: מחיקה מוצלחת. notice_successful_connection: חיבור מוצלח. - notice_file_not_found: הדף שאת\ה מנסה לגשת אליו אינו קיים או שהוסר. + notice_file_not_found: הדף שאתה מנסה לגשת אליו אינו קיים או שהוסר. notice_locking_conflict: המידע עודכן על ידי משתמש אחר. notice_not_authorized: אינך מורשה לראות דף זה. notice_email_sent: "דואל נשלח לכתובת {{value}}" notice_email_error: "ארעה שגיאה בעט שליחת הדואל ({{value}})" - notice_feeds_access_key_reseted: מפתח ה-RSS שלך אופס. + notice_feeds_access_key_reseted: מפתח ה־RSS שלך אופס. + notice_api_access_key_reseted: מפתח הגישה שלך ל־API אופס. notice_failed_to_save_issues: "נכשרת בשמירת {{count}} נושא\ים ב {{total}} נבחרו: {{ids}}." + notice_failed_to_save_members: "כשלון בשמירת חבר(ים): {{errors}}." notice_no_issue_selected: "לא נבחר אף נושא! בחר בבקשה את הנושאים שברצונך לערוך." - - error_scm_not_found: כניסה ו\או גירסא אינם קיימים במאגר. + notice_account_pending: "החשבון שלך נוצר ועתה מחכה לאישור מנהל המערכת." + notice_default_data_loaded: אפשרויות ברירת מחדל מופעלות. + notice_unable_delete_version: לא ניתן למחוק גירסה + notice_unable_delete_time_entry: לא ניתן למחוק רשומת זמן. + notice_issue_done_ratios_updated: אחוזי התקדמות לנושא עודכנו. + + error_can_t_load_default_data: "אפשרויות ברירת המחדל לא הצליחו להיטען: {{value}}" + error_scm_not_found: כניסה ו\או גירסה אינם קיימים במאגר. error_scm_command_failed: "ארעה שגיאה בעת ניסון גישה למאגר: {{value}}" - - mail_subject_lost_password: "סיסמת ה-{{value}} שלך" - mail_body_lost_password: 'לשינו סיסמת ה-Redmine שלך,לחץ על הקישור הבא:' + error_scm_annotate: "הכניסה לא קיימת או שלא ניתן לתאר אותה." + error_issue_not_found_in_project: 'הנושאים לא נמצאו או אינם שיכים לפרויקט' + error_no_tracker_in_project: לא הוגדר סיווג לפרויקט זה. נא בדוק את הגדרות הפרויקט. + error_no_default_issue_status: לא מוגדר מצב ברירת מחדל לנושאים. נא בדוק את התצורה ("ניהול -> מצבי נושא"). + error_can_not_delete_custom_field: לא ניתן למחוק שדה מותאם אישית + error_can_not_delete_tracker: קיימים נושאים בסיווג זה, ולא ניתן למחוק אותו. + error_can_not_remove_role: תפקיד זה נמצא בשימוש, ולא ניתן למחוק אותו. + error_can_not_reopen_issue_on_closed_version: לא ניתן לפתוח מחדש נושא שמשויך לגירסה סגורה + error_can_not_archive_project: לא ניתן לארכב פרויקט זה + error_issue_done_ratios_not_updated: אחוז התקדמות לנושא לא עודכן. + error_workflow_copy_source: נא בחר סיווג או תפקיד מקור + error_workflow_copy_target: נא בחר תפקיד(ים) וסיווג(ים) + error_unable_delete_issue_status: לא ניתן למחוק מצב נושא + error_unable_to_connect: לא ניתן להתחבר ({{value}}) + warning_attachments_not_saved: "כשלון בשמירת {{count}} קבצים." + + mail_subject_lost_password: "סיסמת ה־{{value}} שלך" + mail_body_lost_password: 'לשינו סיסמת ה־Redmine שלך, לחץ על הקישור הבא:' mail_subject_register: "הפעלת חשבון {{value}}" - mail_body_register: 'להפעלת חשבון ה-Redmine שלך, לחץ על הקישור הבא:' - + mail_body_register: 'להפעלת חשבון ה־Redmine שלך, לחץ על הקישור הבא:' + mail_body_account_information_external: "אתה יכול להשתמש בחשבון {{value}} כדי להתחבר" + mail_body_account_information: פרטי החשבון שלך + mail_subject_account_activation_request: "בקשת הפעלה לחשבון {{value}}" + mail_body_account_activation_request: "משתמש חדש ({{value}}) נרשם. החשבון שלו מחכה לאישור שלך:" + mail_subject_reminder: "{{count}} נושאים מיעדים להגשה בימים הקרובים" + mail_body_reminder: "{{count}} נושאים שמיועדים אליך מיועדים להגשה בתוך {{days}} ימים:" + mail_subject_wiki_content_added: "דף ה־wiki ‏'{{page}}' נוסף" + mail_body_wiki_content_added: דף ה־wiki ‏'{{page}}' נוסף ע"י {{author}}. + mail_subject_wiki_content_updated: "דף ה־wiki ‏'{{page}}' עודכן" + mail_body_wiki_content_updated: דף ה־wiki ‏'{{page}}' עודכן ע"י {{author}}. + gui_validation_error: שגיאה 1 gui_validation_error_plural: "{{count}} שגיאות" - + field_name: שם field_description: תיאור field_summary: תקציר @@ -199,10 +233,11 @@ he: field_tracker: סיווג field_subject: שם נושא field_due_date: תאריך סיום - field_assigned_to: מוצב ל + field_assigned_to: אחראי field_priority: עדיפות - field_fixed_version: גירסאת יעד + field_fixed_version: גירסת יעד field_user: מתשמש + field_principal: מנהל field_role: תפקיד field_homepage: דף הבית field_is_public: פומבי @@ -217,7 +252,7 @@ he: field_password: סיסמה field_new_password: סיסמה חדשה field_password_confirmation: אישור - field_version: גירסא + field_version: גירסה field_type: סוג field_host: שרת field_port: פורט @@ -235,7 +270,7 @@ he: field_comments: הערות field_url: URL field_start_page: דף התחלתי - field_subproject: תת פרויקט + field_subproject: תת־פרויקט field_hours: שעות field_activity: פעילות field_spent_on: תאריך @@ -247,10 +282,21 @@ he: field_redirect_existing_links: העבר קישורים קיימים field_estimated_hours: זמן משוער field_column_names: עמודות + field_time_zone: איזור זמן + field_searchable: ניתן לחיפוש field_default_value: ערך ברירת מחדל - + field_comments_sorting: הצג הערות + field_parent_title: דף אב + field_editable: ניתן לעריכה + field_watcher: צופה + field_identity_url: כתובת OpenID + field_content: תוכן + field_group_by: קבץ את התוצאות לפי + field_sharing: שיתוף + field_parent_issue: משימת אב + setting_app_title: כותרת ישום - setting_app_subtitle: תת-כותרת ישום + setting_app_subtitle: תת־כותרת ישום setting_welcome_text: טקסט "ברוך הבא" setting_default_language: שפת ברירת מחדל setting_login_required: דרוש אימות @@ -258,39 +304,140 @@ he: setting_attachment_max_size: גודל דבוקה מקסימאלי setting_issues_export_limit: גבול יצוא נושאים setting_mail_from: כתובת שליחת דוא"ל + setting_bcc_recipients: מוסתר (bcc) + setting_plain_text_mail: טקסט פשוט בלבד (ללא HTML) setting_host_name: שם שרת setting_text_formatting: עיצוב טקסט setting_wiki_compression: כיווץ היסטורית WIKI setting_feeds_limit: גבול תוכן הזנות - setting_autofetch_changesets: משיכה אוטומתי של עידכונים - setting_sys_api_enabled: אפשר WS לניהול המאגר + setting_default_projects_public: פרויקטים חדשים הינם פומביים כברירת מחדל + setting_autofetch_changesets: משיכה אוטומטית של עידכונים + setting_sys_api_enabled: אפשר שירות רשת לניהול המאגר setting_commit_ref_keywords: מילות מפתח מקשרות setting_commit_fix_keywords: מילות מפתח מתקנות setting_autologin: חיבור אוטומטי setting_date_format: פורמט תאריך + setting_time_format: פורמט זמן setting_cross_project_issue_relations: הרשה קישור נושאים בין פרויקטים setting_issue_list_default_columns: עמודות ברירת מחדל המוצגות ברשימת הנושאים setting_repositories_encodings: קידוד המאגרים - + setting_commit_logs_encoding: קידוד הודעות הפקדה + setting_emails_footer: תחתית דוא"ל + setting_protocol: פרוטוקול + setting_per_page_options: אפשרויות אוביקטים לפי דף + setting_user_format: פורמט הצגת משתמשים + setting_activity_days_default: ימים המוצגים על פעילות הפרויקט + setting_display_subprojects_issues: הצג נושאים של תתי־פרויקטים כברירת מחדל + setting_enabled_scm: אפשר ניהול תצורה + setting_mail_handler_body_delimiters: חתוך כתובות דואר אחרי אחת משורות אלה + setting_mail_handler_api_enabled: אפשר שירות רשת לדואר נכנס + setting_mail_handler_api_key: מפתח API + setting_sequential_project_identifiers: השתמש במספרים עוקבים למזהי פרויקט + setting_gravatar_enabled: שימוש בצלמיות משתמשים מ־Gravatar + setting_gravatar_default: תמונת Gravatar ברירת מחדל + setting_diff_max_lines_displayed: מספר מירבי של שורות בתצוגת שינויים + setting_file_max_size_displayed: גודל מירבי של מלל המוצג בתוך השורה + setting_repository_log_display_limit: מספר מירבי של גירסאות המוצגות ביומן קובץ + setting_openid: אפשר התחברות ורישום באמצעות OpenID + 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_rest_api_enabled: אפשר שירות רשת REST + setting_cache_formatted_text: שמור טקסט מעוצב במטמון + + permission_add_project: יצירת פרויקט + permission_add_subprojects: יצירת תתי־פרויקט + permission_edit_project: עריכת פרויקט + permission_select_project_modules: בחירת מודולי פרויקט + permission_manage_members: ניהול חברים + permission_manage_project_activities: נהל פעילויות פרויקט + permission_manage_versions: ניהול גירסאות + permission_manage_categories: ניהול קטגוריות נושאים + permission_view_issues: צפיה בנושאים + permission_add_issues: הוספת נושא + permission_edit_issues: עריכת נושאים + permission_manage_issue_relations: ניהול קשרים בין נושאים + permission_add_issue_notes: הוספת הערות לנושאים + permission_edit_issue_notes: עריכת רשימות + permission_edit_own_issue_notes: עריכת הערות של עצמו + permission_move_issues: הזזת נושאים + permission_delete_issues: מחיקת נושאים + permission_manage_public_queries: ניהול שאילתות פומביות + permission_save_queries: שמירת שאילתות + permission_view_gantt: צפיה בגאנט + permission_view_calendar: צפיה בלוח השנה + permission_view_issue_watchers: צפיה ברשימת צופים + permission_add_issue_watchers: הוספת צופים + permission_delete_issue_watchers: הסרת צופים + permission_log_time: תיעוד זמן שהושקע + permission_view_time_entries: צפיה בזמן שהושקע + permission_edit_time_entries: עריכת רישום זמנים + permission_edit_own_time_entries: עריכת לוג הזמן של עצמו + permission_manage_news: ניהול חדשות + permission_comment_news: תגובה לחדשות + permission_manage_documents: ניהול מסמכים + permission_view_documents: צפיה במסמכים + permission_manage_files: ניהול קבצים + permission_view_files: צפיה בקבצים + permission_manage_wiki: ניהול wiki + permission_rename_wiki_pages: שינוי שם של דפי wiki + permission_delete_wiki_pages: מחיקת דפי wiki + permission_view_wiki_pages: צפיה ב־wiki + permission_view_wiki_edits: צפיה בהיסטורית wiki + permission_edit_wiki_pages: עריכת דפי wiki + permission_delete_wiki_pages_attachments: מחיקת דבוקות + permission_protect_wiki_pages: הגנה על כל דפי wiki + permission_manage_repository: ניהול מאגר + permission_browse_repository: סיור במאגר + permission_view_changesets: צפיה בקבוצות שינויים + permission_commit_access: אישור הפקדות + permission_manage_boards: ניהול לוחות + permission_view_messages: צפיה בהודעות + permission_add_messages: הצבת הודעות + permission_edit_messages: עריכת הודעות + permission_edit_own_messages: עריכת הודעות של עצמו + permission_delete_messages: מחיקת הודעות + permission_delete_own_messages: מחיקת הודעות של עצמו + permission_export_wiki_pages: יצא דפי wiki + permission_manage_subtasks: נהל תתי־משימות + + project_module_issue_tracking: מעקב נושאים + project_module_time_tracking: מעקב אחר זמנים + project_module_news: חדשות + project_module_documents: מסמכים + project_module_files: קבצים + project_module_wiki: Wiki + project_module_repository: מאגר + project_module_boards: לוחות + label_user: משתמש label_user_plural: משתמשים label_user_new: משתמש חדש + label_user_anonymous: אלמוני label_project: פרויקט label_project_new: פרויקט חדש label_project_plural: פרויקטים label_x_projects: - zero: no projects - one: 1 project - other: "{{count}} projects" + zero: ללא פרויקטים + one: פרויקט אחד + other: "{{count}} פרויקטים" label_project_all: כל הפרויקטים label_project_latest: הפרויקטים החדשים ביותר label_issue: נושא label_issue_new: נושא חדש label_issue_plural: נושאים label_issue_view_all: צפה בכל הנושאים + label_issues_by: "נושאים לפי {{value}}" + label_issue_added: נושא נוסף + label_issue_updated: נושא עודכן label_document: מסמך label_document_new: מסמך חדש label_document_plural: מסמכים + label_document_added: מוסמך נוסף label_role: תפקיד label_role_plural: תפקידים label_role_new: תפקיד חדש @@ -317,11 +464,13 @@ he: label_information_plural: מידע label_please_login: התחבר בבקשה label_register: הרשמה + label_login_with_open_id_option: או התחבר באמצעות OpenID label_password_lost: אבדה הסיסמה? label_home: דף הבית label_my_page: הדף שלי label_my_account: החשבון שלי label_my_projects: הפרויקטים שלי + label_my_page_block: בלוק הדף שלי label_administration: ניהול label_login: התחבר label_logout: התנתק @@ -331,6 +480,8 @@ he: label_last_login: חיבור אחרון label_registered_on: נרשם בתאריך label_activity: פעילות + label_overall_activity: פעילות כוללת + label_user_activity: "הפעילות של {{value}}" label_new: חדש label_logged_as: מחובר כ label_environment: סביבה @@ -338,11 +489,14 @@ he: label_auth_source: מצב אישור label_auth_source_new: מצב אישור חדש label_auth_source_plural: מצבי אישור - label_subproject_plural: תת-פרויקטים + label_subproject_plural: תת־פרויקטים + label_subproject_new: תת־פרויקט חדש + label_and_its_subprojects: "{{value}} וכל תתי־הפרויקטים שלו" label_min_max_length: אורך מינימאלי - מקסימאלי label_list: רשימה label_date: תאריך label_integer: מספר שלם + label_float: צף label_boolean: ערך בוליאני label_string: טקסט label_text: טקסט ארוך @@ -357,6 +511,7 @@ he: label_attachment_new: קובץ חדש label_attachment_delete: מחק קובץ label_attachment_plural: קבצים + label_file_added: קובץ נוסף label_report: דו"ח label_report_plural: דו"חות label_news: חדשות @@ -364,11 +519,13 @@ he: label_news_plural: חדשות label_news_latest: חדשות אחרונות label_news_view_all: צפה בכל החדשות + label_news_added: חדשות הוספו label_settings: הגדרות label_overview: מבט רחב - label_version: גירסא - label_version_new: גירסא חדשה + label_version: גירסה + label_version_new: גירסה חדשה label_version_plural: גירסאות + label_close_versions: סגור גירסאות שהושלמו label_confirmation: אישור label_export_to: יצא ל label_read: קרא... @@ -395,6 +552,7 @@ he: label_new_statuses_allowed: מצבים חדשים אפשריים label_all: הכל label_none: כלום + label_nobody: אף אחד label_next: הבא label_previous: הקודם label_used_by: בשימוש ע"י @@ -426,9 +584,19 @@ he: label_not_equals: הוא לא label_in_less_than: בפחות מ label_in_more_than: ביותר מ + label_greater_or_equal: ">=" + label_less_or_equal: <= label_in: ב label_today: היום + label_all_time: תמיד + label_yesterday: אתמול label_this_week: השבוע + label_last_week: שבוע שעבר + label_last_n_days: "ב־{{count}} ימים אחרונים" + label_this_month: החודש + label_last_month: חודש שעבר + label_this_year: השנה + label_date_range: טווח תאריכים label_less_than_ago: פחות מ label_more_than_ago: יותר מ label_ago: לפני @@ -436,17 +604,25 @@ he: label_not_contains: לא מכיל label_day_plural: ימים label_repository: מאגר + label_repository_plural: מאגרים label_browse: סייר label_modification: "שינוי {{count}}" label_modification_plural: "{{count}} שינויים" - label_revision: גירסא + label_branch: ענף + label_tag: סימון + 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: גירסה אחרונה label_latest_revision_plural: גירסאות אחרונות label_view_revisions: צפה בגירסאות + label_view_all_revisions: צפה בכל הגירסאות label_max_size: גודל מקסימאלי label_sort_highest: הזז לראשית label_sort_higher: הזז למעלה @@ -455,7 +631,7 @@ he: label_roadmap: מפת הדרכים label_roadmap_due_in: "נגמר בעוד {{value}}" label_roadmap_overdue: "{{value}} מאחר" - label_roadmap_no_issues: אין נושאים לגירסא זו + label_roadmap_no_issues: אין נושאים לגירסה זו label_search: חפש label_result_plural: תוצאות label_all_words: כל המילים @@ -466,12 +642,13 @@ he: label_wiki_page_plural: דפי Wiki label_index_by_title: סדר על פי כותרת label_index_by_date: סדר על פי תאריך - label_current_version: גירסא נוכאית + label_current_version: גירסה נוכחית label_preview: תצוגה מקדימה label_feed_plural: הזנות label_changes_details: פירוט כל השינויים label_issue_tracking: מעקב אחר נושאים label_spent_time: זמן שהושקע + label_overall_spent_time: זמן שהושקע סה"כ label_f_hour: "{{value}} שעה" label_f_hour_plural: "{{value}} שעות" label_time_tracking: מעקב זמנים @@ -479,7 +656,7 @@ he: label_statistics: סטטיסטיקות label_commits_per_month: הפקדות לפי חודש label_commits_per_author: הפקדות לפי כותב - label_view_diff: צפה בהבדלים + label_view_diff: צפה בשינויים label_diff_inline: בתוך השורה label_diff_side_by_side: צד לצד label_options: אפשרויות @@ -487,12 +664,13 @@ he: label_permissions_report: דו"ח הרשאות label_watched_issues: נושאים שנצפו label_related_issues: נושאים קשורים - label_applied_status: מוצב מוחל + label_applied_status: מצב מוחל label_loading: טוען... label_relation_new: קשר חדש label_relation_delete: מחק קשר label_relates_to: קשור ל label_duplicates: מכפיל את + label_duplicated_by: שוכפל ע"י label_blocks: חוסם את label_blocked_by: חסום ע"י label_precedes: מקדים את @@ -508,10 +686,13 @@ he: label_board: פורום label_board_new: פורום חדש label_board_plural: פורומים + label_board_locked: נעול + label_board_sticky: דביק label_topic_plural: נושאים label_message_plural: הודעות label_message_last: הודעה אחרונה label_message_new: הודעה חדשה + label_message_posted: הודעה הוספה label_reply_plural: השבות label_send_information: שלח מידע על חשבון למשתמש label_year: שנה @@ -522,9 +703,12 @@ he: label_language_based: מבוסס שפה label_sort_by: "מין לפי {{value}}" label_send_test_email: שלח דוא"ל בדיקה + label_feeds_access_key: מפתח גישה ל־RSS + label_missing_feeds_access_key: חסר מפתח גישה ל־RSS label_feeds_access_key_created_on: "מפתח הזנת RSS נוצר לפני{{value}}" label_module_plural: מודולים label_added_time_by: "נוסף על ידי {{author}} לפני {{age}} " + label_updated_time_by: 'עודכן ע"י {{author}} לפני {{age}}' label_updated_time: "עודכן לפני {{value}} " label_jump_to_a_project: קפוץ לפרויקט... label_file_plural: קבצים @@ -534,7 +718,61 @@ he: label_bulk_edit_selected_issues: ערוך את הנושאים המסומנים label_theme: ערכת נושא label_default: ברירת מחדל - + label_search_titles_only: חפש בכותרות בלבד + label_user_mail_option_all: "לכל אירוע בכל הפרויקטים שלי" + label_user_mail_option_selected: "לכל אירוע בפרויקטים שבחרתי בלבד..." + label_user_mail_option_none: "רק לנושאים שאני צופה או קשור אליהם" + label_user_mail_no_self_notified: "אני לא רוצה שיודיעו לי על שינויים שאני מבצע" + label_registration_activation_by_email: הפעל חשבון באמצעות דוא"ל + label_registration_manual_activation: הפעלת חשבון ידנית + label_registration_automatic_activation: הפעלת חשבון אוטומטית + label_display_per_page: "בכל דף: {{value}} תוצאות" + label_age: גיל + label_change_properties: שנה מאפיינים + label_general: כללי + label_more: עוד + label_scm: מערכת ניהול תצורה + label_plugins: תוספים + label_ldap_authentication: אימות LDAP + label_downloads_abbr: D/L + label_optional_description: תיאור רשות + label_add_another_file: הוסף עוד קובץ + label_preferences: העדפות + label_chronological_order: בסדר כרונולוגי + label_reverse_chronological_order: בסדר כרונולוגי הפוך + label_planning: תכנון + label_incoming_emails: דוא"ל נכנס + label_generate_key: צור מפתח + label_issue_watchers: צופים + label_example: דוגמא + label_display: תצוגה + label_sort: מיון + label_ascending: בסדר עולה + label_descending: בסדר יורד + label_date_from_to: 'מתאריך {{start}} ועד תאריך {{end}}' + label_wiki_content_added: הדף נוסף ל־wiki + label_wiki_content_updated: דף ה־wiki עודכן + label_group: קבוצה + label_group_plural: קבוצות + label_group_new: קבוצה חדשה + label_time_entry_plural: זמן שהושקע + label_version_sharing_none: לא משותף + label_version_sharing_descendants: עם פרויקטים בנים + label_version_sharing_hierarchy: עם היררכית הפרויקטים + label_version_sharing_tree: עם עץ הפרויקט + label_version_sharing_system: עם כל הפרויקטים + label_update_issue_done_ratios: עדכן אחוז התקדמות לנושא + label_copy_source: מקור + label_copy_target: יעד + label_copy_same_as_target: זהה ליעד + label_display_used_statuses_only: הצג רק את המצבים בשימוש לסיווג זה + label_api_access_key: מפתח גישה ל־API + label_missing_api_access_key: חסר מפתח גישה ל־API + label_api_access_key_created_on: 'מפתח גישה ל־API נוצר לפני {{value}}' + label_profile: פרופיל + label_subtask_plural: תתי־משימות + label_project_copy_notifications: שלח התראות דואר במהלך העתקת הפרויקט + button_login: התחבר button_submit: אשר button_save: שמור @@ -542,6 +780,7 @@ he: button_uncheck_all: בחר כלום button_delete: מחק button_create: צור + button_create_and_continue: צור ופתח חדש button_test: בדוק button_edit: ערוך button_add: הוסף @@ -554,12 +793,13 @@ he: button_list: רשימה button_view: צפה button_move: הזז + button_move_and_follow: העבר ועקוב button_back: הקודם button_cancel: בטל button_activate: הפעל button_sort: מיין button_log_time: זמן לוג - button_rollback: חזור לגירסא זו + button_rollback: חזור לגירסה זו button_watch: צפה button_unwatch: בטל צפיה button_reply: השב @@ -567,344 +807,109 @@ he: button_unarchive: הוצא מהארכיון button_reset: אפס button_rename: שנה שם - + button_change_password: שנה סיסמא + button_copy: העתק + button_copy_and_follow: העתק ועקוב + button_annotate: הוסף תיאור מסגרת + button_update: עדכן + button_configure: אפשרויות + button_quote: צטט + button_duplicate: שכפל + button_show: הצג + status_active: פעיל status_registered: רשום status_locked: נעול - + + version_status_open: פתוח + version_status_locked: נעול + version_status_closed: סגור + + field_active: פעיל + text_select_mail_notifications: בחר פעולת שבגללן ישלח דוא"ל. text_regexp_info: כגון. ^[A-Z0-9]+$ text_min_max_length_info: 0 משמעו ללא הגבלות - text_project_destroy_confirmation: האם אתה בטוח שברצונך למחוק את הפרויקט ואת כל המידע הקשור אליו ? - text_workflow_edit: בחר תפקיד ועוקב כדי לערות את זרימת העבודה - text_are_you_sure: האם אתה בטוח ? + text_project_destroy_confirmation: האם אתה בטוח שברצונך למחוק את הפרויקט ואת כל המידע הקשור אליו? + text_subprojects_destroy_warning: "תת־הפרויקט\ים: {{value}} ימחקו גם כן." + text_workflow_edit: בחר תפקיד וסיווג כדי לערוך את זרימת העבודה + text_are_you_sure: האם אתה בטוח? + text_journal_changed: "{{label}} השתנה מ{{old}} ל{{new}}" + text_journal_set_to: "{{label}} נקבע ל{{value}}" + text_journal_deleted: "{{label}} נמחק ({{old}})" + text_journal_added: "{{label}} {{value}} נוסף" text_tip_task_begin_day: מטלה המתחילה היום text_tip_task_end_day: מטלה המסתיימת היום text_tip_task_begin_end_day: מטלה המתחילה ומסתיימת היום text_project_identifier_info: 'אותיות לטיניות (a-z), מספרים ומקפים.
    ברגע שנשמר, לא ניתן לשנות את המזהה.' text_caracters_maximum: "מקסימום {{count}} תווים." + text_caracters_minimum: "חייב להיות לפחות באורך של {{count}} תווים." text_length_between: "אורך בין {{min}} ל {{max}} תווים." text_tracker_no_workflow: זרימת עבודה לא הוגדרה עבור סיווג זה text_unallowed_characters: תווים לא מורשים text_comma_separated: הכנסת ערכים מרובים מותרת (מופרדים בפסיקים). - text_issues_ref_in_commit_messages: קישור ותיקום נושאים בהודעות הפקדות + text_line_separated: ניתן להזין מספר ערכים (שורה אחת לכל ערך). + text_issues_ref_in_commit_messages: קישור ותיקום נושאים בהודעות הפקדה 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: הסר הצבת קטגוריה text_issue_category_reassign_to: הצב מחדש את הקטגוריה לנושאים - + text_user_mail_option: "בפרויקטים שלא בחרת, אתה רק תקבל התרעות על שאתה צופה או קשור אליהם (לדוגמא:נושאים שאתה היוצר שלהם או אחראי עליהם)." + text_no_configuration_data: "לא הוגדרה תצורה עבור תפקידים, סיווגים, מצבי נושא וזרימת עבודה.\nמומלץ מאד לטעון את תצורת ברירת המחדל. תוכל לשנותה מאוחר יותר." + text_load_default_configuration: טען את אפשרויות ברירת המחדל + text_status_changed_by_changeset: "הוחל בסדרת השינויים {{value}}." + text_issues_destroy_confirmation: 'האם אתה בטוח שברצונך למחוק את הנושא\ים?' + text_select_project_modules: 'בחר מודולים להחיל על פרויקט זה:' + text_default_administrator_account_changed: מנהל המערכת ברירת המחדל שונה + text_file_repository_writable: מאגר הקבצים ניתן לכתיבה + text_plugin_assets_writable: ספרית נכסי תוספים ניתנת לכתיבה + text_rmagick_available: RMagick זמין (רשות) + text_destroy_time_entries_question: "{{hours}} שעות דווחו על הנושאים שאתה עומד למחוק. מה ברצונך לעשות?" + text_destroy_time_entries: מחק שעות שדווחו + text_assign_time_entries_to_project: הצב שעות שדווחו לפרויקט הזה + text_reassign_time_entries: 'הצב מחדש שעות שדווחו לפרויקט הזה:' + text_user_wrote: "{{value}} כתב:" + text_enumeration_destroy_question: "{{count}} אוביקטים מוצבים לערך זה." + text_enumeration_category_reassign_to: 'הצב מחדש לערך הזה:' + 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: שורה אחת לכל ערך + text_wiki_page_destroy_question: לדף זה יש {{descendants}} דפים בנים ותלויים. מה ברצונך לעשות? + text_wiki_page_nullify_children: השאר דפים בנים כדפים ראשיים + text_wiki_page_destroy_children: מחק את הדפים הבנים ואת כל התלויים בהם + text_wiki_page_reassign_children: הצב מחדש דפים בנים לדף האב הנוכחי + text_own_membership_delete_confirmation: |- + בכוונתך למחוק חלק או את כל ההרשאות שלך. לאחר מכן לא תוכל יותר לערוך פרויקט זה. + האם אתה בטוח שברצונך להמשיך? + text_zoom_in: התקרב + text_zoom_out: התרחק + default_role_manager: מנהל default_role_developer: מפתח default_role_reporter: מדווח - default_tracker_bug: באג - default_tracker_feature: פיצ'ר + default_tracker_bug: תקלה + default_tracker_feature: יכולת default_tracker_support: תמיכה default_issue_status_new: חדש - default_issue_status_in_progress: In Progress - default_issue_status_resolved: פתור + default_issue_status_in_progress: בעבודה + default_issue_status_resolved: נפתר default_issue_status_feedback: משוב default_issue_status_closed: סגור - default_issue_status_rejected: דחוי + default_issue_status_rejected: נדחה default_doc_category_user: תיעוד משתמש default_doc_category_tech: תיעוד טכני default_priority_low: נמוכה default_priority_normal: רגילה - default_priority_high: גהבוה + default_priority_high: גבוהה default_priority_urgent: דחופה default_priority_immediate: מידית default_activity_design: עיצוב default_activity_development: פיתוח - + enumeration_issue_priorities: עדיפות נושאים enumeration_doc_categories: קטגוריות מסמכים enumeration_activities: פעילויות (מעקב אחר זמנים) - label_search_titles_only: חפש בכותרות בלבד - label_nobody: אף אחד - button_change_password: שנה סיסמא - text_user_mail_option: "בפרויקטים שלא בחרת, אתה רק תקבל התרעות על שאתה צופה או קשור אליהם (לדוגמא:נושאים שאתה היוצר שלהם או מוצבים אליך)." - label_user_mail_option_selected: "לכל אירוע בפרויקטים שבחרתי בלבד..." - label_user_mail_option_all: "לכל אירוע בכל הפרויקטים שלי" - label_user_mail_option_none: "רק לנושאים שאני צופה או קשור אליהם" - setting_emails_footer: תחתית דוא"ל - label_float: צף - button_copy: העתק - mail_body_account_information_external: "אתה יכול להשתמש בחשבון {{value}} כדי להתחבר" - mail_body_account_information: פרטי החשבון שלך - setting_protocol: פרוטוקול - label_user_mail_no_self_notified: "אני לא רוצה שיודיעו לי על שינויים שאני מבצע" - setting_time_format: פורמט זמן - label_registration_activation_by_email: הפעל חשבון באמצעות דוא"ל - mail_subject_account_activation_request: "בקשת הפעלה לחשבון {{value}}" - mail_body_account_activation_request: "משתמש חדש ({{value}}) נרשם. החשבון שלו מחכה לאישור שלך:" - label_registration_automatic_activation: הפעלת חשבון אוטומטית - label_registration_manual_activation: הפעלת חשבון ידנית - notice_account_pending: "החשבון שלך נוצר ועתה מחכה לאישור מנהל המערכת." - field_time_zone: איזור זמן - text_caracters_minimum: "חייב להיות לפחות באורך של {{count}} תווים." - setting_bcc_recipients: מוסתר (bcc) - button_annotate: הוסף תיאור מסגרת - label_issues_by: "נושאים לפי {{value}}" - field_searchable: ניתן לחיפוש - label_display_per_page: "בכל דף: {{value}} תוצאות" - setting_per_page_options: אפשרויות אוביקטים לפי דף - label_age: גיל - notice_default_data_loaded: אפשרויות ברירת מחדל מופעלות. - text_load_default_configuration: טען את אפשרויות ברירת המחדל - text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. יהיה באפשרותך לשנותו לאחר שיטען." - error_can_t_load_default_data: "אפשרויות ברירת המחדל לא הצליחו להיטען: {{value}}" - button_update: עדכן - label_change_properties: שנה מאפיינים - label_general: כללי - label_repository_plural: מאגרים - label_associated_revisions: שינויים קשורים - setting_user_format: פורמט הצגת משתמשים - text_status_changed_by_changeset: "הוחל בסדרת השינויים {{value}}." - label_more: עוד - text_issues_destroy_confirmation: 'האם את\ה בטוח שברצונך למחוק את הנושא\ים ?' - label_scm: SCM - text_select_project_modules: 'בחר מודולים להחיל על פקרויקט זה:' - label_issue_added: נושא נוסף - label_issue_updated: נושא עודכן - label_document_added: מוסמך נוסף - label_message_posted: הודעה הוספה - label_file_added: קובץ נוסף - label_news_added: חדשות הוספו - project_module_boards: לוחות - project_module_issue_tracking: מעקב נושאים - project_module_wiki: Wiki - project_module_files: קבצים - project_module_documents: מסמכים - project_module_repository: מאגר - project_module_news: חדשות - project_module_time_tracking: מעקב אחר זמנים - text_file_repository_writable: מאגר הקבצים ניתן לכתיבה - text_default_administrator_account_changed: מנהל המערכת ברירת המחדל שונה - text_rmagick_available: RMagick available (optional) - button_configure: אפשרויות - label_plugins: תוספים - label_ldap_authentication: אימות LDAP - label_downloads_abbr: D/L - label_this_month: החודש - label_last_n_days: "ב-{{count}} ימים אחרונים" - label_all_time: תמיד - label_this_year: השנה - label_date_range: טווח תאריכים - label_last_week: שבוע שעבר - label_yesterday: אתמול - label_last_month: חודש שעבר - label_add_another_file: הוסף עוד קובץ - label_optional_description: תיאור רשות - text_destroy_time_entries_question: "{{hours}} שעות דווחו על הנושים שאת\ה עומד\ת למחוק. מה ברצונך לעשות ?" - error_issue_not_found_in_project: 'הנושאים לא נמצאו או אינם שיכים לפרויקט' - text_assign_time_entries_to_project: הצב שעות שדווחו לפרויקט הזה - text_destroy_time_entries: מחק שעות שדווחו - text_reassign_time_entries: 'הצב מחדש שעות שדווחו לפרויקט הזה:' - setting_activity_days_default: ימים המוצגים על פעילות הפרויקט - label_chronological_order: בסדר כרונולוגי - field_comments_sorting: הצג הערות - label_reverse_chronological_order: בסדר כרונולוגי הפוך - label_preferences: העדפות - setting_display_subprojects_issues: הצג נושאים של תת פרויקטים כברירת מחדל - label_overall_activity: פעילות כוללת - 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}} נושאים מיעדים להגשה בימים הקרובים" - text_user_wrote: "{{value}} כתב:" - label_duplicated_by: שוכפל ע"י - setting_enabled_scm: אפשר SCM - text_enumeration_category_reassign_to: 'הצב מחדש לערך הזה:' - text_enumeration_destroy_question: "{{count}} אוביקטים מוצבים לערך זה." - label_incoming_emails: דוא"ל נכנס - label_generate_key: יצר מפתח - setting_mail_handler_api_enabled: Enable WS for incoming emails - setting_mail_handler_api_key: מפתח API - 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: דף אב - label_issue_watchers: צופים - setting_commit_logs_encoding: Commit messages encoding - button_quote: צטט - setting_sequential_project_identifiers: Generate 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: ערוך את לוג הזמן של עצמך - permission_manage_public_queries: נהל שאילתות פומביות - permission_add_issues: הוסף נושא - permission_log_time: תעד זמן שבוזבז - permission_view_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: נהל לוחות - 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: Commit access - permission_browse_repository: סייר במאגר - permission_view_documents: צפה במסמכים - permission_edit_project: ערוך פרויקט - permission_add_issue_notes: Add notes - permission_save_queries: שמור שאילתות - permission_view_wiki_pages: צפה ב-wiki - permission_rename_wiki_pages: שנה שם של דפי wiki - permission_edit_time_entries: ערוך רישום זמנים - permission_edit_own_issue_notes: Edit own notes - setting_gravatar_enabled: Use Gravatar user icons - label_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}}" - setting_diff_max_lines_displayed: Max number of diff lines displayed - text_plugin_assets_writable: Plugin assets directory writable - text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.' - warning_attachments_not_saved: "{{count}} file(s) could not be saved." - button_create_and_continue: צור ופתח חדש - text_custom_field_possible_values_info: 'One line for each value' - label_display: תצוגה - field_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: צופה - 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: מתאריך {{start}} ועד תאריך {{end}} - label_greater_or_equal: ">=" - label_less_or_equal: <= - text_wiki_page_destroy_question: This page has {{descendants}} child page(s) and descendant(s). What do you want to do? - text_wiki_page_reassign_children: Reassign child pages to this parent page - text_wiki_page_nullify_children: Keep child pages as root pages - text_wiki_page_destroy_children: Delete child pages and all their descendants - setting_password_min_length: אורך סיסמא מינימאלי - 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}} השתנה מ{{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: Active - enumeration_system_activity: System Activity - permission_delete_issue_watchers: Delete watchers - version_status_closed: סגור - version_status_locked: נעול - version_status_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: שכפל - 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: התחל יומנים לפי - 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: תת-פרויקט חדש - text_own_membership_delete_confirmation: |- - You are about to remove some or all of your permissions and may no longer be able to edit this project after that. - Are you sure you want to continue? - label_close_versions: Close completed versions - label_board_sticky: Sticky - label_board_locked: Locked - permission_export_wiki_pages: Export wiki pages - setting_cache_formatted_text: Cache formatted text - permission_manage_project_activities: Manage project activities - error_can_not_delete_custom_field: Unable to delete custom field - permission_manage_subtasks: Manage subtasks - label_profile: Profile - error_unable_to_connect: Unable to connect ({{value}}) - error_can_not_remove_role: This role is in use and can not be deleted. - field_parent_issue: Parent task - error_unable_delete_issue_status: Unable to delete issue status - label_subtask_plural: Subtasks - error_can_not_delete_tracker: This tracker contains issues and can't be deleted. - label_project_copy_notifications: Send email notifications during the project copy - field_principal: Principal - label_my_page_block: My page block - notice_failed_to_save_members: "Failed to save member(s): {{errors}}." - text_zoom_out: Zoom out - text_zoom_in: Zoom in - notice_unable_delete_time_entry: Unable to delete time log entry. - label_overall_spent_time: Overall spent time + enumeration_system_activity: פעילות מערכת diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 6839fb7b2..a62d07327 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -914,20 +914,20 @@ permission_export_wiki_pages: Wiki oldalak exportálása permission_manage_project_activities: Projekt tevékenységek kezelése label_board_locked: Zárolt - error_can_not_delete_custom_field: Unable to delete custom field - permission_manage_subtasks: Manage subtasks - label_profile: Profile - error_unable_to_connect: Unable to connect ({{value}}) - error_can_not_remove_role: This role is in use and can not be deleted. - field_parent_issue: Parent task - error_unable_delete_issue_status: Unable to delete issue status - label_subtask_plural: Subtasks - error_can_not_delete_tracker: This tracker contains issues and can't be deleted. - label_project_copy_notifications: Send email notifications during the project copy - field_principal: Principal - label_my_page_block: My page block - notice_failed_to_save_members: "Failed to save member(s): {{errors}}." - text_zoom_out: Zoom out - text_zoom_in: Zoom in - notice_unable_delete_time_entry: Unable to delete time log entry. - label_overall_spent_time: Overall spent time + error_can_not_delete_custom_field: Nem lehet törölni az egyéni mezőt + permission_manage_subtasks: Alfeladatok kezelése + label_profile: Profil + error_unable_to_connect: Nem lehet csatlakozni ({{value}}) + error_can_not_remove_role: Ez a szerepkör használatban van és ezért nem törölhető- + field_parent_issue: Szülő feladat + error_unable_delete_issue_status: Nem lehet törölni a feladat állapotát + label_subtask_plural: Alfeladatok + error_can_not_delete_tracker: Ebbe a kategóriába feladatok tartoznak és ezért nem törölhető. + label_project_copy_notifications: Küldjön e-mail értesítéseket projektmásolás közben. + field_principal: Felelős + label_my_page_block: Saját kezdőlap-blokk + notice_failed_to_save_members: "Nem sikerült menteni a tago(ka)t: {{errors}}." + text_zoom_out: Kicsinyít + text_zoom_in: Nagyít + notice_unable_delete_time_entry: Az időrögzítés nem törölhető + label_overall_spent_time: Összes rászánt idő diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 389707d5b..3762d835c 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -910,19 +910,19 @@ zh: setting_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: 复制项目时发送邮件通知 + label_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: 不能删除自定义属性 error_unable_to_connect: 不能连接到 ({{value}}) error_can_not_remove_role: 该角色正在使用中, 不能删除. error_can_not_delete_tracker: 该跟踪标签包含问题, 不能删除. field_principal: Principal - label_my_page_block: 我的工作台模块 - notice_failed_to_save_members: "成员保存失败：{{errors}}。" - text_zoom_out: 缩小 - text_zoom_in: 放大 - notice_unable_delete_time_entry: 无法删除工时记录。 - 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 From 5f20bc240ee190985393c46f4e281792856bc380 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 29 Jul 2010 14:58:33 +0000 Subject: [PATCH 020/222] Add a favicon link with support for suburi. #3301 Contributed by Yuki Kita and Christian Boenning git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3894 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/application_helper.rb | 4 ++++ app/views/layouts/base.rhtml | 1 + 2 files changed, 5 insertions(+) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 054bac8af..4d698a234 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -783,6 +783,10 @@ module ApplicationHelper end end + def favicon + "" + end + private def wiki_helper diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml index 1873191c0..9521457d6 100644 --- a/app/views/layouts/base.rhtml +++ b/app/views/layouts/base.rhtml @@ -5,6 +5,7 @@ <%=h html_title %> +<%= favicon %> <%= stylesheet_link_tag 'application', :media => 'all' %> <%= javascript_include_tag :defaults %> <%= heads_for_wiki_formatter %> From 702b7296a08819094c0f095a30e08b76460cb0f2 Mon Sep 17 00:00:00 2001 From: Azamat Hackimov Date: Thu, 29 Jul 2010 15:47:38 +0000 Subject: [PATCH 021/222] Translation updates * de (#5982) * zh (#5910) - revert last commit & new string git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3897 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/de.yml | 79 +++++++++++++++++++++++-------------------- config/locales/zh.yml | 30 ++++++++-------- 2 files changed, 57 insertions(+), 52 deletions(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index 8e3c4455d..05d5d9630 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -99,13 +99,13 @@ de: gb: "GB" tb: "TB" - + # Used in array.to_sentence. support: array: sentence_connector: "und" skip_last_comma: true - + activerecord: errors: template: @@ -139,7 +139,7 @@ de: cant_link_an_issue_with_a_descendant: "Ein Ticket kann nicht mit einer ihrer Unteraufgaben verlinkt werden" actionview_instancetag_blank_option: Bitte auswählen - + general_text_No: 'Nein' general_text_Yes: 'Ja' general_text_no: 'nein' @@ -172,6 +172,7 @@ de: notice_feeds_access_key_reseted: Ihr Atom-Zugriffsschlüssel wurde zurückgesetzt. notice_api_access_key_reseted: Ihr API-Zugriffsschlüssel wurde zurückgesetzt. notice_failed_to_save_issues: "{{count}} von {{total}} ausgewählten Tickets konnte(n) nicht gespeichert werden: {{ids}}." + notice_failed_to_save_members: "Benutzer konnte nicht gespeichert werden: {{errors}}." notice_no_issue_selected: "Kein Ticket ausgewählt! Bitte wählen Sie die Tickets, die Sie bearbeiten möchten." notice_account_pending: "Ihr Konto wurde erstellt und wartet jetzt auf die Genehmigung des Administrators." notice_default_data_loaded: Die Standard-Konfiguration wurde erfolgreich geladen. @@ -186,17 +187,18 @@ de: error_issue_not_found_in_project: 'Das Ticket wurde nicht gefunden oder gehört nicht zu diesem Projekt.' error_no_tracker_in_project: Diesem Projekt ist kein Tracker zugeordnet. Bitte überprüfen Sie die Projekteinstellungen. error_no_default_issue_status: Es ist kein Status als Standard definiert. Bitte überprüfen Sie Ihre Konfiguration (unter "Administration -> Ticket-Status"). + error_can_not_delete_custom_field: Kann das benutzerdefinierte Feld nicht löschen. + error_can_not_delete_tracker: Dieser Tracker enthält Tickets und kann nicht gelöscht werden. + error_can_not_remove_role: Diese Rolle wird verwendet und kann nicht gelöscht werden. error_can_not_reopen_issue_on_closed_version: Das Ticket ist einer abgeschlossenen Version zugeordnet und kann daher nicht wieder geöffnet werden. error_can_not_archive_project: Dieses Projekt kann nicht archiviert werden. error_issue_done_ratios_not_updated: Der Ticket-Fortschritt wurde nicht aktualisiert. error_workflow_copy_source: Bitte wählen Sie einen Quell-Tracker und eine Quell-Rolle. error_workflow_copy_target: Bitte wählen Sie die Ziel-Tracker und -Rollen. error_unable_delete_issue_status: "Der Ticket-Status konnte nicht gelöscht werden." - - warning_attachments_not_saved: - one: "1 Datei konnte nicht gespeichert werden." - other: "{{count}} Dateien konnten nicht gespeichert werden." - + error_unable_to_connect: Fehler beim Verbinden ({{value}}) + warning_attachments_not_saved: "{{count}} Datei(en) konnten nicht gespeichert werden." + mail_subject_lost_password: "Ihr {{value}} Kennwort" mail_body_lost_password: 'Benutzen Sie den folgenden Link, um Ihr Kennwort zu ändern:' mail_subject_register: "{{value}} Kontoaktivierung" @@ -211,7 +213,6 @@ de: mail_body_wiki_content_added: "Die Wiki-Seite '{{page}}' wurde von {{author}} hinzugefügt." mail_subject_wiki_content_updated: "Wiki-Seite '{{page}}' erfolgreich aktualisiert" mail_body_wiki_content_updated: "Die Wiki-Seite '{{page}}' wurde von {{author}} aktualisiert." - gui_validation_error: 1 Fehler gui_validation_error_plural: "{{count}} Fehler" @@ -250,6 +251,7 @@ de: field_priority: Priorität field_fixed_version: Zielversion field_user: Benutzer + field_principal: Principal field_role: Rolle field_homepage: Projekt-Homepage field_is_public: Öffentlich @@ -305,6 +307,7 @@ de: field_content: Inhalt field_group_by: Gruppiere Ergebnisse nach field_sharing: Gemeinsame Verwendung + field_parent_issue: Übergeordnete Aufgabe setting_app_title: Applikations-Titel setting_app_subtitle: Applikations-Untertitel @@ -414,6 +417,7 @@ de: permission_delete_messages: Forenbeiträge löschen permission_delete_own_messages: Eigene Forenbeiträge löschen permission_export_wiki_pages: Wiki-Seiten exportieren + permission_manage_subtasks: Unteraufgaben verwalten project_module_issue_tracking: Ticket-Verfolgung project_module_time_tracking: Zeiterfassung @@ -423,7 +427,7 @@ de: project_module_wiki: Wiki project_module_repository: Projektarchiv project_module_boards: Foren - + label_user: Benutzer label_user_plural: Benutzer label_user_new: Neuer Benutzer @@ -480,6 +484,7 @@ de: label_my_page: Meine Seite label_my_account: Mein Konto label_my_projects: Meine Projekte + label_my_page_block: My page block label_administration: Administration label_login: Anmelden label_logout: Abmelden @@ -543,9 +548,18 @@ de: label_open_issues_plural: offen label_closed_issues: geschlossen label_closed_issues_plural: geschlossen - label_x_open_issues_abbr_on_total: "{{count}} offen / {{total}}" - label_x_open_issues_abbr: "{{count}} offen" - label_x_closed_issues_abbr: "{{count}} geschlossen" + label_x_open_issues_abbr_on_total: + zero: 0 offen / {{total}} + one: 1 offen / {{total}} + other: "{{count}} offen / {{total}}" + label_x_open_issues_abbr: + zero: 0 offen + one: 1 offen + other: "{{count}} offen" + label_x_closed_issues_abbr: + zero: 0 geschlossen + one: 1 geschlossen + other: "{{count}} geschlossen" label_total: Gesamtzahl label_permissions: Berechtigungen label_current_status: Gegenwärtiger Status @@ -769,7 +783,10 @@ de: label_api_access_key: API-Zugriffsschlüssel label_missing_api_access_key: Der API-Zugriffsschlüssel fehlt. label_api_access_key_created_on: Der API-Zugriffsschlüssel wurde vor {{value}} erstellt - + label_profile: Profil + label_subtask_plural: Unteraufgaben + label_project_copy_notifications: Sende Mailbenachrichtigungen beim Kopieren des Projekts. + button_login: Anmelden button_submit: OK button_save: Speichern @@ -817,13 +834,13 @@ de: status_active: aktiv status_registered: angemeldet status_locked: gesperrt - - version_status_closed: abgeschlossen - version_status_locked: gesperrt + version_status_open: offen + version_status_locked: gesperrt + version_status_closed: abgeschlossen - field_active: Aktiv - + field_active: Activ + text_select_mail_notifications: Bitte wählen Sie die Aktionen aus, für die eine Mailbenachrichtigung gesendet werden soll. text_regexp_info: z. B. ^[A-Z0-9]+$ text_min_max_length_info: 0 heißt keine Beschränkung @@ -878,10 +895,10 @@ de: text_wiki_page_nullify_children: Verschiebe die Unterseiten auf die oberste Ebene text_wiki_page_destroy_children: Lösche alle Unterseiten text_wiki_page_reassign_children: Ordne die Unterseiten dieser Seite zu - text_own_membership_delete_confirmation: |- - Sie sind dabei, einige oder alle Ihre Berechtigungen zu entfernen. Es ist möglich, dass Sie danach das Projekt nicht mehr ansehen oder bearbeiten dürfen. - Sind Sie sicher, dass Sie dies tun möchten? - + text_own_membership_delete_confirmation: "Sie sind dabei, einige oder alle Ihre Berechtigungen zu entfernen. Es ist möglich, dass Sie danach das Projekt nicht mehr ansehen oder bearbeiten dürfen.\nSind Sie sicher, dass Sie dies tun möchten?" + text_zoom_in: Zoom in + text_zoom_out: Zoom out + default_role_manager: Manager default_role_developer: Entwickler default_role_reporter: Reporter @@ -903,21 +920,9 @@ de: default_priority_immediate: Sofort default_activity_design: Design default_activity_development: Entwicklung + enumeration_issue_priorities: Ticket-Prioritäten enumeration_doc_categories: Dokumentenkategorien enumeration_activities: Aktivitäten (Zeiterfassung) enumeration_system_activity: System-Aktivität - label_profile: Profil - permission_manage_subtasks: Unteraufgaben verwalten - field_parent_issue: Übergeordnete Aufgabe - label_subtask_plural: Unteraufgaben - label_project_copy_notifications: Sende Mailbenachrichtigungen beim Kopieren des Projekts. - error_can_not_delete_custom_field: Kann das benutzerdefinierte Feld nicht löschen. - error_unable_to_connect: Fehler beim Verbinden ({{value}}) - error_can_not_remove_role: Diese Rolle wird verwendet und kann nicht gelöscht werden. - error_can_not_delete_tracker: Dieser Tracker enthält Tickets und kann nicht gelöscht werden. - field_principal: Principal - label_my_page_block: My page block - notice_failed_to_save_members: "Failed to save member(s): {{errors}}." - text_zoom_out: Zoom out - text_zoom_in: Zoom in + diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 3762d835c..5aef09692 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -498,9 +498,9 @@ zh: label_date: 日期 label_integer: 整数 label_float: 浮点数 - label_boolean: 布尔量 - label_string: 文字 - label_text: 长段文字 + label_boolean: 布尔值 + label_string: 字符串 + label_text: 文本 label_attribute: 属性 label_attribute_plural: 属性 label_download: "{{count}} 次下载" @@ -910,19 +910,19 @@ zh: setting_cache_formatted_text: 缓存格式化文本 permission_manage_project_activities: 管理项目活动 error_unable_delete_issue_status: 无法删除问题状态 - label_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 + label_profile: 简介 + permission_manage_subtasks: 管理子任务 + field_parent_issue: 父任务 + label_subtask_plural: 子任务 + label_project_copy_notifications: 复制项目时发送邮件通知 error_can_not_delete_custom_field: 不能删除自定义属性 error_unable_to_connect: 不能连接到 ({{value}}) error_can_not_remove_role: 该角色正在使用中, 不能删除. error_can_not_delete_tracker: 该跟踪标签包含问题, 不能删除. - field_principal: Principal - label_my_page_block: My page block - notice_failed_to_save_members: "Failed to save member(s): {{errors}}." - text_zoom_out: Zoom out - text_zoom_in: Zoom in - notice_unable_delete_time_entry: Unable to delete time log entry. - label_overall_spent_time: Overall spent time + field_principal: 用户/用户组 + label_my_page_block: 我的工作台模块 + notice_failed_to_save_members: "成员保存失败：{{errors}}。" + text_zoom_out: 缩小 + text_zoom_in: 放大 + notice_unable_delete_time_entry: 无法删除工时记录。 + label_overall_spent_time: 所有项目耗用工时 From dbb8645353531257efad5301c1c9333d6bf362d9 Mon Sep 17 00:00:00 2001 From: Azamat Hackimov Date: Thu, 29 Jul 2010 15:48:53 +0000 Subject: [PATCH 022/222] RTL theme for reference (thanks to Orgad Shaneh, #5972) git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3898 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/issues/_changesets.rhtml | 4 +- app/views/issues/_history.rhtml | 2 +- public/stylesheets/application.css | 4 ++ public/themes/rtl/stylesheets/application.css | 50 +++++++++++++++++++ .../themes/rtl/stylesheets/context_menu.css | 6 +++ 5 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 public/themes/rtl/stylesheets/application.css create mode 100644 public/themes/rtl/stylesheets/context_menu.css diff --git a/app/views/issues/_changesets.rhtml b/app/views/issues/_changesets.rhtml index 0b1f10b72..52cd60ff5 100644 --- a/app/views/issues/_changesets.rhtml +++ b/app/views/issues/_changesets.rhtml @@ -3,6 +3,8 @@

    <%= link_to("#{l(:label_revision)} #{changeset.revision}", :controller => 'repositories', :action => 'revision', :id => changeset.project, :rev => changeset.revision) %>
    <%= authoring(changeset.committed_on, changeset.author) %>

    - <%= textilizable(changeset, :comments) %> +
    + <%= textilizable(changeset, :comments) %> +
    <% end %> diff --git a/app/views/issues/_history.rhtml b/app/views/issues/_history.rhtml index 7459eb352..a95cbf81c 100644 --- a/app/views/issues/_history.rhtml +++ b/app/views/issues/_history.rhtml @@ -1,7 +1,7 @@ <% reply_links = authorize_for('issues', 'edit') -%> <% for journal in journals %>
    -

    <%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %>
    +

    <%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %>
    <%= avatar(journal.user, :size => "24") %> <%= content_tag('a', '', :name => "note-#{journal.indice}")%> <%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %>

    diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index b3dbfd7f2..59a2c3edd 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -903,6 +903,10 @@ td.username img.gravatar { clear: left; } +.journal-link { + float: right; +} + h2 img { vertical-align:middle; } .hascontextmenu { cursor: context-menu; } diff --git a/public/themes/rtl/stylesheets/application.css b/public/themes/rtl/stylesheets/application.css new file mode 100644 index 000000000..74f20b43c --- /dev/null +++ b/public/themes/rtl/stylesheets/application.css @@ -0,0 +1,50 @@ +@import url(../../alternate/stylesheets/application.css); + +body, #wrapper { direction: rtl;} + +#quick-search { float: left; } +#main-menu { margin-left: -500px; left: auto; right: 6px; margin-right: 0px;} +#main-menu li { float: right; } +#top-menu ul { float: right; } +#account { float: left; } +#top-menu #loggedas { float: left; } +#top-menu li { float: right; } +.tabular label.floating +{ + margin-right: 0; + margin-left: auto; + text-align: right; +} +.tabular label +{ + float: right; + margin-left: auto; +} +.tabular p { clear: right; } +.tabular label.block { text-align: right; } + +.icon { background-position: 100% 40%; padding-right: 20px; padding-left: 0px; } +div#activity dt, #search-results dt { background-position: 100% 50%; padding-right: 20px; padding-left: 0px; } +#content .tabs ul li { float: right; } +#content .tabs ul { padding-left: auto; padding-right: 1em; } +table.progress { float: right; } +.contextual { float: left; } +.icon22 { background-position: 100% 40%; padding-right: 26px; padding-left: auto; } +h3, .wiki h2 { padding: 10px 2px 1px 0; } +.tooltip span.tip { text-align: right; } +tr.issue td.subject { text-align: right; } +tr.time-entry td.subject, tr.time-entry td.comments { text-align: right; } +#sidebar { float: left; } +#main.nosidebar #content { border-width: 1px; border-style: solid; border-color: #D7D7D7 #BBBBBB #BBBBBB #D7D7D7;} +.tabular.settings label { margin-left: auto; } +.splitcontentleft { float: right; } +.splitcontentright { float: left; } +p.progress-info { clear: right; } +table.list td.buttons a { padding-right: 20px; } +.filecontent { direction: ltr; } +.entries { direction: ltr; } +.changeset-changes { direction: ltr; padding-left: 2em } +.changesets { direction: ltr; } +div#issue-changesets { float: left; margin-right: 1em; margin-left: 0 } +#activity dt, .journal { clear: right; } +.journal-link { float: left; } diff --git a/public/themes/rtl/stylesheets/context_menu.css b/public/themes/rtl/stylesheets/context_menu.css new file mode 100644 index 000000000..c400d3e84 --- /dev/null +++ b/public/themes/rtl/stylesheets/context_menu.css @@ -0,0 +1,6 @@ +@import url(../../../stylesheets/context_menu.css); + +#context-menu li.folder ul { left:auto; right:168px; } +#context-menu li.folder>ul { left:auto; right:148px; } + +#context-menu li a.submenu { background:url("../../../images/bullet_arrow_left.png") left no-repeat; } From ca663fcd10a2d0850b324d532e73e5854654d29a Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Fri, 30 Jul 2010 19:18:33 +0000 Subject: [PATCH 023/222] Use image_path for the favicon instead to pick up asset hosts. #3301 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3899 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4d698a234..e40758969 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -784,7 +784,7 @@ module ApplicationHelper end def favicon - "" + "" end private From 5c525f0b41abc11c49b91ad5885302387d531f75 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Mon, 2 Aug 2010 15:42:54 +0000 Subject: [PATCH 024/222] Added tests for AccountController#register GET. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3903 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/functional/account_controller_test.rb | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb index 17d19dfe1..ce3d13f10 100644 --- a/test/functional/account_controller_test.rb +++ b/test/functional/account_controller_test.rb @@ -153,4 +153,27 @@ class AccountControllerTest < ActionController::TestCase assert_redirected_to '' assert_nil @request.session[:user_id] end + + context "GET #register" do + context "with self registration on" do + setup do + Setting.self_registration = '3' + get :register + end + + should_respond_with :success + should_render_template :register + should_assign_to :user + end + + context "with self registration off" do + setup do + Setting.self_registration = '0' + get :register + end + + should_redirect_to('/') { home_url } + end + end + end From d3158e37b9d4e3f3da8266f38eed626e5ed7df03 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Mon, 2 Aug 2010 15:42:59 +0000 Subject: [PATCH 025/222] Added tests for AccountController#register POST with automatic registration. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3904 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/functional/account_controller_test.rb | 44 +++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb index ce3d13f10..61ad97430 100644 --- a/test/functional/account_controller_test.rb +++ b/test/functional/account_controller_test.rb @@ -175,5 +175,47 @@ class AccountControllerTest < ActionController::TestCase should_redirect_to('/') { home_url } end end - + + # See integration/account_test.rb for the full test + context "POST #register" do + context "with self registration on automatic" do + setup do + Setting.self_registration = '3' + post :register, :user => { + :login => 'register', + :password => 'test', + :password_confirmation => 'test', + :firstname => 'John', + :lastname => 'Doe', + :mail => 'register@example.com' + } + end + + should_respond_with :redirect + should_assign_to :user + should_redirect_to('my page') { {:controller => 'my', :action => 'account'} } + + should "create a new user" do + user = User.last(:conditions => {:login => 'register'}) + assert user + assert_kind_of User, user + end + + should 'set the user status to active' do + user = User.last(:conditions => {:login => 'register'}) + assert user + assert_equal User::STATUS_ACTIVE, user.status + end + end + + context "with self registration off" do + setup do + Setting.self_registration = '0' + post :register + end + + should_redirect_to('/') { home_url } + end + end + end From 25037b841bfd52ca05c6c1a179c06fd509f17443 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Mon, 2 Aug 2010 15:43:04 +0000 Subject: [PATCH 026/222] Refactor: extract method to shoulda macro. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3905 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/functional/account_controller_test.rb | 6 +----- test/test_helper.rb | 9 +++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb index 61ad97430..2a8c9c66b 100644 --- a/test/functional/account_controller_test.rb +++ b/test/functional/account_controller_test.rb @@ -195,11 +195,7 @@ class AccountControllerTest < ActionController::TestCase should_assign_to :user should_redirect_to('my page') { {:controller => 'my', :action => 'account'} } - should "create a new user" do - user = User.last(:conditions => {:login => 'register'}) - assert user - assert_kind_of User, user - end + should_create_a_new_user { User.last(:conditions => {:login => 'register'}) } should 'set the user status to active' do user = User.last(:conditions => {:login => 'register'}) diff --git a/test/test_helper.rb b/test/test_helper.rb index c934e1bc2..15a1f1570 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -162,4 +162,13 @@ class ActiveSupport::TestCase end end end + + def self.should_create_a_new_user(&block) + should "create a new user" do + user = instance_eval &block + assert user + assert_kind_of User, user + assert !user.new_record? + end + end end From 13234f85521d3d8a673fecda3e1a1f4abd1025b8 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Tue, 3 Aug 2010 15:26:50 +0000 Subject: [PATCH 027/222] Refactor: Add methods to User to edit the encapsulate the status field. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3906 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/account_controller.rb | 12 ++++++------ app/models/user.rb | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index b0a5b42a7..5fa56b167 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -83,9 +83,9 @@ class AccountController < ApplicationController else @user = User.new(params[:user]) @user.admin = false - @user.status = User::STATUS_REGISTERED + @user.register if session[:auth_source_registration] - @user.status = User::STATUS_ACTIVE + @user.activate @user.login = session[:auth_source_registration][:login] @user.auth_source_id = session[:auth_source_registration][:auth_source_id] if @user.save @@ -116,8 +116,8 @@ class AccountController < ApplicationController token = Token.find_by_action_and_value('register', params[:token]) redirect_to(home_url) && return unless token and !token.expired? user = token.user - redirect_to(home_url) && return unless user.status == User::STATUS_REGISTERED - user.status = User::STATUS_ACTIVE + redirect_to(home_url) && return unless user.registered? + user.activate if user.save token.destroy flash[:notice] = l(:notice_account_activated) @@ -170,7 +170,7 @@ class AccountController < ApplicationController user.mail = registration['email'] unless registration['email'].nil? user.firstname, user.lastname = registration['fullname'].split(' ') unless registration['fullname'].nil? user.random_password - user.status = User::STATUS_REGISTERED + user.register case Setting.self_registration when '1' @@ -241,7 +241,7 @@ class AccountController < ApplicationController # Pass a block for behavior when a user fails to save def register_automatically(user, &block) # Automatic activation - user.status = User::STATUS_ACTIVE + user.activate user.last_login_on = Time.now if user.save self.logged_user = user diff --git a/app/models/user.rb b/app/models/user.rb index db18db49e..c5c638f93 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -164,6 +164,30 @@ class User < Principal self.status == STATUS_LOCKED end + def activate + self.status = STATUS_ACTIVE + end + + def register + self.status = STATUS_REGISTERED + end + + def lock + self.status = STATUS_LOCKED + end + + def activate! + update_attribute(:status, STATUS_ACTIVE) + end + + def register! + update_attribute(:status, STATUS_REGISTERED) + end + + def lock! + update_attribute(:status, STATUS_LOCKED) + end + def check_password?(clear_password) if auth_source_id.present? auth_source.authenticate(self.login, clear_password) From 16969fdbbb08403f6c11404085561fdbd565b487 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Tue, 3 Aug 2010 16:01:53 +0000 Subject: [PATCH 028/222] Show the number of days in the subject line of Reminder emails. i18n check needed. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3907 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/mailer.rb | 2 +- config/locales/bg.yml | 2 +- config/locales/bs.yml | 2 +- config/locales/ca.yml | 2 +- config/locales/cs.yml | 2 +- config/locales/da.yml | 2 +- config/locales/de.yml | 2 +- config/locales/el.yml | 2 +- config/locales/en-GB.yml | 2 +- config/locales/en.yml | 2 +- config/locales/es.yml | 2 +- config/locales/eu.yml | 2 +- config/locales/fi.yml | 2 +- config/locales/fr.yml | 2 +- config/locales/gl.yml | 2 +- config/locales/he.yml | 2 +- config/locales/hr.yml | 2 +- config/locales/hu.yml | 2 +- config/locales/id.yml | 2 +- config/locales/it.yml | 2 +- config/locales/ja.yml | 2 +- config/locales/ko.yml | 2 +- config/locales/lt.yml | 2 +- config/locales/lv.yml | 2 +- config/locales/mn.yml | 2 +- config/locales/nl.yml | 2 +- config/locales/no.yml | 2 +- config/locales/pl.yml | 2 +- config/locales/pt-BR.yml | 2 +- config/locales/pt.yml | 2 +- config/locales/ro.yml | 2 +- config/locales/ru.yml | 2 +- config/locales/sk.yml | 2 +- config/locales/sl.yml | 2 +- config/locales/sr-CY.yml | 2 +- config/locales/sr.yml | 2 +- config/locales/sv.yml | 2 +- config/locales/th.yml | 2 +- config/locales/tr.yml | 2 +- config/locales/uk.yml | 2 +- config/locales/vi.yml | 2 +- config/locales/zh-TW.yml | 2 +- config/locales/zh.yml | 2 +- test/unit/mailer_test.rb | 1 + 44 files changed, 44 insertions(+), 43 deletions(-) diff --git a/app/models/mailer.rb b/app/models/mailer.rb index f39c53209..8f50b1b7b 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -80,7 +80,7 @@ class Mailer < ActionMailer::Base def reminder(user, issues, days) set_language_if_valid user.language recipients user.mail - subject l(:mail_subject_reminder, issues.size) + subject l(:mail_subject_reminder, :count => issues.size, :days => days) body :issues => issues, :days => days, :issues_url => url_for(:controller => 'issues', :action => 'index', :set_filter => 1, :assigned_to_id => user.id, :sort_key => 'due_date', :sort_order => 'asc') diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 051bbdaf2..8b2b23704 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -704,7 +704,7 @@ bg: 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" + 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 diff --git a/config/locales/bs.yml b/config/locales/bs.yml index d3fe0a128..3d476ae13 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -184,7 +184,7 @@ bs: mail_body_account_information: Informacija o vašem korisničkom računu mail_subject_account_activation_request: "{{value}} zahtjev za aktivaciju korisničkog računa" mail_body_account_activation_request: "Novi korisnik ({{value}}) se registrovao. Korisnički račun čeka vaše odobrenje za aktivaciju:" - mail_subject_reminder: "{{count}} aktivnost(i) u kašnjenju u narednim danima" + mail_subject_reminder: "{{count}} aktivnost(i) u kašnjenju u narednim {{days}} danima" mail_body_reminder: "{{count}} aktivnost(i) koje su dodjeljenje vama u narednim {{days}} danima:" gui_validation_error: 1 greška diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 5f54930d1..1e47d3d66 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -166,7 +166,7 @@ ca: mail_body_account_information: Informació del compte mail_subject_account_activation_request: "Sol·licitud d'activació del compte de {{value}}" mail_body_account_activation_request: "S'ha registrat un usuari nou ({{value}}). El seu compte està pendent d'aprovació:" - mail_subject_reminder: "%d assumptes venceran els següents {{count}} dies" + mail_subject_reminder: "{{count}} assumptes venceran els següents {{days}} dies" mail_body_reminder: "{{count}} assumptes que teniu assignades venceran els següents {{days}} dies:" gui_validation_error: 1 error diff --git a/config/locales/cs.yml b/config/locales/cs.yml index b00527956..de4ad44c5 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -710,7 +710,7 @@ cs: text_subprojects_destroy_warning: "Jeho podprojek(y): {{value}} budou také smazány." label_and_its_subprojects: "{{value}} a jeho podprojekty" mail_body_reminder: "{{count}} úkol(ů), které máte přiřazeny má termín během několik dní ({{days}}):" - mail_subject_reminder: "{{count}} úkol(ů) má termín během několik dní" + mail_subject_reminder: "{{count}} úkol(ů) má termín během několik dní ({{days}})" text_user_wrote: "{{value}} napsal:" label_duplicated_by: duplicated by setting_enabled_scm: Povoleno SCM diff --git a/config/locales/da.yml b/config/locales/da.yml index 069674685..b241a52d8 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -791,7 +791,7 @@ da: permission_browse_repository: Gennemse repository permission_manage_repository: Administrér repository permission_manage_members: Administrér medlemmer - mail_subject_reminder: "{{count}} sag(er) har deadline i de kommende dage" + mail_subject_reminder: "{{count}} sag(er) har deadline i de kommende dage ({{days}})" permission_add_issue_notes: Tilføj noter permission_edit_messages: Redigér beskeder permission_view_issue_watchers: Se liste over overvågere diff --git a/config/locales/de.yml b/config/locales/de.yml index 05d5d9630..f7f9043c4 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -207,7 +207,7 @@ de: mail_body_account_information: Ihre Konto-Informationen mail_subject_account_activation_request: "Antrag auf {{value}} Kontoaktivierung" mail_body_account_activation_request: "Ein neuer Benutzer ({{value}}) hat sich registriert. Sein Konto wartet auf Ihre Genehmigung:" - mail_subject_reminder: "{{count}} Tickets müssen in den nächsten Tagen abgegeben werden" + mail_subject_reminder: "{{count}} Tickets müssen in den nächsten {{days}} Tagen abgegeben werden" mail_body_reminder: "{{count}} Tickets, die Ihnen zugewiesen sind, müssen in den nächsten {{days}} Tagen abgegeben werden:" mail_subject_wiki_content_added: "Wiki-Seite '{{page}}' hinzugefügt" mail_body_wiki_content_added: "Die Wiki-Seite '{{page}}' wurde von {{author}} hinzugefügt." diff --git a/config/locales/el.yml b/config/locales/el.yml index 6176a6c8e..a9146a611 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -171,7 +171,7 @@ el: mail_body_account_information: Πληροφορίες του λογαριασμού σας mail_subject_account_activation_request: "αίτημα ενεργοποίησης λογαριασμού {{value}}" mail_body_account_activation_request: "'Ένας νέος χρήστης ({{value}}) έχει εγγραφεί. Ο λογαριασμός είναι σε στάδιο αναμονής της έγκρισης σας:" - mail_subject_reminder: "{{count}} θέμα(τα) με προθεσμία στις επόμενες ημέρες" + 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}}." diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 42f173b82..2872df15e 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -180,7 +180,7 @@ en-GB: mail_body_account_information: Your account information mail_subject_account_activation_request: "{{value}} account activation request" mail_body_account_activation_request: "A new user ({{value}}) has registered. The account is pending your approval:" - mail_subject_reminder: "{{count}} issue(s) due in the next days" + mail_subject_reminder: "{{count}} issue(s) due in the next {{days}} days" mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:" mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" mail_body_wiki_content_added: "The '{{page}}' wiki page has been added by {{author}}." diff --git a/config/locales/en.yml b/config/locales/en.yml index 4ba6df5c5..b3d87515d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -183,7 +183,7 @@ en: mail_body_account_information: Your account information mail_subject_account_activation_request: "{{value}} account activation request" mail_body_account_activation_request: "A new user ({{value}}) has registered. The account is pending your approval:" - mail_subject_reminder: "{{count}} issue(s) due in the next days" + mail_subject_reminder: "{{count}} issue(s) due in the next {{days}} days" mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:" mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" mail_body_wiki_content_added: "The '{{page}}' wiki page has been added by {{author}}." diff --git a/config/locales/es.yml b/config/locales/es.yml index 0a7a38a9c..bc345dcb5 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -662,7 +662,7 @@ es: mail_subject_account_activation_request: "Petición de activación de cuenta {{value}}" mail_subject_lost_password: "Tu contraseña del {{value}}" mail_subject_register: "Activación de la cuenta del {{value}}" - mail_subject_reminder: "{{count}} peticion(es) finalizan en los próximos días" + mail_subject_reminder: "{{count}} peticion(es) finalizan en los próximos {{days}} días" notice_account_activated: Su cuenta ha sido activada. Ya puede conectarse. notice_account_invalid_creditentials: Usuario o contraseña inválido. notice_account_lost_email_sent: Se le ha enviado un correo con instrucciones para elegir una nueva contraseña. diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 9f08652fc..741d3298f 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -180,7 +180,7 @@ eu: mail_body_account_information: Zure kontuaren informazioa mail_subject_account_activation_request: "{{value}} kontu gaitzeko eskaera" mail_body_account_activation_request: "Erabiltzaile berri bat ({{value}}) erregistratu da. Kontua zure onarpenaren zain dago:" - mail_subject_reminder: "{{count}} arazo hurrengo egunetan amaitzen d(ir)a" + mail_subject_reminder: "{{count}} arazo hurrengo {{days}} egunetan amaitzen d(ir)a" mail_body_reminder: "Zuri esleituta dauden {{count}} arazo hurrengo {{days}} egunetan amaitzen d(ir)a:" mail_subject_wiki_content_added: "'{{page}}' wiki orria gehitu da" mail_body_wiki_content_added: "{{author}}-(e)k '{{page}}' wiki orria gehitu du." diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 5556252cf..b6b48bac0 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -740,7 +740,7 @@ fi: text_subprojects_destroy_warning: "Tämän aliprojekti(t): {{value}} tullaan myös poistamaan." label_and_its_subprojects: "{{value}} ja aliprojektit" mail_body_reminder: "{{count}} sinulle nimettyä tapahtuma(a) erääntyy {{days}} päivä sisään:" - mail_subject_reminder: "{{count}} tapahtuma(a) erääntyy lähipäivinä" + mail_subject_reminder: "{{count}} tapahtuma(a) erääntyy {{days}} lähipäivinä" text_user_wrote: "{{value}} kirjoitti:" label_duplicated_by: kopioinut setting_enabled_scm: Versionhallinta käytettävissä diff --git a/config/locales/fr.yml b/config/locales/fr.yml index ce247d24c..8eb82ad73 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -200,7 +200,7 @@ fr: mail_body_account_information: Paramètres de connexion de votre compte mail_subject_account_activation_request: "Demande d'activation d'un compte {{value}}" mail_body_account_activation_request: "Un nouvel utilisateur ({{value}}) s'est inscrit. Son compte nécessite votre approbation :" - mail_subject_reminder: "{{count}} demande(s) arrivent à échéance" + mail_subject_reminder: "{{count}} demande(s) arrivent à échéance ({{days}})" mail_body_reminder: "{{count}} demande(s) qui vous sont assignées arrivent à échéance dans les {{days}} prochains jours :" mail_subject_wiki_content_added: "Page wiki '{{page}}' ajoutée" mail_body_wiki_content_added: "La page wiki '{{page}}' a été ajoutée par {{author}}." diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 0652ce9e4..2a1d97ed7 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -639,7 +639,7 @@ gl: mail_subject_account_activation_request: "Petición de activación de conta {{value}}" mail_subject_lost_password: "O teu contrasinal de {{value}}" mail_subject_register: "Activación da conta de {{value}}" - mail_subject_reminder: "{{count}} petición(s) rematarán nos próximos días" + mail_subject_reminder: "{{count}} petición(s) rematarán nos próximos {{days}} días" notice_account_activated: A súa conta foi activada. Xa pode conectarse. notice_account_invalid_creditentials: Usuario ou contrasinal inválido. notice_account_lost_email_sent: Enviouse un correo con instrucións para elixir un novo contrasinal. diff --git a/config/locales/he.yml b/config/locales/he.yml index f84fd01fe..532c60195 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -192,7 +192,7 @@ he: mail_body_account_information: פרטי החשבון שלך mail_subject_account_activation_request: "בקשת הפעלה לחשבון {{value}}" mail_body_account_activation_request: "משתמש חדש ({{value}}) נרשם. החשבון שלו מחכה לאישור שלך:" - mail_subject_reminder: "{{count}} נושאים מיעדים להגשה בימים הקרובים" + 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}}. diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 424fc7dc5..728a6d8e9 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -176,7 +176,7 @@ hr: mail_body_account_information: Vaši korisnički podaci mail_subject_account_activation_request: "{{value}} predmet za aktivaciju korisničkog računa" mail_body_account_activation_request: "Novi korisnik ({{value}}) je registriran. Njegov korisnički račun čeka vaše odobrenje:" - mail_subject_reminder: "{{count}} predmet(a) dospijeva sljedećih dana" + mail_subject_reminder: "{{count}} predmet(a) dospijeva sljedećih {{days}} dana" mail_body_reminder: "{{count}} vama dodijeljen(ih) predmet(a) dospijeva u sljedećih {{days}} dana:" 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}}." diff --git a/config/locales/hu.yml b/config/locales/hu.yml index a62d07327..088027f1a 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -737,7 +737,7 @@ enumeration_doc_categories: Dokumentum kategóriák enumeration_activities: Tevékenységek (idő rögzítés) mail_body_reminder: "{{count}} neked kiosztott feladat határidős az elkövetkező {{days}} napban:" - mail_subject_reminder: "{{count}} feladat határidős az elkövetkező napokban" + mail_subject_reminder: "{{count}} feladat határidős az elkövetkező {{days}} napokban" text_user_wrote: "{{value}} írta:" label_duplicated_by: duplikálta setting_enabled_scm: Forráskódkezelő (SCM) engedélyezése diff --git a/config/locales/id.yml b/config/locales/id.yml index 5a14cda55..ec6688e5d 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -177,7 +177,7 @@ id: mail_body_account_information: Informasi akun anda mail_subject_account_activation_request: "Permintaan aktivasi akun {{value}} " mail_body_account_activation_request: "Pengguna baru ({{value}}) sudan didaftarkan. Akun tersebut menunggu persetujuan anda:" - mail_subject_reminder: "{{count}} masalah harus selesai pada hari berikutnya" + mail_subject_reminder: "{{count}} masalah harus selesai pada hari berikutnya ({{days}})" mail_body_reminder: "{{count}} masalah yang ditugaskan pada anda harus selesai dalam {{days}} hari kedepan:" mail_subject_wiki_content_added: "'{{page}}' halaman wiki sudah ditambahkan" mail_body_wiki_content_added: "The '{{page}}' halaman wiki sudah ditambahkan oleh {{author}}." diff --git a/config/locales/it.yml b/config/locales/it.yml index 758928f2a..bab1c6a91 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -717,7 +717,7 @@ it: text_subprojects_destroy_warning: "Anche i suoi sottoprogetti: {{value}} verranno eliminati." label_and_its_subprojects: "{{value}} ed i suoi sottoprogetti" mail_body_reminder: "{{count}} segnalazioni che ti sono state assegnate scadranno nei prossimi {{days}} giorni:" - mail_subject_reminder: "{{count}} segnalazioni in scadenza nei prossimi giorni" + mail_subject_reminder: "{{count}} segnalazioni in scadenza nei prossimi {{days}} giorni" text_user_wrote: "{{value}} ha scritto:" label_duplicated_by: duplicato da setting_enabled_scm: SCM abilitato diff --git a/config/locales/ja.yml b/config/locales/ja.yml index dc69c9792..c82155b8e 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -214,7 +214,7 @@ ja: mail_body_account_information: アカウント情報 mail_subject_account_activation_request: "{{value}} アカウントの承認要求" mail_body_account_activation_request: "新しいユーザ {{value}} が登録されました。このアカウントはあなたの承認待ちです：" - mail_subject_reminder: "{{count}}件のチケットが期日間近です" + mail_subject_reminder: "{{count}}件のチケットが{{days}}期日間近です" mail_body_reminder: "{{count}}件の担当チケットの期日が{{days}}日以内に到来します:" mail_subject_wiki_content_added: "Wikiページ {{page}} が追加されました" mail_body_wiki_content_added: "{{author}} によってWikiページ {{page}} が追加されました。" diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 6ba93edc3..d79c86cb9 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -228,7 +228,7 @@ ko: mail_subject_account_activation_request: "{{value}} 계정 활성화 요청" mail_body_account_activation_request: "새 사용자({{value}})가 등록되었습니다. 관리자님의 승인을 기다리고 있습니다.:" mail_body_reminder: "당신이 맡고 있는 일감 {{count}}개의 완료 기한이 {{days}}일 후 입니다." - mail_subject_reminder: "내일이 만기인 일감 {{count}}개" + mail_subject_reminder: "내일이 만기인 일감 {{count}}개 ({{days}})" mail_subject_wiki_content_added: "위키페이지 '{{page}}'이(가) 추가되었습니다." mail_subject_wiki_content_updated: "'위키페이지 {{page}}'이(가) 수정되었습니다." mail_body_wiki_content_added: "{{author}}이(가) 위키페이지 '{{page}}'을(를) 추가하였습니다." diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 675c3a14b..9bcafc71b 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -237,7 +237,7 @@ lt: mail_body_account_information: Informacija apie Jūsų paskyrą mail_subject_account_activation_request: "{{value}} paskyros aktyvavimo prašymas" mail_body_account_activation_request: "Užsiregistravo naujas vartotojas ({{value}}). Jo paskyra laukia jūsų patvirtinimo:" - mail_subject_reminder: "{{count}} darbas(ai) po kelių dienų" + mail_subject_reminder: "{{count}} darbas(ai) po kelių {{days}} dienų" mail_body_reminder: "{{count}} darbas(ai), kurie yra jums priskirti, baigiasi po {{days}} dienų(os):" mail_subject_wiki_content_added: "'{{page}}' pridėtas wiki puslapis" mail_body_wiki_content_added: "The '{{page}}' wiki puslapi pridėjo {{author}}." diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 4d49bd120..351f8528e 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -172,7 +172,7 @@ lv: mail_body_account_information: Jūsu konta informācija mail_subject_account_activation_request: "{{value}} konta aktivizācijas pieprasījums" mail_body_account_activation_request: "Jauns lietotājs ({{value}}) ir reģistrēts. Lietotāja konts gaida Jūsu apstiprinājumu:" - mail_subject_reminder: "{{count}} uzdevums(i) sagaidāms(i) tuvākajās dienās" + mail_subject_reminder: "{{count}} uzdevums(i) sagaidāms(i) tuvākajās {{days}} dienās" mail_body_reminder: "{{count}} uzdevums(i), kurš(i) ir nozīmēts(i) Jums, sagaidāms(i) tuvākajās {{days}} dienās:" mail_subject_wiki_content_added: "'{{page}}' Wiki lapa pievienota" mail_body_wiki_content_added: "The '{{page}}' Wiki lapu pievienojis {{author}}." diff --git a/config/locales/mn.yml b/config/locales/mn.yml index 63e808024..568e1f341 100644 --- a/config/locales/mn.yml +++ b/config/locales/mn.yml @@ -176,7 +176,7 @@ mn: mail_body_account_information: Таны дансны тухай мэдээлэл mail_subject_account_activation_request: "{{value}} дансыг идэвхжүүлэх хүсэлт" mail_body_account_activation_request: "Шинэ хэрэглэгч ({{value}}) бүртгүүлсэн байна. Таны баталгаажуулахыг хүлээж байна:" - mail_subject_reminder: "Дараагийн өдрүүдэд {{count}} асуудлыг шийдэх хэрэгтэй" + mail_subject_reminder: "Дараагийн өдрүүдэд {{count}} асуудлыг шийдэх хэрэгтэй ({{days}})" mail_body_reminder: "Танд оноогдсон {{count}} асуудлуудыг дараагийн {{days}} өдрүүдэд шийдэх хэрэгтэй:" mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" mail_body_wiki_content_added: "The '{{page}}' wiki page has been added by {{author}}." diff --git a/config/locales/nl.yml b/config/locales/nl.yml index e24d5cbb5..4472a19d7 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -601,7 +601,7 @@ nl: mail_subject_account_activation_request: "{{value}} accountactivatieverzoek" mail_subject_lost_password: "uw {{value}} wachtwoord" mail_subject_register: "uw {{value}} accountactivatie" - mail_subject_reminder: "{{count}} issue(s) die voldaan moeten zijn in de komende dagen." + mail_subject_reminder: "{{count}} issue(s) die voldaan moeten zijn in de komende {{days}} dagen." notice_account_activated: uw account is geactiveerd. u kunt nu inloggen. notice_account_invalid_creditentials: Incorrecte gebruikersnaam of wachtwoord notice_account_lost_email_sent: Er is een e-mail naar u verstuurd met instructies over het kiezen van een nieuw wachtwoord. diff --git a/config/locales/no.yml b/config/locales/no.yml index 53bac51be..7d49537df 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -163,7 +163,7 @@ mail_body_account_information: Informasjon om din konto mail_subject_account_activation_request: "{{value}} kontoaktivering" mail_body_account_activation_request: "En ny bruker ({{value}}) er registrert, og avventer din godkjenning:" - mail_subject_reminder: "{{count}} sak(er) har frist de kommende dagene" + mail_subject_reminder: "{{count}} sak(er) har frist de kommende {{days}} dagene" mail_body_reminder: "{{count}} sak(er) som er tildelt deg har frist de kommende {{days}} dager:" gui_validation_error: 1 feil diff --git a/config/locales/pl.yml b/config/locales/pl.yml index efa2415de..2dadc8478 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -640,7 +640,7 @@ pl: mail_subject_account_activation_request: "Zapytanie aktywacyjne konta {{value}}" mail_subject_lost_password: "Twoje hasło do {{value}}" mail_subject_register: "Aktywacja konta w {{value}}" - mail_subject_reminder: "Uwaga na terminy, masz zagadnienia do obsłużenia w ciągu następnych {{count}} dni!" + mail_subject_reminder: "Uwaga na terminy, masz zagadnienia do obsłużenia w ciągu następnych {{count}} dni! ({{days}})" notice_account_activated: Twoje konto zostało aktywowane. Możesz się zalogować. notice_account_invalid_creditentials: Zły użytkownik lub hasło notice_account_lost_email_sent: Email z instrukcjami zmiany hasła został wysłany do Ciebie. diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 9365505d0..a66f23718 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -196,7 +196,7 @@ pt-BR: mail_body_account_information: Informações sobre sua conta mail_subject_account_activation_request: "{{value}} - Requisição de ativação de conta" mail_body_account_activation_request: "Um novo usuário ({{value}}) se registrou. A conta está aguardando sua aprovação:" - mail_subject_reminder: "{{count}} tarefa(s) com data prevista para os próximos dias" + mail_subject_reminder: "{{count}} tarefa(s) com data prevista para os próximos {{days}} dias" mail_body_reminder: "{{count}} tarefa(s) para você com data prevista para os próximos {{days}} dias:" gui_validation_error: 1 erro diff --git a/config/locales/pt.yml b/config/locales/pt.yml index c8dafd847..615f31645 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -181,7 +181,7 @@ pt: mail_body_account_information: Informação da sua conta mail_subject_account_activation_request: "Pedido de activação da conta {{value}}" mail_body_account_activation_request: "Um novo utilizador ({{value}}) registou-se. A sua conta está à espera de aprovação:" - mail_subject_reminder: "{{count}} tarefa(s) para entregar nos próximos dias" + mail_subject_reminder: "{{count}} tarefa(s) para entregar nos próximos {{days}} dias" mail_body_reminder: "{{count}} tarefa(s) que estão atribuídas a si estão agendadas para estarem completas nos próximos {{days}} dias:" gui_validation_error: 1 erro diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 5733ddebb..45fdd1eaa 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -164,7 +164,7 @@ ro: mail_body_account_information: Informații despre contul dumneavoastră mail_subject_account_activation_request: "Cerere de activare a contului {{value}}" mail_body_account_activation_request: "S-a înregistrat un utilizator nou ({{value}}). Contul așteaptă aprobarea dumneavoastră:" - mail_subject_reminder: "{{count}} tichete trebuie rezolvate în următoarele zile" + mail_subject_reminder: "{{count}} tichete trebuie rezolvate în următoarele {{days}} zile" mail_body_reminder: "{{count}} tichete atribuite dumneavoastră trebuie rezolvate în următoarele {{days}} zile:" gui_validation_error: o eroare diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 645db4de8..ee9ee37a1 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -755,7 +755,7 @@ ru: mail_subject_account_activation_request: "Запрос на активацию пользователя в системе {{value}}" mail_subject_lost_password: "Ваш {{value}} пароль" mail_subject_register: "Активация учетной записи {{value}}" - mail_subject_reminder: "{{count}} назначенных на Вас задач в ближайшие дни" + mail_subject_reminder: "{{count}} назначенных на Вас задач в ближайшие {{days}} дни" notice_account_activated: Ваша учетная запись активирована. Вы можете войти. notice_account_invalid_creditentials: Неправильное имя пользователя или пароль diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 22f5799f7..0b2351e6b 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -708,7 +708,7 @@ sk: text_subprojects_destroy_warning: "Jeho podprojekt(y): {{value}} budú takisto vymazané." label_and_its_subprojects: "{{value}} a jeho podprojekty" mail_body_reminder: "{{count}} úloha(y), ktorá(é) je(sú) vám priradený(é), ma(jú) byť hotova(é) za {{days}} dní:" - mail_subject_reminder: "{{count}} úloha(y) ma(jú) byť hotova(é) za pár dní" + mail_subject_reminder: "{{count}} úloha(y) ma(jú) byť hotova(é) za pár {{days}} dní" text_user_wrote: "{{value}} napísal:" label_duplicated_by: duplikovaný setting_enabled_scm: Zapnúť SCM diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 77a155757..aac2e4331 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -167,7 +167,7 @@ sl: mail_body_account_information: Informacije o vašem računu mail_subject_account_activation_request: "{{value}} zahtevek za aktivacijo računa" mail_body_account_activation_request: "Registriral se je nov uporabnik ({{value}}). Račun čaka na vašo odobritev:" - mail_subject_reminder: "{{count}} zahtevek(zahtevki) zapadejo v naslednjih dneh" + mail_subject_reminder: "{{count}} zahtevek(zahtevki) zapadejo v naslednjih {{days}} dneh" mail_body_reminder: "{{count}} zahtevek(zahtevki), ki so vam dodeljeni bodo zapadli v naslednjih {{days}} dneh:" gui_validation_error: 1 napaka diff --git a/config/locales/sr-CY.yml b/config/locales/sr-CY.yml index 11f558470..39cc5dcb8 100644 --- a/config/locales/sr-CY.yml +++ b/config/locales/sr-CY.yml @@ -178,7 +178,7 @@ sr-CY: mail_body_account_information: Информације о вашем налогу mail_subject_account_activation_request: "Захтев за активацију налога {{value}}" mail_body_account_activation_request: "Нови корисник ({{value}}) је регистрован. Налог чека на ваше одобрење:" - mail_subject_reminder: "{{count}} проблема доспева наредних дана" + mail_subject_reminder: "{{count}} проблема доспева наредних {{days}} дана" mail_body_reminder: "{{count}} проблема додељених вама доспева у наредних {{days}} дана:" mail_subject_wiki_content_added: "'{{page}}' wiki страна је додато" mail_body_wiki_content_added: "{{author}} је додао '{{page}}' wiki страна." diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 50140b7d8..f52d9e063 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -178,7 +178,7 @@ sr: mail_body_account_information: Informacije o vašem nalogu mail_subject_account_activation_request: "Zahtev za aktivaciju naloga {{value}}" mail_body_account_activation_request: "Novi korisnik ({{value}}) je registrovan. Nalog čeka na vaše odobrenje:" - mail_subject_reminder: "{{count}} problema dospeva narednih dana" + mail_subject_reminder: "{{count}} problema dospeva narednih {{days}} dana" mail_body_reminder: "{{count}} problema dodeljenih vama dospeva u narednih {{days}} dana:" mail_subject_wiki_content_added: "'{{page}}' wiki strana je dodato" mail_body_wiki_content_added: "{{author}} je dodao '{{page}}' wiki strana." diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 23450007a..35ebc1053 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -234,7 +234,7 @@ sv: mail_body_account_information: Din kontoinformation mail_subject_account_activation_request: "{{value}} begäran om kontoaktivering" mail_body_account_activation_request: "En ny användare ({{value}}) har registrerat sig och avvaktar ditt godkännande:" - mail_subject_reminder: "{{count}} ärende(n) har deadline under de kommande dagarna" + mail_subject_reminder: "{{count}} ärende(n) har deadline under de kommande {{days}} dagarna" mail_body_reminder: "{{count}} ärende(n) som är tilldelat dig har deadline under de {{days}} dagarna:" mail_subject_wiki_content_added: "'{{page}}' wikisida has lagts till" mail_body_wiki_content_added: The '{{page}}' wikisida has lagts till av {{author}}. diff --git a/config/locales/th.yml b/config/locales/th.yml index 5f68696eb..2c127f3de 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -707,7 +707,7 @@ th: enumeration_activities: กิจกรรม (ใช้ในการติดตามเวลา) 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" + 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 diff --git a/config/locales/tr.yml b/config/locales/tr.yml index bc7bcbf7e..db4330924 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -749,7 +749,7 @@ tr: text_user_wrote: "{{value}} wrote:" setting_mail_handler_api_enabled: Enable WS for incoming emails label_and_its_subprojects: "{{value}} and its subprojects" - mail_subject_reminder: "{{count}} issue(s) due in the next days" + mail_subject_reminder: "{{count}} issue(s) due in the next {{days}} days" setting_mail_handler_api_key: API key setting_commit_logs_encoding: Commit messages encoding general_csv_decimal_separator: '.' diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 5ab983325..1a590dc0b 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -706,7 +706,7 @@ uk: 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" + 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 diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 9d2af5e86..f8ca507bf 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -226,7 +226,7 @@ vi: mail_body_account_information: Thông tin về tài khoản mail_subject_account_activation_request: "{{value}}: Yêu cầu chứng thực tài khoản" mail_body_account_activation_request: "Người dùng ({{value}}) mới đăng ký và cần bạn xác nhận:" - mail_subject_reminder: "{{count}} vấn đề hết hạn trong các ngày tới" + mail_subject_reminder: "{{count}} vấn đề hết hạn trong các {{days}} ngày tới" mail_body_reminder: "{{count}} vấn đề gán cho bạn sẽ hết hạn trong {{days}} ngày tới:" gui_validation_error: 1 lỗi diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index fc5f557d1..5a08041c2 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -273,7 +273,7 @@ mail_body_account_information: 您的 Redmine 帳號資訊 mail_subject_account_activation_request: Redmine 帳號啟用需求通知 mail_body_account_activation_request: "有位新用戶 ({{value}}) 已經完成註冊，正等候您的審核：" - mail_subject_reminder: "您有 {{count}} 個項目即將到期" + mail_subject_reminder: "您有 {{count}} 個項目即將到期 ({{days}})" mail_body_reminder: "{{count}} 個指派給您的項目，將於 {{days}} 天之內到期：" mail_subject_wiki_content_added: "'{{page}}' wiki 頁面已被新增" mail_body_wiki_content_added: "The '{{page}}' wiki 頁面已被 {{author}} 新增。" diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 5aef09692..eeac629a1 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -200,7 +200,7 @@ zh: mail_body_account_information: 您的帐号信息 mail_subject_account_activation_request: "{{value}}帐号激活请求" mail_body_account_activation_request: "新用户（{{value}}）已完成注册，正在等候您的审核：" - mail_subject_reminder: "{{count}} 个问题需要尽快解决" + mail_subject_reminder: "{{count}} 个问题需要尽快解决 ({{days}})" mail_body_reminder: "指派给您的 {{count}} 个问题需要在 {{days}} 天内完成：" mail_subject_wiki_content_added: "'{{page}}' wiki页面已添加" mail_body_wiki_content_added: "'{{page}}' wiki页面已由 {{author}} 添加。" diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb index f1fc2502f..a5932d325 100644 --- a/test/unit/mailer_test.rb +++ b/test/unit/mailer_test.rb @@ -352,6 +352,7 @@ class MailerTest < ActiveSupport::TestCase mail = ActionMailer::Base.deliveries.last assert mail.bcc.include?('dlopper@somenet.foo') assert mail.body.include?('Bug #3: Error 281 when updating a recipe') + assert_equal '1 issue(s) due in the next 42 days', mail.subject end def last_email From 6e14b8a6af27b9e801f3a31e144a274af9f530fe Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Wed, 4 Aug 2010 00:27:41 +0000 Subject: [PATCH 029/222] Remove extra css like the border on revision links in Associated Revisions. #5971 Contributed by Holger Just. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3908 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- public/stylesheets/application.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 59a2c3edd..520ed8371 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -287,8 +287,8 @@ fieldset#filters td.add-filter { text-align: right; vertical-align: top; } .buttons { font-size: 0.9em; margin-bottom: 1.4em; margin-top: 1em; } div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;} -div#issue-changesets .changeset { padding: 4px;} -div#issue-changesets .changeset { border-bottom: 1px solid #ddd; } +div#issue-changesets div.changeset { padding: 4px;} +div#issue-changesets div.changeset { border-bottom: 1px solid #ddd; } div#issue-changesets p { margin-top: 0; margin-bottom: 1em;} div#activity dl, #search-results { margin-left: 2em; } From 6f3ae29522f49c6ac536a9118657d79bb2cef600 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Wed, 4 Aug 2010 00:38:22 +0000 Subject: [PATCH 030/222] Use the MenuManager for the Administration menu. #6008 Contributed by Jean-Baptiste Barth. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3909 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/admin/_menu.rhtml | 21 +++------------------ lib/redmine.rb | 17 ++++++++++++++++- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/views/admin/_menu.rhtml b/app/views/admin/_menu.rhtml index a8de88850..bd3abebe1 100644 --- a/app/views/admin/_menu.rhtml +++ b/app/views/admin/_menu.rhtml @@ -1,20 +1,5 @@
    -
      -
    • <%= link_to l(:label_project_plural), {:controller => 'admin', :action => 'projects'}, :class => 'projects' %>
      • -
    • <%= link_to l(:label_user_plural), {:controller => 'users'}, :class => 'users' %>
      • -
    • <%= link_to l(:label_group_plural), {:controller => 'groups'}, :class => 'groups' %>
      • -
    • <%= link_to l(:label_role_and_permissions), {:controller => 'roles'}, :class => 'roles' %>
      • -
    • <%= link_to l(:label_tracker_plural), {:controller => 'trackers'}, :class => 'trackers' %>
      • -
    • <%= link_to l(:label_issue_status_plural), {:controller => 'issue_statuses'}, :class => 'issue_statuses' %>
      • -
    • <%= link_to l(:label_workflow), {:controller => 'workflows', :action => 'edit'}, :class => 'workflows' %>
      • -
    • <%= link_to l(:label_custom_field_plural), {:controller => 'custom_fields'}, :class => 'custom_fields' %>
      • -
    • <%= link_to l(:label_enumerations), {:controller => 'enumerations'}, :class => 'enumerations' %>
      • -
    • <%= link_to l(:label_settings), {:controller => 'settings'}, :class => 'settings' %>
      • -
    • <%= link_to l(:label_ldap_authentication), {:controller => 'ldap_auth_sources', :action => 'index'}, :class => 'server_authentication' %>
      • - <% menu_items_for(:admin_menu) do |item| -%> -
    • <%= link_to h(item.caption), item.url, item.html_options %>
      • - <% end -%> -
    • <%= link_to l(:label_plugins), {:controller => 'admin', :action => 'plugins'}, :class => 'plugins' %>
      • -
    • <%= link_to l(:label_information_plural), {:controller => 'admin', :action => 'info'}, :class => 'info' %>
      • -
    +
      + <%= render_menu :admin_menu %> +
    diff --git a/lib/redmine.rb b/lib/redmine.rb index 238ee110a..b95166e76 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -157,7 +157,22 @@ Redmine::MenuManager.map :application_menu do |menu| end Redmine::MenuManager.map :admin_menu do |menu| - # Empty + menu.push :projects, {:controller => 'admin', :action => 'projects'}, :caption => :label_project_plural + menu.push :users, {:controller => 'users'}, :caption => :label_user_plural + menu.push :groups, {:controller => 'groups'}, :caption => :label_group_plural + menu.push :roles, {:controller => 'roles'}, :caption => :label_role_and_permissions + menu.push :trackers, {:controller => 'trackers'}, :caption => :label_tracker_plural + menu.push :issue_statuses, {:controller => 'issue_statuses'}, :caption => :label_issue_status_plural, + :html => {:class => 'issue_statuses'} + menu.push :workflows, {:controller => 'workflows', :action => 'edit'}, :caption => :label_workflow + menu.push :custom_fields, {:controller => 'custom_fields'}, :caption => :label_custom_field_plural, + :html => {:class => 'custom_fields'} + menu.push :enumerations, {:controller => 'enumerations'} + menu.push :settings, {:controller => 'settings'} + menu.push :ldap_authentication, {:controller => 'ldap_auth_sources', :action => 'index'}, + :html => {:class => 'server_authentication'} + menu.push :plugins, {:controller => 'admin', :action => 'plugins'}, :last => true + menu.push :info, {:controller => 'admin', :action => 'info'}, :caption => :label_information_plural, :last => true end Redmine::MenuManager.map :project_menu do |menu| From 07cd12978e524deafcfd81714ce965003c5e29bc Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Wed, 4 Aug 2010 00:59:15 +0000 Subject: [PATCH 031/222] Add maxlength attributes to some Project fields. #4896 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Contributed by Felix Schäfer git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3910 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/projects/_form.rhtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/projects/_form.rhtml b/app/views/projects/_form.rhtml index 30848e4cd..fbc6714c8 100644 --- a/app/views/projects/_form.rhtml +++ b/app/views/projects/_form.rhtml @@ -2,14 +2,14 @@
    -

    <%= f.text_field :name, :required => true %>
    <%= l(:text_caracters_maximum, 30) %>

    +

    <%= f.text_field :name, :required => true, :maxlength => 30 %>
    <%= l(:text_caracters_maximum, 30) %>

    <% unless @project.allowed_parents.compact.empty? %>

    <%= label(:project, :parent_id, l(:field_parent)) %><%= parent_project_select_tag(@project) %>

    <% end %>

    <%= f.text_area :description, :rows => 5, :class => 'wiki-edit' %>

    -

    <%= f.text_field :identifier, :required => true, :disabled => @project.identifier_frozen? %> +

    <%= f.text_field :identifier, :required => true, :disabled => @project.identifier_frozen?, :maxlength => 20 %> <% unless @project.identifier_frozen? %>
    <%= l(:text_length_between, :min => 1, :max => 20) %> <%= l(:text_project_identifier_info) %> <% end %>

    From a544a1e57cd6620d0341566230598753677dfc13 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Wed, 4 Aug 2010 01:17:45 +0000 Subject: [PATCH 032/222] Added css classes to the HTML body based on the theme, controller, and action. #819 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3911 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/application_helper.rb | 13 +++++++++++++ app/views/layouts/base.rhtml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e40758969..d6fd16a6e 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -393,6 +393,19 @@ module ApplicationHelper end end + # Returns the theme, controller name, and action as css classes for the + # HTML body. + def body_css_classes + css = [] + if theme = Redmine::Themes.theme(Setting.ui_theme) + css << 'theme-' + theme.name + end + + css << 'controller-' + params[:controller] + css << 'action-' + params[:action] + css.join(' ') + end + def accesskey(s) Redmine::AccessKeys.key_for s end diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml index 9521457d6..2daae7cb9 100644 --- a/app/views/layouts/base.rhtml +++ b/app/views/layouts/base.rhtml @@ -19,7 +19,7 @@ <%= yield :header_tags -%> - +
    From 8c79385261d809504060ad103f58707680fcca70 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Wed, 4 Aug 2010 13:37:44 +0000 Subject: [PATCH 033/222] Refactor: extract back_url method to ApplicationController. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3912 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/application_controller.rb | 4 ++++ app/controllers/issues_controller.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 6e5634dbc..c00b6ba42 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -218,6 +218,10 @@ class ApplicationController < ActionController::Base end end + def back_url + params[:back_url] || request.env['HTTP_REFERER'] + end + def redirect_back_or_default(default) back_url = CGI.unescape(params[:back_url].to_s) if !back_url.blank? diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 8b5d73fa3..d73dfebfe 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -349,7 +349,7 @@ class IssuesController < ApplicationController @priorities = IssuePriority.all.reverse @statuses = IssueStatus.find(:all, :order => 'position') - @back = params[:back_url] || request.env['HTTP_REFERER'] + @back = back_url render :layout => false end From 70973fda64de03efa47ed6c991ffcdf45cab4e87 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Wed, 4 Aug 2010 15:04:30 +0000 Subject: [PATCH 034/222] Fix a few requires for metric_fu's rcov. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3913 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/functional/auth_sources_controller_test.rb | 2 +- test/functional/calendars_controller_test.rb | 2 +- test/functional/gantts_controller_test.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/functional/auth_sources_controller_test.rb b/test/functional/auth_sources_controller_test.rb index bd97844ed..348e0e098 100644 --- a/test/functional/auth_sources_controller_test.rb +++ b/test/functional/auth_sources_controller_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require File.dirname(__FILE__) + '/../test_helper' class AuthSourcesControllerTest < ActionController::TestCase fixtures :all diff --git a/test/functional/calendars_controller_test.rb b/test/functional/calendars_controller_test.rb index 79cfe28a0..ad047c669 100644 --- a/test/functional/calendars_controller_test.rb +++ b/test/functional/calendars_controller_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require File.dirname(__FILE__) + '/../test_helper' class CalendarsControllerTest < ActionController::TestCase fixtures :all diff --git a/test/functional/gantts_controller_test.rb b/test/functional/gantts_controller_test.rb index 4c27de7cd..24c84f2ae 100644 --- a/test/functional/gantts_controller_test.rb +++ b/test/functional/gantts_controller_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require File.dirname(__FILE__) + '/../test_helper' class GanttsControllerTest < ActionController::TestCase fixtures :all From 491c9d2b55265365fedb7e11aad01d64ba70b9dc Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Barth Date: Wed, 4 Aug 2010 20:41:32 +0000 Subject: [PATCH 035/222] Display projects as links in users/memberships partial. #5898 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3914 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/users/_memberships.rhtml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/users/_memberships.rhtml b/app/views/users/_memberships.rhtml index 70921f4ab..4c71f81ba 100644 --- a/app/views/users/_memberships.rhtml +++ b/app/views/users/_memberships.rhtml @@ -14,7 +14,9 @@ <% @user.memberships.each do |membership| %> <% next if membership.new_record? %> - <%=h membership.project %> + + <%= link_to h(membership.project), {:controller => 'projects', :action => 'show', :id => membership.project} %> + <%=h membership.roles.sort.collect(&:to_s).join(', ') %> <% remote_form_for(:membership, :url => { :action => 'edit_membership', :id => @user, :membership_id => membership }, From 8a2bc5772e0ef3aae1150ce55aba5f78af4749ef Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Barth Date: Wed, 4 Aug 2010 20:52:31 +0000 Subject: [PATCH 036/222] Focus on the input when adding a related issue on issues/show page. #4656 Contributed by Edouard Briere git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3915 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/issues/_relations.rhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/issues/_relations.rhtml b/app/views/issues/_relations.rhtml index 83a78b1c8..71eaaa673 100644 --- a/app/views/issues/_relations.rhtml +++ b/app/views/issues/_relations.rhtml @@ -1,6 +1,6 @@
    <% if authorize_for('issue_relations', 'new') %> - <%= toggle_link l(:button_add), 'new-relation-form'%> + <%= toggle_link l(:button_add), 'new-relation-form', {:focus => 'relation_issue_to_id'} %> <% end %>
    From 0bcde4ab284031851d53bbecf793c4d54c9b6247 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Barth Date: Wed, 4 Aug 2010 21:01:56 +0000 Subject: [PATCH 037/222] Fixed: assigned_to and author filters in cross project issues view should be based on user's project visibility. #5760 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3916 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/query.rb | 2 +- test/unit/query_test.rb | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/models/query.rb b/app/models/query.rb index f697a721d..fd7aa3477 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -187,7 +187,7 @@ class Query < ActiveRecord::Base if project user_values += project.users.sort.collect{|s| [s.name, s.id.to_s] } else - project_ids = User.current.projects.collect(&:id) + project_ids = Project.all(:conditions => Project.visible_by(User.current)).collect(&:id) if project_ids.any? # members of the user's projects user_values += User.active.find(:all, :conditions => ["#{User.table_name}.id IN (SELECT DISTINCT user_id FROM members WHERE project_id IN (?))", project_ids]).sort.collect{|s| [s.name, s.id.to_s] } diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index 26cba2a5e..4b11830e8 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -351,4 +351,13 @@ class QueryTest < ActiveSupport::TestCase assert !q.editable_by?(manager) assert !q.editable_by?(developer) end + + context "#available_filters" do + should "include users of visible projects in cross-project view" do + query = Query.new(:name => "_") + users = query.available_filters["assigned_to_id"] + assert_not_nil users + assert users[:values].map{|u|u[1]}.include?("3") + end + end end From e4af6e77a7347f02491ca95f0a5eb32e40e271ef Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 5 Aug 2010 17:43:07 +0000 Subject: [PATCH 038/222] Refactor: extract method in IssuesController#move. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3917 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/issues_controller.rb | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index d73dfebfe..4f6f975cd 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -264,15 +264,9 @@ class IssuesController < ApplicationController moved_issues = [] @issues.each do |issue| issue.reload - changed_attributes = {} - [: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 - end issue.init_journal(User.current) 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 => changed_attributes}) + if r = issue.move_to_project(@target_project, new_tracker, {:copy => @copy, :attributes => extract_changed_attributes_for_move(params)}) moved_issues << r else unsaved_issue_ids << issue.id @@ -485,4 +479,14 @@ private return false end end + + def extract_changed_attributes_for_move(params) + changed_attributes = {} + [: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 + end + changed_attributes + end end From 041bca6ac90d0d53c6e29a729e84b66b4d87b040 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Fri, 6 Aug 2010 15:47:27 +0000 Subject: [PATCH 039/222] Refactor: start to split IssuesController#move into two separate actions. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3918 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/issues_controller.rb | 7 +++++- app/views/issues/move.rhtml | 2 +- config/routes.rb | 2 +- lib/redmine.rb | 2 +- test/functional/issues_controller_test.rb | 26 +++++++++++------------ test/integration/routing_test.rb | 2 +- 6 files changed, 23 insertions(+), 18 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 4f6f975cd..7fb4148ed 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -20,7 +20,7 @@ class IssuesController < ApplicationController default_search_scope :issues before_filter :find_issue, :only => [:show, :edit, :update, :reply] - before_filter :find_issues, :only => [:bulk_edit, :move, :destroy] + before_filter :find_issues, :only => [:bulk_edit, :move, :perform_move, :destroy] before_filter :find_project, :only => [:new, :create, :update_form, :preview, :auto_complete] before_filter :authorize, :except => [:index, :changes, :preview, :context_menu] before_filter :find_optional_project, :only => [:index, :changes] @@ -287,6 +287,11 @@ class IssuesController < ApplicationController end render :layout => false if request.xhr? end + + # TODO: more descriptive name? move to separate controller like IssueMovesController? + def perform_move + move + end def destroy @hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f diff --git a/app/views/issues/move.rhtml b/app/views/issues/move.rhtml index 47388c36b..c216cba7c 100644 --- a/app/views/issues/move.rhtml +++ b/app/views/issues/move.rhtml @@ -6,7 +6,7 @@ <% end -%> -<% form_tag({}, :id => 'move_form') do %> +<% form_tag({:action => 'perform_move'}, :id => 'move_form') do %> <%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join %>
    diff --git a/config/routes.rb b/config/routes.rb index 58e620eab..2e8a145cb 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -124,7 +124,7 @@ ActionController::Routing::Routes.draw do |map| issues_actions.connect 'projects/:project_id/issues/gantt', :controller => 'gantts', :action => 'show' issues_actions.connect 'projects/:project_id/issues/calendar', :controller => 'calendars', :action => 'show' issues_actions.connect 'issues/:id/quoted', :action => 'reply', :id => /\d+/ - issues_actions.connect 'issues/:id/:action', :action => /edit|move|destroy/, :id => /\d+/ + issues_actions.connect 'issues/:id/:action', :action => /edit|perform_move|destroy/, :id => /\d+/ issues_actions.connect 'issues.:format', :action => 'create', :format => /xml/ end issues_routes.with_options :conditions => {:method => :put} do |issues_actions| diff --git a/lib/redmine.rb b/lib/redmine.rb index b95166e76..4196a5d7a 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -69,7 +69,7 @@ Redmine::AccessControl.map do |map| map.permission :add_issue_notes, {:issues => [:edit, :update, :reply]} map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin - map.permission :move_issues, {:issues => :move}, :require => :loggedin + map.permission :move_issues, {:issues => [:move, :perform_move]}, :require => :loggedin map.permission :delete_issues, {:issues => :destroy}, :require => :member # Queries map.permission :manage_public_queries, {:queries => [:new, :edit, :destroy]}, :require => :member diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 670fb2d7e..92e6fd30a 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -1038,22 +1038,22 @@ class IssuesControllerTest < ActionController::TestCase assert_redirected_to :controller => 'issues', :action => 'index', :project_id => Project.find(1).identifier end - def test_move_one_issue_to_another_project + def test_perform_move_one_issue_to_another_project @request.session[:user_id] = 2 - post :move, :id => 1, :new_project_id => 2, :tracker_id => '', :assigned_to_id => '', :status_id => '', :start_date => '', :due_date => '' + post :perform_move, :id => 1, :new_project_id => 2, :tracker_id => '', :assigned_to_id => '', :status_id => '', :start_date => '', :due_date => '' assert_redirected_to :action => 'index', :project_id => 'ecookbook' assert_equal 2, Issue.find(1).project_id end - def test_move_one_issue_to_another_project_should_follow_when_needed + def test_perform_move_one_issue_to_another_project_should_follow_when_needed @request.session[:user_id] = 2 - post :move, :id => 1, :new_project_id => 2, :follow => '1' + post :perform_move, :id => 1, :new_project_id => 2, :follow => '1' assert_redirected_to '/issues/1' end - def test_bulk_move_to_another_project + def test_bulk_perform_move_to_another_project @request.session[:user_id] = 2 - post :move, :ids => [1, 2], :new_project_id => 2 + post :perform_move, :ids => [1, 2], :new_project_id => 2 assert_redirected_to :action => 'index', :project_id => 'ecookbook' # Issues moved to project 2 assert_equal 2, Issue.find(1).project_id @@ -1063,9 +1063,9 @@ class IssuesControllerTest < ActionController::TestCase assert_equal 2, Issue.find(2).tracker_id end - def test_bulk_move_to_another_tracker + def test_bulk_perform_move_to_another_tracker @request.session[:user_id] = 2 - post :move, :ids => [1, 2], :new_tracker_id => 2 + post :perform_move, :ids => [1, 2], :new_tracker_id => 2 assert_redirected_to :action => 'index', :project_id => 'ecookbook' assert_equal 2, Issue.find(1).tracker_id assert_equal 2, Issue.find(2).tracker_id @@ -1075,19 +1075,19 @@ class IssuesControllerTest < ActionController::TestCase @request.session[:user_id] = 2 assert_difference 'Issue.count', 2 do assert_no_difference 'Project.find(1).issues.count' do - post :move, :ids => [1, 2], :new_project_id => 2, :copy_options => {:copy => '1'} + post :perform_move, :ids => [1, 2], :new_project_id => 2, :copy_options => {:copy => '1'} end end assert_redirected_to 'projects/ecookbook/issues' end - context "#move via bulk copy" do + context "#perform_move via bulk copy" do should "allow not changing the issue's attributes" do @request.session[:user_id] = 2 issue_before_move = Issue.find(1) assert_difference 'Issue.count', 1 do assert_no_difference 'Project.find(1).issues.count' do - post :move, :ids => [1], :new_project_id => 2, :copy_options => {:copy => '1'}, :new_tracker_id => '', :assigned_to_id => '', :status_id => '', :start_date => '', :due_date => '' + post :perform_move, :ids => [1], :new_project_id => 2, :copy_options => {:copy => '1'}, :new_tracker_id => '', :assigned_to_id => '', :status_id => '', :start_date => '', :due_date => '' end end issue_after_move = Issue.first(:order => 'id desc', :conditions => {:project_id => 2}) @@ -1104,7 +1104,7 @@ class IssuesControllerTest < ActionController::TestCase @request.session[:user_id] = 2 assert_difference 'Issue.count', 2 do assert_no_difference 'Project.find(1).issues.count' do - post :move, :ids => [1, 2], :new_project_id => 2, :copy_options => {:copy => '1'}, :new_tracker_id => '', :assigned_to_id => 4, :status_id => 3, :start_date => '2009-12-01', :due_date => '2009-12-31' + post :perform_move, :ids => [1, 2], :new_project_id => 2, :copy_options => {:copy => '1'}, :new_tracker_id => '', :assigned_to_id => 4, :status_id => 3, :start_date => '2009-12-01', :due_date => '2009-12-31' end end @@ -1122,7 +1122,7 @@ class IssuesControllerTest < ActionController::TestCase def test_copy_to_another_project_should_follow_when_needed @request.session[:user_id] = 2 - post :move, :ids => [1], :new_project_id => 2, :copy_options => {:copy => '1'}, :follow => '1' + post :perform_move, :ids => [1], :new_project_id => 2, :copy_options => {:copy => '1'}, :follow => '1' issue = Issue.first(:order => 'id DESC') assert_redirected_to :controller => 'issues', :action => 'show', :id => issue end diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb index f8476df56..51f8e71f6 100644 --- a/test/integration/routing_test.rb +++ b/test/integration/routing_test.rb @@ -86,7 +86,7 @@ class RoutingTest < ActionController::IntegrationTest should_route :get, "/projects/23/issues/64/copy", :controller => 'issues', :action => 'new', :project_id => '23', :copy_from => '64' should_route :get, "/issues/1/move", :controller => 'issues', :action => 'move', :id => '1' - should_route :post, "/issues/1/move", :controller => 'issues', :action => 'move', :id => '1' + should_route :post, "/issues/1/perform_move", :controller => 'issues', :action => 'perform_move', :id => '1' should_route :post, "/issues/1/quoted", :controller => 'issues', :action => 'reply', :id => '1' From ab546a14cb9f3e40b29df0fda5c82c8d779be843 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Fri, 6 Aug 2010 20:46:44 +0000 Subject: [PATCH 040/222] Add a rake task to run CI. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3919 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/tasks/ci.rake | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 lib/tasks/ci.rake diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake new file mode 100644 index 000000000..092575317 --- /dev/null +++ b/lib/tasks/ci.rake @@ -0,0 +1,41 @@ +desc "Run the Continous Integration tests for Redmine" +task :ci do + # RAILS_ENV and ENV[] can diverge so force them both to test + ENV['RAILS_ENV'] = 'test' + RAILS_ENV = 'test' + Rake::Task["ci:setup"].invoke + Rake::Task["ci:build"].invoke + Rake::Task["ci:teardown"].invoke +end + +# Tasks can be hooked into by redefining them in a plugin +namespace :ci do + desc "Setup Redmine for a new build." + task :setup do + Rake::Task["ci:dump_environment"].invoke + Rake::Task["db:create"].invoke + Rake::Task["db:migrate"].invoke + Rake::Task["db:schema:dump"].invoke + end + + desc "Build Redmine" + task :build do + Rake::Task["test"].invoke + end + + # Use this to cleanup after building or run post-build analysis. + desc "Finish the build" + task :teardown do + end + + desc "Dump the environment information to a BUILD_ENVIRONMENT ENV variable for debugging" + task :dump_environment do + + ENV['BUILD_ENVIRONMENT'] = ['ruby -v', 'gem -v', 'gem list'].collect do |command| + result = `#{command}` + "$ #{command}\n#{result}" + end.join("\n") + + end +end + From 7a3dcdc67f79c0c703cb6340547a218b29d0c8b5 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sat, 7 Aug 2010 15:11:15 +0000 Subject: [PATCH 041/222] Exclude test files from YARD. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3920 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/tasks/yardoc.rake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/tasks/yardoc.rake b/lib/tasks/yardoc.rake index c98f3bd4f..761065df8 100644 --- a/lib/tasks/yardoc.rake +++ b/lib/tasks/yardoc.rake @@ -2,7 +2,9 @@ begin require 'yard' YARD::Rake::YardocTask.new do |t| - t.files = ['lib/**/*.rb', 'app/**/*.rb', 'vendor/plugins/**/*.rb'] + files = ['lib/**/*.rb', 'app/**/*.rb'] + files << Dir['vendor/plugins/**/*.rb'].reject {|f| f.match(/test/) } # Exclude test files + t.files = files end rescue LoadError From 2c79572e4bdcbc00412d618aa84cfc5142b44d26 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sat, 7 Aug 2010 15:11:21 +0000 Subject: [PATCH 042/222] Save yard doc to the doc/app directory. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3921 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/tasks/yardoc.rake | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/tasks/yardoc.rake b/lib/tasks/yardoc.rake index 761065df8..88cf9b85e 100644 --- a/lib/tasks/yardoc.rake +++ b/lib/tasks/yardoc.rake @@ -5,6 +5,7 @@ begin files = ['lib/**/*.rb', 'app/**/*.rb'] files << Dir['vendor/plugins/**/*.rb'].reject {|f| f.match(/test/) } # Exclude test files t.files = files + t.options += ['--output-dir', './doc/app'] end rescue LoadError From 2e14ba95a034341bffc27ff5028090b60ecaf456 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sat, 7 Aug 2010 15:11:26 +0000 Subject: [PATCH 043/222] Add static docs to YARD. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3922 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/tasks/yardoc.rake | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/tasks/yardoc.rake b/lib/tasks/yardoc.rake index 88cf9b85e..aa6c5eeb0 100644 --- a/lib/tasks/yardoc.rake +++ b/lib/tasks/yardoc.rake @@ -5,7 +5,14 @@ begin files = ['lib/**/*.rb', 'app/**/*.rb'] files << Dir['vendor/plugins/**/*.rb'].reject {|f| f.match(/test/) } # Exclude test files t.files = files - t.options += ['--output-dir', './doc/app'] + + static_files = ['doc/CHANGELOG', + 'doc/COPYING', + 'doc/INSTALL', + 'doc/RUNNING_TESTS', + 'doc/UPGRADING'].join(',') + + t.options += ['--output-dir', './doc/app', '--files', static_files] end rescue LoadError From 5b64f0ff969db3f0a99c1c780ab03d842da6b59d Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sat, 7 Aug 2010 15:11:31 +0000 Subject: [PATCH 044/222] Updated changelog format to use lists. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3923 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- doc/CHANGELOG | 260 +++++++++++++++++++++++++------------------------- 1 file changed, 130 insertions(+), 130 deletions(-) diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 4a100bfce..4e6be6a27 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -6,151 +6,151 @@ http://www.redmine.org/ == 2010-07-18 v1.0.0 (Release candidate) -#443: Adds context menu to the roadmap issue lists -#443: Subtasking -#741: Description preview while editing an issue -#1131: Add support for alternate (non-LDAP) authentication -#1214: REST API for Issues -#1223: File upload on wiki edit form -#1755: add "blocked by" as a related issues option -#2420: Fetching emails from an POP server -#2482: Named scopes in Issue and ActsAsWatchable plus some view refactoring (logic extraction). -#2924: Make the right click menu more discoverable using a cursor property -#2985: Make syntax highlighting pluggable -#3201: Workflow Check/Uncheck All Rows/Columns -#3359: Update CodeRay 0.9 -#3706: Allow assigned_to field configuration on Issue creation by email -#3936: configurable list of models to include in search -#4480: Create a link to the user profile from the administration interface -#4482: Cache textile rendering -#4572: Make it harder to ruin your database -#4573: Move github gems to Gemcutter -#4664: Add pagination to forum threads -#4732: Make login case-insensitive also for PostgreSQL -#4812: Create links to other projects -#4819: Replace images with smushed ones for speed -#4945: Allow custom fields attached to project to be searchable -#5121: Fix issues list layout overflow -#5169: Issue list view hook request -#5208: Aibility to edit wiki sidebar -#5281: Remove empty ul tags in the issue history -#5291: Updated basque translations -#5328: Automatically add "Repository" menu_item after repository creation -#5415: Fewer SQL statements generated for watcher_recipients -#5416: Exclude "fields_for" from overridden methods in TabularFormBuilder -#5573: Allow issue assignment in email -#5595: Allow start date and due dates to be set via incoming email -#5752: The projects view (/projects) renders ul's wrong -#5781: Allow to use more macros on the welcome page and project list -Fixed #1288: Unable to past escaped wiki syntax in an issue description -Fixed #1334: Wiki formatting character *_ and _* -Fixed #1416: Inline code with less-then/greater-than produces @lt; and @gt; respectively -Fixed #2473: Login and mail should not be case sensitive -Fixed #2990: Ruby 1.9 - wrong number of arguments (1 for 0) on rake db:migrate -Fixed #3089: Text formatting sometimes breaks when combined -Fixed #3690: Status change info duplicates on the issue screen -Fixed #3691: Redmine allows two files with the same file name to be uploaded to the same issue -Fixed #3764: ApplicationHelperTest fails with JRuby -Fixed #4265: Unclosed code tags in issue descriptions affects main UI -Fixed #4745: Bug in index.xml.builder (issues) -Fixed #4852: changing user/roles of project member not possible without javascript -Fixed #4857: Week number calculation in date picker is wrong if a week starts with Sunday -Fixed #4883: Bottom "contextual" placement in issue with associated changeset -Fixed #4918: Revisions r3453 and r3454 broke On-the-fly user creation with LDAP -Fixed #4935: Navigation to the Master Timesheet page (time_entries) -Fixed #5043: Flash messages are not displayed after the project settings[module/activity] saved -Fixed #5081: Broken links on public/help/wiki_syntax_detailed.html -Fixed #5104: Description of document not wikified on documents index -Fixed #5108: Issue linking fails inside of []s -Fixed #5199: diff code coloring using coderay -Fixed #5233: Add a hook to the issue report (Summary) view -Fixed #5265: timetracking: subtasks time is added to the main task -Fixed #5343: acts_as_event Doesn't Accept Outside URLs -Fixed #5440: UI Inconsistency : Administration > Enumerations table row headers should be enclosed in -Fixed #5463: 0.9.4 INSTALL and/or UPGRADE, missing session_store.rb -Fixed #5524: Update_parent_attributes doesn't work for the old parent issue when reparenting -Fixed #5548: SVN Repository: Can not list content of a folder which includes square brackets. -Fixed #5589: "with subproject" malfunction -Fixed #5676: Search for Numeric Value -Fixed #5696: Redmine + PostgreSQL 8.4.4 fails on _dir_list_content.rhtml -Fixed #5698: redmine:email:receive_imap fails silently for mails with subject longer than 255 characters -Fixed #5700: TimelogController#destroy assumes success -Fixed #5751: developer role is mispelled -Fixed #5769: Popup Calendar doesn't Advance in Chrome -Fixed #5771: Problem when importing git repository -Fixed #5823: Error in comments in plugin.rb +* #443: Adds context menu to the roadmap issue lists +* #443: Subtasking +* #741: Description preview while editing an issue +* #1131: Add support for alternate (non-LDAP) authentication +* #1214: REST API for Issues +* #1223: File upload on wiki edit form +* #1755: add "blocked by" as a related issues option +* #2420: Fetching emails from an POP server +* #2482: Named scopes in Issue and ActsAsWatchable plus some view refactoring (logic extraction). +* #2924: Make the right click menu more discoverable using a cursor property +* #2985: Make syntax highlighting pluggable +* #3201: Workflow Check/Uncheck All Rows/Columns +* #3359: Update CodeRay 0.9 +* #3706: Allow assigned_to field configuration on Issue creation by email +* #3936: configurable list of models to include in search +* #4480: Create a link to the user profile from the administration interface +* #4482: Cache textile rendering +* #4572: Make it harder to ruin your database +* #4573: Move github gems to Gemcutter +* #4664: Add pagination to forum threads +* #4732: Make login case-insensitive also for PostgreSQL +* #4812: Create links to other projects +* #4819: Replace images with smushed ones for speed +* #4945: Allow custom fields attached to project to be searchable +* #5121: Fix issues list layout overflow +* #5169: Issue list view hook request +* #5208: Aibility to edit wiki sidebar +* #5281: Remove empty ul tags in the issue history +* #5291: Updated basque translations +* #5328: Automatically add "Repository" menu_item after repository creation +* #5415: Fewer SQL statements generated for watcher_recipients +* #5416: Exclude "fields_for" from overridden methods in TabularFormBuilder +* #5573: Allow issue assignment in email +* #5595: Allow start date and due dates to be set via incoming email +* #5752: The projects view (/projects) renders ul's wrong +* #5781: Allow to use more macros on the welcome page and project list +* Fixed #1288: Unable to past escaped wiki syntax in an issue description +* Fixed #1334: Wiki formatting character *_ and _* +* Fixed #1416: Inline code with less-then/greater-than produces @lt; and @gt; respectively +* Fixed #2473: Login and mail should not be case sensitive +* Fixed #2990: Ruby 1.9 - wrong number of arguments (1 for 0) on rake db:migrate +* Fixed #3089: Text formatting sometimes breaks when combined +* Fixed #3690: Status change info duplicates on the issue screen +* Fixed #3691: Redmine allows two files with the same file name to be uploaded to the same issue +* Fixed #3764: ApplicationHelperTest fails with JRuby +* Fixed #4265: Unclosed code tags in issue descriptions affects main UI +* Fixed #4745: Bug in index.xml.builder (issues) +* Fixed #4852: changing user/roles of project member not possible without javascript +* Fixed #4857: Week number calculation in date picker is wrong if a week starts with Sunday +* Fixed #4883: Bottom "contextual" placement in issue with associated changeset +* Fixed #4918: Revisions r3453 and r3454 broke On-the-fly user creation with LDAP +* Fixed #4935: Navigation to the Master Timesheet page (time_entries) +* Fixed #5043: Flash messages are not displayed after the project settings[module/activity] saved +* Fixed #5081: Broken links on public/help/wiki_syntax_detailed.html +* Fixed #5104: Description of document not wikified on documents index +* Fixed #5108: Issue linking fails inside of []s +* Fixed #5199: diff code coloring using coderay +* Fixed #5233: Add a hook to the issue report (Summary) view +* Fixed #5265: timetracking: subtasks time is added to the main task +* Fixed #5343: acts_as_event Doesn't Accept Outside URLs +* Fixed #5440: UI Inconsistency : Administration > Enumerations table row headers should be enclosed in +* Fixed #5463: 0.9.4 INSTALL and/or UPGRADE, missing session_store.rb +* Fixed #5524: Update_parent_attributes doesn't work for the old parent issue when reparenting +* Fixed #5548: SVN Repository: Can not list content of a folder which includes square brackets. +* Fixed #5589: "with subproject" malfunction +* Fixed #5676: Search for Numeric Value +* Fixed #5696: Redmine + PostgreSQL 8.4.4 fails on _dir_list_content.rhtml +* Fixed #5698: redmine:email:receive_imap fails silently for mails with subject longer than 255 characters +* Fixed #5700: TimelogController#destroy assumes success +* Fixed #5751: developer role is mispelled +* Fixed #5769: Popup Calendar doesn't Advance in Chrome +* Fixed #5771: Problem when importing git repository +* Fixed #5823: Error in comments in plugin.rb == 2010-07-07 v0.9.6 -Fixed: Redmine.pm access by unauthorized users +* Fixed: Redmine.pm access by unauthorized users == 2010-06-24 v0.9.5 -Linkify folder names on revision view -"fiters" and "options" should be hidden in print view via css -Fixed: NoMethodError when no issue params are submitted -Fixed: projects.atom with required authentication -Fixed: External links not correctly displayed in Wiki TOC -Fixed: Member role forms in project settings are not hidden after member added -Fixed: pre can't be inside p -Fixed: session cookie path does not respect RAILS_RELATIVE_URL_ROOT -Fixed: mail handler fails when the from address is empty +* Linkify folder names on revision view +* "fiters" and "options" should be hidden in print view via css +* Fixed: NoMethodError when no issue params are submitted +* Fixed: projects.atom with required authentication +* Fixed: External links not correctly displayed in Wiki TOC +* Fixed: Member role forms in project settings are not hidden after member added +* Fixed: pre can't be inside p +* Fixed: session cookie path does not respect RAILS_RELATIVE_URL_ROOT +* Fixed: mail handler fails when the from address is empty == 2010-05-01 v0.9.4 -Filters collapsed by default on issues index page for a saved query -Fixed: When categories list is too big the popup menu doesn't adjust (ex. in the issue list) -Fixed: remove "main-menu" div when the menu is empty -Fixed: Code syntax highlighting not working in Document page -Fixed: Git blame/annotate fails on moved files -Fixed: Failing test in test_show_atom -Fixed: Migrate from trac - not displayed Wikis -Fixed: Email notifications on file upload sent to empty recipient list -Fixed: Migrating from trac is not possible, fails to allocate memory -Fixed: Lost password no longer flashes a confirmation message -Fixed: Crash while deleting in-use enumeration -Fixed: Hard coded English string at the selection of issue watchers -Fixed: Bazaar v2.1.0 changed behaviour -Fixed: Roadmap display can raise an exception if no trackers are selected -Fixed: Gravatar breaks layout of "logged in" page -Fixed: Reposman.rb on Windows -Fixed: Possible error 500 while moving an issue to another project with SQLite -Fixed: backslashes in issue description/note should be escaped when quoted -Fixed: Long text in 
     disrupts Associated revisions
-Fixed: Links to missing wiki pages not red on project overview page
-Fixed: Cannot delete a project with subprojects that shares versions
-Fixed: Update of Subversion changesets broken under Solaris
-Fixed: "Move issues" permission not working for Non member
-Fixed: Sidebar overlap on Users tab of Group editor
-Fixed: Error on db:migrate with table prefix set (hardcoded name in principal.rb)
-Fixed: Report shows sub-projects for non-members
-Fixed: 500 internal error when browsing any Redmine page in epiphany
-Fixed: Watchers selection lost when issue creation fails
-Fixed: When copying projects, redmine should not generate an email to people who created issues
-Fixed: Issue "#" table cells should have a class attribute to enable fine-grained CSS theme
-Fixed: Plugin generators should display help if no parameter is given
+* Filters collapsed by default on issues index page for a saved query
+* Fixed: When categories list is too big the popup menu doesn't adjust (ex. in the issue list)
+* Fixed: remove "main-menu" div when the menu is empty
+* Fixed: Code syntax highlighting not working in Document page
+* Fixed: Git blame/annotate fails on moved files
+* Fixed: Failing test in test_show_atom
+* Fixed: Migrate from trac - not displayed Wikis
+* Fixed: Email notifications on file upload sent to empty recipient list
+* Fixed: Migrating from trac is not possible, fails to allocate memory
+* Fixed: Lost password no longer flashes a confirmation message
+* Fixed: Crash while deleting in-use enumeration
+* Fixed: Hard coded English string at the selection of issue watchers
+* Fixed: Bazaar v2.1.0 changed behaviour
+* Fixed: Roadmap display can raise an exception if no trackers are selected
+* Fixed: Gravatar breaks layout of "logged in" page
+* Fixed: Reposman.rb on Windows
+* Fixed: Possible error 500 while moving an issue to another project with SQLite
+* Fixed: backslashes in issue description/note should be escaped when quoted
+* Fixed: Long text in 
     disrupts Associated revisions
+* Fixed: Links to missing wiki pages not red on project overview page
+* Fixed: Cannot delete a project with subprojects that shares versions
+* Fixed: Update of Subversion changesets broken under Solaris
+* Fixed: "Move issues" permission not working for Non member
+* Fixed: Sidebar overlap on Users tab of Group editor
+* Fixed: Error on db:migrate with table prefix set (hardcoded name in principal.rb)
+* Fixed: Report shows sub-projects for non-members
+* Fixed: 500 internal error when browsing any Redmine page in epiphany
+* Fixed: Watchers selection lost when issue creation fails
+* Fixed: When copying projects, redmine should not generate an email to people who created issues
+* Fixed: Issue "#" table cells should have a class attribute to enable fine-grained CSS theme
+* Fixed: Plugin generators should display help if no parameter is given
 
 
 == 2010-02-28 v0.9.3
 
-Adds filter for system shared versions on the cross project issue list
-Makes project identifiers searchable
-Remove invalid utf8 sequences from commit comments and author name
-Fixed: Wrong link when "http" not included in project "Homepage" link
-Fixed: Escaping in html email templates
-Fixed: Pound (#) followed by number with leading zero (0) removes leading zero when rendered in wiki
-Fixed: Deselecting textile text formatting causes interning empty string errors
-Fixed: error with postgres when entering a non-numeric id for an issue relation
-Fixed: div.task incorrectly wrapping on Gantt Chart
-Fixed: Project copy loses wiki pages hierarchy
-Fixed: parent project field doesn't include blank value when a member with 'add subproject' permission edits a child project
-Fixed: Repository.fetch_changesets tries to fetch changesets for archived projects
-Fixed: Duplicated project name for subproject version on gantt chart
-Fixed: roadmap shows subprojects issues even if subprojects is unchecked
-Fixed: IndexError if all the :last menu items are deleted from a menu
-Fixed: Very high CPU usage for a long time when fetching commits from a large Git repository
+* Adds filter for system shared versions on the cross project issue list
+* Makes project identifiers searchable
+* Remove invalid utf8 sequences from commit comments and author name
+* Fixed: Wrong link when "http" not included in project "Homepage" link
+* Fixed: Escaping in html email templates
+* Fixed: Pound (#) followed by number with leading zero (0) removes leading zero when rendered in wiki
+* Fixed: Deselecting textile text formatting causes interning empty string errors
+* Fixed: error with postgres when entering a non-numeric id for an issue relation
+* Fixed: div.task incorrectly wrapping on Gantt Chart
+* Fixed: Project copy loses wiki pages hierarchy
+* Fixed: parent project field doesn't include blank value when a member with 'add subproject' permission edits a child project
+* Fixed: Repository.fetch_changesets tries to fetch changesets for archived projects
+* Fixed: Duplicated project name for subproject version on gantt chart
+* Fixed: roadmap shows subprojects issues even if subprojects is unchecked
+* Fixed: IndexError if all the :last menu items are deleted from a menu
+* Fixed: Very high CPU usage for a long time when fetching commits from a large Git repository
 
 
 == 2010-02-07 v0.9.2

From a1b607480abc6649f9531b1fd8a7d20c3c656084 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Barth 
Date: Sun, 8 Aug 2010 07:07:20 +0000
Subject: [PATCH 045/222] Refactor: added link_to_project helper to handle
 links to projects

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3924 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb            | 27 +++++++++++++++-----
 app/helpers/projects_helper.rb               |  2 +-
 app/helpers/queries_helper.rb                |  2 +-
 app/views/admin/projects.rhtml               |  2 +-
 app/views/issues/_list_simple.rhtml          |  2 +-
 app/views/news/_news.rhtml                   |  2 +-
 app/views/news/index.rhtml                   |  2 +-
 app/views/users/_memberships.rhtml           |  2 +-
 app/views/users/show.rhtml                   |  2 +-
 app/views/welcome/index.rhtml                |  2 +-
 test/unit/helpers/application_helper_test.rb | 12 +++++++++
 11 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index d6fd16a6e..2c334b7f0 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -103,6 +103,23 @@ module ApplicationHelper
     link_to(text, {:controller => 'repositories', :action => 'revision', :id => project, :rev => revision}, :title => l(:label_revision_id, revision))
   end
 
+  # Generates a link to a project if active
+  # Examples:
+  # 
+  #   link_to_project(project)                          # => link to the specified project overview
+  #   link_to_project(project, :action=>'settings')     # => link to project settings
+  #   link_to_project(project, {:only_path => false}, :class => "project") # => 3rd arg adds html options
+  #   link_to_project(project, {}, :class => "project") # => html options with default url (project overview)
+  #
+  def link_to_project(project, options={}, html_options = nil)
+    if project.active?
+      url = {:controller => 'projects', :action => 'show', :id => project}.merge(options)
+      link_to(h(project), url, html_options)
+    else
+      h(project)
+    end
+  end
+
   def toggle_link(name, id, options={})
     onclick = "Element.toggle('#{id}'); "
     onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
@@ -368,12 +385,12 @@ module ApplicationHelper
       ancestors = (@project.root? ? [] : @project.ancestors.visible)
       if ancestors.any?
         root = ancestors.shift
-        b << link_to(h(root), {:controller => 'projects', :action => 'show', :id => root, :jump => current_menu_item}, :class => 'root')
+        b << link_to_project(root, {:jump => current_menu_item}, :class => 'root')
         if ancestors.size > 2
           b << '…'
           ancestors = ancestors[-2, 2]
         end
-        b += ancestors.collect {|p| link_to(h(p), {:controller => 'projects', :action => 'show', :id => p, :jump => current_menu_item}, :class => 'ancestor') }
+        b += ancestors.collect {|p| link_to_project(p, {:jump => current_menu_item}, :class => 'ancestor') }
       end
       b << h(@project)
       b.join(' » ')
@@ -605,8 +622,7 @@ module ApplicationHelper
             end
           when 'project'
             if p = Project.visible.find_by_id(oid)
-              link = link_to h(p.name), {:only_path => only_path, :controller => 'projects', :action => 'show', :id => p},
-                                              :class => 'project'
+              link = link_to_project(p, {:only_path => only_path}, :class => 'project')
             end
           end
         elsif sep == ':'
@@ -648,8 +664,7 @@ module ApplicationHelper
             end
           when 'project'
             if p = Project.visible.find(:first, :conditions => ["identifier = :s OR LOWER(name) = :s", {:s => name.downcase}])
-              link = link_to h(p.name), {:only_path => only_path, :controller => 'projects', :action => 'show', :id => p},
-                                              :class => 'project'
+              link = link_to_project(p, {:only_path => only_path}, :class => 'project')
             end
           end
         end
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 044ccfb77..3b089c111 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -72,7 +72,7 @@ module ProjectsHelper
         end
         classes = (ancestors.empty? ? 'root' : 'child')
         s << "
  • " +
-               link_to(h(project), {:controller => 'projects', :action => 'show', :id => project}, :class => "project #{User.current.member_of?(project) ? 'my-project' : nil}")
+               link_to_project(project, {}, :class => "project #{User.current.member_of?(project) ? 'my-project' : nil}")
         s << "
    #{textilizable(project.short_description, :project => project)}
    " unless project.description.blank?
         s << "
    \n"
         ancestors << project
diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb
index 594c8a79a..26be63693 100644
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -50,7 +50,7 @@ module QueriesHelper
     when 'User'
       link_to_user value
     when 'Project'
-      link_to(h(value), :controller => 'projects', :action => 'show', :id => value)
+      link_to_project value
     when 'Version'
       link_to(h(value), :controller => 'versions', :action => 'show', :id => value)
     when 'TrueClass'
diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml
index dc7bb97ed..46b68e4cc 100644
--- a/app/views/admin/projects.rhtml
+++ b/app/views/admin/projects.rhtml
@@ -27,7 +27,7 @@
   
 <% project_tree(@projects) do |project, level| %>
    <%= css_project_classes(project) %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
-	<%= project.active? ? link_to(h(project.name), :controller => 'projects', :action => 'settings', :id => project) : h(project.name) %>
+	<%= link_to_project(project, :action => 'settings') %>
 	<%= textilizable project.short_description, :project => project %>
 	<%= checked_image project.is_public? %>
 	<%= format_date(project.created_on) %>
diff --git a/app/views/issues/_list_simple.rhtml b/app/views/issues/_list_simple.rhtml
index 38823765e..dd7f48946 100644
--- a/app/views/issues/_list_simple.rhtml
+++ b/app/views/issues/_list_simple.rhtml
@@ -14,7 +14,7 @@
 			  <%= check_box_tag("ids[]", issue.id, false, :style => 'display:none;') %>
 				<%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %>
 			
-			<%= link_to(h(issue.project), :controller => 'projects', :action => 'show', :id => issue.project) %>
+			<%= link_to_project(issue.project) %>
 			<%=h issue.tracker %>
 			
         <%= link_to h(truncate(issue.subject, :length => 60)), :controller => 'issues', :action => 'show', :id => issue %> (<%=h issue.status %>)
diff --git a/app/views/news/_news.rhtml b/app/views/news/_news.rhtml
index e95e8a557..8f481f09c 100644
--- a/app/views/news/_news.rhtml
+++ b/app/views/news/_news.rhtml
@@ -1,4 +1,4 @@
-
    <%= link_to(h(news.project.name), :controller => 'projects', :action => 'show', :id => news.project) + ': ' unless @project %>
+
    <%= link_to_project(news.project) + ': ' unless @project %>
 <%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %>
 <%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %>
 
    
diff --git a/app/views/news/index.rhtml b/app/views/news/index.rhtml
index 11a39232c..8b7cc66e1 100644
--- a/app/views/news/index.rhtml
+++ b/app/views/news/index.rhtml
@@ -28,7 +28,7 @@
 
    <%= l(:label_no_data) %>
    
 <% else %>
 <% @newss.each do |news| %>
-    
    <%= link_to(h(news.project.name), :controller => 'projects', :action => 'show', :id => news.project) + ': ' unless news.project == @project %>
+    
    <%= link_to_project(news.project) + ': ' unless news.project == @project %>
     <%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %>
     <%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %>
    
     
    <%= authoring news.created_on, news.author %>
    
diff --git a/app/views/users/_memberships.rhtml b/app/views/users/_memberships.rhtml
index 4c71f81ba..441294708 100644
--- a/app/views/users/_memberships.rhtml
+++ b/app/views/users/_memberships.rhtml
@@ -15,7 +15,7 @@
 	<% next if membership.new_record? %>
 	
   
-    <%= link_to h(membership.project), {:controller => 'projects', :action => 'show', :id => membership.project} %>
+    <%= link_to_project membership.project %>
   
   
     <%=h membership.roles.sort.collect(&:to_s).join(', ') %>
diff --git a/app/views/users/show.rhtml b/app/views/users/show.rhtml
index 82634b010..df5aec825 100644
--- a/app/views/users/show.rhtml
+++ b/app/views/users/show.rhtml
@@ -24,7 +24,7 @@
 
    <%=l(:label_project_plural)%>
    
 
      
 <% for membership in @memberships %>
-	
    • <%= link_to(h(membership.project.name), :controller => 'projects', :action => 'show', :id => membership.project) %>
+	
    • <%= link_to_project(membership.project) %>
     (<%=h membership.roles.sort.collect(&:to_s).join(', ') %>, <%= format_date(membership.created_on) %>)
      • 
 <% end %>
 
    
diff --git a/app/views/welcome/index.rhtml b/app/views/welcome/index.rhtml
index a0ada7cce..6ac09c153 100644
--- a/app/views/welcome/index.rhtml
+++ b/app/views/welcome/index.rhtml
@@ -20,7 +20,7 @@
 		<% for project in @projects %>
 		  <% @project = project %>
 			
  • 
-			<%= link_to h(project.name), :controller => 'projects', :action => 'show', :id => project %> (<%= format_time(project.created_on) %>)
+			<%= link_to_project project %> (<%= format_time(project.created_on) %>)
 			<%= textilizable project.short_description, :project => project %>
 			
    • 
 		<% end %>
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 90d342898..6fd21fe37 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -597,4 +597,16 @@ EXPECTED
     t = link_to_user(user)
     assert_equal ::I18n.t(:label_user_anonymous), t
   end
+
+  def test_link_to_project
+    project = Project.find(1)
+    assert_equal %(eCookbook),
+                 link_to_project(project)
+    assert_equal %(eCookbook),
+                 link_to_project(project, :action => 'settings')
+    assert_equal %(eCookbook),
+                 link_to_project(project, {:only_path => false, :jump => 'blah'})
+    assert_equal %(eCookbook),
+                 link_to_project(project, {:action => 'settings'}, :class => "project")
+  end
 end

From 780bdccc42461eae0eefc6eb876e2ce4b5564007 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Barth 
Date: Sun, 8 Aug 2010 07:07:30 +0000
Subject: [PATCH 046/222] Fixed wrong commit range in git log command. #5628

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3925 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/git_adapter.rb                | 10 +++++-----
 test/unit/lib/redmine/scm/adapters/git_adapter_test.rb |  4 ++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
index d15bce1af..0857d9047 100644
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -114,12 +114,12 @@ module Redmine
         def revisions(path, identifier_from, identifier_to, options={})
           revisions = Revisions.new
 
-          cmd = "#{GIT_BIN} --git-dir #{target('')} log --raw --date=iso --pretty=fuller"
-          cmd << " --reverse" if options[:reverse]
-          cmd << " --all" if options[:all]
+          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]} " if options[:limit]
-          cmd << " #{shell_quote(identifier_from + '..')} " if identifier_from
-          cmd << " #{shell_quote identifier_to} " if identifier_to
+          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]
           cmd << " -- #{path}" if path && !path.empty?
 
diff --git a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
index 2dc5d3e8e..6b716b9cd 100644
--- a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
@@ -16,6 +16,10 @@ class GitAdapterTest < ActiveSupport::TestCase
       assert_equal 13, @adapter.revisions('',nil,nil,:all => true).length
     end
     
+    def test_getting_certain_revisions
+      assert_equal 1, @adapter.revisions('','899a15d^','899a15d').length
+    end
+    
     def test_annotate
       annotate = @adapter.annotate('sources/watchers_controller.rb')
       assert_kind_of Redmine::Scm::Adapters::Annotate, annotate

From bc5d32d6de2c42aa084d2e5de0ef0c22da756a3a Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Barth 
Date: Sun, 8 Aug 2010 07:07:38 +0000
Subject: [PATCH 047/222] Replace Test::Unit::TestCase with
 ActiveSupport::TestCase. #5477

Contributed by Alexey Palazhchenko

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3926 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/unit/lib/redmine/menu_manager/menu_item_test.rb | 2 +-
 test/unit/lib/redmine/menu_manager_test.rb           | 6 +-----
 test/unit/lib/redmine_test.rb                        | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/test/unit/lib/redmine/menu_manager/menu_item_test.rb b/test/unit/lib/redmine/menu_manager/menu_item_test.rb
index 835e154d8..ab17d4a4b 100644
--- a/test/unit/lib/redmine/menu_manager/menu_item_test.rb
+++ b/test/unit/lib/redmine/menu_manager/menu_item_test.rb
@@ -24,7 +24,7 @@ module RedmineMenuTestHelper
   end
 end
 
-class Redmine::MenuManager::MenuItemTest < Test::Unit::TestCase
+class Redmine::MenuManager::MenuItemTest < ActiveSupport::TestCase
   include RedmineMenuTestHelper
 
   Redmine::MenuManager.map :test_menu do |menu|
diff --git a/test/unit/lib/redmine/menu_manager_test.rb b/test/unit/lib/redmine/menu_manager_test.rb
index 0c01ca323..200ed3976 100644
--- a/test/unit/lib/redmine/menu_manager_test.rb
+++ b/test/unit/lib/redmine/menu_manager_test.rb
@@ -17,7 +17,7 @@
 
 require File.dirname(__FILE__) + '/../../../test_helper'
 
-class Redmine::MenuManagerTest < Test::Unit::TestCase
+class Redmine::MenuManagerTest < ActiveSupport::TestCase
   context "MenuManager#map" do
     should "be tested"
   end
@@ -25,8 +25,4 @@ class Redmine::MenuManagerTest < Test::Unit::TestCase
   context "MenuManager#items" do
     should "be tested"
   end
-
-  should "be tested" do
-    assert true
-  end
 end
diff --git a/test/unit/lib/redmine_test.rb b/test/unit/lib/redmine_test.rb
index 5150da1f2..2d32abdcb 100644
--- a/test/unit/lib/redmine_test.rb
+++ b/test/unit/lib/redmine_test.rb
@@ -33,7 +33,7 @@ module RedmineMenuTestHelper
   end
 end
 
-class RedmineTest < Test::Unit::TestCase
+class RedmineTest < ActiveSupport::TestCase
   include RedmineMenuTestHelper
 
   def test_top_menu

From 56a6d86af572fb466bdd4f79b0a00dd69b87a3bb Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Barth 
Date: Sun, 8 Aug 2010 09:01:25 +0000
Subject: [PATCH 048/222] Added project filter when viewing all issues. #5084

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3927 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/query.rb     | 6 ++++++
 test/unit/query_test.rb | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/app/models/query.rb b/app/models/query.rb
index fd7aa3477..b1f784528 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -219,6 +219,12 @@ class Query < ActiveRecord::Base
         @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => system_shared_versions.sort.collect{|s| ["#{s.project.name} - #{s.name}", s.id.to_s] } }
       end
       add_custom_fields_filters(IssueCustomField.find(:all, :conditions => {:is_filter => true, :is_for_all => true}))
+      # project filter
+      project_values = Project.all(:conditions => Project.visible_by(User.current), :order => 'lft').map do |p|
+        pre = (p.level > 0 ? ('--' * p.level + ' ') : '')
+        ["#{pre}#{p.name}",p.id.to_s]
+      end
+      @available_filters["project_id"] = { :type => :list, :order => 1, :values => project_values}
     end
     @available_filters
   end
diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb
index 4b11830e8..12ab5d932 100644
--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -33,6 +33,15 @@ class QueryTest < ActiveSupport::TestCase
     assert query.available_filters['fixed_version_id'][:values].detect {|v| v.last == '2'}
   end
   
+  def test_project_filter_in_global_queries
+    query = Query.new(:project => nil, :name => '_')
+    project_filter = query.available_filters["project_id"]
+    assert_not_nil project_filter
+    project_ids = project_filter[:values].map{|p| p[1]}
+    assert project_ids.include?("1")  #public project
+    assert !project_ids.include?("2") #private project user cannot see
+  end
+  
   def find_issues_with_query(query)
     Issue.find :all,
       :include => [ :assigned_to, :status, :tracker, :project, :priority ], 

From 56e3953a71801befd26d78585ddd0cce4363e121 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Barth 
Date: Sun, 8 Aug 2010 20:26:33 +0000
Subject: [PATCH 049/222] Removed useless debug code. #5978

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3928 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/changeset.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 3bd26b111..063a4a48c 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -76,7 +76,6 @@ class Changeset < ActiveRecord::Base
   def after_create
     scan_comment_for_issue_ids
   end
-  require 'pp'
   
   def scan_comment_for_issue_ids
     return if comments.blank?

From e00884bcca90eabf8de5f8371f0ba8773942a4b8 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Barth 
Date: Mon, 9 Aug 2010 05:10:00 +0000
Subject: [PATCH 050/222] Removed hard-coded english error message on failed
 Member creation

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3929 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/member.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/member.rb b/app/models/member.rb
index 94751efb2..d840cfc3e 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -82,7 +82,7 @@ class Member < ActiveRecord::Base
   protected
   
   def validate
-    errors.add_to_base "Role can't be blank" if member_roles.empty? && roles.empty?
+    errors.add_on_empty :role if member_roles.empty? && roles.empty?
   end
   
   private

From a1b89a53eb7a6893863e787c2930fddde3385717 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Mon, 9 Aug 2010 14:53:23 +0000
Subject: [PATCH 051/222] Refactor: extract POST version of
 IssuesController#move to #perform_move.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3930 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 7fb4148ed..a7e227c85 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -251,6 +251,18 @@ class IssuesController < ApplicationController
   end
 
   def move
+    @issues.sort!
+    @copy = params[:copy_options] && params[:copy_options][:copy]
+    @allowed_projects = Issue.allowed_target_projects_on_move
+    @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
+    @target_project ||= @project    
+    @trackers = @target_project.trackers
+    @available_statuses = Workflow.available_statuses(@project)
+    render :layout => false if request.xhr?
+  end
+
+  # TODO: more descriptive name? move to separate controller like IssueMovesController?
+  def perform_move
     @issues.sort!
     @copy = params[:copy_options] && params[:copy_options][:copy]
     @allowed_projects = Issue.allowed_target_projects_on_move
@@ -285,12 +297,6 @@ class IssuesController < ApplicationController
       end
       return
     end
-    render :layout => false if request.xhr?
-  end
-
-  # TODO: more descriptive name? move to separate controller like IssueMovesController?
-  def perform_move
-    move
   end
   
   def destroy

From 424b4825793ee71faa0e36e40c813bef713ca5f6 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Mon, 9 Aug 2010 23:15:32 +0000
Subject: [PATCH 052/222] Refactor TimelogController#report's joins and provide
 a hook to add more.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3931 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/timelog_controller.rb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 7addff78c..e234848d0 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -55,8 +55,7 @@ class TimelogController < ApplicationController
 
       sql = "SELECT #{sql_select}, tyear, tmonth, tweek, spent_on, SUM(hours) AS hours"
       sql << " FROM #{TimeEntry.table_name}"
-      sql << " LEFT JOIN #{Issue.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id"
-      sql << " LEFT JOIN #{Project.table_name} ON #{TimeEntry.table_name}.project_id = #{Project.table_name}.id"
+      sql << time_report_joins
       sql << " WHERE"
       sql << " (%s) AND" % sql_condition
       sql << " (spent_on BETWEEN '%s' AND '%s')" % [ActiveRecord::Base.connection.quoted_date(@from), ActiveRecord::Base.connection.quoted_date(@to)]
@@ -314,4 +313,12 @@ private
     call_hook(:controller_timelog_available_criterias, { :available_criterias => @available_criterias, :project => @project })
     @available_criterias
   end
+
+  def time_report_joins
+    sql = ''
+    sql << " LEFT JOIN #{Issue.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id"
+    sql << " LEFT JOIN #{Project.table_name} ON #{TimeEntry.table_name}.project_id = #{Project.table_name}.id"
+    call_hook(:controller_timelog_time_report_joins, {:sql => sql} )
+    sql
+  end
 end

From 52c624aabd5540a64b8a481a834b641f2dae4044 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Tue, 10 Aug 2010 15:11:11 +0000
Subject: [PATCH 053/222] Refactor: extract method from #move and
 #perform_move.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3932 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index a7e227c85..46c61ea0f 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -251,25 +251,14 @@ class IssuesController < ApplicationController
   end
 
   def move
-    @issues.sort!
-    @copy = params[:copy_options] && params[:copy_options][:copy]
-    @allowed_projects = Issue.allowed_target_projects_on_move
-    @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
-    @target_project ||= @project    
-    @trackers = @target_project.trackers
-    @available_statuses = Workflow.available_statuses(@project)
+    prepare_for_issue_move
     render :layout => false if request.xhr?
   end
 
   # TODO: more descriptive name? move to separate controller like IssueMovesController?
   def perform_move
-    @issues.sort!
-    @copy = params[:copy_options] && params[:copy_options][:copy]
-    @allowed_projects = Issue.allowed_target_projects_on_move
-    @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
-    @target_project ||= @project    
-    @trackers = @target_project.trackers
-    @available_statuses = Workflow.available_statuses(@project)
+    prepare_for_issue_move
+
     if request.post?
       new_tracker = params[:new_tracker_id].blank? ? nil : @target_project.trackers.find_by_id(params[:new_tracker_id])
       unsaved_issue_ids = []
@@ -473,6 +462,16 @@ private
     @allowed_statuses = @issue.new_statuses_allowed_to(User.current, true)
   end
 
+  def prepare_for_issue_move
+    @issues.sort!
+    @copy = params[:copy_options] && params[:copy_options][:copy]
+    @allowed_projects = Issue.allowed_target_projects_on_move
+    @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
+    @target_project ||= @project    
+    @trackers = @target_project.trackers
+    @available_statuses = Workflow.available_statuses(@project)
+  end
+
   def set_flash_from_bulk_issue_save(issues, unsaved_issue_ids)
     if unsaved_issue_ids.empty?
       flash[:notice] = l(:notice_successful_update) unless issues.empty?

From 83e4cf3dd4207faaa393d993a271a52d4413bad3 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Barth 
Date: Tue, 10 Aug 2010 21:12:32 +0000
Subject: [PATCH 054/222] Prevent 500 error on login when there's a typo in
 OpenID URI scheme, such as http;// or http.//

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3933 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/functional/account_controller_test.rb                 | 7 +++++++
 .../open_id_authentication/lib/open_id_authentication.rb   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
index 2a8c9c66b..1d66d01d3 100644
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -67,6 +67,13 @@ class AccountControllerTest < ActionController::TestCase
     assert_redirected_to 'my/page'
   end
 
+  def test_login_with_invalid_openid_provider
+    Setting.self_registration = '0'
+    Setting.openid = '1'
+    post :login, :openid_url => 'http;//openid.example.com/good_user'
+    assert_redirected_to home_url
+  end
+  
   def test_login_with_openid_for_existing_non_active_user
     Setting.self_registration = '2'
     Setting.openid = '1'
diff --git a/vendor/plugins/open_id_authentication/lib/open_id_authentication.rb b/vendor/plugins/open_id_authentication/lib/open_id_authentication.rb
index 22481136e..70418fde7 100644
--- a/vendor/plugins/open_id_authentication/lib/open_id_authentication.rb
+++ b/vendor/plugins/open_id_authentication/lib/open_id_authentication.rb
@@ -89,7 +89,7 @@ module OpenIdAuthentication
 
       begin
         uri = URI.parse(identifier)
-        uri.scheme = uri.scheme.downcase  # URI should do this
+        uri.scheme = uri.scheme.downcase if uri.scheme # URI should do this
         identifier = uri.normalize.to_s
       rescue URI::InvalidURIError
         raise InvalidOpenId.new("#{identifier} is not an OpenID identifier")

From 0cfa757db0bed740e6641e245849a72a6f4632a8 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Barth 
Date: Tue, 10 Aug 2010 22:37:00 +0000
Subject: [PATCH 055/222] Added a warning when a new user or group membership
 is invalid. #3834

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3934 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/groups_controller.rb | 24 ++++++++++++++++--------
 app/controllers/users_controller.rb  | 24 ++++++++++++++++--------
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 4bd732fc1..29e4e4b07 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -141,14 +141,22 @@ class GroupsController < ApplicationController
     @membership = Member.edit_membership(params[:membership_id], params[:membership], @group)
     @membership.save if request.post?
     respond_to do |format|
-       format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' }
-       format.js { 
-         render(:update) {|page| 
-           page.replace_html "tab-content-memberships", :partial => 'groups/memberships'
-           page.visual_effect(:highlight, "member-#{@membership.id}")
-         }
-       }
-     end
+      if @membership.valid?
+        format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' }
+        format.js {
+          render(:update) {|page|
+            page.replace_html "tab-content-memberships", :partial => 'groups/memberships'
+            page.visual_effect(:highlight, "member-#{@membership.id}")
+          }
+        }
+      else
+        format.js {
+          render(:update) {|page|
+            page.alert(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')))
+          }
+        }
+      end
+    end
   end
   
   def destroy_membership
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f19cd7831..023352d8a 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -123,14 +123,22 @@ class UsersController < ApplicationController
     @membership = Member.edit_membership(params[:membership_id], params[:membership], @user)
     @membership.save if request.post?
     respond_to do |format|
-       format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' }
-       format.js { 
-         render(:update) {|page| 
-           page.replace_html "tab-content-memberships", :partial => 'users/memberships'
-           page.visual_effect(:highlight, "member-#{@membership.id}")
-         }
-       }
-     end
+      if @membership.valid?
+        format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' }
+        format.js {
+          render(:update) {|page|
+            page.replace_html "tab-content-memberships", :partial => 'users/memberships'
+            page.visual_effect(:highlight, "member-#{@membership.id}")
+          }
+        }
+      else
+        format.js {
+          render(:update) {|page|
+            page.alert(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')))
+          }
+        }
+      end
+    end
   end
   
   def destroy_membership

From e43f9fc21edc0a7b3451f64204c3399eab359529 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Barth 
Date: Tue, 10 Aug 2010 23:07:44 +0000
Subject: [PATCH 056/222] Show projects depending on their visibility in user's
 profile. #6100

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3935 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/users_controller.rb      |  6 ++----
 test/functional/users_controller_test.rb | 10 ++++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 023352d8a..0354d165d 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -53,10 +53,8 @@ class UsersController < ApplicationController
     @user = User.find(params[:id])
     @custom_values = @user.custom_values
     
-    # show only public projects and private projects that the logged in user is also a member of
-    @memberships = @user.memberships.select do |membership|
-      membership.project.is_public? || (User.current.member_of?(membership.project))
-    end
+    # show projects based on current user visibility
+    @memberships = @user.memberships.all(:conditions => Project.visible_by(User.current))
     
     events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 10)
     @events_by_day = events.group_by(&:event_date)
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index d178f8f85..640ce8685 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -96,6 +96,16 @@ class UsersControllerTest < ActionController::TestCase
     assert_response 200
     assert_not_nil assigns(:user)
   end
+  
+  def test_show_displays_memberships_based_on_project_visibility
+    @request.session[:user_id] = 1
+    get :show, :id => 2
+    assert_response :success
+    memberships = assigns(:memberships)
+    assert_not_nil memberships
+    project_ids = memberships.map(&:project_id)
+    assert project_ids.include?(2) #private project admin can see
+  end
 
   def test_edit
     ActionMailer::Base.deliveries.clear

From ff43bb1a74a7450dbcee2d8b0b152d2173a810e1 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Wed, 11 Aug 2010 14:42:10 +0000
Subject: [PATCH 057/222] Refactor: Extract a new IssueMovesController from
 IssuesController.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3936 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issue_moves_controller.rb     | 94 ++++++++++++++++++
 app/controllers/issues_controller.rb          | 58 -----------
 app/helpers/issue_moves_helper.rb             |  2 +
 .../move.rhtml => issue_moves/new.rhtml}      |  4 +-
 app/views/issues/_action_menu.rhtml           |  4 +-
 app/views/issues/context_menu.rhtml           |  4 +-
 config/routes.rb                              |  9 +-
 lib/redmine.rb                                |  2 +-
 .../functional/issue_moves_controller_test.rb | 99 +++++++++++++++++++
 test/functional/issues_controller_test.rb     | 97 +-----------------
 test/integration/routing_test.rb              |  4 +-
 test/unit/helpers/issue_moves_helper_test.rb  |  4 +
 12 files changed, 217 insertions(+), 164 deletions(-)
 create mode 100644 app/controllers/issue_moves_controller.rb
 create mode 100644 app/helpers/issue_moves_helper.rb
 rename app/views/{issues/move.rhtml => issue_moves/new.rhtml} (96%)
 create mode 100644 test/functional/issue_moves_controller_test.rb
 create mode 100644 test/unit/helpers/issue_moves_helper_test.rb

diff --git a/app/controllers/issue_moves_controller.rb b/app/controllers/issue_moves_controller.rb
new file mode 100644
index 000000000..1999930df
--- /dev/null
+++ b/app/controllers/issue_moves_controller.rb
@@ -0,0 +1,94 @@
+class IssueMovesController < ApplicationController
+  default_search_scope :issues
+  before_filter :find_issues
+  before_filter :authorize
+  
+  def new
+    prepare_for_issue_move
+    render :layout => false if request.xhr?
+  end
+
+  def create
+    prepare_for_issue_move
+
+    if request.post?
+      new_tracker = params[:new_tracker_id].blank? ? nil : @target_project.trackers.find_by_id(params[:new_tracker_id])
+      unsaved_issue_ids = []
+      moved_issues = []
+      @issues.each do |issue|
+        issue.reload
+        issue.init_journal(User.current)
+        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
+        else
+          unsaved_issue_ids << issue.id
+        end
+      end
+      set_flash_from_bulk_issue_save(@issues, unsaved_issue_ids)
+
+      if params[:follow]
+        if @issues.size == 1 && moved_issues.size == 1
+          redirect_to :controller => 'issues', :action => 'show', :id => moved_issues.first
+        else
+          redirect_to :controller => 'issues', :action => 'index', :project_id => (@target_project || @project)
+        end
+      else
+        redirect_to :controller => 'issues', :action => 'index', :project_id => @project
+      end
+      return
+    end
+  end
+
+  private
+
+  def prepare_for_issue_move
+    @issues.sort!
+    @copy = params[:copy_options] && params[:copy_options][:copy]
+    @allowed_projects = Issue.allowed_target_projects_on_move
+    @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
+    @target_project ||= @project    
+    @trackers = @target_project.trackers
+    @available_statuses = Workflow.available_statuses(@project)
+  end
+
+  # Filter for bulk operations
+  # TODO: duplicated in IssuesController
+  def find_issues
+    @issues = Issue.find_all_by_id(params[:id] || params[:ids])
+    raise ActiveRecord::RecordNotFound if @issues.empty?
+    projects = @issues.collect(&:project).compact.uniq
+    if projects.size == 1
+      @project = projects.first
+    else
+      # TODO: let users bulk edit/move/destroy issues from different projects
+      render_error 'Can not bulk edit/move/destroy issues from different projects'
+      return false
+    end
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+
+  # TODO: duplicated in IssuesController
+  def set_flash_from_bulk_issue_save(issues, unsaved_issue_ids)
+    if unsaved_issue_ids.empty?
+      flash[:notice] = l(:notice_successful_update) unless issues.empty?
+    else
+      flash[:error] = l(:notice_failed_to_save_issues,
+                        :count => unsaved_issue_ids.size,
+                        :total => issues.size,
+                        :ids => '#' + unsaved_issue_ids.join(', #'))
+    end
+  end
+
+  def extract_changed_attributes_for_move(params)
+    changed_attributes = {}
+    [: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
+    end
+    changed_attributes
+  end
+
+end
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 46c61ea0f..50a6f08e7 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -249,44 +249,6 @@ class IssuesController < ApplicationController
     @available_statuses = Workflow.available_statuses(@project)
     @custom_fields = @project.all_issue_custom_fields
   end
-
-  def move
-    prepare_for_issue_move
-    render :layout => false if request.xhr?
-  end
-
-  # TODO: more descriptive name? move to separate controller like IssueMovesController?
-  def perform_move
-    prepare_for_issue_move
-
-    if request.post?
-      new_tracker = params[:new_tracker_id].blank? ? nil : @target_project.trackers.find_by_id(params[:new_tracker_id])
-      unsaved_issue_ids = []
-      moved_issues = []
-      @issues.each do |issue|
-        issue.reload
-        issue.init_journal(User.current)
-        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
-        else
-          unsaved_issue_ids << issue.id
-        end
-      end
-      set_flash_from_bulk_issue_save(@issues, unsaved_issue_ids)
-
-      if params[:follow]
-        if @issues.size == 1 && moved_issues.size == 1
-          redirect_to :controller => 'issues', :action => 'show', :id => moved_issues.first
-        else
-          redirect_to :controller => 'issues', :action => 'index', :project_id => (@target_project || @project)
-        end
-      else
-        redirect_to :controller => 'issues', :action => 'index', :project_id => @project
-      end
-      return
-    end
-  end
   
   def destroy
     @hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f
@@ -462,16 +424,6 @@ private
     @allowed_statuses = @issue.new_statuses_allowed_to(User.current, true)
   end
 
-  def prepare_for_issue_move
-    @issues.sort!
-    @copy = params[:copy_options] && params[:copy_options][:copy]
-    @allowed_projects = Issue.allowed_target_projects_on_move
-    @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
-    @target_project ||= @project    
-    @trackers = @target_project.trackers
-    @available_statuses = Workflow.available_statuses(@project)
-  end
-
   def set_flash_from_bulk_issue_save(issues, unsaved_issue_ids)
     if unsaved_issue_ids.empty?
       flash[:notice] = l(:notice_successful_update) unless issues.empty?
@@ -489,14 +441,4 @@ private
       return false
     end
   end
-
-  def extract_changed_attributes_for_move(params)
-    changed_attributes = {}
-    [: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
-    end
-    changed_attributes
-  end
 end
diff --git a/app/helpers/issue_moves_helper.rb b/app/helpers/issue_moves_helper.rb
new file mode 100644
index 000000000..b58b4ce5a
--- /dev/null
+++ b/app/helpers/issue_moves_helper.rb
@@ -0,0 +1,2 @@
+module IssueMovesHelper
+end
diff --git a/app/views/issues/move.rhtml b/app/views/issue_moves/new.rhtml
similarity index 96%
rename from app/views/issues/move.rhtml
rename to app/views/issue_moves/new.rhtml
index c216cba7c..2dc971df2 100644
--- a/app/views/issues/move.rhtml
+++ b/app/views/issue_moves/new.rhtml
@@ -6,14 +6,14 @@
 <% end -%>
 
 
-<% form_tag({:action => 'perform_move'}, :id => 'move_form') do %>
+<% form_tag({:action => 'create'}, :id => 'move_form') do %>
 <%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join %>
 
 
    
 
    
 <%= select_tag "new_project_id",
                project_tree_options_for_select(@allowed_projects, :selected => @target_project),
-               :onchange => remote_function(:url => { :action => 'move' },
+               :onchange => remote_function(:url => { :action => 'new' },
                                             :method => :get,
                                             :update => 'content',
                                             :with => "Form.serialize('move_form')") %>
    
diff --git a/app/views/issues/_action_menu.rhtml b/app/views/issues/_action_menu.rhtml
index 693b49237..c5d17511a 100644
--- 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 => 'issues', :action => 'move', :id => @issue, :copy_options => {:copy => 't'} }, :class => 'icon icon-copy' %>
-<%= link_to_if_authorized l(:button_move), {:controller => 'issues', :action => 'move', :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 => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
 
    
diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml
index d9e92a4f8..dc11b5fdb 100644
--- a/app/views/issues/context_menu.rhtml
+++ b/app/views/issues/context_menu.rhtml
@@ -102,9 +102,9 @@
   
  • <%= context_menu_link l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue},
 	        :class => 'icon-duplicate', :disabled => !@can[:copy] %>
    • 
 <% end %>
-  
  • <%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'move', :ids => @issues.collect(&:id), :copy_options => {:copy => 't'}},
+  
  • <%= context_menu_link l(:button_copy), new_issue_move_path(:ids => @issues.collect(&:id), :copy_options => {:copy => 't'}),
 	                        :class => 'icon-copy', :disabled => !@can[:move]  %>
    • 
-  
  • <%= context_menu_link l(:button_move), {:controller => 'issues', :action => 'move', :ids => @issues.collect(&:id)},
+  
  • <%= context_menu_link l(:button_move), new_issue_move_path(:ids => @issues.collect(&:id)),
 	                        :class => 'icon-move', :disabled => !@can[:move]  %>
    • 
   
  • <%= context_menu_link l(:button_delete), {:controller => 'issues', :action => 'destroy', :ids => @issues.collect(&:id)},
                             :method => :post, :confirm => l(:text_issues_destroy_confirmation), :class => 'icon-del', :disabled => !@can[:delete] %>
    • 
diff --git a/config/routes.rb b/config/routes.rb
index 2e8a145cb..6f71cb658 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -102,7 +102,9 @@ ActionController::Routing::Routes.draw do |map|
       document_actions.connect 'documents/:id/:action', :action => /destroy|edit/
     end
   end
-  
+
+  map.resources :issue_moves, :only => [:new, :create], :path_prefix => '/issues', :as => 'move'
+
   map.with_options :controller => 'issues' do |issues_routes|
     issues_routes.with_options :conditions => {:method => :get} do |issues_views|
       issues_views.connect 'issues', :action => 'index'
@@ -116,7 +118,6 @@ ActionController::Routing::Routes.draw do |map|
       issues_views.connect 'issues/:id', :action => 'show', :id => /\d+/
       issues_views.connect 'issues/:id.:format', :action => 'show', :id => /\d+/
       issues_views.connect 'issues/:id/edit', :action => 'edit', :id => /\d+/
-      issues_views.connect 'issues/:id/move', :action => 'move', :id => /\d+/
     end
     issues_routes.with_options :conditions => {:method => :post} do |issues_actions|
       issues_actions.connect 'issues', :action => 'index'
@@ -124,7 +125,7 @@ ActionController::Routing::Routes.draw do |map|
       issues_actions.connect 'projects/:project_id/issues/gantt', :controller => 'gantts', :action => 'show'
       issues_actions.connect 'projects/:project_id/issues/calendar', :controller => 'calendars', :action => 'show'
       issues_actions.connect 'issues/:id/quoted', :action => 'reply', :id => /\d+/
-      issues_actions.connect 'issues/:id/:action', :action => /edit|perform_move|destroy/, :id => /\d+/
+      issues_actions.connect 'issues/:id/:action', :action => /edit|destroy/, :id => /\d+/
       issues_actions.connect 'issues.:format', :action => 'create', :format => /xml/
     end
     issues_routes.with_options :conditions => {:method => :put} do |issues_actions|
@@ -138,7 +139,7 @@ ActionController::Routing::Routes.draw do |map|
     issues_routes.connect 'issues/calendar', :controller => 'calendars', :action => 'show'
     issues_routes.connect 'issues/:action'
   end
-  
+
   map.with_options  :controller => 'issue_relations', :conditions => {:method => :post} do |relations|
     relations.connect 'issues/:issue_id/relations/:id', :action => 'new'
     relations.connect 'issues/:issue_id/relations/:id/destroy', :action => 'destroy'
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 4196a5d7a..1d8dbea18 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -69,7 +69,7 @@ Redmine::AccessControl.map do |map|
     map.permission :add_issue_notes, {:issues => [:edit, :update, :reply]}
     map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
     map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin
-    map.permission :move_issues, {:issues => [:move, :perform_move]}, :require => :loggedin
+    map.permission :move_issues, {:issue_moves => [:new, :create]}, :require => :loggedin
     map.permission :delete_issues, {:issues => :destroy}, :require => :member
     # Queries
     map.permission :manage_public_queries, {:queries => [:new, :edit, :destroy]}, :require => :member
diff --git a/test/functional/issue_moves_controller_test.rb b/test/functional/issue_moves_controller_test.rb
new file mode 100644
index 000000000..083959c74
--- /dev/null
+++ b/test/functional/issue_moves_controller_test.rb
@@ -0,0 +1,99 @@
+require 'test_helper'
+
+class IssueMovesControllerTest < ActionController::TestCase
+  fixtures :all
+
+  def setup
+    User.current = nil
+  end
+
+  def test_create_one_issue_to_another_project
+    @request.session[:user_id] = 2
+    post :create, :id => 1, :new_project_id => 2, :tracker_id => '', :assigned_to_id => '', :status_id => '', :start_date => '', :due_date => ''
+    assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook'
+    assert_equal 2, Issue.find(1).project_id
+  end
+
+  def test_create_one_issue_to_another_project_should_follow_when_needed
+    @request.session[:user_id] = 2
+    post :create, :id => 1, :new_project_id => 2, :follow => '1'
+    assert_redirected_to '/issues/1'
+  end
+
+  def test_bulk_create_to_another_project
+    @request.session[:user_id] = 2
+    post :create, :ids => [1, 2], :new_project_id => 2
+    assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook'
+    # Issues moved to project 2
+    assert_equal 2, Issue.find(1).project_id
+    assert_equal 2, Issue.find(2).project_id
+    # No tracker change
+    assert_equal 1, Issue.find(1).tracker_id
+    assert_equal 2, Issue.find(2).tracker_id
+  end
+ 
+  def test_bulk_create_to_another_tracker
+    @request.session[:user_id] = 2
+    post :create, :ids => [1, 2], :new_tracker_id => 2
+    assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook'
+    assert_equal 2, Issue.find(1).tracker_id
+    assert_equal 2, Issue.find(2).tracker_id
+  end
+
+  def test_bulk_copy_to_another_project
+    @request.session[:user_id] = 2
+    assert_difference 'Issue.count', 2 do
+      assert_no_difference 'Project.find(1).issues.count' do
+        post :create, :ids => [1, 2], :new_project_id => 2, :copy_options => {:copy => '1'}
+      end
+    end
+    assert_redirected_to 'projects/ecookbook/issues'
+  end
+
+  context "#create via bulk copy" do
+    should "allow not changing the issue's attributes" do
+      @request.session[:user_id] = 2
+      issue_before_move = Issue.find(1)
+      assert_difference 'Issue.count', 1 do
+        assert_no_difference 'Project.find(1).issues.count' do
+          post :create, :ids => [1], :new_project_id => 2, :copy_options => {:copy => '1'}, :new_tracker_id => '', :assigned_to_id => '', :status_id => '', :start_date => '', :due_date => ''
+        end
+      end
+      issue_after_move = Issue.first(:order => 'id desc', :conditions => {:project_id => 2})
+      assert_equal issue_before_move.tracker_id, issue_after_move.tracker_id
+      assert_equal issue_before_move.status_id, issue_after_move.status_id
+      assert_equal issue_before_move.assigned_to_id, issue_after_move.assigned_to_id
+    end
+    
+    should "allow changing the issue's attributes" do
+      # Fixes random test failure with Mysql
+      # where Issue.all(:limit => 2, :order => 'id desc', :conditions => {:project_id => 2}) doesn't return the expected results
+      Issue.delete_all("project_id=2")
+      
+      @request.session[:user_id] = 2
+      assert_difference 'Issue.count', 2 do
+        assert_no_difference 'Project.find(1).issues.count' do
+          post :create, :ids => [1, 2], :new_project_id => 2, :copy_options => {:copy => '1'}, :new_tracker_id => '', :assigned_to_id => 4, :status_id => 3, :start_date => '2009-12-01', :due_date => '2009-12-31'
+        end
+      end
+
+      copied_issues = Issue.all(:limit => 2, :order => 'id desc', :conditions => {:project_id => 2})
+      assert_equal 2, copied_issues.size
+      copied_issues.each do |issue|
+        assert_equal 2, issue.project_id, "Project is incorrect"
+        assert_equal 4, issue.assigned_to_id, "Assigned to is incorrect"
+        assert_equal 3, issue.status_id, "Status is incorrect"
+        assert_equal '2009-12-01', issue.start_date.to_s, "Start date is incorrect"
+        assert_equal '2009-12-31', issue.due_date.to_s, "Due date is incorrect"
+      end
+    end
+  end
+  
+  def test_copy_to_another_project_should_follow_when_needed
+    @request.session[:user_id] = 2
+    post :create, :ids => [1], :new_project_id => 2, :copy_options => {:copy => '1'}, :follow => '1'
+    issue = Issue.first(:order => 'id DESC')
+    assert_redirected_to :controller => 'issues', :action => 'show', :id => issue
+  end
+
+end
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 92e6fd30a..6b23a6511 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -1037,95 +1037,6 @@ class IssuesControllerTest < ActionController::TestCase
     assert_response :redirect
     assert_redirected_to :controller => 'issues', :action => 'index', :project_id => Project.find(1).identifier
   end
-
-  def test_perform_move_one_issue_to_another_project
-    @request.session[:user_id] = 2
-    post :perform_move, :id => 1, :new_project_id => 2, :tracker_id => '', :assigned_to_id => '', :status_id => '', :start_date => '', :due_date => ''
-    assert_redirected_to :action => 'index', :project_id => 'ecookbook'
-    assert_equal 2, Issue.find(1).project_id
-  end
-
-  def test_perform_move_one_issue_to_another_project_should_follow_when_needed
-    @request.session[:user_id] = 2
-    post :perform_move, :id => 1, :new_project_id => 2, :follow => '1'
-    assert_redirected_to '/issues/1'
-  end
-
-  def test_bulk_perform_move_to_another_project
-    @request.session[:user_id] = 2
-    post :perform_move, :ids => [1, 2], :new_project_id => 2
-    assert_redirected_to :action => 'index', :project_id => 'ecookbook'
-    # Issues moved to project 2
-    assert_equal 2, Issue.find(1).project_id
-    assert_equal 2, Issue.find(2).project_id
-    # No tracker change
-    assert_equal 1, Issue.find(1).tracker_id
-    assert_equal 2, Issue.find(2).tracker_id
-  end
- 
-  def test_bulk_perform_move_to_another_tracker
-    @request.session[:user_id] = 2
-    post :perform_move, :ids => [1, 2], :new_tracker_id => 2
-    assert_redirected_to :action => 'index', :project_id => 'ecookbook'
-    assert_equal 2, Issue.find(1).tracker_id
-    assert_equal 2, Issue.find(2).tracker_id
-  end
-
-  def test_bulk_copy_to_another_project
-    @request.session[:user_id] = 2
-    assert_difference 'Issue.count', 2 do
-      assert_no_difference 'Project.find(1).issues.count' do
-        post :perform_move, :ids => [1, 2], :new_project_id => 2, :copy_options => {:copy => '1'}
-      end
-    end
-    assert_redirected_to 'projects/ecookbook/issues'
-  end
-
-  context "#perform_move via bulk copy" do
-    should "allow not changing the issue's attributes" do
-      @request.session[:user_id] = 2
-      issue_before_move = Issue.find(1)
-      assert_difference 'Issue.count', 1 do
-        assert_no_difference 'Project.find(1).issues.count' do
-          post :perform_move, :ids => [1], :new_project_id => 2, :copy_options => {:copy => '1'}, :new_tracker_id => '', :assigned_to_id => '', :status_id => '', :start_date => '', :due_date => ''
-        end
-      end
-      issue_after_move = Issue.first(:order => 'id desc', :conditions => {:project_id => 2})
-      assert_equal issue_before_move.tracker_id, issue_after_move.tracker_id
-      assert_equal issue_before_move.status_id, issue_after_move.status_id
-      assert_equal issue_before_move.assigned_to_id, issue_after_move.assigned_to_id
-    end
-    
-    should "allow changing the issue's attributes" do
-      # Fixes random test failure with Mysql
-      # where Issue.all(:limit => 2, :order => 'id desc', :conditions => {:project_id => 2}) doesn't return the expected results
-      Issue.delete_all("project_id=2")
-      
-      @request.session[:user_id] = 2
-      assert_difference 'Issue.count', 2 do
-        assert_no_difference 'Project.find(1).issues.count' do
-          post :perform_move, :ids => [1, 2], :new_project_id => 2, :copy_options => {:copy => '1'}, :new_tracker_id => '', :assigned_to_id => 4, :status_id => 3, :start_date => '2009-12-01', :due_date => '2009-12-31'
-        end
-      end
-
-      copied_issues = Issue.all(:limit => 2, :order => 'id desc', :conditions => {:project_id => 2})
-      assert_equal 2, copied_issues.size
-      copied_issues.each do |issue|
-        assert_equal 2, issue.project_id, "Project is incorrect"
-        assert_equal 4, issue.assigned_to_id, "Assigned to is incorrect"
-        assert_equal 3, issue.status_id, "Status is incorrect"
-        assert_equal '2009-12-01', issue.start_date.to_s, "Start date is incorrect"
-        assert_equal '2009-12-31', issue.due_date.to_s, "Due date is incorrect"
-      end
-    end
-  end
-  
-  def test_copy_to_another_project_should_follow_when_needed
-    @request.session[:user_id] = 2
-    post :perform_move, :ids => [1], :new_project_id => 2, :copy_options => {:copy => '1'}, :follow => '1'
-    issue = Issue.first(:order => 'id DESC')
-    assert_redirected_to :controller => 'issues', :action => 'show', :id => issue
-  end
   
   def test_context_menu_one_issue
     @request.session[:user_id] = 2
@@ -1156,10 +1067,10 @@ class IssuesControllerTest < ActionController::TestCase
                             :attributes => { :href => '/projects/ecookbook/issues/1/copy',
                                              :class => 'icon-duplicate' }
     assert_tag :tag => 'a', :content => 'Copy',
-                            :attributes => { :href => '/issues/move?copy_options%5Bcopy%5D=t&ids%5B%5D=1',
+                            :attributes => { :href => '/issues/move/new?copy_options%5Bcopy%5D=t&ids%5B%5D=1',
                                              :class => 'icon-copy' }
     assert_tag :tag => 'a', :content => 'Move',
-                            :attributes => { :href => '/issues/move?ids%5B%5D=1',
+                            :attributes => { :href => '/issues/move/new?ids%5B%5D=1',
                                              :class => 'icon-move' }
     assert_tag :tag => 'a', :content => 'Delete',
                             :attributes => { :href => '/issues/destroy?ids%5B%5D=1',
@@ -1190,10 +1101,10 @@ class IssuesControllerTest < ActionController::TestCase
                             :attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&ids%5B%5D=2&issue%5Bassigned_to_id%5D=3',
                                              :class => '' }
     assert_tag :tag => 'a', :content => 'Copy',
-                            :attributes => { :href => '/issues/move?copy_options%5Bcopy%5D=t&ids%5B%5D=1&ids%5B%5D=2',
+                            :attributes => { :href => '/issues/move/new?copy_options%5Bcopy%5D=t&ids%5B%5D=1&ids%5B%5D=2',
                                              :class => 'icon-copy' }
     assert_tag :tag => 'a', :content => 'Move',
-                            :attributes => { :href => '/issues/move?ids%5B%5D=1&ids%5B%5D=2',
+                            :attributes => { :href => '/issues/move/new?ids%5B%5D=1&ids%5B%5D=2',
                                              :class => 'icon-move' }
     assert_tag :tag => 'a', :content => 'Delete',
                             :attributes => { :href => '/issues/destroy?ids%5B%5D=1&ids%5B%5D=2',
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index 51f8e71f6..af66f7417 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -85,8 +85,8 @@ class RoutingTest < ActionController::IntegrationTest
     # Extra actions
     should_route :get, "/projects/23/issues/64/copy", :controller => 'issues', :action => 'new', :project_id => '23', :copy_from => '64'
 
-    should_route :get, "/issues/1/move", :controller => 'issues', :action => 'move', :id => '1'
-    should_route :post, "/issues/1/perform_move", :controller => 'issues', :action => 'perform_move', :id => '1'
+    should_route :get, "/issues/move/new", :controller => 'issue_moves', :action => 'new'
+    should_route :post, "/issues/move", :controller => 'issue_moves', :action => 'create'
     
     should_route :post, "/issues/1/quoted", :controller => 'issues', :action => 'reply', :id => '1'
 
diff --git a/test/unit/helpers/issue_moves_helper_test.rb b/test/unit/helpers/issue_moves_helper_test.rb
new file mode 100644
index 000000000..b2ffb6042
--- /dev/null
+++ b/test/unit/helpers/issue_moves_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class IssueMovesHelperTest < ActionView::TestCase
+end

From a6112ef40d234ae51bf35cef0cc939794f38ede8 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 12 Aug 2010 13:57:46 +0000
Subject: [PATCH 058/222] Fix path to test_helper

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3937 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/functional/issue_moves_controller_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/issue_moves_controller_test.rb b/test/functional/issue_moves_controller_test.rb
index 083959c74..7c4005767 100644
--- a/test/functional/issue_moves_controller_test.rb
+++ b/test/functional/issue_moves_controller_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 
 class IssueMovesControllerTest < ActionController::TestCase
   fixtures :all

From f18b126fba301d32474357f05aeab6c39958153c Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 12 Aug 2010 13:57:51 +0000
Subject: [PATCH 059/222] Refactor: Pull up method to ApplicationController.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3938 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/application_controller.rb | 18 +++++++++++++++++-
 app/controllers/issue_moves_controller.rb | 17 -----------------
 app/controllers/issues_controller.rb      | 16 ----------------
 3 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c00b6ba42..3e482cf4b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -201,7 +201,23 @@ class ApplicationController < ActionController::Base
   def self.model_object(model)
     write_inheritable_attribute('model_object', model)
   end
-    
+
+  # Filter for bulk issue operations
+  def find_issues
+    @issues = Issue.find_all_by_id(params[:id] || params[:ids])
+    raise ActiveRecord::RecordNotFound if @issues.empty?
+    projects = @issues.collect(&:project).compact.uniq
+    if projects.size == 1
+      @project = projects.first
+    else
+      # TODO: let users bulk edit/move/destroy issues from different projects
+      render_error 'Can not bulk edit/move/destroy issues from different projects'
+      return false
+    end
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+  
   # make sure that the user is a member of the project (or admin) if project is private
   # used as a before_filter for actions that do not require any particular permission on the project
   def check_project_privacy
diff --git a/app/controllers/issue_moves_controller.rb b/app/controllers/issue_moves_controller.rb
index 1999930df..37068fad5 100644
--- a/app/controllers/issue_moves_controller.rb
+++ b/app/controllers/issue_moves_controller.rb
@@ -52,23 +52,6 @@ class IssueMovesController < ApplicationController
     @available_statuses = Workflow.available_statuses(@project)
   end
 
-  # Filter for bulk operations
-  # TODO: duplicated in IssuesController
-  def find_issues
-    @issues = Issue.find_all_by_id(params[:id] || params[:ids])
-    raise ActiveRecord::RecordNotFound if @issues.empty?
-    projects = @issues.collect(&:project).compact.uniq
-    if projects.size == 1
-      @project = projects.first
-    else
-      # TODO: let users bulk edit/move/destroy issues from different projects
-      render_error 'Can not bulk edit/move/destroy issues from different projects'
-      return false
-    end
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-
   # TODO: duplicated in IssuesController
   def set_flash_from_bulk_issue_save(issues, unsaved_issue_ids)
     if unsaved_issue_ids.empty?
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 50a6f08e7..e05d19390 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -359,22 +359,6 @@ private
     render_404
   end
   
-  # Filter for bulk operations
-  def find_issues
-    @issues = Issue.find_all_by_id(params[:id] || params[:ids])
-    raise ActiveRecord::RecordNotFound if @issues.empty?
-    projects = @issues.collect(&:project).compact.uniq
-    if projects.size == 1
-      @project = projects.first
-    else
-      # TODO: let users bulk edit/move/destroy issues from different projects
-      render_error 'Can not bulk edit/move/destroy issues from different projects'
-      return false
-    end
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-  
   def find_project
     project_id = (params[:issue] && params[:issue][:project_id]) || params[:project_id]
     @project = Project.find(project_id)

From 32f6fa5b00982314a16fb013a9f474dc2ae2196c Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Barth 
Date: Fri, 13 Aug 2010 06:09:38 +0000
Subject: [PATCH 060/222] Fixed: changing view style in repository/diff doesn't
 keep previously selected file. #6045

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3939 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/repositories/diff.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/repositories/diff.rhtml b/app/views/repositories/diff.rhtml
index 73e13abf4..36e86403f 100644
--- a/app/views/repositories/diff.rhtml
+++ b/app/views/repositories/diff.rhtml
@@ -1,7 +1,7 @@
 
    <%= l(:label_revision) %> <%= format_revision(@rev_to) + ':' if @rev_to %><%= format_revision(@rev) %> <%=h @path %>
    
 
 
-<% form_tag({}, :method => 'get') do %>
+<% form_tag({:path => @path}, :method => 'get') do %>
   <%= hidden_field_tag('rev', params[:rev]) if params[:rev] %>
   <%= hidden_field_tag('rev_to', params[:rev_to]) if params[:rev_to] %>
   
    

From 13fe01a185c514591f093c30670cb3ae77070721 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Fri, 13 Aug 2010 14:59:04 +0000
Subject: [PATCH 061/222] Refactor: pull up method to ApplicationController.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3940 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/application_controller.rb | 15 +++++++++++++++
 app/controllers/issue_moves_controller.rb | 12 ------------
 app/controllers/issues_controller.rb      | 11 -----------
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3e482cf4b..e5909e69b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -365,6 +365,21 @@ class ApplicationController < ActionController::Base
     flash[:warning] = l(:warning_attachments_not_saved, obj.unsaved_attachments.size) if obj.unsaved_attachments.present?
   end
 
+  # Sets the `flash` notice or error based the number of issues that did not save
+  #
+  # @param [Array, Issue] issues all of the saved and unsaved Issues
+  # @param [Array, Integer] unsaved_issue_ids the issue ids that were not saved
+  def set_flash_from_bulk_issue_save(issues, unsaved_issue_ids)
+    if unsaved_issue_ids.empty?
+      flash[:notice] = l(:notice_successful_update) unless issues.empty?
+    else
+      flash[:error] = l(:notice_failed_to_save_issues,
+                        :count => unsaved_issue_ids.size,
+                        :total => issues.size,
+                        :ids => '#' + unsaved_issue_ids.join(', #'))
+    end
+  end
+
   # Rescues an invalid query statement. Just in case...
   def query_statement_invalid(exception)
     logger.error "Query::StatementInvalid: #{exception.message}" if logger
diff --git a/app/controllers/issue_moves_controller.rb b/app/controllers/issue_moves_controller.rb
index 37068fad5..6ac46a1ee 100644
--- a/app/controllers/issue_moves_controller.rb
+++ b/app/controllers/issue_moves_controller.rb
@@ -52,18 +52,6 @@ class IssueMovesController < ApplicationController
     @available_statuses = Workflow.available_statuses(@project)
   end
 
-  # TODO: duplicated in IssuesController
-  def set_flash_from_bulk_issue_save(issues, unsaved_issue_ids)
-    if unsaved_issue_ids.empty?
-      flash[:notice] = l(:notice_successful_update) unless issues.empty?
-    else
-      flash[:error] = l(:notice_failed_to_save_issues,
-                        :count => unsaved_issue_ids.size,
-                        :total => issues.size,
-                        :ids => '#' + unsaved_issue_ids.join(', #'))
-    end
-  end
-
   def extract_changed_attributes_for_move(params)
     changed_attributes = {}
     [:assigned_to_id, :status_id, :start_date, :due_date].each do |valid_attribute|
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index e05d19390..7518e3751 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -408,17 +408,6 @@ private
     @allowed_statuses = @issue.new_statuses_allowed_to(User.current, true)
   end
 
-  def set_flash_from_bulk_issue_save(issues, unsaved_issue_ids)
-    if unsaved_issue_ids.empty?
-      flash[:notice] = l(:notice_successful_update) unless issues.empty?
-    else
-      flash[:error] = l(:notice_failed_to_save_issues,
-                        :count => unsaved_issue_ids.size,
-                        :total => issues.size,
-                        :ids => '#' + unsaved_issue_ids.join(', #'))
-    end
-  end
-
   def check_for_default_issue_status
     if IssueStatus.default.nil?
       render_error l(:error_no_default_issue_status)

From 22c978ad9433f7cbac63273fb34d3be7c7a1c78e Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Mon, 16 Aug 2010 16:25:04 +0000
Subject: [PATCH 062/222] Refactor: move IssuesController#reply to
 JournalsController

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3941 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb        | 25 +--------------
 app/controllers/journals_controller.rb      | 34 ++++++++++++++++++++-
 app/helpers/journals_helper.rb              |  2 +-
 config/routes.rb                            |  2 +-
 lib/redmine.rb                              |  4 +--
 test/functional/issues_controller_test.rb   | 14 ---------
 test/functional/journals_controller_test.rb | 14 +++++++++
 test/integration/routing_test.rb            |  2 +-
 8 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 7518e3751..eaa6dbc35 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -19,7 +19,7 @@ class IssuesController < ApplicationController
   menu_item :new_issue, :only => [:new, :create]
   default_search_scope :issues
   
-  before_filter :find_issue, :only => [:show, :edit, :update, :reply]
+  before_filter :find_issue, :only => [:show, :edit, :update]
   before_filter :find_issues, :only => [:bulk_edit, :move, :perform_move, :destroy]
   before_filter :find_project, :only => [:new, :create, :update_form, :preview, :auto_complete]
   before_filter :authorize, :except => [:index, :changes, :preview, :context_menu]
@@ -200,29 +200,6 @@ class IssuesController < ApplicationController
     end
   end
 
-  def reply
-    journal = Journal.find(params[:journal_id]) if params[:journal_id]
-    if journal
-      user = journal.user
-      text = journal.notes
-    else
-      user = @issue.author
-      text = @issue.description
-    end
-    # Replaces pre blocks with [...]
-    text = text.to_s.strip.gsub(%r{
    ((.|\s)*?)
    }m, '[...]')
-    content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> "
-    content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
-      
-    render(:update) { |page|
-      page.<< "$('notes').value = \"#{escape_javascript content}\";"
-      page.show 'update'
-      page << "Form.Element.focus('notes');"
-      page << "Element.scrollTo('update');"
-      page << "$('notes').scrollTop = $('notes').scrollHeight - $('notes').clientHeight;"
-    }
-  end
-  
   # Bulk edit a set of issues
   def bulk_edit
     @issues.sort!
diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index e9fe9099d..10450970c 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -16,7 +16,31 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class JournalsController < ApplicationController
-  before_filter :find_journal
+  before_filter :find_journal, :only => [:edit]
+  before_filter :find_issue, :only => [:new]
+  
+  def new
+    journal = Journal.find(params[:journal_id]) if params[:journal_id]
+    if journal
+      user = journal.user
+      text = journal.notes
+    else
+      user = @issue.author
+      text = @issue.description
+    end
+    # Replaces pre blocks with [...]
+    text = text.to_s.strip.gsub(%r{
    ((.|\s)*?)
    }m, '[...]')
+    content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> "
+    content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
+      
+    render(:update) { |page|
+      page.<< "$('notes').value = \"#{escape_javascript content}\";"
+      page.show 'update'
+      page << "Form.Element.focus('notes');"
+      page << "Element.scrollTo('update');"
+      page << "$('notes').scrollTop = $('notes').scrollHeight - $('notes').clientHeight;"
+    }
+  end
   
   def edit
     if request.post?
@@ -38,4 +62,12 @@ private
   rescue ActiveRecord::RecordNotFound
     render_404
   end
+
+  # TODO: duplicated in IssuesController
+  def find_issue
+    @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
+    @project = @issue.project
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
 end
diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index cf8772430..c8d53f253 100644
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -22,7 +22,7 @@ module JournalsHelper
     links = []
     if !journal.notes.blank?
       links << link_to_remote(image_tag('comment.png'),
-                              { :url => {:controller => 'issues', :action => 'reply', :id => issue, :journal_id => journal} },
+                              { :url => {:controller => 'journals', :action => 'new', :id => issue, :journal_id => journal} },
                               :title => l(:button_quote)) if options[:reply_links]
       links << link_to_in_place_notes_editor(image_tag('edit.png'), "journal-#{journal.id}-notes", 
                                              { :controller => 'journals', :action => 'edit', :id => journal },
diff --git a/config/routes.rb b/config/routes.rb
index 6f71cb658..08cd10055 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -124,7 +124,7 @@ ActionController::Routing::Routes.draw do |map|
       issues_actions.connect 'projects/:project_id/issues', :action => 'create'
       issues_actions.connect 'projects/:project_id/issues/gantt', :controller => 'gantts', :action => 'show'
       issues_actions.connect 'projects/:project_id/issues/calendar', :controller => 'calendars', :action => 'show'
-      issues_actions.connect 'issues/:id/quoted', :action => 'reply', :id => /\d+/
+      issues_actions.connect 'issues/:id/quoted', :controller => 'journals', :action => 'new', :id => /\d+/
       issues_actions.connect 'issues/:id/:action', :action => /edit|destroy/, :id => /\d+/
       issues_actions.connect 'issues.:format', :action => 'create', :format => /xml/
     end
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 1d8dbea18..e92f67b73 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -63,10 +63,10 @@ Redmine::AccessControl.map do |map|
                                   :queries => :index,
                                   :reports => [:issue_report, :issue_report_details]}
     map.permission :add_issues, {:issues => [:new, :create, :update_form]}
-    map.permission :edit_issues, {:issues => [:edit, :update, :reply, :bulk_edit, :update_form]}
+    map.permission :edit_issues, {:issues => [:edit, :update, :bulk_edit, :update_form], :journals => [:new]}
     map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
     map.permission :manage_subtasks, {}
-    map.permission :add_issue_notes, {:issues => [:edit, :update, :reply]}
+    map.permission :add_issue_notes, {:issues => [:edit, :update], :journals => [:new]}
     map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
     map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin
     map.permission :move_issues, {:issue_moves => [:new, :create]}, :require => :loggedin
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 6b23a6511..0c1172f60 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -634,20 +634,6 @@ class IssuesControllerTest < ActionController::TestCase
     assert_equal 'This is the test_new issue', issue.subject
   end
   
-  def test_reply_to_issue
-    @request.session[:user_id] = 2
-    get :reply, :id => 1
-    assert_response :success
-    assert_select_rjs :show, "update"
-  end
-
-  def test_reply_to_note
-    @request.session[:user_id] = 2
-    get :reply, :id => 1, :journal_id => 2
-    assert_response :success
-    assert_select_rjs :show, "update"
-  end
-
   def test_update_using_invalid_http_verbs
     @request.session[:user_id] = 2
     subject = 'Updated by an invalid http verb'
diff --git a/test/functional/journals_controller_test.rb b/test/functional/journals_controller_test.rb
index 0a11bab3e..7d8345b28 100644
--- a/test/functional/journals_controller_test.rb
+++ b/test/functional/journals_controller_test.rb
@@ -31,6 +31,20 @@ class JournalsControllerTest < ActionController::TestCase
     User.current = nil
   end
   
+  def test_reply_to_issue
+    @request.session[:user_id] = 2
+    get :new, :id => 1
+    assert_response :success
+    assert_select_rjs :show, "update"
+  end
+
+  def test_reply_to_note
+    @request.session[:user_id] = 2
+    get :new, :id => 1, :journal_id => 2
+    assert_response :success
+    assert_select_rjs :show, "update"
+  end
+
   def test_get_edit
     @request.session[:user_id] = 1
     xhr :get, :edit, :id => 2
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index af66f7417..b9eac552e 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -88,7 +88,7 @@ class RoutingTest < ActionController::IntegrationTest
     should_route :get, "/issues/move/new", :controller => 'issue_moves', :action => 'new'
     should_route :post, "/issues/move", :controller => 'issue_moves', :action => 'create'
     
-    should_route :post, "/issues/1/quoted", :controller => 'issues', :action => 'reply', :id => '1'
+    should_route :post, "/issues/1/quoted", :controller => 'journals', :action => 'new', :id => '1'
 
     should_route :get, "/issues/calendar", :controller => 'calendars', :action => 'show'
     should_route :post, "/issues/calendar", :controller => 'calendars', :action => 'show'

From d2b0a5184856866a3454142dcb372b5fb64969b3 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Mon, 16 Aug 2010 23:39:27 +0000
Subject: [PATCH 063/222] Allow key authentication for Boards. #6132

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3942 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/boards_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 541fefada..fa82218de 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -18,6 +18,7 @@
 class BoardsController < ApplicationController
   default_search_scope :messages
   before_filter :find_project, :find_board_if_available, :authorize
+  accept_key_auth :index, :show
 
   helper :messages
   include MessagesHelper

From a24f448dc0c761ade909946ee4a15d231dbf6061 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Mon, 16 Aug 2010 23:56:37 +0000
Subject: [PATCH 064/222] Add the Gantt chart as a project menu item

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3943 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/gantts_controller.rb | 1 +
 lib/redmine.rb                       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/controllers/gantts_controller.rb b/app/controllers/gantts_controller.rb
index e762c19c8..cdfef5238 100644
--- a/app/controllers/gantts_controller.rb
+++ b/app/controllers/gantts_controller.rb
@@ -1,4 +1,5 @@
 class GanttsController < ApplicationController
+  menu_item :gantt
   before_filter :find_optional_project
 
   rescue_from Query::StatementInvalid, :with => :query_statement_invalid
diff --git a/lib/redmine.rb b/lib/redmine.rb
index e92f67b73..d390cda26 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -183,6 +183,7 @@ Redmine::MenuManager.map :project_menu do |menu|
   menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
   menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new,
               :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }
+  menu.push :gantt, { :controller => 'gantts', :action => 'show' }, :param => :project_id, :caption => :label_gantt
   menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
   menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
   menu.push :wiki, { :controller => 'wiki', :action => 'index', :page => nil }, 

From e63acb70ca82d0c62476c92bbe815330ee01ad93 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Mon, 16 Aug 2010 23:56:42 +0000
Subject: [PATCH 065/222] Add the Calendar as a project menu item.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3944 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/calendars_controller.rb | 1 +
 lib/redmine.rb                          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index f2af58086..1115691a1 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -1,4 +1,5 @@
 class CalendarsController < ApplicationController
+  menu_item :calendar
   before_filter :find_optional_project
 
   rescue_from Query::StatementInvalid, :with => :query_statement_invalid
diff --git a/lib/redmine.rb b/lib/redmine.rb
index d390cda26..073e52d2d 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -184,6 +184,7 @@ Redmine::MenuManager.map :project_menu do |menu|
   menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new,
               :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }
   menu.push :gantt, { :controller => 'gantts', :action => 'show' }, :param => :project_id, :caption => :label_gantt
+  menu.push :calendar, { :controller => 'calendars', :action => 'show' }, :param => :project_id, :caption => :label_calendar
   menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
   menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
   menu.push :wiki, { :controller => 'wiki', :action => 'index', :page => nil }, 

From 3eff27344b0bef7703ba248d0a2312bfca95c182 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Tue, 17 Aug 2010 15:03:58 +0000
Subject: [PATCH 066/222] Refactor: move IssuesController#auto_complete to a
 new controller. #4382

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3945 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/auto_completes_controller.rb  | 25 +++++++++++++++++++
 app/controllers/issues_controller.rb          | 14 +----------
 .../issues.html.erb}                          |  0
 app/views/issues/_form.rhtml                  |  5 +---
 config/routes.rb                              |  3 ++-
 lib/redmine.rb                                |  3 ++-
 .../auto_completes_controller_test.rb         | 20 +++++++++++++++
 test/functional/issues_controller_test.rb     | 14 -----------
 test/integration/routing_test.rb              |  2 +-
 9 files changed, 52 insertions(+), 34 deletions(-)
 create mode 100644 app/controllers/auto_completes_controller.rb
 rename app/views/{issues/auto_complete.html.erb => auto_completes/issues.html.erb} (100%)
 create mode 100644 test/functional/auto_completes_controller_test.rb

diff --git a/app/controllers/auto_completes_controller.rb b/app/controllers/auto_completes_controller.rb
new file mode 100644
index 000000000..1438106f6
--- /dev/null
+++ b/app/controllers/auto_completes_controller.rb
@@ -0,0 +1,25 @@
+class AutoCompletesController < ApplicationController
+  before_filter :find_project
+  
+  def issues
+    @issues = []
+    q = params[:q].to_s
+    if q.match(/^\d+$/)
+      @issues << @project.issues.visible.find_by_id(q.to_i)
+    end
+    unless q.blank?
+      @issues += @project.issues.visible.find(:all, :conditions => ["LOWER(#{Issue.table_name}.subject) LIKE ?", "%#{q.downcase}%"], :limit => 10)
+    end
+    render :layout => false
+  end
+
+  private
+
+  def find_project
+    project_id = (params[:issue] && params[:issue][:project_id]) || params[:project_id]
+    @project = Project.find(project_id)
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+
+end
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index eaa6dbc35..4981f43ee 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -21,7 +21,7 @@ class IssuesController < ApplicationController
   
   before_filter :find_issue, :only => [:show, :edit, :update]
   before_filter :find_issues, :only => [:bulk_edit, :move, :perform_move, :destroy]
-  before_filter :find_project, :only => [:new, :create, :update_form, :preview, :auto_complete]
+  before_filter :find_project, :only => [:new, :create, :update_form, :preview]
   before_filter :authorize, :except => [:index, :changes, :preview, :context_menu]
   before_filter :find_optional_project, :only => [:index, :changes]
   before_filter :check_for_default_issue_status, :only => [:new, :create]
@@ -316,18 +316,6 @@ class IssuesController < ApplicationController
     render :layout => false
   end
   
-  def auto_complete
-    @issues = []
-    q = params[:q].to_s
-    if q.match(/^\d+$/)
-      @issues << @project.issues.visible.find_by_id(q.to_i)
-    end
-    unless q.blank?
-      @issues += @project.issues.visible.find(:all, :conditions => ["LOWER(#{Issue.table_name}.subject) LIKE ?", "%#{q.downcase}%"], :limit => 10)
-    end
-    render :layout => false
-  end
-  
 private
   def find_issue
     @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
diff --git a/app/views/issues/auto_complete.html.erb b/app/views/auto_completes/issues.html.erb
similarity index 100%
rename from app/views/issues/auto_complete.html.erb
rename to app/views/auto_completes/issues.html.erb
diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml
index 1e3beaf85..ccb7a55a3 100644
--- a/app/views/issues/_form.rhtml
+++ b/app/views/issues/_form.rhtml
@@ -9,10 +9,7 @@
 <% unless (@issue.new_record? && @issue.parent_issue_id.nil?) || !User.current.allowed_to?(:manage_subtasks, @project) %>
 
    <%= f.text_field :parent_issue_id, :size => 10 %>
    
 
    
-<%= javascript_tag "observeParentIssueField('#{url_for(:controller => :issues,
-                                                       :action => :auto_complete,
-                                                       :id => @issue,
-                                                       :project_id => @project) }')" %>
+<%= javascript_tag "observeParentIssueField('#{auto_complete_issues_path(:id => @issue, :project_id => @project) }')" %>
 <% end %>
 
 
    <%= f.text_area :description,
diff --git a/config/routes.rb b/config/routes.rb
index 08cd10055..910087ab9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -104,7 +104,8 @@ ActionController::Routing::Routes.draw do |map|
   end
 
   map.resources :issue_moves, :only => [:new, :create], :path_prefix => '/issues', :as => 'move'
-
+  map.auto_complete_issues '/issues/auto_complete', :controller => 'auto_completes', :action => 'issues'
+  
   map.with_options :controller => 'issues' do |issues_routes|
     issues_routes.with_options :conditions => {:method => :get} do |issues_views|
       issues_views.connect 'issues', :action => 'index'
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 073e52d2d..aa9fe75d1 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -58,7 +58,8 @@ Redmine::AccessControl.map do |map|
     map.permission :manage_categories, {:projects => :settings, :issue_categories => [:new, :edit, :destroy]}, :require => :member
     # Issues
     map.permission :view_issues, {:projects => :roadmap, 
-                                  :issues => [:index, :changes, :show, :context_menu, :auto_complete],
+                                  :issues => [:index, :changes, :show, :context_menu],
+                                  :auto_complete => [:issues],
                                   :versions => [:show, :status_by],
                                   :queries => :index,
                                   :reports => [:issue_report, :issue_report_details]}
diff --git a/test/functional/auto_completes_controller_test.rb b/test/functional/auto_completes_controller_test.rb
new file mode 100644
index 000000000..25e75fc4b
--- /dev/null
+++ b/test/functional/auto_completes_controller_test.rb
@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class AutoCompletesControllerTest < ActionController::TestCase
+  fixtures :all
+
+  def test_issues_should_not_be_case_sensitive
+    get :issues, :project_id => 'ecookbook', :q => 'ReCiPe'
+    assert_response :success
+    assert_not_nil assigns(:issues)
+    assert assigns(:issues).detect {|issue| issue.subject.match /recipe/}
+  end
+  
+  def test_issues_should_return_issue_with_given_id
+    get :issues, :project_id => 'subproject1', :q => '13'
+    assert_response :success
+    assert_not_nil assigns(:issues)
+    assert assigns(:issues).include?(Issue.find(13))
+  end
+  
+end
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 0c1172f60..948cf8598 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -1123,20 +1123,6 @@ class IssuesControllerTest < ActionController::TestCase
     assert_not_nil assigns(:notes)
   end
 
-  def test_auto_complete_should_not_be_case_sensitive
-    get :auto_complete, :project_id => 'ecookbook', :q => 'ReCiPe'
-    assert_response :success
-    assert_not_nil assigns(:issues)
-    assert assigns(:issues).detect {|issue| issue.subject.match /recipe/}
-  end
-  
-  def test_auto_complete_should_return_issue_with_given_id
-    get :auto_complete, :project_id => 'subproject1', :q => '13'
-    assert_response :success
-    assert_not_nil assigns(:issues)
-    assert assigns(:issues).include?(Issue.find(13))
-  end
-  
   def test_destroy_issue_with_no_time_entries
     assert_nil TimeEntry.find_by_issue_id(2)
     @request.session[:user_id] = 2
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index b9eac552e..607df5b06 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -100,7 +100,7 @@ class RoutingTest < ActionController::IntegrationTest
     should_route :get, "/projects/project-name/issues/gantt", :controller => 'gantts', :action => 'show', :project_id => 'project-name'
     should_route :post, "/projects/project-name/issues/gantt", :controller => 'gantts', :action => 'show', :project_id => 'project-name'
 
-    should_route :get, "/issues/auto_complete", :controller => 'issues', :action => 'auto_complete'
+    should_route :get, "/issues/auto_complete", :controller => 'auto_completes', :action => 'issues'
   end
 
   context "issue categories" do

From 1f8d396e3f12ec177fec0dea6a4a7c39c00fe496 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Wed, 18 Aug 2010 15:01:35 +0000
Subject: [PATCH 067/222] Refactor: move IssuesController#preview to a new
 controller.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3946 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb          | 15 ----------
 app/controllers/previews_controller.rb        | 28 +++++++++++++++++++
 app/views/issues/_edit.rhtml                  |  2 +-
 app/views/issues/new.rhtml                    |  2 +-
 .../issue.html.erb}                           |  0
 config/routes.rb                              |  2 ++
 test/functional/issues_controller_test.rb     | 16 -----------
 test/functional/previews_controller_test.rb   | 22 +++++++++++++++
 test/integration/routing_test.rb              |  3 ++
 9 files changed, 57 insertions(+), 33 deletions(-)
 create mode 100644 app/controllers/previews_controller.rb
 rename app/views/{issues/preview.html.erb => previews/issue.html.erb} (100%)
 create mode 100644 test/functional/previews_controller_test.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 4981f43ee..239c23e71 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -301,21 +301,6 @@ class IssuesController < ApplicationController
     render :partial => 'attributes'
   end
   
-  def preview
-    @issue = @project.issues.find_by_id(params[:id]) unless params[:id].blank?
-    if @issue
-      @attachements = @issue.attachments
-      @description = params[:issue] && params[:issue][:description]
-      if @description && @description.gsub(/(\r?\n|\n\r?)/, "\n") == @issue.description.to_s.gsub(/(\r?\n|\n\r?)/, "\n")
-        @description = nil
-      end
-      @notes = params[:notes]
-    else
-      @description = (params[:issue] ? params[:issue][:description] : nil)
-    end
-    render :layout => false
-  end
-  
 private
   def find_issue
     @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
diff --git a/app/controllers/previews_controller.rb b/app/controllers/previews_controller.rb
new file mode 100644
index 000000000..e1c644653
--- /dev/null
+++ b/app/controllers/previews_controller.rb
@@ -0,0 +1,28 @@
+class PreviewsController < ApplicationController
+  before_filter :find_project
+
+  def issue
+    @issue = @project.issues.find_by_id(params[:id]) unless params[:id].blank?
+    if @issue
+      @attachements = @issue.attachments
+      @description = params[:issue] && params[:issue][:description]
+      if @description && @description.gsub(/(\r?\n|\n\r?)/, "\n") == @issue.description.to_s.gsub(/(\r?\n|\n\r?)/, "\n")
+        @description = nil
+      end
+      @notes = params[:notes]
+    else
+      @description = (params[:issue] ? params[:issue][:description] : nil)
+    end
+    render :layout => false
+  end
+
+  private
+  
+  def find_project
+    project_id = (params[:issue] && params[:issue][:project_id]) || params[:project_id]
+    @project = Project.find(project_id)
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+  
+end
diff --git a/app/views/issues/_edit.rhtml b/app/views/issues/_edit.rhtml
index 0c01f80be..ec36b1459 100644
--- a/app/views/issues/_edit.rhtml
+++ b/app/views/issues/_edit.rhtml
@@ -44,7 +44,7 @@
     <%= f.hidden_field :lock_version %>
     <%= submit_tag l(:button_submit) %>
     <%= link_to_remote l(:label_preview), 
-                       { :url => { :controller => 'issues', :action => 'preview', :project_id => @project, :id => @issue },
+                       { :url => preview_issue_path(:project_id => @project, :id => @issue),
                          :method => 'post',
                          :update => 'preview',
                          :with => 'Form.serialize("issue-form")',
diff --git a/app/views/issues/new.rhtml b/app/views/issues/new.rhtml
index 839286bdb..310085d7c 100644
--- a/app/views/issues/new.rhtml
+++ b/app/views/issues/new.rhtml
@@ -9,7 +9,7 @@
     <%= submit_tag l(:button_create) %>
     <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
     <%= link_to_remote l(:label_preview), 
-                       { :url => { :controller => 'issues', :action => 'preview', :project_id => @project },
+                       { :url => preview_issue_path(:project_id => @project),
                          :method => 'post',
                          :update => 'preview',
                          :with => "Form.serialize('issue-form')",
diff --git a/app/views/issues/preview.html.erb b/app/views/previews/issue.html.erb
similarity index 100%
rename from app/views/issues/preview.html.erb
rename to app/views/previews/issue.html.erb
diff --git a/config/routes.rb b/config/routes.rb
index 910087ab9..956ce054b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -105,6 +105,8 @@ ActionController::Routing::Routes.draw do |map|
 
   map.resources :issue_moves, :only => [:new, :create], :path_prefix => '/issues', :as => 'move'
   map.auto_complete_issues '/issues/auto_complete', :controller => 'auto_completes', :action => 'issues'
+  # TODO: would look nicer as /issues/:id/preview
+  map.preview_issue '/issues/preview/:id', :controller => 'previews', :action => 'issue'
   
   map.with_options :controller => 'issues' do |issues_routes|
     issues_routes.with_options :conditions => {:method => :get} do |issues_views|
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 948cf8598..22f528b7b 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -1107,22 +1107,6 @@ class IssuesControllerTest < ActionController::TestCase
                                              :class => 'icon-del disabled' }
   end
   
-  def test_preview_new_issue
-    @request.session[:user_id] = 2
-    post :preview, :project_id => '1', :issue => {:description => 'Foo'}
-    assert_response :success
-    assert_template 'preview'
-    assert_not_nil assigns(:description)
-  end
-                              
-  def test_preview_notes
-    @request.session[:user_id] = 2
-    post :preview, :project_id => '1', :id => 1, :issue => {:description => Issue.find(1).description}, :notes => 'Foo'
-    assert_response :success
-    assert_template 'preview'
-    assert_not_nil assigns(:notes)
-  end
-
   def test_destroy_issue_with_no_time_entries
     assert_nil TimeEntry.find_by_issue_id(2)
     @request.session[:user_id] = 2
diff --git a/test/functional/previews_controller_test.rb b/test/functional/previews_controller_test.rb
new file mode 100644
index 000000000..63456d1d0
--- /dev/null
+++ b/test/functional/previews_controller_test.rb
@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class PreviewsControllerTest < ActionController::TestCase
+  fixtures :all
+
+  def test_preview_new_issue
+    @request.session[:user_id] = 2
+    post :issue, :project_id => '1', :issue => {:description => 'Foo'}
+    assert_response :success
+    assert_template 'preview'
+    assert_not_nil assigns(:description)
+  end
+                              
+  def test_preview_issue_notes
+    @request.session[:user_id] = 2
+    post :issue, :project_id => '1', :id => 1, :issue => {:description => Issue.find(1).description}, :notes => 'Foo'
+    assert_response :success
+    assert_template 'preview'
+    assert_not_nil assigns(:notes)
+  end
+
+end
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index 607df5b06..01a96b7aa 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -101,6 +101,9 @@ class RoutingTest < ActionController::IntegrationTest
     should_route :post, "/projects/project-name/issues/gantt", :controller => 'gantts', :action => 'show', :project_id => 'project-name'
 
     should_route :get, "/issues/auto_complete", :controller => 'auto_completes', :action => 'issues'
+
+    should_route :get, "/issues/preview/123", :controller => 'previews', :action => 'issue', :id => '123'
+    should_route :post, "/issues/preview/123", :controller => 'previews', :action => 'issue', :id => '123'
   end
 
   context "issue categories" do

From e6e21046c0fb6b5ccb32545e05771916907a62ad Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Wed, 18 Aug 2010 15:03:42 +0000
Subject: [PATCH 068/222] No more IssuesController#preview action.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3947 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 239c23e71..a0264bc56 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -21,8 +21,8 @@ class IssuesController < ApplicationController
   
   before_filter :find_issue, :only => [:show, :edit, :update]
   before_filter :find_issues, :only => [:bulk_edit, :move, :perform_move, :destroy]
-  before_filter :find_project, :only => [:new, :create, :update_form, :preview]
-  before_filter :authorize, :except => [:index, :changes, :preview, :context_menu]
+  before_filter :find_project, :only => [:new, :create, :update_form]
+  before_filter :authorize, :except => [:index, :changes, :context_menu]
   before_filter :find_optional_project, :only => [:index, :changes]
   before_filter :check_for_default_issue_status, :only => [:new, :create]
   before_filter :build_new_issue_from_params, :only => [:new, :create]

From c090d115e2bda1b72c2711b8df8a79202cbd10db Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Wed, 18 Aug 2010 17:23:23 +0000
Subject: [PATCH 069/222] Added a rake task to display permissions.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3948 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/permissions.rake | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 lib/tasks/permissions.rake

diff --git a/lib/tasks/permissions.rake b/lib/tasks/permissions.rake
new file mode 100644
index 000000000..02ce1b2a8
--- /dev/null
+++ b/lib/tasks/permissions.rake
@@ -0,0 +1,9 @@
+namespace :redmine do
+  desc "List all permissions and the actions registered with them"
+  task :permissions => :environment do
+    puts "Permission Name - controller/action pairs"
+    Redmine::AccessControl.permissions.sort {|a,b| a.name.to_s <=> b.name.to_s }.each do |permission|
+      puts ":#{permission.name} - #{permission.actions.join(', ')}"
+    end
+  end
+end

From 73ba49a7154a7a3f971ea0b53b4fdf232c4210b3 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 01:01:35 +0000
Subject: [PATCH 070/222] Use the base layout for all 403, 404, and 500 pages.
 #6172

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3949 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/application_controller.rb | 13 +++++++++---
 test/integration/layout_test.rb           | 26 +++++++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 test/integration/layout_test.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e5909e69b..725bde788 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -258,7 +258,7 @@ class ApplicationController < ActionController::Base
   def render_403
     @project = nil
     respond_to do |format|
-      format.html { render :template => "common/403", :layout => (request.xhr? ? false : 'base'), :status => 403 }
+      format.html { render :template => "common/403", :layout => use_layout, :status => 403 }
       format.atom { head 403 }
       format.xml { head 403 }
       format.js { head 403 }
@@ -269,7 +269,7 @@ class ApplicationController < ActionController::Base
     
   def render_404
     respond_to do |format|
-      format.html { render :template => "common/404", :layout => !request.xhr?, :status => 404 }
+      format.html { render :template => "common/404", :layout => use_layout, :status => 404 }
       format.atom { head 404 }
       format.xml { head 404 }
       format.js { head 404 }
@@ -282,7 +282,7 @@ class ApplicationController < ActionController::Base
     respond_to do |format|
       format.html { 
         flash.now[:error] = msg
-        render :text => '', :layout => !request.xhr?, :status => 500
+        render :text => '', :layout => use_layout, :status => 500
       }
       format.atom { head 500 }
       format.xml { head 500 }
@@ -290,6 +290,13 @@ class ApplicationController < ActionController::Base
       format.json { head 500 }
     end
   end
+
+  # Picks which layout to use based on the request
+  #
+  # @return [boolean, string] name of the layout to use or false for no layout
+  def use_layout
+    request.xhr? ? false : 'base'
+  end
   
   def invalid_authenticity_token
     if api_request?
diff --git a/test/integration/layout_test.rb b/test/integration/layout_test.rb
new file mode 100644
index 000000000..03d407d24
--- /dev/null
+++ b/test/integration/layout_test.rb
@@ -0,0 +1,26 @@
+require "#{File.dirname(__FILE__)}/../test_helper"
+
+class LayoutTest < ActionController::IntegrationTest
+  fixtures :all
+
+  test "browsing to a missing page should render the base layout" do
+    get "/users/100000000"
+
+    assert_response :not_found
+
+    # UsersController uses the admin layout by default
+    assert_select "#admin-menu", :count => 0
+  end
+
+  test "browsing to an unauthorized page should render the base layout" do
+    user = User.find(9)
+    user.password, user.password_confirmation = 'test', 'test'
+    user.save!
+    
+    log_user('miscuser9','test')
+
+    get "/admin"
+    assert_response :forbidden
+    assert_select "#admin-menu", :count => 0
+  end
+end

From a256e4b1dc76b969ac593f9b5b9c39703820c297 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 01:13:50 +0000
Subject: [PATCH 071/222] Scope the calendar popup CSS so it doesn't conflict
 with the Calendar menu. #6163

Contributed by Adam Soltys

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3950 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/stylesheets/calendar.css | 84 ++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/public/stylesheets/calendar.css b/public/stylesheets/calendar.css
index c8d2dd619..288ed724f 100644
--- a/public/stylesheets/calendar.css
+++ b/public/stylesheets/calendar.css
@@ -8,7 +8,7 @@ img.calendar-trigger {
 
 div.calendar { position: relative; z-index: 30;}
 
-.calendar, .calendar table {
+div.calendar, div.calendar table {
   border: 1px solid #556;
   font-size: 11px;
   color: #000;
@@ -19,16 +19,16 @@ div.calendar { position: relative; z-index: 30;}
 
 /* Header part -- contains navigation buttons and day names. */
 
-.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+div.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
   text-align: center;    /* They are the navigation buttons */
   padding: 2px;          /* Make the buttons seem like they're pressing */
 }
 
-.calendar .nav {
+div.calendar .nav {
   background: #467aa7;
 }
 
-.calendar thead .title { /* This holds the current "month, year" */
+div.calendar thead .title { /* This holds the current "month, year" */
   font-weight: bold;      /* Pressing it will take you to the current date */
   text-align: center;
   background: #fff;
@@ -36,79 +36,79 @@ div.calendar { position: relative; z-index: 30;}
   padding: 2px;
 }
 
-.calendar thead .headrow { /* Row  containing navigation buttons */
+div.calendar thead .headrow { /* Row  containing navigation buttons */
   background: #467aa7;
   color: #fff;
 }
 
-.calendar thead .daynames { /* Row  containing the day names */
+div.calendar thead .daynames { /* Row  containing the day names */
   background: #bdf;
 }
 
-.calendar thead .name { /* Cells  containing the day names */
+div.calendar thead .name { /* Cells  containing the day names */
   border-bottom: 1px solid #556;
   padding: 2px;
   text-align: center;
   color: #000;
 }
 
-.calendar thead .weekend { /* How a weekend day name shows in header */
+div.calendar thead .weekend { /* How a weekend day name shows in header */
   color: #a66;
 }
 
-.calendar thead .hilite { /* How do the buttons in header appear when hover */
+div.calendar thead .hilite { /* How do the buttons in header appear when hover */
   background-color: #80b0da;
   color: #000;
   padding: 1px;
 }
 
-.calendar thead .active { /* Active (pressed) buttons in header */
+div.calendar thead .active { /* Active (pressed) buttons in header */
   background-color: #77c;
   padding: 2px 0px 0px 2px;
 }
 
 /* The body part -- contains all the days in month. */
 
-.calendar tbody .day { /* Cells  containing month days dates */
+div.calendar tbody .day { /* Cells  containing month days dates */
   width: 2em;
   color: #456;
   text-align: right;
   padding: 2px 4px 2px 2px;
 }
-.calendar tbody .day.othermonth {
+div.calendar tbody .day.othermonth {
   font-size: 80%;
   color: #bbb;
 }
-.calendar tbody .day.othermonth.oweekend {
+div.calendar tbody .day.othermonth.oweekend {
   color: #fbb;
 }
 
-.calendar table .wn {
+div.calendar table .wn {
   padding: 2px 3px 2px 2px;
   border-right: 1px solid #000;
   background: #bdf;
 }
 
-.calendar tbody .rowhilite td {
+div.calendar tbody .rowhilite td {
   background: #def;
 }
 
-.calendar tbody .rowhilite td.wn {
+div.calendar tbody .rowhilite td.wn {
   background: #80b0da;
 }
 
-.calendar tbody td.hilite { /* Hovered cells  */
+div.calendar tbody td.hilite { /* Hovered cells  */
   background: #80b0da;
   padding: 1px 3px 1px 1px;
   border: 1px solid #bbb;
 }
 
-.calendar tbody td.active { /* Active (pressed) cells  */
+div.calendar tbody td.active { /* Active (pressed) cells  */
   background: #cde;
   padding: 2px 2px 0px 2px;
 }
 
-.calendar tbody td.selected { /* Cell showing today date */
+div.calendar tbody td.selected { /* Cell showing today date */
   font-weight: bold;
   border: 1px solid #000;
   padding: 1px 3px 1px 1px;
@@ -116,55 +116,55 @@ div.calendar { position: relative; z-index: 30;}
   color: #000;
 }
 
-.calendar tbody td.weekend { /* Cells showing weekend days */
+div.calendar tbody td.weekend { /* Cells showing weekend days */
   color: #a66;
 }
 
-.calendar tbody td.today { /* Cell showing selected date */
+div.calendar tbody td.today { /* Cell showing selected date */
   font-weight: bold;
   color: #f00;
 }
 
-.calendar tbody .disabled { color: #999; }
+div.calendar tbody .disabled { color: #999; }
 
-.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+div.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
   visibility: hidden;
 }
 
-.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+div.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
   display: none;
 }
 
 /* The footer part -- status bar and "Close" button */
 
-.calendar tfoot .footrow { /* The  in footer (only one right now) */
+div.calendar tfoot .footrow { /* The  in footer (only one right now) */
   text-align: center;
   background: #556;
   color: #fff;
 }
 
-.calendar tfoot .ttip { /* Tooltip (status bar) cell  */
+div.calendar tfoot .ttip { /* Tooltip (status bar) cell  */
   background: #fff;
   color: #445;
   border-top: 1px solid #556;
   padding: 1px;
 }
 
-.calendar tfoot .hilite { /* Hover style for buttons in footer */
+div.calendar tfoot .hilite { /* Hover style for buttons in footer */
   background: #aaf;
   border: 1px solid #04f;
   color: #000;
   padding: 1px;
 }
 
-.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+div.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
   background: #77c;
   padding: 2px 0px 0px 2px;
 }
 
 /* Combo boxes (menus that display months/years for direct selection) */
 
-.calendar .combo {
+div.calendar .combo {
   position: absolute;
   display: none;
   top: 0px;
@@ -178,59 +178,59 @@ div.calendar { position: relative; z-index: 30;}
   z-index: 100;
 }
 
-.calendar .combo .label,
-.calendar .combo .label-IEfix {
+div.calendar .combo .label,
+div.calendar .combo .label-IEfix {
   text-align: center;
   padding: 1px;
 }
 
-.calendar .combo .label-IEfix {
+div.calendar .combo .label-IEfix {
   width: 4em;
 }
 
-.calendar .combo .hilite {
+div.calendar .combo .hilite {
   background: #acf;
 }
 
-.calendar .combo .active {
+div.calendar .combo .active {
   border-top: 1px solid #46a;
   border-bottom: 1px solid #46a;
   background: #eef;
   font-weight: bold;
 }
 
-.calendar td.time {
+div.calendar td.time {
   border-top: 1px solid #000;
   padding: 1px 0px;
   text-align: center;
   background-color: #f4f0e8;
 }
 
-.calendar td.time .hour,
-.calendar td.time .minute,
-.calendar td.time .ampm {
+div.calendar td.time .hour,
+div.calendar td.time .minute,
+div.calendar td.time .ampm {
   padding: 0px 3px 0px 4px;
   border: 1px solid #889;
   font-weight: bold;
   background-color: #fff;
 }
 
-.calendar td.time .ampm {
+div.calendar td.time .ampm {
   text-align: center;
 }
 
-.calendar td.time .colon {
+div.calendar td.time .colon {
   padding: 0px 2px 0px 3px;
   font-weight: bold;
 }
 
-.calendar td.time span.hilite {
+div.calendar td.time span.hilite {
   border-color: #000;
   background-color: #667;
   color: #fff;
 }
 
-.calendar td.time span.active {
+div.calendar td.time span.active {
   border-color: #f00;
   background-color: #000;
   color: #0f0;

From fc6e7f12b70ee716eb762d112acd43467466b2ae Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 01:28:33 +0000
Subject: [PATCH 072/222] Small test refactoring, extract method.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3951 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/integration/layout_test.rb | 4 +---
 test/test_helper.rb             | 6 ++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/test/integration/layout_test.rb b/test/integration/layout_test.rb
index 03d407d24..001bf50d2 100644
--- a/test/integration/layout_test.rb
+++ b/test/integration/layout_test.rb
@@ -13,9 +13,7 @@ class LayoutTest < ActionController::IntegrationTest
   end
 
   test "browsing to an unauthorized page should render the base layout" do
-    user = User.find(9)
-    user.password, user.password_confirmation = 'test', 'test'
-    user.save!
+    change_user_password('miscuser9', 'test')
     
     log_user('miscuser9','test')
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 15a1f1570..dc04fa82d 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -86,6 +86,12 @@ class ActiveSupport::TestCase
     saved_settings.each {|k, v| Setting[k] = v}
   end
 
+  def change_user_password(login, new_password)
+    user = User.first(:conditions => {:login => login})
+    user.password, user.password_confirmation = new_password, new_password
+    user.save!
+  end
+
   def self.ldap_configured?
     @test_ldap = Net::LDAP.new(:host => '127.0.0.1', :port => 389)
     return @test_ldap.bind

From 782a5f121881addf54afe6064376ded72b5a84ed Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 03:43:33 +0000
Subject: [PATCH 073/222] Add Issue Status to the tooltip. #6169

Contributed by Nick Peelman

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3952 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/issues_helper.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 60798fedf..617822986 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -30,12 +30,14 @@ module IssuesHelper
   end
   
   def render_issue_tooltip(issue)
+    @cached_label_status ||= l(:field_status)
     @cached_label_start_date ||= l(:field_start_date)
     @cached_label_due_date ||= l(:field_due_date)
     @cached_label_assigned_to ||= l(:field_assigned_to)
     @cached_label_priority ||= l(:field_priority)
     
     link_to_issue(issue) + "

    " +
+      "#{@cached_label_status}: #{issue.status.name}
    " +
       "#{@cached_label_start_date}: #{format_date(issue.start_date)}
    " +
       "#{@cached_label_due_date}: #{format_date(issue.due_date)}
    " +
       "#{@cached_label_assigned_to}: #{issue.assigned_to}
    " +

From 01788e83e755e08c96274341f22ea1d7d3814bad Mon Sep 17 00:00:00 2001
From: Azamat Hackimov 
Date: Thu, 19 Aug 2010 15:41:09 +0000
Subject: [PATCH 074/222] Translation updates for upcoming release * de (#6079)
 * es (#6021) * it (#6093) * nl (#6025) * ru * sr and sr-YU (sr is now serbian
 cyrillic, #6078) * sv (#6142)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4003 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 config/locales/de.yml                         |    2 +-
 config/locales/es.yml                         |   44 +-
 config/locales/it.yml                         |  343 ++--
 config/locales/ja.yml                         |    2 +-
 config/locales/nl.yml                         |  152 +-
 config/locales/ru.yml                         |    2 +-
 config/locales/sr-CY.yml                      |  907 ---------
 config/locales/sr-YU.yml                      |  907 +++++++++
 config/locales/sr.yml                         | 1618 ++++++++---------
 config/locales/sv.yml                         |    6 +-
 .../javascripts/calendar/lang/calendar-it.js  |   25 +-
 .../calendar/lang/calendar-sr-CY.js           |  127 --
 .../calendar/lang/calendar-sr-yu.js           |  127 ++
 .../javascripts/calendar/lang/calendar-sr.js  |  254 +--
 .../jstoolbar/lang/jstoolbar-it.js            |    5 +-
 .../jstoolbar/lang/jstoolbar-sr-yu.js         |   16 +
 .../jstoolbar/lang/jstoolbar-sr.js            |   32 +-
 17 files changed, 2296 insertions(+), 2273 deletions(-)
 delete mode 100644 config/locales/sr-CY.yml
 create mode 100644 config/locales/sr-YU.yml
 delete mode 100644 public/javascripts/calendar/lang/calendar-sr-CY.js
 create mode 100644 public/javascripts/calendar/lang/calendar-sr-yu.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-sr-yu.js

diff --git a/config/locales/de.yml b/config/locales/de.yml
index f7f9043c4..411e9e9ff 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -839,7 +839,7 @@ de:
   version_status_locked: gesperrt
   version_status_closed: abgeschlossen
 
-  field_active: Activ
+  field_active: Aktiv
   
   text_select_mail_notifications: Bitte wählen Sie die Aktionen aus, für die eine Mailbenachrichtigung gesendet werden soll.
   text_regexp_info: z. B. ^[A-Z0-9]+$
diff --git a/config/locales/es.yml b/config/locales/es.yml
index bc345dcb5..e7abd4347 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1,7 +1,7 @@
 # Spanish translations for Rails
 # by Francisco Fernando García Nieto (ffgarcianieto@gmail.com)
 # Redmine spanish translation: 
-# by J. Cayetano Delgado (jcdelgado _at_ ingenia.es)
+# by J. Cayetano Delgado (Cayetano _dot_ Delgado _at_ ioko _dot_ com)
 
 es:
   number:
@@ -926,25 +926,25 @@ es:
     Está a punto de eliminar algún o todos sus permisos y podría perder la posibilidad de modificar este proyecto tras hacerlo.
     ¿Está seguro de querer continuar?
   label_close_versions: Cerrar versiones completadas
-  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.
+  label_board_sticky: Pegajoso
+  label_board_locked: Bloqueado
+  permission_export_wiki_pages: Exportar páginas wiki
+  setting_cache_formatted_text: Cachear texto formateado
+  permission_manage_project_activities: Gestionar actividades del proyecto
+  error_unable_delete_issue_status: Fue imposible eliminar el estado de la petición
+  label_profile: Perfil
+  permission_manage_subtasks: Gestionar subtareas
+  field_parent_issue: Tarea padre
+  label_subtask_plural: Subtareas
+  label_project_copy_notifications: Enviar notificaciones por correo electrónico durante la copia del proyecto
+  error_can_not_delete_custom_field: Fue imposible eliminar el campo personalizado
+  error_unable_to_connect: Fue imposible conectar con ({{value}})
+  error_can_not_remove_role: Este rol está en uso y no puede ser eliminado.
+  error_can_not_delete_tracker: Este tipo contiene peticiones y no puede ser eliminado.
   field_principal: Principal
-  label_my_page_block: My page block
-  notice_failed_to_save_members: "Failed to save member(s): {{errors}}."
-  text_zoom_out: Zoom out
-  text_zoom_in: Zoom in
-  notice_unable_delete_time_entry: Unable to delete time log entry.
-  label_overall_spent_time: Overall spent time
+  label_my_page_block: Bloque Mi página
+  notice_failed_to_save_members: "Fallo al guardar miembro(s): {{errors}}."
+  text_zoom_out: Alejar
+  text_zoom_in: Acercar
+  notice_unable_delete_time_entry: Fue imposible eliminar la entrada de tiempo dedicado.
+  label_overall_spent_time: Tiempo total dedicado
diff --git a/config/locales/it.yml b/config/locales/it.yml
index bab1c6a91..aec2c8ea0 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1,5 +1,6 @@
 # Italian translations for Ruby on Rails 
 # by Claudio Poli (masterkain@gmail.com)
+# by Diego Pierotto (ita.translations@tiscali.it)
 
 it:
   date:
@@ -64,8 +65,8 @@ it:
         one:  "oltre un anno"
         other: "oltre {{count}} anni"
       almost_x_years:
-        one:   "almost 1 year"
-        other: "almost {{count}} years"
+        one:   "quasi 1 anno"
+        other: "quasi {{count}} anni"
       
   number:
     format:
@@ -91,7 +92,7 @@ it:
         
   support:
     array:
-      sentence_connector: "and"
+      sentence_connector: "e"
       skip_last_comma: false
       
   activerecord:
@@ -128,9 +129,9 @@ it:
   actionview_instancetag_blank_option: Scegli
   
   general_text_No: 'No'
-  general_text_Yes: 'Si'
+  general_text_Yes: 'Sì'
   general_text_no: 'no'
-  general_text_yes: 'si'
+  general_text_yes: 'sì'
   general_lang_name: 'Italiano'
   general_csv_separator: ','
   general_csv_decimal_separator: '.'
@@ -138,13 +139,13 @@ it:
   general_pdf_encoding: ISO-8859-1
   general_first_day_of_week: '1'
   
-  notice_account_updated: L'utenza è stata aggiornata.
+  notice_account_updated: L'utente è stata aggiornato.
   notice_account_invalid_creditentials: Nome utente o password non validi.
   notice_account_password_updated: La password è stata aggiornata.
   notice_account_wrong_password: Password errata
-  notice_account_register_done: L'utenza è stata creata.
+  notice_account_register_done: L'utente è stata creato.
   notice_account_unknown_email: Utente sconosciuto.
-  notice_can_t_change_password: Questa utenza utilizza un metodo di autenticazione esterno. Impossibile cambiare la password.
+  notice_can_t_change_password: Questo utente utilizza un metodo di autenticazione esterno. Impossibile cambiare la password.
   notice_account_lost_email_sent: Ti è stata spedita una email con le istruzioni per cambiare la password.
   notice_account_activated: Il tuo account è stato attivato. Ora puoi effettuare l'accesso.
   notice_successful_create: Creazione effettuata.
@@ -154,17 +155,17 @@ it:
   notice_file_not_found: La pagina desiderata non esiste o è stata rimossa.
   notice_locking_conflict: Le informazioni sono state modificate da un altro utente.
   notice_not_authorized: Non sei autorizzato ad accedere a questa pagina.
-  notice_email_sent: "Una e-mail è stata spedita a {{value}}"
-  notice_email_error: "Si è verificato un errore durante l'invio di una e-mail ({{value}})"
+  notice_email_sent: "Una email è stata spedita a {{value}}"
+  notice_email_error: "Si è verificato un errore durante l'invio di una email ({{value}})"
   notice_feeds_access_key_reseted: La tua chiave di accesso RSS è stata reimpostata.
   
   error_scm_not_found: "La risorsa e/o la versione non esistono nel repository."
   error_scm_command_failed: "Si è verificato un errore durante l'accesso al repository: {{value}}"
   
   mail_subject_lost_password: "Password {{value}}"
-  mail_body_lost_password: 'Per cambiare la password, usate il seguente collegamento:'
-  mail_subject_register: "Attivazione utenza {{value}}"
-  mail_body_register: 'Per attivare la vostra utenza, usate il seguente collegamento:'
+  mail_body_lost_password: 'Per cambiare la password, usa il seguente collegamento:'
+  mail_subject_register: "Attivazione utente {{value}}"
+  mail_body_register: "Per attivare l'utente, usa il seguente collegamento:"
   
   gui_validation_error: 1 errore
   gui_validation_error_plural: "{{count}} errori"
@@ -195,22 +196,22 @@ it:
   field_issue: Segnalazione
   field_status: Stato
   field_notes: Note
-  field_is_closed: Chiude la segnalazione
+  field_is_closed: Chiudi la segnalazione
   field_is_default: Stato predefinito
   field_tracker: Tracker
   field_subject: Oggetto
   field_due_date: Data ultima
   field_assigned_to: Assegnato a
-  field_priority: Priorita'
+  field_priority: Priorità
   field_fixed_version: Versione prevista
   field_user: Utente
   field_role: Ruolo
   field_homepage: Homepage
   field_is_public: Pubblico
   field_parent: Sottoprogetto di
-  field_is_in_roadmap: Segnalazioni mostrate nel roadmap
-  field_login: Login
-  field_mail_notification: Notifiche via e-mail
+  field_is_in_roadmap: Segnalazioni mostrate nella roadmap
+  field_login: Utente
+  field_mail_notification: Notifiche via email
   field_admin: Amministratore
   field_last_login_on: Ultima connessione
   field_language: Lingua
@@ -222,17 +223,17 @@ it:
   field_type: Tipo
   field_host: Host
   field_port: Porta
-  field_account: Utenza
+  field_account: Utente
   field_base_dn: DN base
-  field_attr_login: Attributo login
+  field_attr_login: Attributo connessione
   field_attr_firstname: Attributo nome
   field_attr_lastname: Attributo cognome
-  field_attr_mail: Attributo e-mail
-  field_onthefly: Creazione utenza "al volo"
+  field_attr_mail: Attributo email
+  field_onthefly: Creazione utente "al volo"
   field_start_date: Inizio
   field_done_ratio: % completato
   field_auth_source: Modalità di autenticazione
-  field_hide_mail: Nascondi il mio indirizzo di e-mail
+  field_hide_mail: Nascondi il mio indirizzo email
   field_comments: Commento
   field_url: URL
   field_start_page: Pagina principale
@@ -255,9 +256,9 @@ it:
   setting_default_language: Lingua predefinita
   setting_login_required: Autenticazione richiesta
   setting_self_registration: Auto-registrazione abilitata
-  setting_attachment_max_size: Massima dimensione allegati
+  setting_attachment_max_size: Dimensione massima allegati
   setting_issues_export_limit: Limite esportazione segnalazioni
-  setting_mail_from: Indirizzo sorgente e-mail
+  setting_mail_from: Indirizzo sorgente email
   setting_host_name: Nome host
   setting_text_formatting: Formattazione testo
   setting_wiki_compression: Comprimi cronologia wiki
@@ -266,7 +267,7 @@ it:
   setting_sys_api_enabled: Abilita WS per la gestione del repository
   setting_commit_ref_keywords: Parole chiave riferimento
   setting_commit_fix_keywords: Parole chiave chiusura
-  setting_autologin: Login automatico
+  setting_autologin: Connessione automatica
   setting_date_format: Formato data
   setting_cross_project_issue_relations: Consenti la creazione di relazioni tra segnalazioni in progetti differenti
   
@@ -277,9 +278,9 @@ it:
   label_project_new: Nuovo progetto
   label_project_plural: Progetti
   label_x_projects:
-    zero:  no projects
-    one:   1 project
-    other: "{{count}} projects"
+    zero:  nessun progetto
+    one:   1 progetto
+    other: "{{count}} progetti"
   label_project_all: Tutti i progetti
   label_project_latest: Ultimi progetti registrati
   label_issue: Segnalazione
@@ -300,10 +301,10 @@ it:
   label_tracker_plural: Tracker
   label_tracker_new: Nuovo tracker
   label_workflow: Workflow
-  label_issue_status: Stato segnalazioni
-  label_issue_status_plural: Stati segnalazione
+  label_issue_status: Stato segnalazione
+  label_issue_status_plural: Stati segnalazioni
   label_issue_status_new: Nuovo stato
-  label_issue_category: Categorie segnalazioni
+  label_issue_category: Categoria segnalazione
   label_issue_category_plural: Categorie segnalazioni
   label_issue_category_new: Nuova categoria
   label_custom_field: Campo personalizzato
@@ -313,16 +314,16 @@ it:
   label_enumeration_new: Nuovo valore
   label_information: Informazione
   label_information_plural: Informazioni
-  label_please_login: Autenticarsi
+  label_please_login: Entra
   label_register: Registrati
   label_password_lost: Password dimenticata
   label_home: Home
   label_my_page: Pagina personale
-  label_my_account: La mia utenza
+  label_my_account: Il mio utente
   label_my_projects: I miei progetti
   label_administration: Amministrazione
-  label_login: Login
-  label_logout: Logout
+  label_login: Entra
+  label_logout: Esci
   label_help: Aiuto
   label_reported_issues: Segnalazioni
   label_assigned_to_me_issues: Le mie segnalazioni
@@ -330,7 +331,7 @@ it:
   label_registered_on: Registrato il
   label_activity: Attività
   label_new: Nuovo
-  label_logged_as: Autenticato come
+  label_logged_as: Collegato come
   label_environment: Ambiente
   label_authentication: Autenticazione
   label_auth_source: Modalità di autenticazione
@@ -376,17 +377,17 @@ it:
   label_closed_issues: chiusa
   label_closed_issues_plural: chiuse
   label_x_open_issues_abbr_on_total:
-    zero:  0 open / {{total}}
-    one:   1 open / {{total}}
-    other: "{{count}} open / {{total}}"
+    zero:  0 aperte / {{total}}
+    one:   1 aperta / {{total}}
+    other: "{{count}} aperte / {{total}}"
   label_x_open_issues_abbr:
-    zero:  0 open
-    one:   1 open
-    other: "{{count}} open"
+    zero:  0 aperte
+    one:   1 aperta
+    other: "{{count}} aperte"
   label_x_closed_issues_abbr:
-    zero:  0 closed
-    one:   1 closed
-    other: "{{count}} closed"
+    zero:  0 chiuse
+    one:   1 chiusa
+    other: "{{count}} chiuse"
   label_total: Totale
   label_permissions: Permessi
   label_current_status: Stato attuale
@@ -409,9 +410,9 @@ it:
   label_comment: Commento
   label_comment_plural: Commenti
   label_x_comments:
-    zero: no comments
-    one: 1 comment
-    other: "{{count}} comments"
+    zero: nessun commento
+    one: 1 commento
+    other: "{{count}} commenti"
   label_comment_add: Aggiungi un commento
   label_comment_added: Commento aggiunto
   label_comment_delete: Elimina commenti
@@ -458,10 +459,10 @@ it:
   label_result_plural: Risultati
   label_all_words: Tutte le parole
   label_wiki: Wiki
-  label_wiki_edit: Modifica Wiki
+  label_wiki_edit: Modifica wiki
   label_wiki_edit_plural: Modfiche wiki
   label_wiki_page: Pagina Wiki
-  label_wiki_page_plural: Pagine Wiki
+  label_wiki_page_plural: Pagine wiki
   label_index_by_title: Ordina per titolo
   label_index_by_date: Ordina per data
   label_current_version: Versione corrente
@@ -495,14 +496,14 @@ it:
   label_blocked_by: bloccato da
   label_precedes: precede
   label_follows: segue
-  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_end_to_start: fine a inizio
+  label_end_to_end: fine a fine
+  label_start_to_start: inizio a inizio
+  label_start_to_end: inizio a fine
   label_stay_logged_in: Rimani collegato
   label_disabled: disabilitato
   label_show_completed_versions: Mostra versioni completate
-  label_me: io
+  label_me: me
   label_board: Forum
   label_board_new: Nuovo forum
   label_board_plural: Forum
@@ -519,24 +520,24 @@ it:
   label_date_to: A
   label_language_based: Basato sul linguaggio
   label_sort_by: "Ordina per {{value}}"
-  label_send_test_email: Invia una e-mail di test
+  label_send_test_email: Invia una email di prova
   label_feeds_access_key_created_on: "chiave di accesso RSS creata {{value}} fa"
   label_module_plural: Moduli
   label_added_time_by: "Aggiunto da {{author}} {{age}} fa"
   label_updated_time: "Aggiornato {{value}} fa"
   label_jump_to_a_project: Vai al progetto...
   
-  button_login: Login
+  button_login: Entra
   button_submit: Invia
   button_save: Salva
   button_check_all: Seleziona tutti
   button_uncheck_all: Deseleziona tutti
   button_delete: Elimina
   button_create: Crea
-  button_test: Test
+  button_test: Prova
   button_edit: Modifica
   button_add: Aggiungi
-  button_change: Modifica
+  button_change: Cambia
   button_apply: Applica
   button_clear: Pulisci
   button_lock: Blocca
@@ -556,7 +557,7 @@ it:
   button_reply: Rispondi
   button_archive: Archivia
   button_unarchive: Ripristina
-  button_reset: Reset
+  button_reset: Reimposta
   button_rename: Rinomina
   
   status_active: attivo
@@ -564,9 +565,9 @@ it:
   status_locked: bloccato
   
   text_select_mail_notifications: Seleziona le azioni per cui deve essere inviata una notifica.
-  text_regexp_info: eg. ^[A-Z0-9]+$
+  text_regexp_info: es. ^[A-Z0-9]+$
   text_min_max_length_info: 0 significa nessuna restrizione
-  text_project_destroy_confirmation: Sei sicuro di voler cancellare il progetti e tutti i dati ad esso collegati?
+  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_task_begin_day: attività che iniziano in questa giornata
@@ -577,25 +578,25 @@ it:
   text_length_between: "Lunghezza compresa tra {{min}} e {{max}} caratteri."
   text_tracker_no_workflow: Nessun workflow definito per questo tracker
   text_unallowed_characters: Caratteri non permessi
-  text_comma_separated: Valori multipli permessi (separati da virgola).
+  text_comma_separated: Valori multipli permessi (separati da virgole).
   text_issues_ref_in_commit_messages: Segnalazioni di riferimento e chiusura nei messaggi di commit
   text_issue_added: "E' stata segnalata l'anomalia {{id}} da {{author}}."
-  text_issue_updated: "L'anomalia {{id}} e' stata aggiornata da {{author}}."
-  text_wiki_destroy_confirmation: Sicuro di voler cancellare questo wiki e tutti i suoi contenuti?
+  text_issue_updated: "L'anomalia {{id}} è stata aggiornata da {{author}}."
+  text_wiki_destroy_confirmation: Sicuro di voler eliminare questo wiki e tutti i suoi contenuti?
   text_issue_category_destroy_question: "Alcune segnalazioni ({{count}}) risultano assegnate a questa categoria. Cosa vuoi fare ?"
-  text_issue_category_destroy_assignments: Rimuovi gli assegnamenti a questa categoria
+  text_issue_category_destroy_assignments: Rimuovi le assegnazioni a questa categoria
   text_issue_category_reassign_to: Riassegna segnalazioni a questa categoria
   
-  default_role_manager: Manager
+  default_role_manager: Gestore
   default_role_developer: Sviluppatore
-  default_role_reporter: Reporter
+  default_role_reporter: Segnalatore
   default_tracker_bug: Segnalazione
   default_tracker_feature: Funzione
   default_tracker_support: Supporto
   default_issue_status_new: Nuovo
-  default_issue_status_in_progress: In Progress
+  default_issue_status_in_progress: In elaborazione
   default_issue_status_resolved: Risolto
-  default_issue_status_feedback: Feedback
+  default_issue_status_feedback: Commenti
   default_issue_status_closed: Chiuso
   default_issue_status_rejected: Rifiutato
   default_doc_category_user: Documentazione utente
@@ -630,7 +631,7 @@ it:
   label_user_mail_option_selected: "Solo per gli eventi relativi ai progetti selezionati..."
   label_user_mail_option_all: "Per ogni evento relativo ad uno dei miei progetti"
   label_user_mail_option_none: "Solo per argomenti che osservo o che mi riguardano"
-  setting_emails_footer: Piè di pagina e-mail
+  setting_emails_footer: Piè di pagina email
   label_float: Decimale
   button_copy: Copia
   mail_body_account_information_external: "Puoi utilizzare il tuo account {{value}} per accedere al sistema."
@@ -638,7 +639,7 @@ it:
   setting_protocol: Protocollo
   label_user_mail_no_self_notified: "Non voglio notifiche riguardanti modifiche da me apportate"
   setting_time_format: Formato ora
-  label_registration_activation_by_email: attivazione account via e-mail
+  label_registration_activation_by_email: attivazione account via email
   mail_subject_account_activation_request: "{{value}} richiesta attivazione account"
   mail_body_account_activation_request: "Un nuovo utente ({{value}}) ha effettuato la registrazione. Il suo account è in attesa di abilitazione da parte tua:"
   label_registration_automatic_activation: attivazione account automatica
@@ -655,7 +656,7 @@ it:
   label_age: Età
   notice_default_data_loaded: Configurazione predefinita caricata con successo.
   text_load_default_configuration: Carica la configurazione predefinita
-  text_no_configuration_data: "Ruoli, tracker, stati delle segnalazioni e workflow non sono stati ancora configurati.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+  text_no_configuration_data: "Ruoli, tracker, stati delle segnalazioni e workflow non sono stati ancora configurati.\nE' vivamente consigliato caricare la configurazione predefinita. Potrai modificarla una volta caricata."
   error_can_t_load_default_data: "Non è stato possibile caricare la configurazione predefinita : {{value}}"
   button_update: Aggiorna
   label_change_properties: Modifica le proprietà
@@ -699,7 +700,7 @@ it:
   label_last_month: ultimo mese
   label_add_another_file: Aggiungi un altro file
   label_optional_description: Descrizione opzionale
-  text_destroy_time_entries_question: "{{hours}} ore risultano spese sulle segnalazioni che stai per cancellare. Cosa vuoi fare ?"
+  text_destroy_time_entries_question: "{{hours}} ore risultano spese sulle segnalazioni che stai per eliminare. Cosa vuoi fare ?"
   error_issue_not_found_in_project: 'La segnalazione non è stata trovata o non appartiene al progetto'
   text_assign_time_entries_to_project: Assegna le ore segnalate al progetto
   text_destroy_time_entries: Elimina le ore segnalate
@@ -709,9 +710,9 @@ it:
   field_comments_sorting: Mostra commenti
   label_reverse_chronological_order: In ordine cronologico inverso
   label_preferences: Preferenze
-  setting_display_subprojects_issues: Mostra le segnalazioni dei sottoprogetti nel progetto principale per default
+  setting_display_subprojects_issues: Mostra le segnalazioni dei sottoprogetti nel progetto principale in modo predefinito
   label_overall_activity: Attività generale
-  setting_default_projects_public: I nuovi progetti sono pubblici per default
+  setting_default_projects_public: I nuovi progetti sono pubblici in modo predefinito
   error_scm_annotate: "L'oggetto non esiste o non può essere annotato."
   label_planning: Pianificazione
   text_subprojects_destroy_warning: "Anche i suoi sottoprogetti: {{value}} verranno eliminati."
@@ -723,17 +724,17 @@ it:
   setting_enabled_scm: SCM abilitato
   text_enumeration_category_reassign_to: 'Riassegnale a questo valore:'
   text_enumeration_destroy_question: "{{count}} oggetti hanno un assegnamento su questo valore."
-  label_incoming_emails: E-mail in arrivo
+  label_incoming_emails: Email in arrivo
   label_generate_key: Genera una chiave
-  setting_mail_handler_api_enabled: Abilita WS per le e-mail in arrivo
+  setting_mail_handler_api_enabled: Abilita WS per le email in arrivo
   setting_mail_handler_api_key: Chiave API
-  text_email_delivery_not_configured: "La consegna via e-mail non è configurata e le notifiche sono disabilitate.\nConfigura il tuo server SMTP in config/email.yml e riavvia l'applicazione per abilitarle."
-  field_parent_title: Parent page
+  text_email_delivery_not_configured: "La consegna via email non è configurata e le notifiche sono disabilitate.\nConfigura il tuo server SMTP in config/email.yml e riavvia l'applicazione per abilitarle."
+  field_parent_title: Pagina principale
   label_issue_watchers: Osservatori
   setting_commit_logs_encoding: Codifica dei messaggi di commit
   button_quote: Quota
   setting_sequential_project_identifiers: Genera progetti con identificativi in sequenza
-  notice_unable_delete_version: Impossibile cancellare la versione
+  notice_unable_delete_version: Impossibile eliminare la versione
   label_renamed: rinominato
   label_copied: copiato
   setting_plain_text_mail: Solo testo (non HTML)
@@ -747,7 +748,7 @@ it:
   permission_view_time_entries: Vedi tempi impiegati
   permission_manage_versions: Gestisci versioni
   permission_manage_wiki: Gestisci wiki
-  permission_manage_categories: Gestisci categorie segnalazione
+  permission_manage_categories: Gestisci categorie segnalazioni
   permission_protect_wiki_pages: Proteggi pagine wiki
   permission_comment_news: Commenta notizie
   permission_delete_messages: Elimina messaggi
@@ -785,23 +786,23 @@ it:
   permission_edit_own_issue_notes: Modifica proprie note
   setting_gravatar_enabled: Usa icone utente Gravatar
   label_example: Esempio
-  text_repository_usernames_mapping: "Seleziona per aggiornare la corrispondenza tra gli utenti Redmine e quelli presenti nel log del repository.\nGli utenti Redmine e repository con lo stesso username o email sono mappati automaticamente."
+  text_repository_usernames_mapping: "Seleziona per aggiornare la corrispondenza tra gli utenti Redmine e quelli presenti nel log del repository.\nGli utenti Redmine e repository con lo stesso note utente o email sono mappati automaticamente."
   permission_edit_own_messages: Modifica propri messaggi
   permission_delete_own_messages: Elimina propri messaggi
   label_user_activity: "attività di {{value}}"
   label_updated_time_by: "Aggiornato da {{author}} {{age}} fa"
   text_diff_truncated: '... Le differenze sono state troncate perchè superano il limite massimo visualizzabile.'
   setting_diff_max_lines_displayed: Limite massimo di differenze (linee) mostrate
-  text_plugin_assets_writable: Assets directory dei plugins scrivibile
+  text_plugin_assets_writable: Directory attività dei plugins scrivibile
   warning_attachments_not_saved: "{{count}} file non possono essere salvati."
   button_create_and_continue: Crea e continua
-  text_custom_field_possible_values_info: 'Un valore per ogni linea'
+  text_custom_field_possible_values_info: 'Un valore per ogni riga'
   label_display: Mostra
   field_editable: Modificabile
   setting_repository_log_display_limit: Numero massimo di revisioni elencate nella cronologia file
   setting_file_max_size_displayed: Dimensione massima dei contenuti testuali visualizzati
   field_watcher: Osservatore
-  setting_openid: Accetta login e registrazione con OpenID
+  setting_openid: Accetta connessione e registrazione con OpenID
   field_identity_url: URL OpenID
   label_login_with_open_id_option: oppure autenticati usando OpenID
   field_content: Contenuto
@@ -815,7 +816,7 @@ it:
   text_wiki_page_reassign_children: Riassegna le pagine figlie al padre di questa pagina
   text_wiki_page_nullify_children: Mantieni le pagine figlie come pagine radice
   text_wiki_page_destroy_children: Elimina le pagine figlie e tutta la discendenza
-  setting_password_min_length: Minima lunghezza password
+  setting_password_min_length: Lunghezza minima password
   field_group_by: Raggruppa risultati per
   mail_subject_wiki_content_updated: "La pagina wiki '{{page}}' è stata aggiornata"
   label_wiki_content_added: Aggiunta pagina al wiki
@@ -825,89 +826,89 @@ it:
   mail_body_wiki_content_updated: La pagina '{{page}}' wiki è stata aggiornata da{{author}}.
   permission_add_project: Crea progetto
   setting_new_project_user_role_id: Ruolo assegnato agli utenti non amministratori che creano un progetto
-  label_view_all_revisions: View all revisions
+  label_view_all_revisions: Mostra tutte le revisioni
   label_tag: Tag
   label_branch: Branch
-  error_no_tracker_in_project: No tracker is associated to this project. Please check the Project settings.
-  error_no_default_issue_status: No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").
-  text_journal_changed: "{{label}} changed from {{old}} to {{new}}"
-  text_journal_set_to: "{{label}} set to {{value}}"
-  text_journal_deleted: "{{label}} deleted ({{old}})"
-  label_group_plural: Groups
-  label_group: Group
-  label_group_new: New group
-  label_time_entry_plural: Spent time
-  text_journal_added: "{{label}} {{value}} added"
-  field_active: Active
-  enumeration_system_activity: System Activity
-  permission_delete_issue_watchers: Delete watchers
-  version_status_closed: closed
-  version_status_locked: locked
-  version_status_open: open
-  error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened
-  label_user_anonymous: Anonymous
-  button_move_and_follow: Move and follow
-  setting_default_projects_modules: Default enabled modules for new projects
-  setting_gravatar_default: Default Gravatar image
-  field_sharing: Sharing
-  label_version_sharing_hierarchy: With project hierarchy
-  label_version_sharing_system: With all projects
-  label_version_sharing_descendants: With subprojects
-  label_version_sharing_tree: With project tree
-  label_version_sharing_none: Not shared
-  error_can_not_archive_project: This project can not be archived
-  button_duplicate: Duplicate
-  button_copy_and_follow: Copy and follow
-  label_copy_source: Source
-  setting_issue_done_ratio: Calculate the issue done ratio with
-  setting_issue_done_ratio_issue_status: Use the issue status
-  error_issue_done_ratios_not_updated: Issue done ratios not updated.
-  error_workflow_copy_target: Please select target tracker(s) and role(s)
-  setting_issue_done_ratio_issue_field: Use the issue field
-  label_copy_same_as_target: Same as target
-  label_copy_target: Target
-  notice_issue_done_ratios_updated: Issue done ratios updated.
-  error_workflow_copy_source: Please select a source tracker or role
-  label_update_issue_done_ratios: Update issue done ratios
-  setting_start_of_week: Start calendars on
-  permission_view_issues: View Issues
-  label_display_used_statuses_only: Only display statuses that are used by this tracker
-  label_revision_id: Revision {{value}}
-  label_api_access_key: API access key
-  label_api_access_key_created_on: API access key created {{value}} ago
-  label_feeds_access_key: RSS access key
-  notice_api_access_key_reseted: Your API access key was reset.
-  setting_rest_api_enabled: Enable REST web service
-  label_missing_api_access_key: Missing an API access key
-  label_missing_feeds_access_key: Missing a RSS access key
-  button_show: Show
-  text_line_separated: Multiple values allowed (one line for each value).
-  setting_mail_handler_body_delimiters: Truncate emails after one of these lines
-  permission_add_subprojects: Create subprojects
-  label_subproject_new: New subproject
+  error_no_tracker_in_project: Nessun tracker è associato a questo progetto. Per favore verifica le impostazioni del Progetto.
+  error_no_default_issue_status: Nessuno stato predefinito delle segnalazioni è configurato. Per favore verifica le impostazioni (Vai in "Amministrazione -> Stati segnalazioni").
+  text_journal_changed: "{{label}} modificata da {{old}} a {{new}}"
+  text_journal_set_to: "{{label}} impostata a {{value}}"
+  text_journal_deleted: "{{label}} eliminata ({{old}})"
+  label_group_plural: Gruppi
+  label_group: Gruppo
+  label_group_new: Nuovo gruppo
+  label_time_entry_plural: Tempo impiegato
+  text_journal_added: "{{value}} {{label}} aggiunto"
+  field_active: Attivo
+  enumeration_system_activity: Attività di sistema
+  permission_delete_issue_watchers: Elimina osservatori
+  version_status_closed: chiusa
+  version_status_locked: bloccata
+  version_status_open: aperta
+  error_can_not_reopen_issue_on_closed_version: Una segnalazione assegnata ad una versione chiusa non può essere riaperta
+  label_user_anonymous: Anonimo
+  button_move_and_follow: Sposta e segui
+  setting_default_projects_modules: Moduli predefiniti abilitati per i nuovi progetti
+  setting_gravatar_default: Immagine Gravatar predefinita
+  field_sharing: Condivisione
+  label_version_sharing_hierarchy: Con gerarchia progetto
+  label_version_sharing_system: Con tutti i progetti
+  label_version_sharing_descendants: Con sottoprogetti
+  label_version_sharing_tree: Con progetto padre
+  label_version_sharing_none: Nessuna condivisione
+  error_can_not_archive_project: Questo progetto non può essere archiviato
+  button_duplicate: Duplica
+  button_copy_and_follow: Copia e segui
+  label_copy_source: Sorgente
+  setting_issue_done_ratio: Calcola la percentuale di segnalazioni completate con
+  setting_issue_done_ratio_issue_status: Usa lo stato segnalazioni
+  error_issue_done_ratios_not_updated: La percentuale delle segnalazioni completate non è aggiornata.
+  error_workflow_copy_target: Per favore seleziona trackers finali e ruolo(i)
+  setting_issue_done_ratio_issue_field: Usa il campo segnalazioni
+  label_copy_same_as_target: Uguale a destinazione
+  label_copy_target: Destinazione
+  notice_issue_done_ratios_updated: La percentuale delle segnalazioni completate è aggiornata.
+  error_workflow_copy_source: Per favore seleziona un tracker sorgente o ruolo
+  label_update_issue_done_ratios: Aggiorna la percentuale delle segnalazioni completate
+  setting_start_of_week: Avvia calendari il
+  permission_view_issues: Mostra segnalazioni
+  label_display_used_statuses_only: Mostra solo stati che vengono usati per questo tracker
+  label_revision_id: Revisione {{value}}
+  label_api_access_key: Chiave di accesso API
+  label_api_access_key_created_on: Chiave di accesso API creata {{value}} fa
+  label_feeds_access_key: Chiave di accesso RSS
+  notice_api_access_key_reseted: La chiave di accesso API è stata reimpostata.
+  setting_rest_api_enabled: Abilita il servizio web REST
+  label_missing_api_access_key: Chiave di accesso API mancante
+  label_missing_feeds_access_key: Chiave di accesso RSS mancante
+  button_show: Mostra
+  text_line_separated: Valori multipli permessi (un valore per ogni riga).
+  setting_mail_handler_body_delimiters: Tronca email dopo una di queste righe
+  permission_add_subprojects: Crea sottoprogetti
+  label_subproject_new: Nuovo sottoprogetto
   text_own_membership_delete_confirmation: |-
-    You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
-    Are you sure you want to continue?
-  label_close_versions: Close completed versions
-  label_board_sticky: Sticky
-  label_board_locked: Locked
-  permission_export_wiki_pages: Export wiki pages
-  setting_cache_formatted_text: Cache formatted text
-  permission_manage_project_activities: Manage project activities
-  error_unable_delete_issue_status: Unable to delete issue status
-  label_profile: Profile
-  permission_manage_subtasks: Manage subtasks
-  field_parent_issue: Parent task
-  label_subtask_plural: Subtasks
-  label_project_copy_notifications: Send email notifications during the project copy
-  error_can_not_delete_custom_field: Unable to delete custom field
-  error_unable_to_connect: Unable to connect ({{value}})
-  error_can_not_remove_role: This role is in use and can not be deleted.
-  error_can_not_delete_tracker: This tracker contains issues and can't be deleted.
-  field_principal: Principal
-  label_my_page_block: My page block
-  notice_failed_to_save_members: "Failed to save member(s): {{errors}}."
-  text_zoom_out: Zoom out
-  text_zoom_in: Zoom in
-  notice_unable_delete_time_entry: Unable to delete time log entry.
-  label_overall_spent_time: Overall spent time
+    Stai per eliminare alcuni o tutti i permessi e non sarai più in grado di modificare questo progetto dopo tale azione.
+    Sei sicuro di voler continuare?
+  label_close_versions: Versioni completate chiuse
+  label_board_sticky: Annunci
+  label_board_locked: Bloccato
+  permission_export_wiki_pages: Esporta pagine wiki
+  setting_cache_formatted_text: Cache testo formattato
+  permission_manage_project_activities: Gestisci attività progetti
+  error_unable_delete_issue_status: Impossibile eliminare lo stato segnalazioni
+  label_profile: Profilo
+  permission_manage_subtasks: Gestisci sottoattività
+  field_parent_issue: Attività principale
+  label_subtask_plural: Sottoattività
+  label_project_copy_notifications: Invia notifiche email durante la copia del progetto
+  error_can_not_delete_custom_field: Impossibile eliminare il campo personalizzato
+  error_unable_to_connect: Impossibile connettersi ({{value}})
+  error_can_not_remove_role: Questo ruolo è in uso e non può essere eliminato.
+  error_can_not_delete_tracker: Questo tracker contiene segnalazioni e non può essere eliminato.
+  field_principal: Principale
+  label_my_page_block: La mia pagina di blocco
+  notice_failed_to_save_members: "Impossibile salvare il membro(i): {{errors}}."
+  text_zoom_out: Riduci ingrandimento
+  text_zoom_in: Aumenta ingrandimento
+  notice_unable_delete_time_entry: Impossibile eliminare il valore time log.
+  label_overall_spent_time: Totale tempo impiegato
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index c82155b8e..4c513fef2 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -214,7 +214,7 @@ ja:
   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: "{{author}} によってWikiページ {{page}} が追加されました。"
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 4472a19d7..f2e0529e3 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -571,7 +571,7 @@ nl:
   label_used_by: Gebruikt door
   label_user: Gebruiker
   label_user_activity: "{{value}}'s activiteit"
-  label_user_mail_no_self_notified: "Ik wil niet verwittigd worden van wijzigingen die ik zelf maak."
+  label_user_mail_no_self_notified: "Ik wil niet op de hoogte gehouden worden van wijzigingen die ik zelf maak."
   label_user_mail_option_all: "Bij elk gebeurtenis in al mijn projecten..."
   label_user_mail_option_none: "Alleen in de dingen die ik monitor of in betrokken ben"
   label_user_mail_option_selected: "Enkel bij elke gebeurtenis op het geselecteerde project..."
@@ -791,98 +791,98 @@ nl:
   text_wiki_page_nullify_children: Behoud subpagina's als hoofdpagina's
   text_wiki_page_destroy_children: Verwijder alle subpagina's en onderliggende pagina's
   setting_password_min_length: Minimum wachtwoord lengte
-  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
+  field_group_by: Groepeer resultaten per
+  mail_subject_wiki_content_updated: "'{{page}}' wiki pagina is bijgewerkt"
+  label_wiki_content_added: Wiki pagina toegevoegd
+  mail_subject_wiki_content_added: "'{{page}}' wiki pagina is toegevoegd"
+  mail_body_wiki_content_added: The '{{page}}' wiki pagina is toegevoegd door {{author}}.
+  label_wiki_content_updated: Wiki pagina bijgewerkt
+  mail_body_wiki_content_updated: The '{{page}}' wiki pagina is bijgewerkt door {{author}}.
+  permission_add_project: Maak project
+  setting_new_project_user_role_id: Rol van gebruiker die een project maakt
+  label_view_all_revisions: Bekijk alle revisies
   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
+  error_no_tracker_in_project: Geen tracker is geassocieerd met dit project. Check de project instellingen.
+  error_no_default_issue_status: Geen standaard issue status ingesteld. Check de configuratie (Ga naar "Administratie -> Issue statussen").
+  text_journal_changed: "{{label}} gewijzigd van {{old}} naar {{new}}"
+  text_journal_set_to: "{{label}} gewijzigd naar {{value}}"
+  text_journal_deleted: "{{label}} verwijderd ({{old}})"
+  label_group_plural: Groepen
+  label_group: Groep
+  label_group_new: Nieuwe groep
+  label_time_entry_plural: Bestede tijd
+  text_journal_added: "{{label}} {{value}} toegevoegd"
+  field_active: Actief
+  enumeration_system_activity: Systeem Activiteit
+  permission_delete_issue_watchers: Verwijder volgers
+  version_status_closed: gesloten
+  version_status_locked: vergrendeld
   version_status_open: open
   error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened
-  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_user_anonymous: Anoniem
+  button_move_and_follow: Verplaats en volg
+  setting_default_projects_modules: Standaard geactiveerde modules voor nieuwe projecten
+  setting_gravatar_default: Standaard Gravatar plaatje
+  field_sharing: Delen
+  label_version_sharing_hierarchy: Met project hiërarchie
+  label_version_sharing_system: Met alle projecten
+  label_version_sharing_descendants: Met subprojecten
   label_version_sharing_tree: With project tree
-  label_version_sharing_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
+  label_version_sharing_none: Niet gedeeld
+  error_can_not_archive_project: Dit project kan niet worden gearchiveerd
+  button_duplicate: Dupliceer
+  button_copy_and_follow: Kopiëer en volg
+  label_copy_source: Bron
+  setting_issue_done_ratio: Bereken issue done ratio met
+  setting_issue_done_ratio_issue_status: Gebruik de issue status
+  error_issue_done_ratios_not_updated: Issue done ratios niet geupdate.
+  error_workflow_copy_target: Selecteer tracker(s) en rol(len)
+  setting_issue_done_ratio_issue_field: Gebruik het issue veld
+  label_copy_same_as_target: Zelfde als doel
+  label_copy_target: Doel
   notice_issue_done_ratios_updated: Issue done ratios updated.
-  error_workflow_copy_source: Please select a source tracker or role
+  error_workflow_copy_source: Selecteer een bron tracker of rol
   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
+  setting_start_of_week: Week begint op
+  permission_view_issues: Bekijk Issues
+  label_display_used_statuses_only: Laat alleen statussen zien die gebruikt worden door deze tracker
   label_revision_id: Revision {{value}}
   label_api_access_key: API access key
-  label_api_access_key_created_on: API access key created {{value}} ago
+  label_api_access_key_created_on: API access key gemaakt {{value}} geleden
   label_feeds_access_key: RSS access key
-  notice_api_access_key_reseted: Your API access key was reset.
+  notice_api_access_key_reseted: Uw API access key was gereset.
   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).
+  label_missing_api_access_key: Geen API access key
+  label_missing_feeds_access_key: Geen RSS access key
+  button_show: Laat zien
+  text_line_separated: Meerdere waarden toegestaan (elke regel is een waarde).
   setting_mail_handler_body_delimiters: Truncate emails after one of these lines
-  permission_add_subprojects: Create subprojects
-  label_subproject_new: New subproject
+  permission_add_subprojects: Maak subprojecten
+  label_subproject_new: Nieuw subproject
   text_own_membership_delete_confirmation: |-
-    You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
-    Are you sure you want to continue?
-  label_close_versions: Close completed versions
+    U staat op punt om sommige of alle van uw permissies te verwijderen en bent mogelijk niet meer toegestaan om dit project hierna te wijzigen.
+    Wilt u doorgaan?
+  label_close_versions: Sluit complete versies
   label_board_sticky: Sticky
-  label_board_locked: Locked
-  permission_export_wiki_pages: Export wiki pages
-  setting_cache_formatted_text: Cache formatted text
+  label_board_locked: Vergrendeld
+  permission_export_wiki_pages: Exporteer wiki pagina's
+  setting_cache_formatted_text: Cache opgemaakte tekst
   permission_manage_project_activities: Manage project activities
-  error_unable_delete_issue_status: Unable to delete issue status
-  label_profile: Profile
+  error_unable_delete_issue_status: Verwijderen van issue status niet gelukt
+  label_profile: Profiel
   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.
+  label_project_copy_notifications: Stuur email notificaties voor de project kopie
+  error_can_not_delete_custom_field: Verwijderen niet mogelijk van custom field
+  error_unable_to_connect: Geen connectie ({{value}})
+  error_can_not_remove_role: Deze rol is in gebruik en kan niet worden verwijderd.
+  error_can_not_delete_tracker: Deze tracker bevat nog issues en kan niet worden verwijderd.
   field_principal: Principal
-  label_my_page_block: My page block
-  notice_failed_to_save_members: "Failed to save member(s): {{errors}}."
-  text_zoom_out: Zoom out
+  label_my_page_block: Mijn pagina block
+  notice_failed_to_save_members: "Niet gelukt om lid/leden op te slaan: {{errors}}."
+  text_zoom_out: Zoom uit
   text_zoom_in: Zoom in
-  notice_unable_delete_time_entry: Unable to delete time log entry.
-  label_overall_spent_time: Overall spent time
+  notice_unable_delete_time_entry: Verwijderen niet mogelijk van tijd log invoer.
+  label_overall_spent_time: Totaal bestede tijd
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index ee9ee37a1..0c2270e8b 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -755,7 +755,7 @@ ru:
   mail_subject_account_activation_request: "Запрос на активацию пользователя в системе {{value}}"
   mail_subject_lost_password: "Ваш {{value}} пароль"
   mail_subject_register: "Активация учетной записи {{value}}"
-  mail_subject_reminder: "{{count}} назначенных на Вас задач в ближайшие {{days}} дни"
+  mail_subject_reminder: "{{count}} назначенных на Вас задач в ближайшие {{days}} дней"
 
   notice_account_activated: Ваша учетная запись активирована. Вы можете войти.
   notice_account_invalid_creditentials: Неправильное имя пользователя или пароль
diff --git a/config/locales/sr-CY.yml b/config/locales/sr-CY.yml
deleted file mode 100644
index 39cc5dcb8..000000000
--- a/config/locales/sr-CY.yml
+++ /dev/null
@@ -1,907 +0,0 @@
-# Serbian translations for Redmine
-# by Vladimir Medarović (vlada@medarovic.com)
-sr-CY:
-  date:
-    formats:
-      # Use the strftime parameters for formats.
-      # When no format has been given, it uses default.
-      # You can provide other formats here if you like!
-      default: "%d.%m.%Y."
-      short: "%e %b"
-      long: "%B %e, %Y"
-      
-    day_names: [Недеља, Понедељак, Уторак, Среда, Четвртак, Петак, Субота]
-    abbr_day_names: [Нед, Пон, Уто, Сре, Чет, Пет, Суб]
-      
-    # Don't forget the nil at the beginning; there's no such thing as a 0th month
-    month_names: [~, Јануар, Фебруар, Март, Април, Мај, Јун, Јул, Август, Септембар, Октобар, Новембар, Децембар]
-    abbr_month_names: [~, Јан, Феб, Мар, Апр, Мај, Јун, Јул, Авг, Сеп, Окт, Нов, Дец]
-    # Used in date_select and datime_select.
-    order: [ :day, :month, :year ]
-
-  time:
-    formats:
-      default: "%d.%m.%Y. у %H:%M"
-      time: "%H:%M"
-      short: "%d. %b у %H:%M"
-      long: "%d. %B %Y у %H:%M"
-    am: "am"
-    pm: "pm"
-
-  datetime:
-    distance_in_words:
-      half_a_minute: "пола минута"
-      less_than_x_seconds:
-        one:   "мање од једне секунде"
-        other: "мање од {{count}} сек."
-      x_seconds:
-        one:   "једна секунда"
-        other: "{{count}} сек."
-      less_than_x_minutes:
-        one:   "мање од минута"
-        other: "мање од {{count}} мин."
-      x_minutes:
-        one:   "један минут"
-        other: "{{count}} мин."
-      about_x_hours:
-        one:   "приближно један сат"
-        other: "приближно {{count}} сати"
-      x_days:
-        one:   "један дан"
-        other: "{{count}} дана"
-      about_x_months:
-        one:   "приближно један месец"
-        other: "приближно {{count}} месеци"
-      x_months:
-        one:   "један месец"
-        other: "{{count}} месеци"
-      about_x_years:
-        one:   "приближно годину дана"
-        other: "приближно {{count}} год."
-      over_x_years:
-        one:   "преко годину дана"
-        other: "преко {{count}} год."
-      almost_x_years:
-        one:   "скоро годину дана"
-        other: "скоро {{count}} год."
-
-  number:
-    human:
-      format:
-        delimiter: ""
-        precision: 1
-      storage_units:
-        format: "%n %u"
-        units:
-          byte:
-            one: "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"
-
-
-# Used in array.to_sentence.
-  support:
-    array:
-      sentence_connector: "и"
-      skip_last_comma: false
-      
-  activerecord:
-    errors:
-      messages:
-        inclusion: "није укључен у списак"
-        exclusion: "је резервисан"
-        invalid: "је неисправан"
-        confirmation: "потврда не одговара"
-        accepted: "мора бити прихваћен"
-        empty: "не може бити празно"
-        blank: "не може бити празно"
-        too_long: "је предугачка (максимум знакова је {{count}})"
-        too_short: "је прекратка (минимум знакова је {{count}})"
-        wrong_length: "је погрешне дужине (број знакова мора бити {{count}})"
-        taken: "је већ у употреби"
-        not_a_number: "није број"
-        not_a_date: "није исправан датум"
-        greater_than: "мора бити већи од {{count}}"
-        greater_than_or_equal_to: "мора бити већи или једнак {{count}}"
-        equal_to: "мора бити једнак {{count}}"
-        less_than: "мора бити мањи од {{count}}"
-        less_than_or_equal_to: "мора бити мањи или једнак {{count}}"
-        odd: "мора бити паран"
-        even: "мора бити непаран"
-        greater_than_start_date: "мора бити већи од почетног датума"
-        not_same_project: "не припада истом пројекту"
-        circular_dependency: "Ова веза ће створити кружну референцу"
-
-  actionview_instancetag_blank_option: Молим одаберите
-  
-  general_text_No: 'Не'
-  general_text_Yes: 'Да'
-  general_text_no: 'не'
-  general_text_yes: 'да'
-  general_lang_name: 'Српски'
-  general_csv_separator: ','
-  general_csv_decimal_separator: '.'
-  general_csv_encoding: UTF-8
-  general_pdf_encoding: UTF-8
-  general_first_day_of_week: '1'
-  
-  notice_account_updated: Налог је успешно ажуриран.
-  notice_account_invalid_creditentials: Неисправно корисничко име или лозинка.
-  notice_account_password_updated: Лозинка је успешно ажурирана.
-  notice_account_wrong_password: Погрешна лозинка
-  notice_account_register_done: Кориснички налог је успешно креиран. Кликните на линк који сте добили у емаил поруци за активацију.
-  notice_account_unknown_email: Непознат корисник.
-  notice_can_t_change_password: Овај кориснички налог за проверу идентитета користи спољни извор. Немогуће је променити лозинку.
-  notice_account_lost_email_sent: Послата вам је емаил порука са упутством за избор нове лозинке
-  notice_account_activated: Ваш кориснички налог је активиран. Сада се можете пријавити.
-  notice_successful_create: Успешно креирање.
-  notice_successful_update: Успешно ажурирање.
-  notice_successful_delete: Успешно брисање.
-  notice_successful_connection: Успешно повезивање.
-  notice_file_not_found: Страна којој желите приступити не постоји или је уклоњена.
-  notice_locking_conflict: Податак је ажуриран од стране другог корисника.
-  notice_not_authorized: Нисте овлашћени за приступ овој страни.
-  notice_email_sent: "Порука је послата на адресу {{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}}."
-  notice_no_issue_selected: "Ни један проблем није одабран! Молим, одаберите проблем који желите да мењате."
-  notice_account_pending: "Ваш налог је креиран и чека на одобрење администратора."
-  notice_default_data_loaded: Подразумевано конфигурисање је успешно учитано.
-  notice_unable_delete_version: Немогуће је обрисати верзију.
-  notice_issue_done_ratios_updated: Однос решених проблема је ажуриран.
-  
-  error_can_t_load_default_data: "Подразумевано конфигурисање је немогуће учитати: {{value}}"
-  error_scm_not_found: "Ставка или исправка нису пронађене у спремишту."
-  error_scm_command_failed: "Грешка се јавила приликом покушаја приступа спремишту: {{value}}"
-  error_scm_annotate: "Ставка не постоји или не може бити означена."
-  error_issue_not_found_in_project: 'Проблем није пронађен или не припада овом пројекту.'
-  error_no_tracker_in_project: 'Ни један трагач није повезан са овим пројектом. Молимо проверите подешавања пројекта.'
-  error_no_default_issue_status: 'Подразумевани статус проблема није дефинисан. Молимо проверите ваше конфигурисање (Идите на "Администрација -> Статуси проблема").'
-  error_can_not_reopen_issue_on_closed_version: 'Проблем додељен затвореној верзији не може бити поново отворен'
-  error_can_not_archive_project: Овај пројекат се не може архивирати
-  error_issue_done_ratios_not_updated: "Однос решених проблема није ажуриран."
-  error_workflow_copy_source: 'Молимо одаберите изворног трагача или улогу'
-  error_workflow_copy_target: 'Молимо одаберите крајњег трагача и улогу'
-  
-  warning_attachments_not_saved: "{{count}} датотека не може бити снимљено."
-  
-  mail_subject_lost_password: "Ваша {{value}} лозинка"
-  mail_body_lost_password: 'За промену ваше лозинке, кликните на следећи линк:'
-  mail_subject_register: "Активација вашег {{value}} налога"
-  mail_body_register: 'За активацију вашег налога, кликните на следећи линк:'
-  mail_body_account_information_external: "Можете користити ваш налог {{value}} за пријаву."
-  mail_body_account_information: Информације о вашем налогу
-  mail_subject_account_activation_request: "Захтев за активацију налога {{value}}"
-  mail_body_account_activation_request: "Нови корисник ({{value}}) је регистрован. Налог чека на ваше одобрење:"
-  mail_subject_reminder: "{{count}} проблема доспева наредних {{days}} дана"
-  mail_body_reminder: "{{count}} проблема додељених вама доспева у наредних {{days}} дана:"
-  mail_subject_wiki_content_added: "'{{page}}' wiki страна је додато"
-  mail_body_wiki_content_added: "{{author}} је додао '{{page}}' wiki страна."
-  mail_subject_wiki_content_updated: "'{{page}}' wiki страна је ажурирано"
-  mail_body_wiki_content_updated: "{{author}} је ажурирао '{{page}}' wiki страна."
-  
-  gui_validation_error: једна грешка
-  gui_validation_error_plural: "{{count}} грешака"
-  
-  field_name: Назив
-  field_description: Опис
-  field_summary: Резиме
-  field_is_required: Обавезно
-  field_firstname: Име
-  field_lastname: Презиме
-  field_mail: Емаил адреса
-  field_filename: Датотека
-  field_filesize: Величина
-  field_downloads: Преузимања
-  field_author: Аутор
-  field_created_on: Креирано
-  field_updated_on: Ажурирано
-  field_field_format: Формат
-  field_is_for_all: За све пројекте
-  field_possible_values: Могуће вредности
-  field_regexp: Регуларан израз
-  field_min_length: Минимална дужина
-  field_max_length: Максимална дужина
-  field_value: Вредност
-  field_category: Категорија
-  field_title: Наслов
-  field_project: Пројекат
-  field_issue: Проблем
-  field_status: Статус
-  field_notes: Белешке
-  field_is_closed: Затворен проблем
-  field_is_default: Подразумевана вредност
-  field_tracker: Трагач
-  field_subject: Предмет
-  field_due_date: Крајњи рок
-  field_assigned_to: Додељено
-  field_priority: Приоритет
-  field_fixed_version: Одредишна верзија
-  field_user: Корисник
-  field_role: Улога
-  field_homepage: Почетна страна
-  field_is_public: Јавно
-  field_parent: Потпројекат од
-  field_is_in_roadmap: Проблеми приказани у плану рада
-  field_login: Корисничко име
-  field_mail_notification: Емаил обавештења
-  field_admin: Администратор
-  field_last_login_on: Последње повезивање
-  field_language: Језик
-  field_effective_date: Датум
-  field_password: Лозинка
-  field_new_password: Нова лозинка
-  field_password_confirmation: Потврда лозинке
-  field_version: Верзија
-  field_type: Тип
-  field_host: Главни рачунар
-  field_port: Прикључак
-  field_account: Кориснички налог
-  field_base_dn: Базни DN
-  field_attr_login: Атрибут пријављивања
-  field_attr_firstname: Атрибут имена
-  field_attr_lastname: Атрибут презимена
-  field_attr_mail: Атрибут емаил адресе
-  field_onthefly: Креирање корисника у току рада
-  field_start_date: Почетак
-  field_done_ratio: % урађено
-  field_auth_source: Режим провере идентитета
-  field_hide_mail: Сакриј моју емаил адресу
-  field_comments: Коментар
-  field_url: URL
-  field_start_page: Почетна страна
-  field_subproject: Потпројекат
-  field_hours: сати
-  field_activity: Активност
-  field_spent_on: Датум
-  field_identifier: Идентификатор
-  field_is_filter: Употреби као филтер
-  field_issue_to: Повезани проблеми
-  field_delay: Кашњење
-  field_assignable: Проблем може бити додељен овој улози
-  field_redirect_existing_links: Преусмери постојеће везе
-  field_estimated_hours: Протекло време
-  field_column_names: Колоне
-  field_time_zone: Временска зона
-  field_searchable: Претражива
-  field_default_value: Подразумевана вредност
-  field_comments_sorting: Прикажи коментаре
-  field_parent_title: Матична страна
-  field_editable: Измељиво
-  field_watcher: Посматрач
-  field_identity_url: OpenID URL
-  field_content: Садржај
-  field_group_by: Групиши резултате по
-  field_sharing: Дељење
-  
-  setting_app_title: Наслов апликације
-  setting_app_subtitle: Поднаслов апликације
-  setting_welcome_text: Текст добродошлице
-  setting_default_language: Подразумевани језик
-  setting_login_required: Обавезна провера идентитета
-  setting_self_registration: Саморегистрација
-  setting_attachment_max_size: Макс. величина приложене датотеке
-  setting_issues_export_limit: Ограничење извоза проблема
-  setting_mail_from: Емаил адреса емисије
-  setting_bcc_recipients: Примаоци невидљиве копије поруке (bcc)
-  setting_plain_text_mail: Порука са чистим текстом (без HTML-а)
-  setting_host_name: Путања и назив главног рачунара
-  setting_text_formatting: Обликовање текста
-  setting_wiki_compression: Компресија Wiki историје
-  setting_feeds_limit: Ограничење садржаја извора вести
-  setting_default_projects_public: Нови пројекти су јавни ако се другачије не наведе
-  setting_autofetch_changesets: Извршавање аутоматског преузимања
-  setting_sys_api_enabled: Омогући WS за управљање спремиштем
-  setting_commit_ref_keywords: Референцирање кључних речи
-  setting_commit_fix_keywords: Поправљање кључних речи
-  setting_autologin: Аутоматска пријава
-  setting_date_format: Формат датума
-  setting_time_format: Формат времена
-  setting_cross_project_issue_relations: Дозволи релације проблема из унакрсних пројеката
-  setting_issue_list_default_columns: Подразумеване колоне приказане на списку проблема
-  setting_repositories_encodings: Кодирање спремишта
-  setting_commit_logs_encoding: Кодирање извршних порука
-  setting_emails_footer: Подножје емаил поруке
-  setting_protocol: Протокол
-  setting_per_page_options: Опције приказа објеката по страни
-  setting_user_format: Формат приказа корисника
-  setting_activity_days_default: Број дана приказаних на пројектној активности
-  setting_display_subprojects_issues: Приказуј проблеме из потпројеката на главном пројекту уколико није другачије наведено
-  setting_enabled_scm: Омогући SCM
-  setting_mail_handler_body_delimiters: "Скрати поруку након једне од ових линија"
-  setting_mail_handler_api_enabled: Омогући WS долазне поруке
-  setting_mail_handler_api_key: API кључ
-  setting_sequential_project_identifiers: Генерисање секвенцијалног имена пројекта
-  setting_gravatar_enabled: Користи Gravatar корисничке иконе
-  setting_gravatar_default: Подразумевана Gravatar слика
-  setting_diff_max_lines_displayed: Макс. број приказаних различитих линија
-  setting_file_max_size_displayed: Макс. величина текстуалних датотека приказаних унутра
-  setting_repository_log_display_limit: Макс. број ревизија приказан у датотеци за евиденцију
-  setting_openid: Дозволи OpenID пријаву и регистрацију
-  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_rest_api_enabled: Омогући REST web услуге
-  setting_cache_formatted_text: Кеширај обрађен текст
-  
-  permission_add_project: Креирање пројекта
-  permission_add_subprojects: Креирање потпојекта
-  permission_edit_project: Измена пројеката
-  permission_select_project_modules: Одабирање модула пројекта
-  permission_manage_members: Управљање члановима
-  permission_manage_project_activities: Управљање пројектним активностима
-  permission_manage_versions: Управљање верзијама
-  permission_manage_categories: Управљање категоријама проблема
-  permission_view_issues: Преглед проблема
-  permission_add_issues: Додавање проблема
-  permission_edit_issues: Измена проблема
-  permission_manage_issue_relations: Управљање релацијама између проблема
-  permission_add_issue_notes: Додавање белешки
-  permission_edit_issue_notes: Измена белешки
-  permission_edit_own_issue_notes: Измена сопствених белешки
-  permission_move_issues: Померање проблема
-  permission_delete_issues: Брисање проблема
-  permission_manage_public_queries: Управљање јавним упитима
-  permission_save_queries: Снимање упита
-  permission_view_gantt: Прегледање Гантовог дијаграма
-  permission_view_calendar: Прегледање календара
-  permission_view_issue_watchers: Прегледање списка посматрача
-  permission_add_issue_watchers: Додавање посматрача
-  permission_delete_issue_watchers: Брисање посматрача
-  permission_log_time: Бележење утрошеног времена
-  permission_view_time_entries: Прегледање утрошеног времена
-  permission_edit_time_entries: Измена утрошеног времена
-  permission_edit_own_time_entries: Измена сопственог утрошеног времена
-  permission_manage_news: Управљање вестима
-  permission_comment_news: Коментарисање вести
-  permission_manage_documents: Управљање документима
-  permission_view_documents: Прегледање докумената
-  permission_manage_files: Управљање датотекама
-  permission_view_files: Прегледање датотека
-  permission_manage_wiki: Управљање wiki странама
-  permission_rename_wiki_pages: Промена имена wiki странама
-  permission_delete_wiki_pages: Брисање wiki страна
-  permission_view_wiki_pages: Прегледање wiki страна
-  permission_view_wiki_edits: Прегледање wiki историје
-  permission_edit_wiki_pages: Измена wiki страна
-  permission_delete_wiki_pages_attachments: Брисање приложених датотека
-  permission_protect_wiki_pages: Заштита wiki страна
-  permission_manage_repository: Управљање спремиштем
-  permission_browse_repository: Прегледање спремишта
-  permission_view_changesets: Прегледање скупа промена
-  permission_commit_access: Потврда приступа
-  permission_manage_boards: Управљање форумима
-  permission_view_messages: Прегледање порука
-  permission_add_messages: Слање порука
-  permission_edit_messages: Измена порука
-  permission_edit_own_messages: Измена сопствених порука
-  permission_delete_messages: Брисање порука
-  permission_delete_own_messages: Брисање сопствених порука
-  permission_export_wiki_pages: Извоз wiki страна
-  
-  project_module_issue_tracking: Трагање за проблемом
-  project_module_time_tracking: Време трагања
-  project_module_news: Вести
-  project_module_documents: Документа
-  project_module_files: Датотеке
-  project_module_wiki: Wiki
-  project_module_repository: Спремиште
-  project_module_boards: Форуми
-  
-  label_user: Корисник
-  label_user_plural: Корисници
-  label_user_new: Нови корисник
-  label_user_anonymous: Анониман
-  label_project: Пројекат
-  label_project_new: Нови пројекат
-  label_project_plural: Пројекти
-  label_x_projects:
-    zero:  нема пројеката
-    one:   један пројекат
-    other: "{{count}} пројеката"
-  label_project_all: Сви пројекти
-  label_project_latest: Последњи пројекти
-  label_issue: Проблем
-  label_issue_new: Нови проблем
-  label_issue_plural: Проблеми
-  label_issue_view_all: Приказ свих проблема
-  label_issues_by: "Проблеми - {{value}}"
-  label_issue_added: Проблем је додат
-  label_issue_updated: Проблем је ажуриран
-  label_document: Документ
-  label_document_new: Нови документ
-  label_document_plural: Документи
-  label_document_added: Документ је додат
-  label_role: Улога
-  label_role_plural: Улоге
-  label_role_new: Нова улога
-  label_role_and_permissions: Улоге и дозволе
-  label_member: Члан
-  label_member_new: Нови члан
-  label_member_plural: Чланови
-  label_tracker: Трагач
-  label_tracker_plural: Трагачи
-  label_tracker_new: Нови трагач
-  label_workflow: Ток рада
-  label_issue_status: Статус проблема
-  label_issue_status_plural: Статуси проблема
-  label_issue_status_new: Нови статус
-  label_issue_category: Категорија проблема
-  label_issue_category_plural: Категорије проблема
-  label_issue_category_new: Нова категорија
-  label_custom_field: Прилагођено поље
-  label_custom_field_plural: Прилагођена поља
-  label_custom_field_new: Ново прилагођено поље
-  label_enumerations: Набројива листа
-  label_enumeration_new: Нова вредност
-  label_information: Информација
-  label_information_plural: Информацијe
-  label_please_login: Молимо, пријавите се
-  label_register: Регистрација
-  label_login_with_open_id_option: или пријава са OpenID
-  label_password_lost: Изгубљена лозинка
-  label_home: Почетак
-  label_my_page: Моја страна
-  label_my_account: Мој налог
-  label_my_projects: Моји пројекти
-  label_administration: Администрација
-  label_login: Пријава
-  label_logout: Одјава
-  label_help: Помоћ
-  label_reported_issues: Пријављени проблеми
-  label_assigned_to_me_issues: Проблеми додољени мени
-  label_last_login: Последње повезивање
-  label_registered_on: Регистрован
-  label_activity: Активност
-  label_overall_activity: Обухватна активност
-  label_user_activity: "Активност корисника {{value}}"
-  label_new: Ново
-  label_logged_as: Пријављени сте као
-  label_environment: Окружење
-  label_authentication: Провера идентитета
-  label_auth_source: Режим провере идентитета
-  label_auth_source_new: Нови режим провере идентитета
-  label_auth_source_plural: Режими провере идентитета
-  label_subproject_plural: Потпројекти
-  label_subproject_new: Нови потпројекат
-  label_and_its_subprojects: "{{value}} и његови потпројекти"
-  label_min_max_length: Мин. - Макс. дужина
-  label_list: Списак
-  label_date: Датум
-  label_integer: Цео број
-  label_float: Са покретним зарезом
-  label_boolean: Логички оператор
-  label_string: Текст
-  label_text: Дуги текст
-  label_attribute: Особина
-  label_attribute_plural: Особине
-  label_download: "{{count}} преузимање"
-  label_download_plural: "{{count}} преузимања"
-  label_no_data: Нема података за приказивање
-  label_change_status: Промена статуса
-  label_history: Историја
-  label_attachment: Датотека
-  label_attachment_new: Нова датотека
-  label_attachment_delete: Брисање датотеке
-  label_attachment_plural: Датотеке
-  label_file_added: Датотека додата
-  label_report: Извештај
-  label_report_plural: Извештаји
-  label_news: Вести
-  label_news_new: Додавање вести
-  label_news_plural: Вести
-  label_news_latest: Последње вести
-  label_news_view_all: Приказ свих вести
-  label_news_added: Вести додато
-  label_settings: Подешавања
-  label_overview: Преглед
-  label_version: Верзија
-  label_version_new: Нова верзија
-  label_version_plural: Верзије
-  label_close_versions: Затвори завршене верзије
-  label_confirmation: Потврда
-  label_export_to: 'Такође доступно и у варијанти:'
-  label_read: Читање...
-  label_public_projects: Јавни пројекти
-  label_open_issues: отворен
-  label_open_issues_plural: отворених
-  label_closed_issues: затворен
-  label_closed_issues_plural: затворених
-  label_x_open_issues_abbr_on_total:
-    zero:  0 отворених / {{total}}
-    one:   1 отворен / {{total}}
-    other: "{{count}} отворених / {{total}}"
-  label_x_open_issues_abbr:
-    zero:  0 отворених
-    one:   1 отворен
-    other: "{{count}} отворених"
-  label_x_closed_issues_abbr:
-    zero:  0 затворених
-    one:   1 затворен
-    other: "{{count}} затворених"
-  label_total: Укупно
-  label_permissions: Овлашћења
-  label_current_status: Тренутни статус
-  label_new_statuses_allowed: Нови статуси дозвољени
-  label_all: сви
-  label_none: ниједан
-  label_nobody: никоме
-  label_next: Следеће
-  label_previous: Претходно
-  label_used_by: Користио
-  label_details: Детаљи
-  label_add_note: Додај белешку
-  label_per_page: По страни
-  label_calendar: Календар
-  label_months_from: месеци од
-  label_gantt: Гантов дијаграм
-  label_internal: Унутрашљи
-  label_last_changes: "последњих {{count}} промена"
-  label_change_view_all: Прикажи све промене
-  label_personalize_page: Персонализујте ову страну
-  label_comment: Коментар
-  label_comment_plural: Коментари
-  label_x_comments:
-    zero: без коментара
-    one: један коментар
-    other: "{{count}} коментара"
-  label_comment_add: Додај коментар
-  label_comment_added: Коментар додат
-  label_comment_delete: Обриши коментаре
-  label_query: Прилагођен упит
-  label_query_plural: Прилагођени упити
-  label_query_new: Нови упит
-  label_filter_add: Додај филтер
-  label_filter_plural: Филтери
-  label_equals: је
-  label_not_equals: није
-  label_in_less_than: мање од
-  label_in_more_than: више од
-  label_greater_or_equal: '>='
-  label_less_or_equal: '<='
-  label_in: у
-  label_today: данас
-  label_all_time: све време
-  label_yesterday: јуче
-  label_this_week: ове седмице
-  label_last_week: последње седмице
-  label_last_n_days: "последњих {{count}} дана"
-  label_this_month: овог месеца
-  label_last_month: последњег месеца
-  label_this_year: ове године
-  label_date_range: Временски период
-  label_less_than_ago: пре мање од неколико дана
-  label_more_than_ago: пре више од неколико дана
-  label_ago: пре неколико дана
-  label_contains: садржи
-  label_not_contains: не садржи
-  label_day_plural: дана
-  label_repository: Спремиште
-  label_repository_plural: Спремишта
-  label_browse: Прегледање
-  label_modification: "{{count}} промена"
-  label_modification_plural: "{{count}} промена"
-  label_branch: Грана
-  label_tag: Ознака
-  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_max_size: Максимална величина
-  label_sort_highest: Премести на врх
-  label_sort_higher: Премести на горе
-  label_sort_lower: Премести на доле
-  label_sort_lowest: Премести на дно
-  label_roadmap: План рада
-  label_roadmap_due_in: "Доспева {{value}}"
-  label_roadmap_overdue: "{{value}} најкасније"
-  label_roadmap_no_issues: Нема проблема за ову верзију
-  label_search: Претрага
-  label_result_plural: Резултати
-  label_all_words: Све речи
-  label_wiki: Wiki
-  label_wiki_edit: Wiki измена
-  label_wiki_edit_plural: Wiki измене
-  label_wiki_page: Wiki страна
-  label_wiki_page_plural: Wiki стране
-  label_index_by_title: Индексирање по наслову
-  label_index_by_date: Индексирање по датуму
-  label_current_version: Тренутна верзија
-  label_preview: Преглед
-  label_feed_plural: Извори вести
-  label_changes_details: Детаљи свих промена
-  label_issue_tracking: Праћење проблема
-  label_spent_time: Утрошено време
-  label_f_hour: "{{value}} сат"
-  label_f_hour_plural: "{{value}} сати"
-  label_time_tracking: Време праћења
-  label_change_plural: Промене
-  label_statistics: Статистика
-  label_commits_per_month: Потврда месечно
-  label_commits_per_author: Потврда по аутору
-  label_view_diff: Погледај разлике
-  label_diff_inline: унутра
-  label_diff_side_by_side: упоредо
-  label_options: Опције
-  label_copy_workflow_from: Копирај ток рада од
-  label_permissions_report: Извештај о овлашћењима
-  label_watched_issues: Посматрани проблеми
-  label_related_issues: Повезани проблеми
-  label_applied_status: Примењени статуси
-  label_loading: Учитавање...
-  label_relation_new: Нова релација
-  label_relation_delete: Обриши релацију
-  label_relates_to: повезаних са
-  label_duplicates: дуплираних
-  label_duplicated_by: дуплираних од
-  label_blocks: одбијених
-  label_blocked_by: одбијених од
-  label_precedes: претходи
-  label_follows: праћених
-  label_end_to_start: од краја до почетка
-  label_end_to_end: од краја до краја
-  label_start_to_start: од почетка до почетка
-  label_start_to_end: од почетка до краја
-  label_stay_logged_in: Остани пријављен
-  label_disabled: онемогућено
-  label_show_completed_versions: Прикажи завршене верзије
-  label_me: мени
-  label_board: Форум
-  label_board_new: Нови форум
-  label_board_plural: Форуми
-  label_board_locked: Закључана
-  label_board_sticky: Лепљива
-  label_topic_plural: Теме
-  label_message_plural: Поруке
-  label_message_last: Последња порука
-  label_message_new: Нова порука
-  label_message_posted: Порука је додата
-  label_reply_plural: Одговори
-  label_send_information: Пошаљи детаље налога кориснику
-  label_year: Година
-  label_month: Месец
-  label_week: Седмица
-  label_date_from: Шаље
-  label_date_to: Прима
-  label_language_based: Базирано на језику корисника
-  label_sort_by: "Поређано по {{value}}"
-  label_send_test_email: Пошаљи пробну поруку
-  label_feeds_access_key: RSS приступни кључ
-  label_missing_feeds_access_key: RSS приступни кључ недостаје
-  label_feeds_access_key_created_on: "RSS приступни кључ је направљен пре {{value}}"
-  label_module_plural: Модули
-  label_added_time_by: "Додао {{author}} пре {{age}}"
-  label_updated_time_by: "Ажурирао {{author}} пре {{age}}"
-  label_updated_time: "Ажурирано пре {{value}}"
-  label_jump_to_a_project: Скок на пројекат...
-  label_file_plural: Датотеке
-  label_changeset_plural: Скупови промена
-  label_default_columns: Подразумеване колоне
-  label_no_change_option: (Без промена)
-  label_bulk_edit_selected_issues: Групна измена одабраних проблема
-  label_theme: Тема
-  label_default: Подразумевано
-  label_search_titles_only: Претражуј само наслове
-  label_user_mail_option_all: "За било који догађај на свим мојим пројектима"
-  label_user_mail_option_selected: "За било који догађај на само одабраним пројектима..."
-  label_user_mail_option_none: "Само за ствари које пратим или сам укључен"
-  label_user_mail_no_self_notified: "Не желим бити обавештаван за промене које сам правим"
-  label_registration_activation_by_email: активација налога путем емаил-а
-  label_registration_manual_activation: ручна активација налога
-  label_registration_automatic_activation: аутоматска активација налога
-  label_display_per_page: "Број ставки по страни: {{value}}"
-  label_age: Старост
-  label_change_properties: Промени својства
-  label_general: Општи
-  label_more: Више
-  label_scm: SCM
-  label_plugins: Додаци
-  label_ldap_authentication: LDAP провера идентитета
-  label_downloads_abbr: D/L
-  label_optional_description: Опционо опис
-  label_add_another_file: Додај још једну датотеку
-  label_preferences: Подешавања
-  label_chronological_order: по хронолошком редоследу
-  label_reverse_chronological_order: по обрнутом хронолошком редоследу
-  label_planning: Планирање
-  label_incoming_emails: Долазне поруке
-  label_generate_key: Генериши кључ
-  label_issue_watchers: Посматрачи
-  label_example: Пример
-  label_display: Приказ
-  label_sort: Редослед
-  label_ascending: Растући низ
-  label_descending: Опадајући низ
-  label_date_from_to: Од {{start}} до {{end}}
-  label_wiki_content_added: Wiki страна је додата
-  label_wiki_content_updated: Wiki страна је ажурирана
-  label_group: Група
-  label_group_plural: Групе
-  label_group_new: Нова група
-  label_time_entry_plural: Проведено време
-  label_version_sharing_none: Није дељено
-  label_version_sharing_descendants: Са потпројектима
-  label_version_sharing_hierarchy: Са хијерархијом пројекта
-  label_version_sharing_tree: Са стаблом пројекта
-  label_version_sharing_system: Са свим пројектима
-  label_update_issue_done_ratios: Ажурирај однос решених проблема
-  label_copy_source: Извор
-  label_copy_target: Одредиште
-  label_copy_same_as_target: Исто као одредиште
-  label_display_used_statuses_only: Приказуј статусе коришћене само од стране овог трагача
-  label_api_access_key: API приступни кључ
-  label_missing_api_access_key: API приступни кључ недостаје
-  label_api_access_key_created_on: "API приступни кључ је креиран пре {{value}}"
-  label_project_copy_notifications: Пошаљи емаил поруку са обавештењем приликом копирања пројекта 
-  
-  button_login: Пријава
-  button_submit: Пошаљи
-  button_save: Сними
-  button_check_all: Укључи све
-  button_uncheck_all: Искључи све
-  button_delete: Обриши
-  button_create: Направи
-  button_create_and_continue: Направи и настави
-  button_test: Тест
-  button_edit: Измени
-  button_add: Додај
-  button_change: Промени
-  button_apply: Примени
-  button_clear: Обриши
-  button_lock: Закључај
-  button_unlock: Откључај
-  button_download: Преузми
-  button_list: Списак
-  button_view: Приказ
-  button_move: Помери
-  button_move_and_follow: Помери и прати
-  button_back: Назад
-  button_cancel: Поништи
-  button_activate: Активирај
-  button_sort: Поређај
-  button_log_time: Евидентирање времена
-  button_rollback: Повратак на ову верзију
-  button_watch: Прати
-  button_unwatch: Не прати више
-  button_reply: Одговори
-  button_archive: Архивирај
-  button_unarchive: Врати из архиве
-  button_reset: Поништи
-  button_rename: Реименуј
-  button_change_password: Променa лозинкe
-  button_copy: Копирај
-  button_copy_and_follow: Копирај и прати
-  button_annotate: Прибележи
-  button_update: Ажурирај
-  button_configure: Подеси
-  button_quote: Под наводницима
-  button_duplicate: Дуплирај
-  button_show: Прикажи
-  
-  status_active: активни
-  status_registered: регистровани
-  status_locked: закључани
-  
-  version_status_open: отворен
-  version_status_locked: закључан
-  version_status_closed: затворен
-
-  field_active: Активан
-  
-  text_select_mail_notifications: Одабери акције за које ће емаил обавештење бити послато.
-  text_regexp_info: нпр. ^[A-Z0-9]+$
-  text_min_max_length_info: 0 значи без ограничења
-  text_project_destroy_confirmation: Јесте ли сигурни да желите да обришете овај пројекат и све припадајуће податке?
-  text_subprojects_destroy_warning: "Потпојекат: {{value}} ће такође бити обрисан."
-  text_workflow_edit: Одаберите улогу и трагача за измену тока рада
-  text_are_you_sure: Јесте ли сигурни?
-  text_journal_changed: "{{label}} промењен од {{old}} у {{new}}"
-  text_journal_set_to: "{{label}} постављен у {{value}}"
-  text_journal_deleted: "{{label}} обрисано ({{old}})"
-  text_journal_added: "{{label}} {{value}} додато"
-  text_tip_task_begin_day: задатак почиње овог дана
-  text_tip_task_end_day: задатак се завршава овог дана
-  text_tip_task_begin_end_day: задатак почиње и завршава истог дана
-  text_project_identifier_info: 'Дозвољена су само мала слова (a-ш), бројеви и цртице.
    Једном снимљен, идентификатор се не може променити.'
-  text_caracters_maximum: "{{count}} знак(ова) највише."
-  text_caracters_minimum: "Број знакова мора бити најмање {{count}}."
-  text_length_between: "Број знакова мора бити између {{min}} и {{max}}."
-  text_tracker_no_workflow: Ток рада није дефинисан за овог трагача
-  text_unallowed_characters: Недозвољени знакови
-  text_comma_separated: Вишеструке вредности су дозвољене (одвојене зарезом).
-  text_line_separated: Вишеструке вредности су дозвољене (један ред за сваку вредност).
-  text_issues_ref_in_commit_messages: Референцирање и поправљање проблема у извршним порукама
-  text_issue_added: "Проблем {{id}} је пријавио {{author}}."
-  text_issue_updated: "Проблем {{id}} је ажурирао {{author}}."
-  text_wiki_destroy_confirmation: Јесте ли сигурни да желите да обришете wiki и сав садржај?
-  text_issue_category_destroy_question: "Неколико проблема ({{count}}) је додељено овој категорији. Шта желите да урадите?"
-  text_issue_category_destroy_assignments: Уклони додољене категорије
-  text_issue_category_reassign_to: Додели поново проблеме овој категорији
-  text_user_mail_option: "За неизабране пројекте, добићете само обавештење о стварима које пратите или сте укључени (нпр. проблеми чији сте ви аутор или заступник)."
-  text_no_configuration_data: "Улоге, трагачи, статуси проблема и процеса рада још увек нису подешени.\nПрепоручљиво је да учитате подразумевано конфигурисање. Измена је могућа након првог учитавања."
-  text_load_default_configuration: Учитај подразумевано конфигурисање
-  text_status_changed_by_changeset: "Примењено у скупу са променама {{value}}."
-  text_issues_destroy_confirmation: 'Јесте ли сигурни да желите да обришете одабране проблеме?'
-  text_select_project_modules: 'Одаберите модуле које желите омогућити за овај пројекат:'
-  text_default_administrator_account_changed: Подразумевани администраторски налог је промењен
-  text_file_repository_writable: Фасцикла приложених датотека је уписива
-  text_plugin_assets_writable: Фасцикла елемената додатка је уписива
-  text_rmagick_available: RMagick је доступан (опционо)
-  text_destroy_time_entries_question: "{{hours}} сати је пријављено за овај проблем који желите обрисати. Шта желите да урадите?"
-  text_destroy_time_entries: Обриши пријављене сате
-  text_assign_time_entries_to_project: Додели пријављене сате пројекту
-  text_reassign_time_entries: 'Додели поново пријављене сате овом проблему:'
-  text_user_wrote: "{{value}} је написао:"
-  text_enumeration_destroy_question: "{{count}} објекат(а) је додељено овој вредности."
-  text_enumeration_category_reassign_to: 'Додели их поново овој вредности:'
-  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: 'Један ред за сваку вредност'
-  text_wiki_page_destroy_question: "Ова страна има {{descendants}} страна наследника и потомака. Шта желите да урадите?"
-  text_wiki_page_nullify_children: "Задржи стране наследника као корене стране"
-  text_wiki_page_destroy_children: "Обриши стране наследника и свих њихових потомака"
-  text_wiki_page_reassign_children: "Додели поново стране наследника њиховој родитељској страни"
-  text_own_membership_delete_confirmation: "Уклањањем појединих или свих ваших дозвола нећете више моћи за уређујете овај пројекат након тога.\nЖелите ли да наставите?"
-  
-  default_role_manager: Менаџер
-  default_role_developer: Програмер
-  default_role_reporter: Извештач
-  default_tracker_bug: Грешка
-  default_tracker_feature: Функционалност
-  default_tracker_support: Подршка
-  default_issue_status_new: Ново
-  default_issue_status_in_progress: У току
-  default_issue_status_resolved: Решено
-  default_issue_status_feedback: Повратна информација
-  default_issue_status_closed: Затворено
-  default_issue_status_rejected: Одбијено
-  default_doc_category_user: Корисничка документација
-  default_doc_category_tech: Техничка документација
-  default_priority_low: Низак
-  default_priority_normal: Нормалан
-  default_priority_high: Висок
-  default_priority_urgent: Хитно
-  default_priority_immediate: Непосредно
-  default_activity_design: Дизајн
-  default_activity_development: Развој
-  
-  enumeration_issue_priorities: Приоритети проблема
-  enumeration_doc_categories: Категорије документа
-  enumeration_activities: Активности (временски праћене)
-  enumeration_system_activity: Системска активност
-
-  error_can_not_delete_custom_field: Unable to delete custom field
-  permission_manage_subtasks: Manage subtasks
-  label_profile: Profile
-  error_unable_to_connect: Unable to connect ({{value}})
-  error_can_not_remove_role: This role is in use and can not be deleted.
-  field_parent_issue: Parent task
-  error_unable_delete_issue_status: Unable to delete issue status
-  label_subtask_plural: Subtasks
-  error_can_not_delete_tracker: This tracker contains issues and can't be deleted.
-  field_principal: Principal
-  label_my_page_block: My page block
-  notice_failed_to_save_members: "Failed to save member(s): {{errors}}."
-  text_zoom_out: Zoom out
-  text_zoom_in: Zoom in
-  notice_unable_delete_time_entry: Unable to delete time log entry.
-  label_overall_spent_time: Overall spent time
diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
new file mode 100644
index 000000000..2cc0c0983
--- /dev/null
+++ b/config/locales/sr-YU.yml
@@ -0,0 +1,907 @@
+# Serbian translations for Redmine
+# by Vladimir Medarović (vlada@medarovic.com)
+sr-YU:
+  date:
+    formats:
+      # Use the strftime parameters for formats.
+      # When no format has been given, it uses default.
+      # You can provide other formats here if you like!
+      default: "%d.%m.%Y."
+      short: "%e %b"
+      long: "%B %e, %Y"
+      
+    day_names: [nedelja, ponedeljak, utorak, sreda, četvrtak, petak, subota]
+    abbr_day_names: [ned, pon, uto, sre, čet, pet, sub]
+      
+    # Don't forget the nil at the beginning; there's no such thing as a 0th month
+    month_names: [~, januar, februar, mart, april, maj, jun, jul, avgust, septembar, oktobar, novembar, decembar]
+    abbr_month_names: [~, jan, feb, mar, apr, maj, jun, jul, avg, sep, okt, nov, dec]
+    # Used in date_select and datime_select.
+    order: [ :day, :month, :year ]
+
+  time:
+    formats:
+      default: "%d.%m.%Y. u %H:%M"
+      time: "%H:%M"
+      short: "%d. %b u %H:%M"
+      long: "%d. %B %Y u %H:%M"
+    am: "am"
+    pm: "pm"
+
+  datetime:
+    distance_in_words:
+      half_a_minute: "pola minuta"
+      less_than_x_seconds:
+        one:   "manje od jedne sekunde"
+        other: "manje od {{count}} sek."
+      x_seconds:
+        one:   "jedna sekunda"
+        other: "{{count}} sek."
+      less_than_x_minutes:
+        one:   "manje od minuta"
+        other: "manje od {{count}} min."
+      x_minutes:
+        one:   "jedan minut"
+        other: "{{count}} min."
+      about_x_hours:
+        one:   "približno jedan sat"
+        other: "približno {{count}} sati"
+      x_days:
+        one:   "jedan dan"
+        other: "{{count}} dana"
+      about_x_months:
+        one:   "približno jedan mesec"
+        other: "približno {{count}} meseci"
+      x_months:
+        one:   "jedan mesec"
+        other: "{{count}} meseci"
+      about_x_years:
+        one:   "približno godinu dana"
+        other: "približno {{count}} god."
+      over_x_years:
+        one:   "preko godinu dana"
+        other: "preko {{count}} god."
+      almost_x_years:
+        one:   "skoro godinu dana"
+        other: "skoro {{count}} god."
+
+  number:
+    human:
+      format:
+        delimiter: ""
+        precision: 1
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
+
+
+# Used in array.to_sentence.
+  support:
+    array:
+      sentence_connector: "i"
+      skip_last_comma: false
+      
+  activerecord:
+    errors:
+      messages:
+        inclusion: "nije uključen u spisak"
+        exclusion: "je rezervisan"
+        invalid: "je neispravan"
+        confirmation: "potvrda ne odgovara"
+        accepted: "mora biti prihvaćen"
+        empty: "ne može biti prazno"
+        blank: "ne može biti prazno"
+        too_long: "je predugačka (maksimum znakova je {{count}})"
+        too_short: "je prekratka (minimum znakova je {{count}})"
+        wrong_length: "je pogrešne dužine (broj znakova mora biti {{count}})"
+        taken: "je već u upotrebi"
+        not_a_number: "nije broj"
+        not_a_date: "nije ispravan datum"
+        greater_than: "mora biti veći od {{count}}"
+        greater_than_or_equal_to: "mora biti veći ili jednak {{count}}"
+        equal_to: "mora biti jednak {{count}}"
+        less_than: "mora biti manji od {{count}}"
+        less_than_or_equal_to: "mora biti manji ili jednak {{count}}"
+        odd: "mora biti paran"
+        even: "mora biti neparan"
+        greater_than_start_date: "mora biti veći od početnog datuma"
+        not_same_project: "ne pripada istom projektu"
+        circular_dependency: "Ova veza će stvoriti kružnu referencu"
+        cant_link_an_issue_with_a_descendant: "Problem ne može biti povezan sa jednim od svojih podzadataka"
+
+  actionview_instancetag_blank_option: Molim odaberite
+  
+  general_text_No: 'Ne'
+  general_text_Yes: 'Da'
+  general_text_no: 'ne'
+  general_text_yes: 'da'
+  general_lang_name: 'Srpski'
+  general_csv_separator: ','
+  general_csv_decimal_separator: '.'
+  general_csv_encoding: UTF-8
+  general_pdf_encoding: UTF-8
+  general_first_day_of_week: '1'
+  
+  notice_account_updated: Nalog je uspešno ažuriran.
+  notice_account_invalid_creditentials: Neispravno korisničko ime ili lozinka.
+  notice_account_password_updated: Lozinka je uspešno ažurirana.
+  notice_account_wrong_password: Pogrešna lozinka
+  notice_account_register_done: Korisnički nalog je uspešno kreiran. Kliknite na link koji ste dobili u e-poruci za aktivaciju.
+  notice_account_unknown_email: Nepoznat korisnik.
+  notice_can_t_change_password: Ovaj korisnički nalog za potvrdu identiteta koristi spoljni izvor. Nemoguće je promeniti lozinku.
+  notice_account_lost_email_sent: Poslata vam je e-poruka sa uputstvom za izbor nove lozinke
+  notice_account_activated: Vaš korisnički nalog je aktiviran. Sada se možete prijaviti.
+  notice_successful_create: Uspešno kreiranje.
+  notice_successful_update: Uspešno ažuriranje.
+  notice_successful_delete: Uspešno brisanje.
+  notice_successful_connection: Uspešno povezivanje.
+  notice_file_not_found: Strana kojoj želite pristupiti ne postoji ili je uklonjena.
+  notice_locking_conflict: Podatak je ažuriran od strane drugog korisnika.
+  notice_not_authorized: Niste ovlašćeni za pristup ovoj strani.
+  notice_email_sent: "E-poruka je poslata na {{value}}"
+  notice_email_error: "Dogodila se greška prilikom slanja e-poruke ({{value}})"
+  notice_feeds_access_key_reseted: Vaš RSS pristupni ključ je poništen.
+  notice_api_access_key_reseted: Vaš API pristupni ključ je poništen.
+  notice_failed_to_save_issues: "Neuspešno snimanje {{count}} problema od {{total}} odabranih: {{ids}}."
+  notice_failed_to_save_members: "Neuspešno snimanje člana(ova): {{errors}}."
+  notice_no_issue_selected: "Ni jedan problem nije odabran! Molimo, odaberite problem koji želite da menjate."
+  notice_account_pending: "Vaš nalog je kreiran i čeka na odobrenje administratora."
+  notice_default_data_loaded: Podrazumevano konfigurisanje je uspešno učitano.
+  notice_unable_delete_version: Verziju je nemoguće izbrisati.
+  notice_unable_delete_time_entry: Stavku evidencije vremena je nemoguće izbrisati.
+  notice_issue_done_ratios_updated: Odnos rešenih problema je ažuriran.
+  
+  error_can_t_load_default_data: "Podrazumevano konfigurisanje je nemoguće učitati: {{value}}"
+  error_scm_not_found: "Stavka ili ispravka nisu pronađene u spremištu."
+  error_scm_command_failed: "Greška se javila prilikom pokušaja pristupa spremištu: {{value}}"
+  error_scm_annotate: "Stavka ne postoji ili ne može biti označena."
+  error_issue_not_found_in_project: 'Problem nije pronađen ili ne pripada ovom projektu.'
+  error_no_tracker_in_project: 'Ni jedno praćenje nije povezano sa ovim projektom. Molimo proverite podešavanja projekta.'
+  error_no_default_issue_status: 'Podrazumevani status problema nije definisan. Molimo proverite vaše konfigurisanje (idite na "Administracija -> Statusi problema").'
+  error_can_not_delete_custom_field: Nemoguće je izbrisati prilagođeno polje
+  error_can_not_delete_tracker: "Ovo praćenje sadrži probleme i ne može biti obrisano."
+  error_can_not_remove_role: "Ova uloga je u upotrebi i ne može biti obrisana."
+  error_can_not_reopen_issue_on_closed_version: 'Problem dodeljen zatvorenoj verziji ne može biti ponovo otvoren'
+  error_can_not_archive_project: Ovaj projekat se ne može arhivirati
+  error_issue_done_ratios_not_updated: "Odnos rešenih problema nije ažuriran."
+  error_workflow_copy_source: 'Molimo odaberite izvorno praćenje ili ulogu'
+  error_workflow_copy_target: 'Molimo odaberite odredišno praćenje i ulogu'
+  error_unable_delete_issue_status: 'Status problema je nemoguće obrisati'
+  error_unable_to_connect: "Povezivanje sa ({{value}}) je nemoguće"  
+  warning_attachments_not_saved: "{{count}} datoteka ne može biti snimljena."
+  
+  mail_subject_lost_password: "Vaša {{value}} lozinka"
+  mail_body_lost_password: 'Za promenu vaše lozinke, kliknite na sledeći link:'
+  mail_subject_register: "Aktivacija vašeg {{value}} naloga"
+  mail_body_register: 'Za aktivaciju vašeg naloga, kliknite na sledeći link:'
+  mail_body_account_information_external: "Vaš nalog {{value}} možete koristiti za prijavu."
+  mail_body_account_information: Informacije o vašem nalogu
+  mail_subject_account_activation_request: "Zahtev za aktivaciju naloga {{value}}"
+  mail_body_account_activation_request: "Novi korisnik ({{value}}) je registrovan. Nalog čeka na vaše odobrenje:"
+  mail_subject_reminder: "{{count}} problema dospeva narednih {{days}} dana"
+  mail_body_reminder: "{{count}} problema dodeljenih vama dospeva u narednih {{days}} dana:"
+  mail_subject_wiki_content_added: "Wiki stranica '{{page}}' je dodata"
+  mail_body_wiki_content_added: "{{author}} je dodao wiki stranicu '{{page}}'."
+  mail_subject_wiki_content_updated: "Wiki stranica '{{page}}' je ažurirana"
+  mail_body_wiki_content_updated: "{{author}} je ažurirao wiki stranicu '{{page}}'."
+  
+  gui_validation_error: jedna greška
+  gui_validation_error_plural: "{{count}} grešaka"
+  
+  field_name: Naziv
+  field_description: Opis
+  field_summary: Rezime
+  field_is_required: Obavezno
+  field_firstname: Ime
+  field_lastname: Prezime
+  field_mail: E-adresa
+  field_filename: Datoteka
+  field_filesize: Veličina
+  field_downloads: Preuzimanja
+  field_author: Autor
+  field_created_on: Kreirano
+  field_updated_on: Ažurirano
+  field_field_format: Format
+  field_is_for_all: Za sve projekte
+  field_possible_values: Moguće vrednosti
+  field_regexp: Regularan izraz
+  field_min_length: Minimalna dužina
+  field_max_length: Maksimalna dužina
+  field_value: Vrednost
+  field_category: Kategorija
+  field_title: Naslov
+  field_project: Projekat
+  field_issue: Problem
+  field_status: Status
+  field_notes: Beleške
+  field_is_closed: Zatvoren problem
+  field_is_default: Podrazumevana vrednost
+  field_tracker: Praćenje
+  field_subject: Predmet
+  field_due_date: Krajnji rok
+  field_assigned_to: Dodeljeno
+  field_priority: Prioritet
+  field_fixed_version: Odredišna verzija
+  field_user: Korisnik
+  field_principal: Glavni
+  field_role: Uloga
+  field_homepage: Početna stranica
+  field_is_public: Javno objavljivanje
+  field_parent: Potprojekat od
+  field_is_in_roadmap: Problemi prikazani u planu rada
+  field_login: Korisničko ime
+  field_mail_notification: Obaveštenja putem e-pošte
+  field_admin: Administrator
+  field_last_login_on: Poslednje povezivanje
+  field_language: Jezik
+  field_effective_date: Datum
+  field_password: Lozinka
+  field_new_password: Nova lozinka
+  field_password_confirmation: Potvrda lozinke
+  field_version: Verzija
+  field_type: Tip
+  field_host: Glavni računar
+  field_port: Port
+  field_account: Korisnički nalog
+  field_base_dn: Bazni DN
+  field_attr_login: Atribut prijavljivanja
+  field_attr_firstname: Atribut imena
+  field_attr_lastname: Atribut prezimena
+  field_attr_mail: Atribut e-adrese
+  field_onthefly: Kreiranje korisnika u toku rada
+  field_start_date: Početak
+  field_done_ratio: % urađeno
+  field_auth_source: Režim potvrde identiteta
+  field_hide_mail: Sakrij moju e-adresu
+  field_comments: Komentar
+  field_url: URL
+  field_start_page: Početna stranica
+  field_subproject: Potprojekat
+  field_hours: sati
+  field_activity: Aktivnost
+  field_spent_on: Datum
+  field_identifier: Identifikator
+  field_is_filter: Upotrebi kao filter
+  field_issue_to: Srodni problemi
+  field_delay: Kašnjenje
+  field_assignable: Problem može biti dodeljen ovoj ulozi
+  field_redirect_existing_links: Preusmeri postojeće veze
+  field_estimated_hours: Proteklo vreme
+  field_column_names: Kolone
+  field_time_zone: Vremenska zona
+  field_searchable: Može da se pretražuje
+  field_default_value: Podrazumevana vrednost
+  field_comments_sorting: Prikaži komentare
+  field_parent_title: Matična stranica
+  field_editable: Izmenljivo
+  field_watcher: Posmatrač
+  field_identity_url: OpenID URL
+  field_content: Sadržaj
+  field_group_by: Grupisanje rezultata po
+  field_sharing: Deljenje
+  field_parent_issue: Matični zadatak
+  
+  setting_app_title: Naslov aplikacije
+  setting_app_subtitle: Podnaslov aplikacije
+  setting_welcome_text: Tekst dobrodošlice
+  setting_default_language: Podrazumevani jezik
+  setting_login_required: Obavezna potvrda identiteta
+  setting_self_registration: Samoregistracija
+  setting_attachment_max_size: Maks. veličina priložene datoteke
+  setting_issues_export_limit: Ograničenje izvoza „problema“
+  setting_mail_from: E-adresa pošiljaoca
+  setting_bcc_recipients: Primaoci „Bcc“ kopije
+  setting_plain_text_mail: Poruka sa čistim tekstom (bez HTML-a)
+  setting_host_name: Putanja i naziv glavnog računara
+  setting_text_formatting: Oblikovanje teksta
+  setting_wiki_compression: Kompresija Wiki istorije
+  setting_feeds_limit: Ograničenje sadržaja izvora vesti
+  setting_default_projects_public: Podrazumeva se javno prikazivanje novih projekata
+  setting_autofetch_changesets: Izvršavanje automatskog preuzimanja
+  setting_sys_api_enabled: Omogućavanje WS za upravljanje spremištem
+  setting_commit_ref_keywords: Referenciranje ključnih reči
+  setting_commit_fix_keywords: Popravljanje ključnih reči
+  setting_autologin: Automatska prijava
+  setting_date_format: Format datuma
+  setting_time_format: Format vremena
+  setting_cross_project_issue_relations: Dozvoli povezivanje problema iz unakrsnih projekata
+  setting_issue_list_default_columns: Podrazumevane kolone prikazane na spisku problema
+  setting_repositories_encodings: Kodiranje spremišta
+  setting_commit_logs_encoding: Kodiranje izvršnih poruka
+  setting_emails_footer: Podnožje stranice e-poruke
+  setting_protocol: Protokol
+  setting_per_page_options: Opcije prikaza objekata po stranici
+  setting_user_format: Format prikaza korisnika
+  setting_activity_days_default: Broj dana prikazanih na projektnoj aktivnosti
+  setting_display_subprojects_issues: Prikazuj probleme iz potprojekata na glavnom projektu, ukoliko nije drugačije navedeno
+  setting_enabled_scm: Omogućavanje SCM
+  setting_mail_handler_body_delimiters: "Skraćivanje e-poruke nakon jedne od ovih linija"
+  setting_mail_handler_api_enabled: Omogućavanje WS dolazne e-poruke
+  setting_mail_handler_api_key: API ključ
+  setting_sequential_project_identifiers: Generisanje sekvencijalnog imena projekta
+  setting_gravatar_enabled: Koristi Gravatar korisničke ikone
+  setting_gravatar_default: Podrazumevana Gravatar slika
+  setting_diff_max_lines_displayed: Maks. broj prikazanih različitih linija
+  setting_file_max_size_displayed: Maks. veličina tekst. datoteka prikazanih umetnuto
+  setting_repository_log_display_limit: Maks. broj revizija prikazanih u datoteci za evidenciju
+  setting_openid: Dozvoli OpenID prijavu i registraciju
+  setting_password_min_length: Minimalna dužina lozinke
+  setting_new_project_user_role_id: Kreatoru projekta (koji nije administrator) dodeljuje je uloga
+  setting_default_projects_modules: Podrazumevano omogućeni moduli za nove projekte
+  setting_issue_done_ratio: Izračunaj odnos rešenih problema
+  setting_issue_done_ratio_issue_field: koristeći polje problema
+  setting_issue_done_ratio_issue_status: koristeći status problema
+  setting_start_of_week: Prvi dan u sedmici
+  setting_rest_api_enabled: Omogući REST web usluge
+  setting_cache_formatted_text: Keširanje obrađenog teksta
+  
+  permission_add_project: Kreiranje projekta
+  permission_add_subprojects: Kreiranje potpojekta
+  permission_edit_project: Izmena projekata
+  permission_select_project_modules: Odabiranje modula projekta
+  permission_manage_members: Upravljanje članovima
+  permission_manage_project_activities: Upravljanje projektnim aktivnostima
+  permission_manage_versions: Upravljanje verzijama
+  permission_manage_categories: Upravljanje kategorijama problema
+  permission_view_issues: Pregled problema
+  permission_add_issues: Dodavanje problema
+  permission_edit_issues: Izmena problema
+  permission_manage_issue_relations: Upravljanje vezama između problema
+  permission_add_issue_notes: Dodavanje beleški
+  permission_edit_issue_notes: Izmena beleški
+  permission_edit_own_issue_notes: Izmena sopstvenih beleški
+  permission_move_issues: Pomeranje problema
+  permission_delete_issues: Brisanje problema
+  permission_manage_public_queries: Upravljanje javnim upitima
+  permission_save_queries: Snimanje upita
+  permission_view_gantt: Pregledanje Gantovog dijagrama
+  permission_view_calendar: Pregledanje kalendara
+  permission_view_issue_watchers: Pregledanje spiska posmatrača
+  permission_add_issue_watchers: Dodavanje posmatrača
+  permission_delete_issue_watchers: Brisanje posmatrača
+  permission_log_time: Beleženje utrošenog vremena
+  permission_view_time_entries: Pregledanje utrošenog vremena
+  permission_edit_time_entries: Izmena utrošenog vremena
+  permission_edit_own_time_entries: Izmena sopstvenog utrošenog vremena
+  permission_manage_news: Upravljanje vestima
+  permission_comment_news: Komentarisanje vesti
+  permission_manage_documents: Upravljanje dokumentima
+  permission_view_documents: Pregledanje dokumenata
+  permission_manage_files: Upravljanje datotekama
+  permission_view_files: Pregledanje datoteka
+  permission_manage_wiki: Upravljanje wiki stranicama
+  permission_rename_wiki_pages: Promena imena wiki stranicama
+  permission_delete_wiki_pages: Brisanje wiki stranica
+  permission_view_wiki_pages: Pregledanje wiki stranica
+  permission_view_wiki_edits: Pregledanje wiki istorije
+  permission_edit_wiki_pages: Izmena wiki stranica
+  permission_delete_wiki_pages_attachments: Brisanje priloženih datoteka
+  permission_protect_wiki_pages: Zaštita wiki stranica
+  permission_manage_repository: Upravljanje spremištem
+  permission_browse_repository: Pregledanje spremišta
+  permission_view_changesets: Pregledanje skupa promena
+  permission_commit_access: Potvrda pristupa
+  permission_manage_boards: Upravljanje forumima
+  permission_view_messages: Pregledanje poruka
+  permission_add_messages: Slanje poruka
+  permission_edit_messages: Izmena poruka
+  permission_edit_own_messages: Izmena sopstvenih poruka
+  permission_delete_messages: Brisanje poruka
+  permission_delete_own_messages: Brisanje sopstvenih poruka
+  permission_export_wiki_pages: Izvoz wiki stranica
+  permission_manage_subtasks: Upravljanje podzadacima
+  
+  project_module_issue_tracking: Praćenje problema
+  project_module_time_tracking: Praćenje vremena
+  project_module_news: Vesti
+  project_module_documents: Dokumenti
+  project_module_files: Datoteke
+  project_module_wiki: Wiki
+  project_module_repository: Spremište
+  project_module_boards: Forumi
+  
+  label_user: Korisnik
+  label_user_plural: Korisnici
+  label_user_new: Novi korisnik
+  label_user_anonymous: Anoniman
+  label_project: Projekat
+  label_project_new: Novi projekat
+  label_project_plural: Projekti
+  label_x_projects:
+    zero:  nema projekata
+    one:   jedan projekat
+    other: "{{count}} projekata"
+  label_project_all: Svi projekti
+  label_project_latest: Poslednji projekti
+  label_issue: Problem
+  label_issue_new: Novi problem
+  label_issue_plural: Problemi
+  label_issue_view_all: Prikaz svih problema
+  label_issues_by: "Problemi ({{value}})"
+  label_issue_added: Problem je dodat
+  label_issue_updated: Problem je ažuriran
+  label_document: Dokument
+  label_document_new: Novi dokument
+  label_document_plural: Dokumenti
+  label_document_added: Dokument je dodat
+  label_role: Uloga
+  label_role_plural: Uloge
+  label_role_new: Nova uloga
+  label_role_and_permissions: Uloge i dozvole
+  label_member: Član
+  label_member_new: Novi član
+  label_member_plural: Članovi
+  label_tracker: Praćenje
+  label_tracker_plural: Praćenja
+  label_tracker_new: Novo praćenje
+  label_workflow: Tok posla
+  label_issue_status: Status problema
+  label_issue_status_plural: Statusi problema
+  label_issue_status_new: Novi status
+  label_issue_category: Kategorija problema
+  label_issue_category_plural: Kategorije problema
+  label_issue_category_new: Nova kategorija
+  label_custom_field: Prilagođeno polje
+  label_custom_field_plural: Prilagođena polja
+  label_custom_field_new: Novo prilagođeno polje
+  label_enumerations: Nabrojiva lista
+  label_enumeration_new: Nova vrednost
+  label_information: Informacija
+  label_information_plural: Informacije
+  label_please_login: Molimo, prijavite se
+  label_register: Registracija
+  label_login_with_open_id_option: ili prijava sa OpenID
+  label_password_lost: Izgubljena lozinka
+  label_home: Početak
+  label_my_page: Moja stranica
+  label_my_account: Moj nalog
+  label_my_projects: Moji projekti
+  label_my_page_block: My page block
+  label_administration: Administracija
+  label_login: Prijava
+  label_logout: Odjava
+  label_help: Pomoć
+  label_reported_issues: Prijavljeni problemi
+  label_assigned_to_me_issues: Problemi dodeljeni meni
+  label_last_login: Poslednje povezivanje
+  label_registered_on: Registrovan
+  label_activity: Aktivnost
+  label_overall_activity: Celokupna aktivnost
+  label_user_activity: "Aktivnost korisnika {{value}}"
+  label_new: Novo
+  label_logged_as: Prijavljeni ste kao
+  label_environment: Okruženje
+  label_authentication: Potvrda identiteta
+  label_auth_source: Režim potvrde identiteta
+  label_auth_source_new: Novi režim potvrde identiteta
+  label_auth_source_plural: Režimi potvrde identiteta
+  label_subproject_plural: Potprojekti
+  label_subproject_new: Novi potprojekat
+  label_and_its_subprojects: "{{value}} i njegovi potprojekti"
+  label_min_max_length: Min. - Maks. dužina
+  label_list: Spisak
+  label_date: Datum
+  label_integer: Ceo broj
+  label_float: Sa pokretnim zarezom
+  label_boolean: Logički operator
+  label_string: Tekst
+  label_text: Dugi tekst
+  label_attribute: Osobina
+  label_attribute_plural: Osobine
+  label_download: "{{count}} preuzimanje"
+  label_download_plural: "{{count}} preuzimanja"
+  label_no_data: Nema podataka za prikazivanje
+  label_change_status: Promena statusa
+  label_history: Istorija
+  label_attachment: Datoteka
+  label_attachment_new: Nova datoteka
+  label_attachment_delete: Brisanje datoteke
+  label_attachment_plural: Datoteke
+  label_file_added: Datoteka je dodata
+  label_report: Izveštaj
+  label_report_plural: Izveštaji
+  label_news: Vesti
+  label_news_new: Dodavanje vesti
+  label_news_plural: Vesti
+  label_news_latest: Poslednje vesti
+  label_news_view_all: Prikaz svih vesti
+  label_news_added: Vesti su dodate
+  label_settings: Podešavanja
+  label_overview: Pregled
+  label_version: Verzija
+  label_version_new: Nova verzija
+  label_version_plural: Verzije
+  label_close_versions: Zatvori završene verzije
+  label_confirmation: Potvrda
+  label_export_to: 'Takođe dostupno i u varijanti:'
+  label_read: Čitanje...
+  label_public_projects: Javni projekti
+  label_open_issues: otvoren
+  label_open_issues_plural: otvorenih
+  label_closed_issues: zatvoren
+  label_closed_issues_plural: zatvorenih
+  label_x_open_issues_abbr_on_total:
+    zero:  0 otvorenih / {{total}}
+    one:   1 otvoren / {{total}}
+    other: "{{count}} otvorenih / {{total}}"
+  label_x_open_issues_abbr:
+    zero:  0 otvorenih
+    one:   1 otvoren
+    other: "{{count}} otvorenih"
+  label_x_closed_issues_abbr:
+    zero:  0 zatvorenih
+    one:   1 zatvoren
+    other: "{{count}} zatvorenih"
+  label_total: Ukupno
+  label_permissions: Dozvole
+  label_current_status: Trenutni status
+  label_new_statuses_allowed: Novi statusi dozvoljeni
+  label_all: svi
+  label_none: nijedan
+  label_nobody: nikome
+  label_next: Sledeće
+  label_previous: Prethodno
+  label_used_by: Koristio
+  label_details: Detalji
+  label_add_note: Dodaj belešku
+  label_per_page: Po strani
+  label_calendar: Kalendar
+  label_months_from: meseci od
+  label_gantt: Gantov dijagram
+  label_internal: Unutrašnji
+  label_last_changes: "poslednjih {{count}} promena"
+  label_change_view_all: Prikaži sve promene
+  label_personalize_page: Personalizuj ovu stranu
+  label_comment: Komentar
+  label_comment_plural: Komentari
+  label_x_comments:
+    zero: bez komentara
+    one: jedan komentar
+    other: "{{count}} komentara"
+  label_comment_add: Dodaj komentar
+  label_comment_added: Komentar dodat
+  label_comment_delete: Obriši komentare
+  label_query: Prilagođen upit
+  label_query_plural: Prilagođeni upiti
+  label_query_new: Novi upit
+  label_filter_add: Dodavanje filtera
+  label_filter_plural: Filteri
+  label_equals: je
+  label_not_equals: nije
+  label_in_less_than: manje od
+  label_in_more_than: više od
+  label_greater_or_equal: '>='
+  label_less_or_equal: '<='
+  label_in: u
+  label_today: danas
+  label_all_time: sve vreme
+  label_yesterday: juče
+  label_this_week: ove sedmice
+  label_last_week: poslednje sedmice
+  label_last_n_days: "poslednjih {{count}} dana"
+  label_this_month: ovog meseca
+  label_last_month: poslednjeg meseca
+  label_this_year: ove godine
+  label_date_range: Vremenski period
+  label_less_than_ago: pre manje od nekoliko dana
+  label_more_than_ago: pre više od nekoliko dana
+  label_ago: pre nekoliko dana
+  label_contains: sadrži
+  label_not_contains: ne sadrži
+  label_day_plural: dana
+  label_repository: Spremište
+  label_repository_plural: Spremišta
+  label_browse: Pregledanje
+  label_modification: "{{count}} promena"
+  label_modification_plural: "{{count}} promena"
+  label_branch: Grana
+  label_tag: Oznaka
+  label_revision: Revizija
+  label_revision_plural: Revizije
+  label_revision_id: "Revizija {{value}}"
+  label_associated_revisions: Pridružene revizije
+  label_added: dodato
+  label_modified: promenjeno
+  label_copied: kopirano
+  label_renamed: preimenovano
+  label_deleted: izbrisano
+  label_latest_revision: Poslednja revizija
+  label_latest_revision_plural: Poslednje revizije
+  label_view_revisions: Pregled revizija
+  label_view_all_revisions: Pregled svih revizija
+  label_max_size: Maksimalna veličina
+  label_sort_highest: Premeštanje na vrh
+  label_sort_higher: Premeštanje na gore
+  label_sort_lower: Premeštanje na dole
+  label_sort_lowest: Premeštanje na dno
+  label_roadmap: Plan rada
+  label_roadmap_due_in: "Dospeva {{value}}"
+  label_roadmap_overdue: "{{value}} najkasnije"
+  label_roadmap_no_issues: Nema problema za ovu verziju
+  label_search: Pretraga
+  label_result_plural: Rezultati
+  label_all_words: Sve reči
+  label_wiki: Wiki
+  label_wiki_edit: Wiki izmena
+  label_wiki_edit_plural: Wiki izmene
+  label_wiki_page: Wiki stranica
+  label_wiki_page_plural: Wiki stranice
+  label_index_by_title: Indeksiranje po naslovu
+  label_index_by_date: Indeksiranje po datumu
+  label_current_version: Trenutna verzija
+  label_preview: Pregled
+  label_feed_plural: Izvori vesti
+  label_changes_details: Detalji svih promena
+  label_issue_tracking: Praćenje problema
+  label_spent_time: Utrošeno vreme
+  label_overall_spent_time: Celokupno utrošeno vreme
+  label_f_hour: "{{value}} sat"
+  label_f_hour_plural: "{{value}} sati"
+  label_time_tracking: Praćenje vremena
+  label_change_plural: Promene
+  label_statistics: Statistika
+  label_commits_per_month: Izvršenja mesečno
+  label_commits_per_author: Izvršenja po autoru
+  label_view_diff: Pogledaj razlike
+  label_diff_inline: unutra
+  label_diff_side_by_side: uporedo
+  label_options: Opcije
+  label_copy_workflow_from: Kopiranje toka posla od
+  label_permissions_report: Izveštaj o dozvolama
+  label_watched_issues: Posmatrani problemi
+  label_related_issues: Srodni problemi
+  label_applied_status: Primenjeni statusi
+  label_loading: Učitavanje...
+  label_relation_new: Nova relacija
+  label_relation_delete: Brisanje relacije
+  label_relates_to: srodnih sa
+  label_duplicates: dupliranih
+  label_duplicated_by: dupliranih od
+  label_blocks: odbijenih
+  label_blocked_by: odbijenih od
+  label_precedes: prethodi
+  label_follows: praćenih
+  label_end_to_start: od kraja do početka
+  label_end_to_end: od kraja do kraja
+  label_start_to_start: od početka do početka
+  label_start_to_end: od početka do kraja
+  label_stay_logged_in: Ostanite prijavljeni
+  label_disabled: onemogućeno
+  label_show_completed_versions: Prikazivanje završene verzije
+  label_me: meni
+  label_board: Forum
+  label_board_new: Novi forum
+  label_board_plural: Forumi
+  label_board_locked: Zaključana
+  label_board_sticky: Lepljiva
+  label_topic_plural: Teme
+  label_message_plural: Poruke
+  label_message_last: Poslednja poruka
+  label_message_new: Nova poruka
+  label_message_posted: Poruka je dodata
+  label_reply_plural: Odgovori
+  label_send_information: Pošalji korisniku detalje naloga
+  label_year: Godina
+  label_month: Mesec
+  label_week: Sedmica
+  label_date_from: Šalje
+  label_date_to: Prima
+  label_language_based: Bazirano na jeziku korisnika
+  label_sort_by: "Sortirano po {{value}}"
+  label_send_test_email: Slanje probne e-poruke
+  label_feeds_access_key: RSS pristupni ključ
+  label_missing_feeds_access_key: RSS pristupni ključ nedostaje
+  label_feeds_access_key_created_on: "RSS pristupni ključ je napravljen pre {{value}}"
+  label_module_plural: Moduli
+  label_added_time_by: "Dodao {{author}} pre {{age}}"
+  label_updated_time_by: "Ažurirao {{author}} pre {{age}}"
+  label_updated_time: "Ažurirano pre {{value}}"
+  label_jump_to_a_project: Skok na projekat...
+  label_file_plural: Datoteke
+  label_changeset_plural: Skupovi promena
+  label_default_columns: Podrazumevane kolone
+  label_no_change_option: (Bez promena)
+  label_bulk_edit_selected_issues: Grupna izmena odabranih problema
+  label_theme: Tema
+  label_default: Podrazumevano
+  label_search_titles_only: Pretražuj samo naslove
+  label_user_mail_option_all: "Za bilo koji događaj na svim mojim projektima"
+  label_user_mail_option_selected: "Za bilo koji događaj na samo odabranim projektima..."
+  label_user_mail_option_none: "Samo za stvari koje pratim ili u koje sam uključen"
+  label_user_mail_no_self_notified: "Ne želim biti obaveštavan za promene koje sam pravim"
+  label_registration_activation_by_email: aktivacija naloga putem e-poruke
+  label_registration_manual_activation: ručna aktivacija naloga
+  label_registration_automatic_activation: automatska aktivacija naloga
+  label_display_per_page: "Broj stavki po stranici: {{value}}"
+  label_age: Starost
+  label_change_properties: Promeni svojstva
+  label_general: Opšti
+  label_more: Više
+  label_scm: SCM
+  label_plugins: Dodatne komponente
+  label_ldap_authentication: LDAP potvrda identiteta
+  label_downloads_abbr: D/L
+  label_optional_description: Opciono opis
+  label_add_another_file: Dodaj još jednu datoteku
+  label_preferences: Podešavanja
+  label_chronological_order: po hronološkom redosledu
+  label_reverse_chronological_order: po obrnutom hronološkom redosledu
+  label_planning: Planiranje
+  label_incoming_emails: Dolazne e-poruke
+  label_generate_key: Generisanje ključa
+  label_issue_watchers: Posmatrači
+  label_example: Primer
+  label_display: Prikaz
+  label_sort: Sortiranje
+  label_ascending: Rastući niz
+  label_descending: Opadajući niz
+  label_date_from_to: Od {{start}} do {{end}}
+  label_wiki_content_added: Wiki stranica je dodata
+  label_wiki_content_updated: Wiki stranica je ažurirana
+  label_group: Grupa
+  label_group_plural: Grupe
+  label_group_new: Nova grupa
+  label_time_entry_plural: Utrošeno vreme
+  label_version_sharing_none: Nije deljeno
+  label_version_sharing_descendants: Sa potprojektima
+  label_version_sharing_hierarchy: Sa hijerarhijom projekta
+  label_version_sharing_tree: Sa stablom projekta
+  label_version_sharing_system: Sa svim projektima
+  label_update_issue_done_ratios: Ažuriraj odnos rešenih problema
+  label_copy_source: Izvor
+  label_copy_target: Odredište
+  label_copy_same_as_target: Isto kao odredište
+  label_display_used_statuses_only: Prikazuj statuse korišćene samo od strane ovog praćenja
+  label_api_access_key: API pristupni ključ
+  label_missing_api_access_key: Nedostaje API pristupni ključ
+  label_api_access_key_created_on: "API pristupni ključ je kreiran pre {{value}}"
+  label_profile: Profil
+  label_subtask_plural: Podzadatak
+  label_project_copy_notifications: Pošalji e-poruku sa obaveštenjem prilikom kopiranja projekta 
+  
+  button_login: Prijava
+  button_submit: Pošalji
+  button_save: Snimi
+  button_check_all: Uključi sve
+  button_uncheck_all: Isključi sve
+  button_delete: Izbriši
+  button_create: Kreiraj
+  button_create_and_continue: Kreiraj i nastavi
+  button_test: Test
+  button_edit: Izmeni
+  button_add: Dodaj
+  button_change: Promeni
+  button_apply: Primeni
+  button_clear: Obriši
+  button_lock: Zaključaj
+  button_unlock: Otključaj
+  button_download: Preuzmi
+  button_list: Spisak
+  button_view: Prikaži
+  button_move: Pomeri
+  button_move_and_follow: Pomeri i prati
+  button_back: Nazad
+  button_cancel: Poništi
+  button_activate: Aktiviraj
+  button_sort: Sortiraj
+  button_log_time: Evidentiraj vreme
+  button_rollback: Povratak na ovu verziju
+  button_watch: Prati
+  button_unwatch: Ne prati više
+  button_reply: Odgovori
+  button_archive: Arhiviraj
+  button_unarchive: Vrati iz arhive
+  button_reset: Poništi
+  button_rename: Preimenuj
+  button_change_password: Promeni lozinku
+  button_copy: Kopiraj
+  button_copy_and_follow: Kopiraj i prati
+  button_annotate: Pribeleži
+  button_update: Ažuriraj
+  button_configure: Podesi
+  button_quote: Pod navodnicima
+  button_duplicate: Dupliraj
+  button_show: Prikaži
+  
+  status_active: aktivni
+  status_registered: registrovani
+  status_locked: zaključani
+  
+  version_status_open: otvoren
+  version_status_locked: zaključan
+  version_status_closed: zatvoren
+
+  field_active: Aktivan
+  
+  text_select_mail_notifications: Odaberi akcije za koje će obaveštenje biti poslato putem e-pošte.
+  text_regexp_info: npr. ^[A-Z0-9]+$
+  text_min_max_length_info: 0 znači bez ograničenja
+  text_project_destroy_confirmation: Jeste li sigurni da želite da izbrišete ovaj projekat i sve pripadajuće podatke?
+  text_subprojects_destroy_warning: "Potprojekti: {{value}} će takođe biti izbrisan."
+  text_workflow_edit: Odaberite ulogu i praćenje za izmenu toka posla
+  text_are_you_sure: Jeste li sigurni?
+  text_journal_changed: "{{label}} promenjen od {{old}} u {{new}}"
+  text_journal_set_to: "{{label}} postavljen u {{value}}"
+  text_journal_deleted: "{{label}} izbrisano ({{old}})"
+  text_journal_added: "{{label}} {{value}} dodato"
+  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.
    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}}."
+  text_length_between: "Broj znakova mora biti između {{min}} i {{max}}."
+  text_tracker_no_workflow: Ovo praćenje nema definisan tok posla
+  text_unallowed_characters: Nedozvoljeni znakovi
+  text_comma_separated: Dozvoljene su višestruke vrednosti (odvojene zarezom).
+  text_line_separated: Dozvoljene su višestruke vrednosti (jedan red za svaku vrednost).
+  text_issues_ref_in_commit_messages: Referenciranje i popravljanje problema u izvršnim porukama
+  text_issue_added: "{{author}} je prijavio problem {{id}}."
+  text_issue_updated: "{{author}} je ažurirao problem {{id}}."
+  text_wiki_destroy_confirmation: Jeste li sigurni da želite da obrišete wiki i sav sadržaj?
+  text_issue_category_destroy_question: "Nekoliko problema ({{count}}) je dodeljeno ovoj kategoriji. Šta želite da uradite?"
+  text_issue_category_destroy_assignments: Ukloni dodeljene kategorije
+  text_issue_category_reassign_to: Dodeli ponovo probleme ovoj kategoriji
+  text_user_mail_option: "Za neizabrane projekte, dobićete samo obaveštenje o stvarima koje pratite ili ste uključeni (npr. problemi čiji ste vi autor ili zastupnik)."
+  text_no_configuration_data: "Uloge, praćenja, statusi problema i toka posla još uvek nisu podešeni.\nPreporučljivo je da učitate podrazumevano konfigurisanje. Izmena je moguća nakon prvog učitavanja."
+  text_load_default_configuration: Učitaj podrazumevano konfigurisanje
+  text_status_changed_by_changeset: "Primenjeno u skupu sa promenama {{value}}."
+  text_issues_destroy_confirmation: 'Jeste li sigurni da želite da izbrišete odabrane probleme?'
+  text_select_project_modules: 'Odaberite module koje želite omogućiti za ovaj projekat:'
+  text_default_administrator_account_changed: Podrazumevani administratorski nalog je promenjen
+  text_file_repository_writable: Fascikla priloženih datoteka je upisiva
+  text_plugin_assets_writable: Fascikla elemenata dodatnih komponenti je upisiva
+  text_rmagick_available: RMagick je dostupan (opciono)
+  text_destroy_time_entries_question: "{{hours}} sati je prijavljeno za ovaj problem koji želite izbrisati. Šta želite da uradite?"
+  text_destroy_time_entries: Izbriši prijavljene sate
+  text_assign_time_entries_to_project: Dodeli prijavljene sate projektu
+  text_reassign_time_entries: 'Dodeli ponovo prijavljene sate ovom problemu:'
+  text_user_wrote: "{{value}} je napisao:"
+  text_enumeration_destroy_question: "{{count}} objekat(a) je dodeljeno ovoj vrednosti."
+  text_enumeration_category_reassign_to: 'Dodeli ih ponovo ovoj vrednosti:'
+  text_email_delivery_not_configured: "Isporuka e-poruka nije konfigurisana i obaveštenja su onemogućena.\nPodesite vaš SMTP server u config/email.yml i pokrenite ponovo aplikaciju za njihovo omogućavanje."
+  text_repository_usernames_mapping: "Odaberite ili ažurirajte Redmine korisnike mapiranjem svakog korisničkog imena pronađenog u evidenciji spremišta.\nKorisnici sa istim Redmine imenom i imenom spremišta ili e-adresom su automatski mapirani."
+  text_diff_truncated: '... Ova razlika je isečena jer je dostignuta maksimalna veličina prikaza.'
+  text_custom_field_possible_values_info: 'Jedan red za svaku vrednost'
+  text_wiki_page_destroy_question: "Ova stranica ima {{descendants}} podređenih stranica i podstranica. Šta želite da uradite?"
+  text_wiki_page_nullify_children: "Zadrži podređene stranice kao korene stranice"
+  text_wiki_page_destroy_children: "Izbriši podređene stranice i sve njihove podstranice"
+  text_wiki_page_reassign_children: "Dodeli ponovo podređene stranice ovoj matičnoj stranici"
+  text_own_membership_delete_confirmation: "Nakon uklanjanja pojedinih ili svih vaših dozvola nećete više moći da uređujete ovaj projekat.\nŽelite li da nastavite?"
+  text_zoom_in: Uvećaj
+  text_zoom_out: Umanji
+  
+  default_role_manager: Menadžer
+  default_role_developer: Programer
+  default_role_reporter: Izveštač
+  default_tracker_bug: Greška
+  default_tracker_feature: Funkcionalnost
+  default_tracker_support: Podrška
+  default_issue_status_new: Novo
+  default_issue_status_in_progress: U toku
+  default_issue_status_resolved: Rešeno
+  default_issue_status_feedback: Povratna informacija
+  default_issue_status_closed: Zatvoreno
+  default_issue_status_rejected: Odbijeno
+  default_doc_category_user: Korisnička dokumentacija
+  default_doc_category_tech: Tehnička dokumentacija
+  default_priority_low: Nizak
+  default_priority_normal: Normalan
+  default_priority_high: Visok
+  default_priority_urgent: Hitno
+  default_priority_immediate: Neposredno
+  default_activity_design: Dizajn
+  default_activity_development: Razvoj
+  
+  enumeration_issue_priorities: Prioriteti problema
+  enumeration_doc_categories: Kategorije dokumenta
+  enumeration_activities: Aktivnosti (praćenje vremena)
+  enumeration_system_activity: Sistemska aktivnost
+  
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index f52d9e063..1bcd3616d 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -10,60 +10,60 @@ sr:
       short: "%e %b"
       long: "%B %e, %Y"
       
-    day_names: [Nedelja, Ponedeljak, Utorak, Sreda, Četvrtak, Petak, Subota]
-    abbr_day_names: [Ned, Pon, Uto, Sre, Čet, Pet, Sub]
+    day_names: [недеља, понедељак, уторак, среда, четвртак, петак, субота]
+    abbr_day_names: [нед, пон, уто, сре, чет, пет, суб]
       
     # Don't forget the nil at the beginning; there's no such thing as a 0th month
-    month_names: [~, Januar, Februar, Mart, April, Maj, Jun, Jul, Avgust, Septembar, Oktobar, Novembar, Decembar]
-    abbr_month_names: [~, Jan, Feb, Mar, Apr, Maj, Jun, Jul, Avg, Sep, Okt, Nov, Dec]
+    month_names: [~, јануар, фебруар, март, април, мај, јун, јул, август, септембар, октобар, новембар, децембар]
+    abbr_month_names: [~, јан, феб, мар, апр, мај, јун, јул, авг, сеп, окт, нов, дец]
     # Used in date_select and datime_select.
     order: [ :day, :month, :year ]
 
   time:
     formats:
-      default: "%d.%m.%Y. u %H:%M"
+      default: "%d.%m.%Y. у %H:%M"
       time: "%H:%M"
-      short: "%d. %b u %H:%M"
-      long: "%d. %B %Y u %H:%M"
+      short: "%d. %b у %H:%M"
+      long: "%d. %B %Y у %H:%M"
     am: "am"
     pm: "pm"
 
   datetime:
     distance_in_words:
-      half_a_minute: "pola minuta"
+      half_a_minute: "пола минута"
       less_than_x_seconds:
-        one:   "manje od jedne sekunde"
-        other: "manje od {{count}} sek."
+        one:   "мање од једне секунде"
+        other: "мање од {{count}} сек."
       x_seconds:
-        one:   "jedna sekunda"
-        other: "{{count}} sek."
+        one:   "једна секунда"
+        other: "{{count}} сек."
       less_than_x_minutes:
-        one:   "manje od minuta"
-        other: "manje od {{count}} min."
+        one:   "мање од минута"
+        other: "мање од {{count}} мин."
       x_minutes:
-        one:   "jedan minut"
-        other: "{{count}} min."
+        one:   "један минут"
+        other: "{{count}} мин."
       about_x_hours:
-        one:   "približno jedan sat"
-        other: "približno {{count}} sati"
+        one:   "приближно један сат"
+        other: "приближно {{count}} сати"
       x_days:
-        one:   "jedan dan"
-        other: "{{count}} dana"
+        one:   "један дан"
+        other: "{{count}} дана"
       about_x_months:
-        one:   "približno jedan mesec"
-        other: "približno {{count}} meseci"
+        one:   "приближно један месец"
+        other: "приближно {{count}} месеци"
       x_months:
-        one:   "jedan mesec"
-        other: "{{count}} meseci"
+        one:   "један месец"
+        other: "{{count}} месеци"
       about_x_years:
-        one:   "približno godinu dana"
-        other: "približno {{count}} god."
+        one:   "приближно годину дана"
+        other: "приближно {{count}} год."
       over_x_years:
-        one:   "preko godinu dana"
-        other: "preko {{count}} god."
+        one:   "преко годину дана"
+        other: "преко {{count}} год."
       almost_x_years:
-        one:   "skoro godinu dana"
-        other: "skoro {{count}} god."
+        one:   "скоро годину дана"
+        other: "скоро {{count}} год."
 
   number:
     human:
@@ -85,823 +85,823 @@ sr:
 # Used in array.to_sentence.
   support:
     array:
-      sentence_connector: "i"
+      sentence_connector: "и"
       skip_last_comma: false
       
   activerecord:
     errors:
       messages:
-        inclusion: "nije uključen u spisak"
-        exclusion: "je rezervisan"
-        invalid: "je neispravan"
-        confirmation: "potvrda ne odgovara"
-        accepted: "mora biti prihvaćen"
-        empty: "ne može biti prazno"
-        blank: "ne može biti prazno"
-        too_long: "je predugačka (maksimum znakova je {{count}})"
-        too_short: "je prekratka (minimum znakova je {{count}})"
-        wrong_length: "je pogrešne dužine (broj znakova mora biti {{count}})"
-        taken: "je već u upotrebi"
-        not_a_number: "nije broj"
-        not_a_date: "nije ispravan datum"
-        greater_than: "mora biti veći od {{count}}"
-        greater_than_or_equal_to: "mora biti veći ili jednak {{count}}"
-        equal_to: "mora biti jednak {{count}}"
-        less_than: "mora biti manji od {{count}}"
-        less_than_or_equal_to: "mora biti manji ili jednak {{count}}"
-        odd: "mora biti paran"
-        even: "mora biti neparan"
-        greater_than_start_date: "mora biti veći od početnog datuma"
-        not_same_project: "ne pripada istom projektu"
-        circular_dependency: "Ova veza će stvoriti kružnu referencu"
+        inclusion: "није укључен у списак"
+        exclusion: "је резервисан"
+        invalid: "је неисправан"
+        confirmation: "потврда не одговара"
+        accepted: "мора бити прихваћен"
+        empty: "не може бити празно"
+        blank: "не може бити празно"
+        too_long: "је предугачка (максимум знакова је {{count}})"
+        too_short: "је прекратка (минимум знакова је {{count}})"
+        wrong_length: "је погрешне дужине (број знакова мора бити {{count}})"
+        taken: "је већ у употреби"
+        not_a_number: "није број"
+        not_a_date: "није исправан датум"
+        greater_than: "мора бити већи од {{count}}"
+        greater_than_or_equal_to: "мора бити већи или једнак {{count}}"
+        equal_to: "мора бити једнак {{count}}"
+        less_than: "мора бити мањи од {{count}}"
+        less_than_or_equal_to: "мора бити мањи или једнак {{count}}"
+        odd: "мора бити паран"
+        even: "мора бити непаран"
+        greater_than_start_date: "мора бити већи од почетног датума"
+        not_same_project: "не припада истом пројекту"
+        circular_dependency: "Ова веза ће створити кружну референцу"
+        cant_link_an_issue_with_a_descendant: "Проблем не може бити повезан са једним од својих подзадатака"
 
-  actionview_instancetag_blank_option: Molim odaberite
+  actionview_instancetag_blank_option: Молим одаберите
   
-  general_text_No: 'Ne'
-  general_text_Yes: 'Da'
-  general_text_no: 'ne'
-  general_text_yes: 'da'
-  general_lang_name: 'Srpski'
+  general_text_No: 'Не'
+  general_text_Yes: 'Да'
+  general_text_no: 'не'
+  general_text_yes: 'да'
+  general_lang_name: 'Српски'
   general_csv_separator: ','
   general_csv_decimal_separator: '.'
   general_csv_encoding: UTF-8
   general_pdf_encoding: UTF-8
   general_first_day_of_week: '1'
   
-  notice_account_updated: Nalog je uspešno ažuriran.
-  notice_account_invalid_creditentials: Neispravno korisničko ime ili lozinka.
-  notice_account_password_updated: Lozinka je uspešno ažurirana.
-  notice_account_wrong_password: Pogrešna lozinka
-  notice_account_register_done: Korisnički nalog je uspešno kreiran. Kliknite na link koji ste dobili u email poruci za aktivaciju.
-  notice_account_unknown_email: Nepoznat korisnik.
-  notice_can_t_change_password: Ovaj korisnički nalog za proveru identiteta koristi spoljni izvor. Nemoguće je promeniti lozinku.
-  notice_account_lost_email_sent: Poslata vam je email poruka sa uputstvom za izbor nove lozinke
-  notice_account_activated: Vaš korisnički nalog je aktiviran. Sada se možete prijaviti.
-  notice_successful_create: Uspešno kreiranje.
-  notice_successful_update: Uspešno ažuriranje.
-  notice_successful_delete: Uspešno brisanje.
-  notice_successful_connection: Uspešno povezivanje.
-  notice_file_not_found: Strana kojoj želite pristupiti ne postoji ili je uklonjena.
-  notice_locking_conflict: Podatak je ažuriran od strane drugog korisnika.
-  notice_not_authorized: Niste ovlašćeni za pristup ovoj strani.
-  notice_email_sent: "Poruka je poslata na adresu {{value}}"
-  notice_email_error: "Dogodila se greška prilikom slanja poruke ({{value}})"
-  notice_feeds_access_key_reseted: Vaš RSS pristupni ključ je poništen.
-  notice_api_access_key_reseted: Vaš API pristupni ključ je poništen.
-  notice_failed_to_save_issues: "Neuspešno snimanje {{count}} problema od {{total}} odabranih: {{ids}}."
-  notice_no_issue_selected: "Ni jedan problem nije odabran! Molim, odaberite problem koji želite da menjate."
-  notice_account_pending: "Vaš nalog je kreiran i čeka na odobrenje administratora."
-  notice_default_data_loaded: Podrazumevano konfigurisanje je uspešno učitano.
-  notice_unable_delete_version: Nemoguće je obrisati verziju.
-  notice_issue_done_ratios_updated: Odnos rešenih problema je ažuriran.
+  notice_account_updated: Налог је успешно ажуриран.
+  notice_account_invalid_creditentials: Неисправно корисничко име или лозинка.
+  notice_account_password_updated: Лозинка је успешно ажурирана.
+  notice_account_wrong_password: Погрешна лозинка
+  notice_account_register_done: Кориснички налог је успешно креиран. Кликните на линк који сте добили у е-поруци за активацију.
+  notice_account_unknown_email: Непознат корисник.
+  notice_can_t_change_password: Овај кориснички налог за потврду идентитета користи спољни извор. Немогуће је променити лозинку.
+  notice_account_lost_email_sent: Послата вам је е-порука са упутством за избор нове лозинке
+  notice_account_activated: Ваш кориснички налог је активиран. Сада се можете пријавити.
+  notice_successful_create: Успешно креирање.
+  notice_successful_update: Успешно ажурирање.
+  notice_successful_delete: Успешно брисање.
+  notice_successful_connection: Успешно повезивање.
+  notice_file_not_found: Страна којој желите приступити не постоји или је уклоњена.
+  notice_locking_conflict: Податак је ажуриран од стране другог корисника.
+  notice_not_authorized: Нисте овлашћени за приступ овој страни.
+  notice_email_sent: "E-порука је послата на {{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}}."
+  notice_failed_to_save_members: "Неуспешно снимање члана(ова): {{errors}}."
+  notice_no_issue_selected: "Ни један проблем није одабран! Молимо, одаберите проблем који желите да мењате."
+  notice_account_pending: "Ваш налог је креиран и чека на одобрење администратора."
+  notice_default_data_loaded: Подразумевано конфигурисање је успешно учитано.
+  notice_unable_delete_version: Верзију је немогуће избрисати.
+  notice_unable_delete_time_entry: Ставку евиденције времена је немогуће избрисати.
+  notice_issue_done_ratios_updated: Однос решених проблема је ажуриран.
   
-  error_can_t_load_default_data: "Podrazumevano konfigurisanje je nemoguće učitati: {{value}}"
-  error_scm_not_found: "Stavka ili ispravka nisu pronađene u spremištu."
-  error_scm_command_failed: "Greška se javila prilikom pokušaja pristupa spremištu: {{value}}"
-  error_scm_annotate: "Stavka ne postoji ili ne može biti označena."
-  error_issue_not_found_in_project: 'Problem nije pronađen ili ne pripada ovom projektu.'
-  error_no_tracker_in_project: 'Ni jedan tragač nije povezan sa ovim projektom. Molimo proverite podešavanja projekta.'
-  error_no_default_issue_status: 'Podrazumevani status problema nije definisan. Molimo proverite vaše konfigurisanje (Idite na "Administracija -> Statusi problema").'
-  error_can_not_reopen_issue_on_closed_version: 'Problem dodeljen zatvorenoj verziji ne može biti ponovo otvoren'
-  error_can_not_archive_project: Ovaj projekat se ne može arhivirati
-  error_issue_done_ratios_not_updated: "Odnos rešenih problema nije ažuriran."
-  error_workflow_copy_source: 'Molimo odaberite izvornog tragača ili ulogu'
-  error_workflow_copy_target: 'Molimo odaberite krajnjeg tragača i ulogu'
+  error_can_t_load_default_data: "Подразумевано конфигурисање је немогуће учитати: {{value}}"
+  error_scm_not_found: "Ставка или исправка нису пронађене у спремишту."
+  error_scm_command_failed: "Грешка се јавила приликом покушаја приступа спремишту: {{value}}"
+  error_scm_annotate: "Ставка не постоји или не може бити означена."
+  error_issue_not_found_in_project: 'Проблем није пронађен или не припада овом пројекту.'
+  error_no_tracker_in_project: 'Ни једно праћење није повезано са овим пројектом. Молимо проверите подешавања пројекта.'
+  error_no_default_issue_status: 'Подразумевани статус проблема није дефинисан. Молимо проверите ваше конфигурисање (идите на "Администрација -> Статуси проблема").'
+  error_can_not_delete_custom_field: Немогуће је избрисати прилагођено поље
+  error_can_not_delete_tracker: "Ово праћење садржи проблеме и не може бити обрисано."
+  error_can_not_remove_role: "Ова улога је у употреби и не може бити обрисана."
+  error_can_not_reopen_issue_on_closed_version: 'Проблем додељен затвореној верзији не може бити поново отворен'
+  error_can_not_archive_project: Овај пројекат се не може архивирати
+  error_issue_done_ratios_not_updated: "Однос решених проблема није ажуриран."
+  error_workflow_copy_source: 'Молимо одаберите изворно праћење или улогу'
+  error_workflow_copy_target: 'Молимо одаберите одредишно праћење и улогу'
+  error_unable_delete_issue_status: 'Статус проблема је немогуће обрисати'
+  error_unable_to_connect: "Повезивање са ({{value}}) је немогуће"  
+  warning_attachments_not_saved: "{{count}} датотека не може бити снимљена."
   
-  warning_attachments_not_saved: "{{count}} datoteka ne može biti snimljeno."
+  mail_subject_lost_password: "Ваша {{value}} лозинка"
+  mail_body_lost_password: 'За промену ваше лозинке, кликните на следећи линк:'
+  mail_subject_register: "Активација вашег {{value}} налога"
+  mail_body_register: 'За активацију вашег налога, кликните на следећи линк:'
+  mail_body_account_information_external: "Ваш налог {{value}} можете користити за пријаву."
+  mail_body_account_information: Информације о вашем налогу
+  mail_subject_account_activation_request: "Захтев за активацију налога {{value}}"
+  mail_body_account_activation_request: "Нови корисник ({{value}}) је регистрован. Налог чека на ваше одобрење:"
+  mail_subject_reminder: "{{count}} проблема доспева наредних {{days}} дана"
+  mail_body_reminder: "{{count}} проблема додељених вама доспева у наредних {{days}} дана:"
+  mail_subject_wiki_content_added: "Wiki страница '{{page}}' је додата"
+  mail_body_wiki_content_added: "{{author}} је додао wiki страницу '{{page}}'."
+  mail_subject_wiki_content_updated: "Wiki страница '{{page}}' је ажурирана"
+  mail_body_wiki_content_updated: "{{author}} је ажурирао wiki страницу '{{page}}'."
   
-  mail_subject_lost_password: "Vaša {{value}} lozinka"
-  mail_body_lost_password: 'Za promenu vaše lozinke, kliknite na sledeći link:'
-  mail_subject_register: "Aktivacija vašeg {{value}} naloga"
-  mail_body_register: 'Za aktivaciju vašeg naloga, kliknite na sledeći link:'
-  mail_body_account_information_external: "Možete koristiti vaš nalog {{value}} za prijavu."
-  mail_body_account_information: Informacije o vašem nalogu
-  mail_subject_account_activation_request: "Zahtev za aktivaciju naloga {{value}}"
-  mail_body_account_activation_request: "Novi korisnik ({{value}}) je registrovan. Nalog čeka na vaše odobrenje:"
-  mail_subject_reminder: "{{count}} problema dospeva narednih {{days}} dana"
-  mail_body_reminder: "{{count}} problema dodeljenih vama dospeva u narednih {{days}} dana:"
-  mail_subject_wiki_content_added: "'{{page}}' wiki strana je dodato"
-  mail_body_wiki_content_added: "{{author}} je dodao '{{page}}' wiki strana."
-  mail_subject_wiki_content_updated: "'{{page}}' wiki strana je ažurirano"
-  mail_body_wiki_content_updated: "{{author}} je ažurirao '{{page}}' wiki strana."
+  gui_validation_error: једна грешка
+  gui_validation_error_plural: "{{count}} грешака"
   
-  gui_validation_error: jedna greška
-  gui_validation_error_plural: "{{count}} grešaka"
-  
-  field_name: Naziv
-  field_description: Opis
-  field_summary: Rezime
-  field_is_required: Obavezno
-  field_firstname: Ime
-  field_lastname: Prezime
-  field_mail: Email adresa
-  field_filename: Datoteka
-  field_filesize: Veličina
-  field_downloads: Preuzimanja
-  field_author: Autor
-  field_created_on: Kreirano
-  field_updated_on: Ažurirano
-  field_field_format: Format
-  field_is_for_all: Za sve projekte
-  field_possible_values: Moguće vrednosti
-  field_regexp: Regularan izraz
-  field_min_length: Minimalna dužina
-  field_max_length: Maksimalna dužina
-  field_value: Vrednost
-  field_category: Kategorija
-  field_title: Naslov
-  field_project: Projekat
-  field_issue: Problem
-  field_status: Status
-  field_notes: Beleške
-  field_is_closed: Zatvoren problem
-  field_is_default: Podrazumevana vrednost
-  field_tracker: Tragač
-  field_subject: Predmet
-  field_due_date: Krajnji rok
-  field_assigned_to: Dodeljeno
-  field_priority: Prioritet
-  field_fixed_version: Odredišna verzija
-  field_user: Korisnik
-  field_role: Uloga
-  field_homepage: Početna strana
-  field_is_public: Javno
-  field_parent: Potprojekat od
-  field_is_in_roadmap: Problemi prikazani u planu rada
-  field_login: Korisničko ime
-  field_mail_notification: Email obaveštenja
-  field_admin: Administrator
-  field_last_login_on: Poslednje povezivanje
-  field_language: Jezik
-  field_effective_date: Datum
-  field_password: Lozinka
-  field_new_password: Nova lozinka
-  field_password_confirmation: Potvrda lozinke
-  field_version: Verzija
-  field_type: Tip
-  field_host: Glavni računar
-  field_port: Priključak
-  field_account: Korisnički nalog
-  field_base_dn: Bazni DN
-  field_attr_login: Atribut prijavljivanja
-  field_attr_firstname: Atribut imena
-  field_attr_lastname: Atribut prezimena
-  field_attr_mail: Atribut email adrese
-  field_onthefly: Kreiranje korisnika u toku rada
-  field_start_date: Početak
-  field_done_ratio: % urađeno
-  field_auth_source: Režim provere identiteta
-  field_hide_mail: Sakrij moju email adresu
-  field_comments: Komentar
+  field_name: Назив
+  field_description: Опис
+  field_summary: Резиме
+  field_is_required: Обавезно
+  field_firstname: Име
+  field_lastname: Презиме
+  field_mail: Е-адреса
+  field_filename: Датотека
+  field_filesize: Величина
+  field_downloads: Преузимања
+  field_author: Аутор
+  field_created_on: Креирано
+  field_updated_on: Ажурирано
+  field_field_format: Формат
+  field_is_for_all: За све пројекте
+  field_possible_values: Могуће вредности
+  field_regexp: Регуларан израз
+  field_min_length: Минимална дужина
+  field_max_length: Максимална дужина
+  field_value: Вредност
+  field_category: Категорија
+  field_title: Наслов
+  field_project: Пројекат
+  field_issue: Проблем
+  field_status: Статус
+  field_notes: Белешке
+  field_is_closed: Затворен проблем
+  field_is_default: Подразумевана вредност
+  field_tracker: Праћење
+  field_subject: Предмет
+  field_due_date: Крајњи рок
+  field_assigned_to: Додељено
+  field_priority: Приоритет
+  field_fixed_version: Одредишна верзија
+  field_user: Корисник
+  field_principal: Главни
+  field_role: Улога
+  field_homepage: Почетна страница
+  field_is_public: Јавно објављивање
+  field_parent: Потпројекат од
+  field_is_in_roadmap: Проблеми приказани у плану рада
+  field_login: Корисничко име
+  field_mail_notification: Обавештења путем е-поште
+  field_admin: Администратор
+  field_last_login_on: Последње повезивање
+  field_language: Језик
+  field_effective_date: Датум
+  field_password: Лозинка
+  field_new_password: Нова лозинка
+  field_password_confirmation: Потврда лозинке
+  field_version: Верзија
+  field_type: Тип
+  field_host: Главни рачунар
+  field_port: Порт
+  field_account: Кориснички налог
+  field_base_dn: Базни DN
+  field_attr_login: Атрибут пријављивања
+  field_attr_firstname: Атрибут имена
+  field_attr_lastname: Атрибут презимена
+  field_attr_mail: Атрибут е-адресе
+  field_onthefly: Креирање корисника у току рада
+  field_start_date: Почетак
+  field_done_ratio: % урађено
+  field_auth_source: Режим потврде идентитета
+  field_hide_mail: Сакриј моју е-адресу
+  field_comments: Коментар
   field_url: URL
-  field_start_page: Početna strana
-  field_subproject: Potprojekat
-  field_hours: sati
-  field_activity: Aktivnost
-  field_spent_on: Datum
-  field_identifier: Identifikator
-  field_is_filter: Upotrebi kao filter
-  field_issue_to: Povezani problemi
-  field_delay: Kašnjenje
-  field_assignable: Problem može biti dodeljen ovoj ulozi
-  field_redirect_existing_links: Preusmeri postojeće veze
-  field_estimated_hours: Proteklo vreme
-  field_column_names: Kolone
-  field_time_zone: Vremenska zona
-  field_searchable: Pretraživa
-  field_default_value: Podrazumevana vrednost
-  field_comments_sorting: Prikaži komentare
-  field_parent_title: Matična strana
-  field_editable: Izmeljivo
-  field_watcher: Posmatrač
+  field_start_page: Почетна страница
+  field_subproject: Потпројекат
+  field_hours: сати
+  field_activity: Активност
+  field_spent_on: Датум
+  field_identifier: Идентификатор
+  field_is_filter: Употреби као филтер
+  field_issue_to: Сродни проблеми
+  field_delay: Кашњење
+  field_assignable: Проблем може бити додељен овој улози
+  field_redirect_existing_links: Преусмери постојеће везе
+  field_estimated_hours: Протекло време
+  field_column_names: Колоне
+  field_time_zone: Временска зона
+  field_searchable: Може да се претражује
+  field_default_value: Подразумевана вредност
+  field_comments_sorting: Прикажи коментаре
+  field_parent_title: Матична страница
+  field_editable: Изменљиво
+  field_watcher: Посматрач
   field_identity_url: OpenID URL
-  field_content: Sadržaj
-  field_group_by: Grupiši rezultate po
-  field_sharing: Deljenje
+  field_content: Садржај
+  field_group_by: Груписање резултата по
+  field_sharing: Дељење
+  field_parent_issue: Матични задатак
   
-  setting_app_title: Naslov aplikacije
-  setting_app_subtitle: Podnaslov aplikacije
-  setting_welcome_text: Tekst dobrodošlice
-  setting_default_language: Podrazumevani jezik
-  setting_login_required: Obavezna provera identiteta
-  setting_self_registration: Samoregistracija
-  setting_attachment_max_size: Maks. veličina priložene datoteke
-  setting_issues_export_limit: Ograničenje izvoza problema
-  setting_mail_from: Email adresa emisije
-  setting_bcc_recipients: Primaoci nevidljive kopije poruke (bcc)
-  setting_plain_text_mail: Poruka sa čistim tekstom (bez HTML-a)
-  setting_host_name: Putanja i naziv glavnog računara
-  setting_text_formatting: Oblikovanje teksta
-  setting_wiki_compression: Kompresija Wiki istorije
-  setting_feeds_limit: Ograničenje sadržaja izvora vesti
-  setting_default_projects_public: Novi projekti su javni ako se drugačije ne navede
-  setting_autofetch_changesets: Izvršavanje automatskog preuzimanja
-  setting_sys_api_enabled: Omogući WS za upravljanje spremištem
-  setting_commit_ref_keywords: Referenciranje ključnih reči
-  setting_commit_fix_keywords: Popravljanje ključnih reči
-  setting_autologin: Automatska prijava
-  setting_date_format: Format datuma
-  setting_time_format: Format vremena
-  setting_cross_project_issue_relations: Dozvoli relacije problema iz unakrsnih projekata
-  setting_issue_list_default_columns: Podrazumevane kolone prikazane na spisku problema
-  setting_repositories_encodings: Kodiranje spremišta
-  setting_commit_logs_encoding: Kodiranje izvršnih poruka
-  setting_emails_footer: Podnožje email poruke
-  setting_protocol: Protokol
-  setting_per_page_options: Opcije prikaza objekata po strani
-  setting_user_format: Format prikaza korisnika
-  setting_activity_days_default: Broj dana prikazanih na projektnoj aktivnosti
-  setting_display_subprojects_issues: Prikazuj probleme iz potprojekata na glavnom projektu ukoliko nije drugačije navedeno
-  setting_enabled_scm: Omogući SCM
-  setting_mail_handler_body_delimiters: "Skrati poruku nakon jedne od ovih linija"
-  setting_mail_handler_api_enabled: Omogući WS dolazne poruke
-  setting_mail_handler_api_key: API ključ
-  setting_sequential_project_identifiers: Generisanje sekvencijalnog imena projekta
-  setting_gravatar_enabled: Koristi Gravatar korisničke ikone
-  setting_gravatar_default: Podrazumevana Gravatar slika
-  setting_diff_max_lines_displayed: Maks. broj prikazanih različitih linija
-  setting_file_max_size_displayed: Maks. veličina tekstualnih datoteka prikazanih unutra
-  setting_repository_log_display_limit: Maks. broj revizija prikazan u datoteci za evidenciju
-  setting_openid: Dozvoli OpenID prijavu i registraciju
-  setting_password_min_length: Minimalna dužina lozinke
-  setting_new_project_user_role_id: Uloga dodeljena korisniku (koji nije administrator), kreatoru projekta
-  setting_default_projects_modules: Podrazumevano omogućeni moduli za nove projekte
-  setting_issue_done_ratio: Izračunaj odnos rešenih problema
-  setting_issue_done_ratio_issue_field: koristeći polje problema
-  setting_issue_done_ratio_issue_status: koristeći status problema
-  setting_start_of_week: Prvi dan u sedmici
-  setting_rest_api_enabled: Omogući REST web usluge
-  setting_cache_formatted_text: Keširaj obrađen tekst
+  setting_app_title: Наслов апликације
+  setting_app_subtitle: Поднаслов апликације
+  setting_welcome_text: Текст добродошлице
+  setting_default_language: Подразумевани језик
+  setting_login_required: Обавезна потврда идентитета
+  setting_self_registration: Саморегистрација
+  setting_attachment_max_size: Макс. величина приложене датотеке
+  setting_issues_export_limit: Ограничење извоза „проблема“
+  setting_mail_from: Е-адреса пошиљаоца
+  setting_bcc_recipients: Примаоци „Bcc“ копије
+  setting_plain_text_mail: Порука са чистим текстом (без HTML-а)
+  setting_host_name: Путања и назив главног рачунара
+  setting_text_formatting: Обликовање текста
+  setting_wiki_compression: Компресија Wiki историје
+  setting_feeds_limit: Ограничење садржаја извора вести
+  setting_default_projects_public: Подразумева се јавно приказивање нових пројеката
+  setting_autofetch_changesets: Извршавање аутоматског преузимања
+  setting_sys_api_enabled: Омогућавање WS за управљање спремиштем
+  setting_commit_ref_keywords: Референцирање кључних речи
+  setting_commit_fix_keywords: Поправљање кључних речи
+  setting_autologin: Аутоматска пријава
+  setting_date_format: Формат датума
+  setting_time_format: Формат времена
+  setting_cross_project_issue_relations: Дозволи повезивање проблема из унакрсних пројеката
+  setting_issue_list_default_columns: Подразумеване колоне приказане на списку проблема
+  setting_repositories_encodings: Кодирање спремишта
+  setting_commit_logs_encoding: Кодирање извршних порука
+  setting_emails_footer: Подножје странице е-поруке
+  setting_protocol: Протокол
+  setting_per_page_options: Опције приказа објеката по страници
+  setting_user_format: Формат приказа корисника
+  setting_activity_days_default: Број дана приказаних на пројектној активности
+  setting_display_subprojects_issues: Приказуј проблеме из потпројеката на главном пројекту, уколико није другачије наведено
+  setting_enabled_scm: Омогућавање SCM
+  setting_mail_handler_body_delimiters: "Скраћивање е-поруке након једне од ових линија"
+  setting_mail_handler_api_enabled: Омогућавање WS долазне е-поруке
+  setting_mail_handler_api_key: API кључ
+  setting_sequential_project_identifiers: Генерисање секвенцијалног имена пројекта
+  setting_gravatar_enabled: Користи Gravatar корисничке иконе
+  setting_gravatar_default: Подразумевана Gravatar слика
+  setting_diff_max_lines_displayed: Макс. број приказаних различитих линија
+  setting_file_max_size_displayed: Макс. величина текст. датотека приказаних уметнуто
+  setting_repository_log_display_limit: Макс. број ревизија приказаних у датотеци за евиденцију
+  setting_openid: Дозволи OpenID пријаву и регистрацију
+  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_rest_api_enabled: Омогући REST web услуге
+  setting_cache_formatted_text: Кеширање обрађеног текста
   
-  permission_add_project: Kreiranje projekta
-  permission_add_subprojects: Kreiranje potpojekta
-  permission_edit_project: Izmena projekata
-  permission_select_project_modules: Odabiranje modula projekta
-  permission_manage_members: Upravljanje članovima
-  permission_manage_project_activities: Upravljanje projektnim aktivnostima
-  permission_manage_versions: Upravljanje verzijama
-  permission_manage_categories: Upravljanje kategorijama problema
-  permission_view_issues: Pregled problema
-  permission_add_issues: Dodavanje problema
-  permission_edit_issues: Izmena problema
-  permission_manage_issue_relations: Upravljanje relacijama između problema
-  permission_add_issue_notes: Dodavanje beleški
-  permission_edit_issue_notes: Izmena beleški
-  permission_edit_own_issue_notes: Izmena sopstvenih beleški
-  permission_move_issues: Pomeranje problema
-  permission_delete_issues: Brisanje problema
-  permission_manage_public_queries: Upravljanje javnim upitima
-  permission_save_queries: Snimanje upita
-  permission_view_gantt: Pregledanje Gantovog dijagrama
-  permission_view_calendar: Pregledanje kalendara
-  permission_view_issue_watchers: Pregledanje spiska posmatrača
-  permission_add_issue_watchers: Dodavanje posmatrača
-  permission_delete_issue_watchers: Brisanje posmatrača
-  permission_log_time: Beleženje utrošenog vremena
-  permission_view_time_entries: Pregledanje utrošenog vremena
-  permission_edit_time_entries: Izmena utrošenog vremena
-  permission_edit_own_time_entries: Izmena sopstvenog utrošenog vremena
-  permission_manage_news: Upravljanje vestima
-  permission_comment_news: Komentarisanje vesti
-  permission_manage_documents: Upravljanje dokumentima
-  permission_view_documents: Pregledanje dokumenata
-  permission_manage_files: Upravljanje datotekama
-  permission_view_files: Pregledanje datoteka
-  permission_manage_wiki: Upravljanje wiki stranama
-  permission_rename_wiki_pages: Promena imena wiki stranama
-  permission_delete_wiki_pages: Brisanje wiki strana
-  permission_view_wiki_pages: Pregledanje wiki strana
-  permission_view_wiki_edits: Pregledanje wiki istorije
-  permission_edit_wiki_pages: Izmena wiki strana
-  permission_delete_wiki_pages_attachments: Brisanje priloženih datoteka
-  permission_protect_wiki_pages: Zaštita wiki strana
-  permission_manage_repository: Upravljanje spremištem
-  permission_browse_repository: Pregledanje spremišta
-  permission_view_changesets: Pregledanje skupa promena
-  permission_commit_access: Potvrda pristupa
-  permission_manage_boards: Upravljanje forumima
-  permission_view_messages: Pregledanje poruka
-  permission_add_messages: Slanje poruka
-  permission_edit_messages: Izmena poruka
-  permission_edit_own_messages: Izmena sopstvenih poruka
-  permission_delete_messages: Brisanje poruka
-  permission_delete_own_messages: Brisanje sopstvenih poruka
-  permission_export_wiki_pages: Izvoz wiki strana
+  permission_add_project: Креирање пројекта
+  permission_add_subprojects: Креирање потпојекта
+  permission_edit_project: Измена пројеката
+  permission_select_project_modules: Одабирање модула пројекта
+  permission_manage_members: Управљање члановима
+  permission_manage_project_activities: Управљање пројектним активностима
+  permission_manage_versions: Управљање верзијама
+  permission_manage_categories: Управљање категоријама проблема
+  permission_view_issues: Преглед проблема
+  permission_add_issues: Додавање проблема
+  permission_edit_issues: Измена проблема
+  permission_manage_issue_relations: Управљање везама између проблема
+  permission_add_issue_notes: Додавање белешки
+  permission_edit_issue_notes: Измена белешки
+  permission_edit_own_issue_notes: Измена сопствених белешки
+  permission_move_issues: Померање проблема
+  permission_delete_issues: Брисање проблема
+  permission_manage_public_queries: Управљање јавним упитима
+  permission_save_queries: Снимање упита
+  permission_view_gantt: Прегледање Гантовог дијаграма
+  permission_view_calendar: Прегледање календара
+  permission_view_issue_watchers: Прегледање списка посматрача
+  permission_add_issue_watchers: Додавање посматрача
+  permission_delete_issue_watchers: Брисање посматрача
+  permission_log_time: Бележење утрошеног времена
+  permission_view_time_entries: Прегледање утрошеног времена
+  permission_edit_time_entries: Измена утрошеног времена
+  permission_edit_own_time_entries: Измена сопственог утрошеног времена
+  permission_manage_news: Управљање вестима
+  permission_comment_news: Коментарисање вести
+  permission_manage_documents: Управљање документима
+  permission_view_documents: Прегледање докумената
+  permission_manage_files: Управљање датотекама
+  permission_view_files: Прегледање датотека
+  permission_manage_wiki: Управљање wiki страницама
+  permission_rename_wiki_pages: Промена имена wiki страницама
+  permission_delete_wiki_pages: Брисање wiki страница
+  permission_view_wiki_pages: Прегледање wiki страница
+  permission_view_wiki_edits: Прегледање wiki историје
+  permission_edit_wiki_pages: Измена wiki страница
+  permission_delete_wiki_pages_attachments: Брисање приложених датотека
+  permission_protect_wiki_pages: Заштита wiki страница
+  permission_manage_repository: Управљање спремиштем
+  permission_browse_repository: Прегледање спремишта
+  permission_view_changesets: Прегледање скупа промена
+  permission_commit_access: Потврда приступа
+  permission_manage_boards: Управљање форумима
+  permission_view_messages: Прегледање порука
+  permission_add_messages: Слање порука
+  permission_edit_messages: Измена порука
+  permission_edit_own_messages: Измена сопствених порука
+  permission_delete_messages: Брисање порука
+  permission_delete_own_messages: Брисање сопствених порука
+  permission_export_wiki_pages: Извоз wiki страница
+  permission_manage_subtasks: Управљање подзадацима
   
-  project_module_issue_tracking: Traganje za problemom
-  project_module_time_tracking: Vreme traganja
-  project_module_news: Vesti
-  project_module_documents: Dokumenta
-  project_module_files: Datoteke
+  project_module_issue_tracking: Праћење проблема
+  project_module_time_tracking: Праћење времена
+  project_module_news: Вести
+  project_module_documents: Документи
+  project_module_files: Датотеке
   project_module_wiki: Wiki
-  project_module_repository: Spremište
-  project_module_boards: Forumi
+  project_module_repository: Спремиште
+  project_module_boards: Форуми
   
-  label_user: Korisnik
-  label_user_plural: Korisnici
-  label_user_new: Novi korisnik
-  label_user_anonymous: Anoniman
-  label_project: Projekat
-  label_project_new: Novi projekat
-  label_project_plural: Projekti
+  label_user: Корисник
+  label_user_plural: Корисници
+  label_user_new: Нови корисник
+  label_user_anonymous: Анониман
+  label_project: Пројекат
+  label_project_new: Нови пројекат
+  label_project_plural: Пројекти
   label_x_projects:
-    zero:  nema projekata
-    one:   jedan projekat
-    other: "{{count}} projekata"
-  label_project_all: Svi projekti
-  label_project_latest: Poslednji projekti
-  label_issue: Problem
-  label_issue_new: Novi problem
-  label_issue_plural: Problemi
-  label_issue_view_all: Prikaz svih problema
-  label_issues_by: "Problemi - {{value}}"
-  label_issue_added: Problem je dodat
-  label_issue_updated: Problem je ažuriran
-  label_document: Dokument
-  label_document_new: Novi dokument
-  label_document_plural: Dokumenti
-  label_document_added: Dokument je dodat
-  label_role: Uloga
-  label_role_plural: Uloge
-  label_role_new: Nova uloga
-  label_role_and_permissions: Uloge i dozvole
-  label_member: Član
-  label_member_new: Novi član
-  label_member_plural: Članovi
-  label_tracker: Tragač
-  label_tracker_plural: Tragači
-  label_tracker_new: Novi tragač
-  label_workflow: Tok rada
-  label_issue_status: Status problema
-  label_issue_status_plural: Statusi problema
-  label_issue_status_new: Novi status
-  label_issue_category: Kategorija problema
-  label_issue_category_plural: Kategorije problema
-  label_issue_category_new: Nova kategorija
-  label_custom_field: Prilagođeno polje
-  label_custom_field_plural: Prilagođena polja
-  label_custom_field_new: Novo prilagođeno polje
-  label_enumerations: Nabrojiva lista
-  label_enumeration_new: Nova vrednost
-  label_information: Informacija
-  label_information_plural: Informacije
-  label_please_login: Molimo, prijavite se
-  label_register: Registracija
-  label_login_with_open_id_option: ili prijava sa OpenID
-  label_password_lost: Izgubljena lozinka
-  label_home: Početak
-  label_my_page: Moja strana
-  label_my_account: Moj nalog
-  label_my_projects: Moji projekti
-  label_administration: Administracija
-  label_login: Prijava
-  label_logout: Odjava
-  label_help: Pomoć
-  label_reported_issues: Prijavljeni problemi
-  label_assigned_to_me_issues: Problemi dodoljeni meni
-  label_last_login: Poslednje povezivanje
-  label_registered_on: Registrovan
-  label_activity: Aktivnost
-  label_overall_activity: Obuhvatna aktivnost
-  label_user_activity: "Aktivnost korisnika {{value}}"
-  label_new: Novo
-  label_logged_as: Prijavljeni ste kao
-  label_environment: Okruženje
-  label_authentication: Provera identiteta
-  label_auth_source: Režim provere identiteta
-  label_auth_source_new: Novi režim provere identiteta
-  label_auth_source_plural: Režimi provere identiteta
-  label_subproject_plural: Potprojekti
-  label_subproject_new: Novi potprojekat
-  label_and_its_subprojects: "{{value}} i njegovi potprojekti"
-  label_min_max_length: Min. - Maks. dužina
-  label_list: Spisak
-  label_date: Datum
-  label_integer: Ceo broj
-  label_float: Sa pokretnim zarezom
-  label_boolean: Logički operator
-  label_string: Tekst
-  label_text: Dugi tekst
-  label_attribute: Osobina
-  label_attribute_plural: Osobine
-  label_download: "{{count}} preuzimanje"
-  label_download_plural: "{{count}} preuzimanja"
-  label_no_data: Nema podataka za prikazivanje
-  label_change_status: Promena statusa
-  label_history: Istorija
-  label_attachment: Datoteka
-  label_attachment_new: Nova datoteka
-  label_attachment_delete: Brisanje datoteke
-  label_attachment_plural: Datoteke
-  label_file_added: Datoteka dodata
-  label_report: Izveštaj
-  label_report_plural: Izveštaji
-  label_news: Vesti
-  label_news_new: Dodavanje vesti
-  label_news_plural: Vesti
-  label_news_latest: Poslednje vesti
-  label_news_view_all: Prikaz svih vesti
-  label_news_added: Vesti dodato
-  label_settings: Podešavanja
-  label_overview: Pregled
-  label_version: Verzija
-  label_version_new: Nova verzija
-  label_version_plural: Verzije
-  label_close_versions: Zatvori završene verzije
-  label_confirmation: Potvrda
-  label_export_to: 'Takođe dostupno i u varijanti:'
-  label_read: Čitanje...
-  label_public_projects: Javni projekti
-  label_open_issues: otvoren
-  label_open_issues_plural: otvorenih
-  label_closed_issues: zatvoren
-  label_closed_issues_plural: zatvorenih
+    zero:  нема пројеката
+    one:   један пројекат
+    other: "{{count}} пројеката"
+  label_project_all: Сви пројекти
+  label_project_latest: Последњи пројекти
+  label_issue: Проблем
+  label_issue_new: Нови проблем
+  label_issue_plural: Проблеми
+  label_issue_view_all: Приказ свих проблема
+  label_issues_by: "Проблеми ({{value}})"
+  label_issue_added: Проблем је додат
+  label_issue_updated: Проблем је ажуриран
+  label_document: Документ
+  label_document_new: Нови документ
+  label_document_plural: Документи
+  label_document_added: Документ је додат
+  label_role: Улога
+  label_role_plural: Улоге
+  label_role_new: Нова улога
+  label_role_and_permissions: Улоге и дозволе
+  label_member: Члан
+  label_member_new: Нови члан
+  label_member_plural: Чланови
+  label_tracker: Праћење
+  label_tracker_plural: Праћења
+  label_tracker_new: Ново праћење
+  label_workflow: Ток посла
+  label_issue_status: Статус проблема
+  label_issue_status_plural: Статуси проблема
+  label_issue_status_new: Нови статус
+  label_issue_category: Категорија проблема
+  label_issue_category_plural: Категорије проблема
+  label_issue_category_new: Нова категорија
+  label_custom_field: Прилагођено поље
+  label_custom_field_plural: Прилагођена поља
+  label_custom_field_new: Ново прилагођено поље
+  label_enumerations: Набројива листа
+  label_enumeration_new: Нова вредност
+  label_information: Информација
+  label_information_plural: Информације
+  label_please_login: Молимо, пријавите се
+  label_register: Регистрација
+  label_login_with_open_id_option: или пријава са OpenID
+  label_password_lost: Изгубљена лозинка
+  label_home: Почетак
+  label_my_page: Моја страница
+  label_my_account: Мој налог
+  label_my_projects: Моји пројекти
+  label_my_page_block: My page block
+  label_administration: Администрација
+  label_login: Пријава
+  label_logout: Одјава
+  label_help: Помоћ
+  label_reported_issues: Пријављени проблеми
+  label_assigned_to_me_issues: Проблеми додељени мени
+  label_last_login: Последње повезивање
+  label_registered_on: Регистрован
+  label_activity: Активност
+  label_overall_activity: Целокупна активност
+  label_user_activity: "Активност корисника {{value}}"
+  label_new: Ново
+  label_logged_as: Пријављени сте као
+  label_environment: Окружење
+  label_authentication: Потврда идентитета
+  label_auth_source: Режим потврде идентитета
+  label_auth_source_new: Нови режим потврде идентитета
+  label_auth_source_plural: Режими потврде идентитета
+  label_subproject_plural: Потпројекти
+  label_subproject_new: Нови потпројекат
+  label_and_its_subprojects: "{{value}} и његови потпројекти"
+  label_min_max_length: Мин. - Макс. дужина
+  label_list: Списак
+  label_date: Датум
+  label_integer: Цео број
+  label_float: Са покретним зарезом
+  label_boolean: Логички оператор
+  label_string: Текст
+  label_text: Дуги текст
+  label_attribute: Особина
+  label_attribute_plural: Особине
+  label_download: "{{count}} преузимање"
+  label_download_plural: "{{count}} преузимања"
+  label_no_data: Нема података за приказивање
+  label_change_status: Промена статуса
+  label_history: Историја
+  label_attachment: Датотека
+  label_attachment_new: Нова датотека
+  label_attachment_delete: Брисање датотеке
+  label_attachment_plural: Датотеке
+  label_file_added: Датотека је додата
+  label_report: Извештај
+  label_report_plural: Извештаји
+  label_news: Вести
+  label_news_new: Додавање вести
+  label_news_plural: Вести
+  label_news_latest: Последње вести
+  label_news_view_all: Приказ свих вести
+  label_news_added: Вести су додате
+  label_settings: Подешавања
+  label_overview: Преглед
+  label_version: Верзија
+  label_version_new: Нова верзија
+  label_version_plural: Верзије
+  label_close_versions: Затвори завршене верзије
+  label_confirmation: Потврда
+  label_export_to: 'Такође доступно и у варијанти:'
+  label_read: Читање...
+  label_public_projects: Јавни пројекти
+  label_open_issues: отворен
+  label_open_issues_plural: отворених
+  label_closed_issues: затворен
+  label_closed_issues_plural: затворених
   label_x_open_issues_abbr_on_total:
-    zero:  0 otvorenih / {{total}}
-    one:   1 otvoren / {{total}}
-    other: "{{count}} otvorenih / {{total}}"
+    zero:  0 отворених / {{total}}
+    one:   1 отворен / {{total}}
+    other: "{{count}} отворених / {{total}}"
   label_x_open_issues_abbr:
-    zero:  0 otvorenih
-    one:   1 otvoren
-    other: "{{count}} otvorenih"
+    zero:  0 отворених
+    one:   1 отворен
+    other: "{{count}} отворених"
   label_x_closed_issues_abbr:
-    zero:  0 zatvorenih
-    one:   1 zatvoren
-    other: "{{count}} zatvorenih"
-  label_total: Ukupno
-  label_permissions: Ovlašćenja
-  label_current_status: Trenutni status
-  label_new_statuses_allowed: Novi statusi dozvoljeni
-  label_all: svi
-  label_none: nijedan
-  label_nobody: nikome
-  label_next: Sledeće
-  label_previous: Prethodno
-  label_used_by: Koristio
-  label_details: Detalji
-  label_add_note: Dodaj belešku
-  label_per_page: Po strani
-  label_calendar: Kalendar
-  label_months_from: meseci od
-  label_gantt: Gantov dijagram
-  label_internal: Unutrašlji
-  label_last_changes: "poslednjih {{count}} promena"
-  label_change_view_all: Prikaži sve promene
-  label_personalize_page: Personalizujte ovu stranu
-  label_comment: Komentar
-  label_comment_plural: Komentari
+    zero:  0 затворених
+    one:   1 затворен
+    other: "{{count}} затворених"
+  label_total: Укупно
+  label_permissions: Дозволе
+  label_current_status: Тренутни статус
+  label_new_statuses_allowed: Нови статуси дозвољени
+  label_all: сви
+  label_none: ниједан
+  label_nobody: никоме
+  label_next: Следеће
+  label_previous: Претходно
+  label_used_by: Користио
+  label_details: Детаљи
+  label_add_note: Додај белешку
+  label_per_page: По страни
+  label_calendar: Календар
+  label_months_from: месеци од
+  label_gantt: Гантов дијаграм
+  label_internal: Унутрашњи
+  label_last_changes: "последњих {{count}} промена"
+  label_change_view_all: Прикажи све промене
+  label_personalize_page: Персонализуј ову страну
+  label_comment: Коментар
+  label_comment_plural: Коментари
   label_x_comments:
-    zero: bez komentara
-    one: jedan komentar
-    other: "{{count}} komentara"
-  label_comment_add: Dodaj komentar
-  label_comment_added: Komentar dodat
-  label_comment_delete: Obriši komentare
-  label_query: Prilagođen upit
-  label_query_plural: Prilagođeni upiti
-  label_query_new: Novi upit
-  label_filter_add: Dodaj filter
-  label_filter_plural: Filteri
-  label_equals: je
-  label_not_equals: nije
-  label_in_less_than: manje od
-  label_in_more_than: više od
+    zero: без коментара
+    one: један коментар
+    other: "{{count}} коментара"
+  label_comment_add: Додај коментар
+  label_comment_added: Коментар додат
+  label_comment_delete: Обриши коментаре
+  label_query: Прилагођен упит
+  label_query_plural: Прилагођени упити
+  label_query_new: Нови упит
+  label_filter_add: Додавање филтера
+  label_filter_plural: Филтери
+  label_equals: је
+  label_not_equals: није
+  label_in_less_than: мање од
+  label_in_more_than: више од
   label_greater_or_equal: '>='
   label_less_or_equal: '<='
-  label_in: u
-  label_today: danas
-  label_all_time: sve vreme
-  label_yesterday: juče
-  label_this_week: ove sedmice
-  label_last_week: poslednje sedmice
-  label_last_n_days: "poslednjih {{count}} dana"
-  label_this_month: ovog meseca
-  label_last_month: poslednjeg meseca
-  label_this_year: ove godine
-  label_date_range: Vremenski period
-  label_less_than_ago: pre manje od nekoliko dana
-  label_more_than_ago: pre više od nekoliko dana
-  label_ago: pre nekoliko dana
-  label_contains: sadrži
-  label_not_contains: ne sadrži
-  label_day_plural: dana
-  label_repository: Spremište
-  label_repository_plural: Spremišta
-  label_browse: Pregledanje
-  label_modification: "{{count}} promena"
-  label_modification_plural: "{{count}} promena"
-  label_branch: Grana
-  label_tag: Oznaka
-  label_revision: Revizija
-  label_revision_plural: Revizije
-  label_revision_id: "Revizija {{value}}"
-  label_associated_revisions: Pridružene revizije
-  label_added: dodato
-  label_modified: promenjeno
-  label_copied: kopirano
-  label_renamed: preimenovano
-  label_deleted: obrisano
-  label_latest_revision: Poslednja revizija
-  label_latest_revision_plural: Poslednje revizije
-  label_view_revisions: Pregled revizija
-  label_view_all_revisions: Pregled svih revizija
-  label_max_size: Maksimalna veličina
-  label_sort_highest: Premesti na vrh
-  label_sort_higher: Premesti na gore
-  label_sort_lower: Premesti na dole
-  label_sort_lowest: Premesti na dno
-  label_roadmap: Plan rada
-  label_roadmap_due_in: "Dospeva {{value}}"
-  label_roadmap_overdue: "{{value}} najkasnije"
-  label_roadmap_no_issues: Nema problema za ovu verziju
-  label_search: Pretraga
-  label_result_plural: Rezultati
-  label_all_words: Sve reči
+  label_in: у
+  label_today: данас
+  label_all_time: све време
+  label_yesterday: јуче
+  label_this_week: ове седмице
+  label_last_week: последње седмице
+  label_last_n_days: "последњих {{count}} дана"
+  label_this_month: овог месеца
+  label_last_month: последњег месеца
+  label_this_year: ове године
+  label_date_range: Временски период
+  label_less_than_ago: пре мање од неколико дана
+  label_more_than_ago: пре више од неколико дана
+  label_ago: пре неколико дана
+  label_contains: садржи
+  label_not_contains: не садржи
+  label_day_plural: дана
+  label_repository: Спремиште
+  label_repository_plural: Спремишта
+  label_browse: Прегледање
+  label_modification: "{{count}} промена"
+  label_modification_plural: "{{count}} промена"
+  label_branch: Грана
+  label_tag: Ознака
+  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_max_size: Максимална величина
+  label_sort_highest: Премештање на врх
+  label_sort_higher: Премештање на горе
+  label_sort_lower: Премештање на доле
+  label_sort_lowest: Премештање на дно
+  label_roadmap: План рада
+  label_roadmap_due_in: "Доспева {{value}}"
+  label_roadmap_overdue: "{{value}} најкасније"
+  label_roadmap_no_issues: Нема проблема за ову верзију
+  label_search: Претрага
+  label_result_plural: Резултати
+  label_all_words: Све речи
   label_wiki: Wiki
-  label_wiki_edit: Wiki izmena
-  label_wiki_edit_plural: Wiki izmene
-  label_wiki_page: Wiki strana
-  label_wiki_page_plural: Wiki strane
-  label_index_by_title: Indeksiranje po naslovu
-  label_index_by_date: Indeksiranje po datumu
-  label_current_version: Trenutna verzija
-  label_preview: Pregled
-  label_feed_plural: Izvori vesti
-  label_changes_details: Detalji svih promena
-  label_issue_tracking: Praćenje problema
-  label_spent_time: Utrošeno vreme
-  label_f_hour: "{{value}} sat"
-  label_f_hour_plural: "{{value}} sati"
-  label_time_tracking: Vreme praćenja
-  label_change_plural: Promene
-  label_statistics: Statistika
-  label_commits_per_month: Potvrda mesečno
-  label_commits_per_author: Potvrda po autoru
-  label_view_diff: Pogledaj razlike
-  label_diff_inline: unutra
-  label_diff_side_by_side: uporedo
-  label_options: Opcije
-  label_copy_workflow_from: Kopiraj tok rada od
-  label_permissions_report: Izveštaj o ovlašćenjima
-  label_watched_issues: Posmatrani problemi
-  label_related_issues: Povezani problemi
-  label_applied_status: Primenjeni statusi
-  label_loading: Učitavanje...
-  label_relation_new: Nova relacija
-  label_relation_delete: Obriši relaciju
-  label_relates_to: povezanih sa
-  label_duplicates: dupliranih
-  label_duplicated_by: dupliranih od
-  label_blocks: odbijenih
-  label_blocked_by: odbijenih od
-  label_precedes: prethodi
-  label_follows: praćenih
-  label_end_to_start: od kraja do početka
-  label_end_to_end: od kraja do kraja
-  label_start_to_start: od početka do početka
-  label_start_to_end: od početka do kraja
-  label_stay_logged_in: Ostani prijavljen
-  label_disabled: onemogućeno
-  label_show_completed_versions: Prikaži završene verzije
-  label_me: meni
-  label_board: Forum
-  label_board_new: Novi forum
-  label_board_plural: Forumi
-  label_board_locked: Zaključana
-  label_board_sticky: Lepljiva
-  label_topic_plural: Teme
-  label_message_plural: Poruke
-  label_message_last: Poslednja poruka
-  label_message_new: Nova poruka
-  label_message_posted: Poruka je dodata
-  label_reply_plural: Odgovori
-  label_send_information: Pošalji detalje naloga korisniku
-  label_year: Godina
-  label_month: Mesec
-  label_week: Sedmica
-  label_date_from: Šalje
-  label_date_to: Prima
-  label_language_based: Bazirano na jeziku korisnika
-  label_sort_by: "Poređano po {{value}}"
-  label_send_test_email: Pošalji probnu poruku
-  label_feeds_access_key: RSS pristupni ključ
-  label_missing_feeds_access_key: RSS pristupni ključ nedostaje
-  label_feeds_access_key_created_on: "RSS pristupni ključ je napravljen pre {{value}}"
-  label_module_plural: Moduli
-  label_added_time_by: "Dodao {{author}} pre {{age}}"
-  label_updated_time_by: "Ažurirao {{author}} pre {{age}}"
-  label_updated_time: "Ažurirano pre {{value}}"
-  label_jump_to_a_project: Skok na projekat...
-  label_file_plural: Datoteke
-  label_changeset_plural: Skupovi promena
-  label_default_columns: Podrazumevane kolone
-  label_no_change_option: (Bez promena)
-  label_bulk_edit_selected_issues: Grupna izmena odabranih problema
-  label_theme: Tema
-  label_default: Podrazumevano
-  label_search_titles_only: Pretražuj samo naslove
-  label_user_mail_option_all: "Za bilo koji događaj na svim mojim projektima"
-  label_user_mail_option_selected: "Za bilo koji događaj na samo odabranim projektima..."
-  label_user_mail_option_none: "Samo za stvari koje pratim ili sam uključen"
-  label_user_mail_no_self_notified: "Ne želim biti obaveštavan za promene koje sam pravim"
-  label_registration_activation_by_email: aktivacija naloga putem email-a
-  label_registration_manual_activation: ručna aktivacija naloga
-  label_registration_automatic_activation: automatska aktivacija naloga
-  label_display_per_page: "Broj stavki po strani: {{value}}"
-  label_age: Starost
-  label_change_properties: Promeni svojstva
-  label_general: Opšti
-  label_more: Više
+  label_wiki_edit: Wiki измена
+  label_wiki_edit_plural: Wiki измене
+  label_wiki_page: Wiki страница
+  label_wiki_page_plural: Wiki странице
+  label_index_by_title: Индексирање по наслову
+  label_index_by_date: Индексирање по датуму
+  label_current_version: Тренутна верзија
+  label_preview: Преглед
+  label_feed_plural: Извори вести
+  label_changes_details: Детаљи свих промена
+  label_issue_tracking: Праћење проблема
+  label_spent_time: Утрошено време
+  label_overall_spent_time: Целокупно утрошено време
+  label_f_hour: "{{value}} сат"
+  label_f_hour_plural: "{{value}} сати"
+  label_time_tracking: Праћење времена
+  label_change_plural: Промене
+  label_statistics: Статистика
+  label_commits_per_month: Извршења месечно
+  label_commits_per_author: Извршења по аутору
+  label_view_diff: Погледај разлике
+  label_diff_inline: унутра
+  label_diff_side_by_side: упоредо
+  label_options: Опције
+  label_copy_workflow_from: Копирање тока посла од
+  label_permissions_report: Извештај о дозволама
+  label_watched_issues: Посматрани проблеми
+  label_related_issues: Сродни проблеми
+  label_applied_status: Примењени статуси
+  label_loading: Учитавање...
+  label_relation_new: Нова релација
+  label_relation_delete: Брисање релације
+  label_relates_to: сродних са
+  label_duplicates: дуплираних
+  label_duplicated_by: дуплираних од
+  label_blocks: одбијених
+  label_blocked_by: одбијених од
+  label_precedes: претходи
+  label_follows: праћених
+  label_end_to_start: од краја до почетка
+  label_end_to_end: од краја до краја
+  label_start_to_start: од почетка до почетка
+  label_start_to_end: од почетка до краја
+  label_stay_logged_in: Останите пријављени
+  label_disabled: онемогућено
+  label_show_completed_versions: Приказивање завршене верзије
+  label_me: мени
+  label_board: Форум
+  label_board_new: Нови форум
+  label_board_plural: Форуми
+  label_board_locked: Закључана
+  label_board_sticky: Лепљива
+  label_topic_plural: Теме
+  label_message_plural: Поруке
+  label_message_last: Последња порука
+  label_message_new: Нова порука
+  label_message_posted: Порука је додата
+  label_reply_plural: Одговори
+  label_send_information: Пошаљи кориснику детаље налога
+  label_year: Година
+  label_month: Месец
+  label_week: Седмица
+  label_date_from: Шаље
+  label_date_to: Прима
+  label_language_based: Базирано на језику корисника
+  label_sort_by: "Сортирано по {{value}}"
+  label_send_test_email: Слање пробне е-поруке
+  label_feeds_access_key: RSS приступни кључ
+  label_missing_feeds_access_key: RSS приступни кључ недостаје
+  label_feeds_access_key_created_on: "RSS приступни кључ је направљен пре {{value}}"
+  label_module_plural: Модули
+  label_added_time_by: "Додао {{author}} пре {{age}}"
+  label_updated_time_by: "Ажурирао {{author}} пре {{age}}"
+  label_updated_time: "Ажурирано пре {{value}}"
+  label_jump_to_a_project: Скок на пројекат...
+  label_file_plural: Датотеке
+  label_changeset_plural: Скупови промена
+  label_default_columns: Подразумеване колоне
+  label_no_change_option: (Без промена)
+  label_bulk_edit_selected_issues: Групна измена одабраних проблема
+  label_theme: Тема
+  label_default: Подразумевано
+  label_search_titles_only: Претражуј само наслове
+  label_user_mail_option_all: "За било који догађај на свим мојим пројектима"
+  label_user_mail_option_selected: "За било који догађај на само одабраним пројектима..."
+  label_user_mail_option_none: "Само за ствари које пратим или у које сам укључен"
+  label_user_mail_no_self_notified: "Не желим бити обавештаван за промене које сам правим"
+  label_registration_activation_by_email: активација налога путем е-поруке
+  label_registration_manual_activation: ручна активација налога
+  label_registration_automatic_activation: аутоматска активација налога
+  label_display_per_page: "Број ставки по страници: {{value}}"
+  label_age: Старост
+  label_change_properties: Промени својства
+  label_general: Општи
+  label_more: Више
   label_scm: SCM
-  label_plugins: Dodaci
-  label_ldap_authentication: LDAP provera identiteta
+  label_plugins: Додатне компоненте
+  label_ldap_authentication: LDAP потврда идентитета
   label_downloads_abbr: D/L
-  label_optional_description: Opciono opis
-  label_add_another_file: Dodaj još jednu datoteku
-  label_preferences: Podešavanja
-  label_chronological_order: po hronološkom redosledu
-  label_reverse_chronological_order: po obrnutom hronološkom redosledu
-  label_planning: Planiranje
-  label_incoming_emails: Dolazne poruke
-  label_generate_key: Generiši ključ
-  label_issue_watchers: Posmatrači
-  label_example: Primer
-  label_display: Prikaz
-  label_sort: Redosled
-  label_ascending: Rastući niz
-  label_descending: Opadajući niz
-  label_date_from_to: Od {{start}} do {{end}}
-  label_wiki_content_added: Wiki strana je dodata
-  label_wiki_content_updated: Wiki strana je ažurirana
-  label_group: Grupa
-  label_group_plural: Grupe
-  label_group_new: Nova grupa
-  label_time_entry_plural: Provedeno vreme
-  label_version_sharing_none: Nije deljeno
-  label_version_sharing_descendants: Sa potprojektima
-  label_version_sharing_hierarchy: Sa hijerarhijom projekta
-  label_version_sharing_tree: Sa stablom projekta
-  label_version_sharing_system: Sa svim projektima
-  label_update_issue_done_ratios: Ažuriraj odnos rešenih problema
-  label_copy_source: Izvor
-  label_copy_target: Odredište
-  label_copy_same_as_target: Isto kao odredište
-  label_display_used_statuses_only: Prikazuj statuse korišćene samo od strane ovog tragača
-  label_api_access_key: API pristupni ključ
-  label_missing_api_access_key: API pristupni ključ nedostaje
-  label_api_access_key_created_on: "API pristupni ključ je kreiran pre {{value}}"
-  label_project_copy_notifications: Pošalji email poruku sa obaveštenjem prilikom kopiranja projekta 
+  label_optional_description: Опционо опис
+  label_add_another_file: Додај још једну датотеку
+  label_preferences: Подешавања
+  label_chronological_order: по хронолошком редоследу
+  label_reverse_chronological_order: по обрнутом хронолошком редоследу
+  label_planning: Планирање
+  label_incoming_emails: Долазне е-поруке
+  label_generate_key: Генерисање кључа
+  label_issue_watchers: Посматрачи
+  label_example: Пример
+  label_display: Приказ
+  label_sort: Сортирање
+  label_ascending: Растући низ
+  label_descending: Опадајући низ
+  label_date_from_to: Од {{start}} до {{end}}
+  label_wiki_content_added: Wiki страница је додата
+  label_wiki_content_updated: Wiki страница је ажурирана
+  label_group: Група
+  label_group_plural: Групе
+  label_group_new: Нова група
+  label_time_entry_plural: Утрошено време
+  label_version_sharing_none: Није дељено
+  label_version_sharing_descendants: Са потпројектима
+  label_version_sharing_hierarchy: Са хијерархијом пројекта
+  label_version_sharing_tree: Са стаблом пројекта
+  label_version_sharing_system: Са свим пројектима
+  label_update_issue_done_ratios: Ажурирај однос решених проблема
+  label_copy_source: Извор
+  label_copy_target: Одредиште
+  label_copy_same_as_target: Исто као одредиште
+  label_display_used_statuses_only: Приказуј статусе коришћене само од стране овог праћења
+  label_api_access_key: API приступни кључ
+  label_missing_api_access_key: Недостаје API приступни кључ
+  label_api_access_key_created_on: "API приступни кључ је креиран пре {{value}}"
+  label_profile: Профил
+  label_subtask_plural: Подзадатак
+  label_project_copy_notifications: Пошаљи е-поруку са обавештењем приликом копирања пројекта 
   
-  button_login: Prijava
-  button_submit: Pošalji
-  button_save: Snimi
-  button_check_all: Uključi sve
-  button_uncheck_all: Isključi sve
-  button_delete: Obriši
-  button_create: Napravi
-  button_create_and_continue: Napravi i nastavi
-  button_test: Test
-  button_edit: Izmeni
-  button_add: Dodaj
-  button_change: Promeni
-  button_apply: Primeni
-  button_clear: Obriši
-  button_lock: Zaključaj
-  button_unlock: Otključaj
-  button_download: Preuzmi
-  button_list: Spisak
-  button_view: Prikaz
-  button_move: Pomeri
-  button_move_and_follow: Pomeri i prati
-  button_back: Nazad
-  button_cancel: Poništi
-  button_activate: Aktiviraj
-  button_sort: Poređaj
-  button_log_time: Evidentiranje vremena
-  button_rollback: Povratak na ovu verziju
-  button_watch: Prati
-  button_unwatch: Ne prati više
-  button_reply: Odgovori
-  button_archive: Arhiviraj
-  button_unarchive: Vrati iz arhive
-  button_reset: Poništi
-  button_rename: Reimenuj
-  button_change_password: Promena lozinke
-  button_copy: Kopiraj
-  button_copy_and_follow: Kopiraj i prati
-  button_annotate: Pribeleži
-  button_update: Ažuriraj
-  button_configure: Podesi
-  button_quote: Pod navodnicima
-  button_duplicate: Dupliraj
-  button_show: Prikaži
+  button_login: Пријава
+  button_submit: Пошаљи
+  button_save: Сними
+  button_check_all: Укључи све
+  button_uncheck_all: Искључи све
+  button_delete: Избриши
+  button_create: Креирај
+  button_create_and_continue: Креирај и настави
+  button_test: Тест
+  button_edit: Измени
+  button_add: Додај
+  button_change: Промени
+  button_apply: Примени
+  button_clear: Обриши
+  button_lock: Закључај
+  button_unlock: Откључај
+  button_download: Преузми
+  button_list: Списак
+  button_view: Прикажи
+  button_move: Помери
+  button_move_and_follow: Помери и прати
+  button_back: Назад
+  button_cancel: Поништи
+  button_activate: Активирај
+  button_sort: Сортирај
+  button_log_time: Евидентирај време
+  button_rollback: Повратак на ову верзију
+  button_watch: Прати
+  button_unwatch: Не прати више
+  button_reply: Одговори
+  button_archive: Архивирај
+  button_unarchive: Врати из архиве
+  button_reset: Поништи
+  button_rename: Преименуј
+  button_change_password: Промени лозинку
+  button_copy: Копирај
+  button_copy_and_follow: Копирај и прати
+  button_annotate: Прибележи
+  button_update: Ажурирај
+  button_configure: Подеси
+  button_quote: Под наводницима
+  button_duplicate: Дуплирај
+  button_show: Прикажи
   
-  status_active: aktivni
-  status_registered: registrovani
-  status_locked: zaključani
+  status_active: активни
+  status_registered: регистровани
+  status_locked: закључани
   
-  version_status_open: otvoren
-  version_status_locked: zaključan
-  version_status_closed: zatvoren
+  version_status_open: отворен
+  version_status_locked: закључан
+  version_status_closed: затворен
 
-  field_active: Aktivan
+  field_active: Активан
   
-  text_select_mail_notifications: Odaberi akcije za koje će email obaveštenje biti poslato.
-  text_regexp_info: npr. ^[A-Z0-9]+$
-  text_min_max_length_info: 0 znači bez ograničenja
-  text_project_destroy_confirmation: Jeste li sigurni da želite da obrišete ovaj projekat i sve pripadajuće podatke?
-  text_subprojects_destroy_warning: "Potpojekat: {{value}} će takođe biti obrisan."
-  text_workflow_edit: Odaberite ulogu i tragača za izmenu toka rada
-  text_are_you_sure: Jeste li sigurni?
-  text_journal_changed: "{{label}} promenjen od {{old}} u {{new}}"
-  text_journal_set_to: "{{label}} postavljen u {{value}}"
-  text_journal_deleted: "{{label}} obrisano ({{old}})"
-  text_journal_added: "{{label}} {{value}} dodato"
-  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 istog dana
-  text_project_identifier_info: 'Dozvoljena su samo mala slova (a-š), brojevi i crtice.
    Jednom snimljen, identifikator se ne može promeniti.'
-  text_caracters_maximum: "{{count}} znak(ova) najviše."
-  text_caracters_minimum: "Broj znakova mora biti najmanje {{count}}."
-  text_length_between: "Broj znakova mora biti između {{min}} i {{max}}."
-  text_tracker_no_workflow: Tok rada nije definisan za ovog tragača
-  text_unallowed_characters: Nedozvoljeni znakovi
-  text_comma_separated: Višestruke vrednosti su dozvoljene (odvojene zarezom).
-  text_line_separated: Višestruke vrednosti su dozvoljene (jedan red za svaku vrednost).
-  text_issues_ref_in_commit_messages: Referenciranje i popravljanje problema u izvršnim porukama
-  text_issue_added: "Problem {{id}} je prijavio {{author}}."
-  text_issue_updated: "Problem {{id}} je ažurirao {{author}}."
-  text_wiki_destroy_confirmation: Jeste li sigurni da želite da obrišete wiki i sav sadržaj?
-  text_issue_category_destroy_question: "Nekoliko problema ({{count}}) je dodeljeno ovoj kategoriji. Šta želite da uradite?"
-  text_issue_category_destroy_assignments: Ukloni dodoljene kategorije
-  text_issue_category_reassign_to: Dodeli ponovo probleme ovoj kategoriji
-  text_user_mail_option: "Za neizabrane projekte, dobićete samo obaveštenje o stvarima koje pratite ili ste uključeni (npr. problemi čiji ste vi autor ili zastupnik)."
-  text_no_configuration_data: "Uloge, tragači, statusi problema i procesa rada još uvek nisu podešeni.\nPreporučljivo je da učitate podrazumevano konfigurisanje. Izmena je moguća nakon prvog učitavanja."
-  text_load_default_configuration: Učitaj podrazumevano konfigurisanje
-  text_status_changed_by_changeset: "Primenjeno u skupu sa promenama {{value}}."
-  text_issues_destroy_confirmation: 'Jeste li sigurni da želite da obrišete odabrane probleme?'
-  text_select_project_modules: 'Odaberite module koje želite omogućiti za ovaj projekat:'
-  text_default_administrator_account_changed: Podrazumevani administratorski nalog je promenjen
-  text_file_repository_writable: Fascikla priloženih datoteka je upisiva
-  text_plugin_assets_writable: Fascikla elemenata dodatka je upisiva
-  text_rmagick_available: RMagick je dostupan (opciono)
-  text_destroy_time_entries_question: "{{hours}} sati je prijavljeno za ovaj problem koji želite obrisati. Šta želite da uradite?"
-  text_destroy_time_entries: Obriši prijavljene sate
-  text_assign_time_entries_to_project: Dodeli prijavljene sate projektu
-  text_reassign_time_entries: 'Dodeli ponovo prijavljene sate ovom problemu:'
-  text_user_wrote: "{{value}} je napisao:"
-  text_enumeration_destroy_question: "{{count}} objekat(a) je dodeljeno ovoj vrednosti."
-  text_enumeration_category_reassign_to: 'Dodeli ih ponovo ovoj vrednosti:'
-  text_email_delivery_not_configured: "Isporuka email poruka nije konfigurisana i obaveštavanja su onemogućena.\nPodesite vaš SMTP server u config/email.yml i pokrenite ponovo aplikaciju za njihovo omogućavanje."
-  text_repository_usernames_mapping: "Odaberite ili ažurirajte Redmine korisnike mapiranjem na svako korisničko ime pronađeno u evidenciji spremišta.\nKorisnici sa istim Redmine imenom i imenom spremišta ili email adresom su automatski mapirani."
-  text_diff_truncated: '... Ova razlika je isečena zato što je dostignuta maksimalna veličina koja može biti prikazana.'
-  text_custom_field_possible_values_info: 'Jedan red za svaku vrednost'
-  text_wiki_page_destroy_question: "Ova strana ima {{descendants}} strana naslednika i potomaka. Šta želite da uradite?"
-  text_wiki_page_nullify_children: "Zadrži strane naslednika kao korene strane"
-  text_wiki_page_destroy_children: "Obriši strane naslednika i svih njihovih potomaka"
-  text_wiki_page_reassign_children: "Dodeli ponovo strane naslednika njihovoj roditeljskoj strani"
-  text_own_membership_delete_confirmation: "Uklanjanjem pojedinih ili svih vaših dozvola nećete više moći za uređujete ovaj projekat nakon toga.\nŽelite li da nastavite?"
+  text_select_mail_notifications: Одабери акције за које ће обавештење бити послато путем е-поште.
+  text_regexp_info: нпр. ^[A-Z0-9]+$
+  text_min_max_length_info: 0 значи без ограничења
+  text_project_destroy_confirmation: Јесте ли сигурни да желите да избришете овај пројекат и све припадајуће податке?
+  text_subprojects_destroy_warning: "Потпројекти: {{value}} ће такође бити избрисан."
+  text_workflow_edit: Одаберите улогу и праћење за измену тока посла
+  text_are_you_sure: Јесте ли сигурни?
+  text_journal_changed: "{{label}} промењен од {{old}} у {{new}}"
+  text_journal_set_to: "{{label}} постављен у {{value}}"
+  text_journal_deleted: "{{label}} избрисано ({{old}})"
+  text_journal_added: "{{label}} {{value}} додато"
+  text_tip_task_begin_day: задатак почиње овог дана
+  text_tip_task_end_day: задатак се завршава овог дана
+  text_tip_task_begin_end_day: задатак почиње и завршава овог дана
+  text_project_identifier_info: 'Дозвољена су само мала слова (a-ш), бројеви и цртице.
    Једном снимљен идентификатор више се не може променити.'
+  text_caracters_maximum: "Највише {{count}} знак(ова)."
+  text_caracters_minimum: "Број знакова мора бити најмање {{count}}."
+  text_length_between: "Број знакова мора бити између {{min}} и {{max}}."
+  text_tracker_no_workflow: Ово праћење нема дефинисан ток посла
+  text_unallowed_characters: Недозвољени знакови
+  text_comma_separated: Дозвољене су вишеструке вредности (одвојене зарезом).
+  text_line_separated: Дозвољене су вишеструке вредности (један ред за сваку вредност).
+  text_issues_ref_in_commit_messages: Референцирање и поправљање проблема у извршним порукама
+  text_issue_added: "{{author}} је пријавио проблем {{id}}."
+  text_issue_updated: "{{author}} је ажурирао проблем {{id}}."
+  text_wiki_destroy_confirmation: Јесте ли сигурни да желите да обришете wiki и сав садржај?
+  text_issue_category_destroy_question: "Неколико проблема ({{count}}) је додељено овој категорији. Шта желите да урадите?"
+  text_issue_category_destroy_assignments: Уклони додељене категорије
+  text_issue_category_reassign_to: Додели поново проблеме овој категорији
+  text_user_mail_option: "За неизабране пројекте, добићете само обавештење о стварима које пратите или сте укључени (нпр. проблеми чији сте ви аутор или заступник)."
+  text_no_configuration_data: "Улоге, праћења, статуси проблема и тока посла још увек нису подешени.\nПрепоручљиво је да учитате подразумевано конфигурисање. Измена је могућа након првог учитавања."
+  text_load_default_configuration: Учитај подразумевано конфигурисање
+  text_status_changed_by_changeset: "Примењено у скупу са променама {{value}}."
+  text_issues_destroy_confirmation: 'Јесте ли сигурни да желите да избришете одабране проблеме?'
+  text_select_project_modules: 'Одаберите модуле које желите омогућити за овај пројекат:'
+  text_default_administrator_account_changed: Подразумевани администраторски налог је промењен
+  text_file_repository_writable: Фасцикла приложених датотека је уписива
+  text_plugin_assets_writable: Фасцикла елемената додатних компоненти је уписива
+  text_rmagick_available: RMagick је доступан (опционо)
+  text_destroy_time_entries_question: "{{hours}} сати је пријављено за овај проблем који желите избрисати. Шта желите да урадите?"
+  text_destroy_time_entries: Избриши пријављене сате
+  text_assign_time_entries_to_project: Додели пријављене сате пројекту
+  text_reassign_time_entries: 'Додели поново пријављене сате овом проблему:'
+  text_user_wrote: "{{value}} је написао:"
+  text_enumeration_destroy_question: "{{count}} објекат(а) је додељено овој вредности."
+  text_enumeration_category_reassign_to: 'Додели их поново овој вредности:'
+  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: 'Један ред за сваку вредност'
+  text_wiki_page_destroy_question: "Ова страница има {{descendants}} подређених страница и подстраница. Шта желите да урадите?"
+  text_wiki_page_nullify_children: "Задржи подређене странице као корене странице"
+  text_wiki_page_destroy_children: "Избриши подређене странице и све њихове подстранице"
+  text_wiki_page_reassign_children: "Додели поново подређене странице овој матичној страници"
+  text_own_membership_delete_confirmation: "Након уклањања појединих или свих ваших дозвола нећете више моћи да уређујете овај пројекат.\nЖелите ли да наставите?"
+  text_zoom_in: Увећај
+  text_zoom_out: Умањи
   
-  default_role_manager: Menadžer
-  default_role_developer: Programer
-  default_role_reporter: Izveštač
-  default_tracker_bug: Greška
-  default_tracker_feature: Funkcionalnost
-  default_tracker_support: Podrška
-  default_issue_status_new: Novo
-  default_issue_status_in_progress: U toku
-  default_issue_status_resolved: Rešeno
-  default_issue_status_feedback: Povratna informacija
-  default_issue_status_closed: Zatvoreno
-  default_issue_status_rejected: Odbijeno
-  default_doc_category_user: Korisnička dokumentacija
-  default_doc_category_tech: Tehnička dokumentacija
-  default_priority_low: Nizak
-  default_priority_normal: Normalan
-  default_priority_high: Visok
-  default_priority_urgent: Hitno
-  default_priority_immediate: Neposredno
-  default_activity_design: Dizajn
-  default_activity_development: Razvoj
+  default_role_manager: Менаџер
+  default_role_developer: Програмер
+  default_role_reporter: Извештач
+  default_tracker_bug: Грешка
+  default_tracker_feature: Функционалност
+  default_tracker_support: Подршка
+  default_issue_status_new: Ново
+  default_issue_status_in_progress: У току
+  default_issue_status_resolved: Решено
+  default_issue_status_feedback: Повратна информација
+  default_issue_status_closed: Затворено
+  default_issue_status_rejected: Одбијено
+  default_doc_category_user: Корисничка документација
+  default_doc_category_tech: Техничка документација
+  default_priority_low: Низак
+  default_priority_normal: Нормалан
+  default_priority_high: Висок
+  default_priority_urgent: Хитно
+  default_priority_immediate: Непосредно
+  default_activity_design: Дизајн
+  default_activity_development: Развој
   
-  enumeration_issue_priorities: Prioriteti problema
-  enumeration_doc_categories: Kategorije dokumenta
-  enumeration_activities: Aktivnosti (vremenski praćene)
-  enumeration_system_activity: Sistemska aktivnost
-
-  error_can_not_delete_custom_field: Unable to delete custom field
-  permission_manage_subtasks: Manage subtasks
-  label_profile: Profile
-  error_unable_to_connect: Unable to connect ({{value}})
-  error_can_not_remove_role: This role is in use and can not be deleted.
-  field_parent_issue: Parent task
-  error_unable_delete_issue_status: Unable to delete issue status
-  label_subtask_plural: Subtasks
-  error_can_not_delete_tracker: This tracker contains issues and can't be deleted.
-  field_principal: Principal
-  label_my_page_block: My page block
-  notice_failed_to_save_members: "Failed to save member(s): {{errors}}."
-  text_zoom_out: Zoom out
-  text_zoom_in: Zoom in
-  notice_unable_delete_time_entry: Unable to delete time log entry.
-  label_overall_spent_time: Overall spent time
+  enumeration_issue_priorities: Приоритети проблема
+  enumeration_doc_categories: Категорије документа
+  enumeration_activities: Активности (праћење времена)
+  enumeration_system_activity: Системска активност
+  
\ No newline at end of file
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 35ebc1053..42f0bc97a 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -905,9 +905,9 @@ sv:
   text_issues_destroy_confirmation: 'Är du säker på att du vill radera markerade ärende(n) ?'
   text_select_project_modules: 'Välj vilka moduler som ska vara aktiva för projektet:'
   text_default_administrator_account_changed: Standardadministratörens konto ändrat
-  text_file_repository_writable: Arkivet för bifogade filer är skrivbar
-  text_plugin_assets_writable: Arkivet för plug-ins är skrivbar
-  text_rmagick_available: RMagick tillgängligt (valfritt)
+  text_file_repository_writable: Arkivet för bifogade filer är skrivbart
+  text_plugin_assets_writable: Arkivet för plug-ins är skrivbart
+  text_rmagick_available: RMagick tillgängligt (ej obligatoriskt)
   text_destroy_time_entries_question: "{{hours}} timmar har rapporterats på ärendena du är på väg att ta bort. Vad vill du göra ?"
   text_destroy_time_entries: Ta bort rapporterade timmar
   text_assign_time_entries_to_project: Tilldela rapporterade timmar till projektet
diff --git a/public/javascripts/calendar/lang/calendar-it.js b/public/javascripts/calendar/lang/calendar-it.js
index fbc80c935..2c3379c73 100644
--- a/public/javascripts/calendar/lang/calendar-it.js
+++ b/public/javascripts/calendar/lang/calendar-it.js
@@ -9,6 +9,9 @@
 // Unicode is the answer to a real internationalized world.  Also please
 // include your contact information in the header, as can be seen above.
 
+// Italian translation
+// by Diego Pierotto (ita.translations@tiscali.it)
+
 // full day names
 Calendar._DN = new Array
 ("Domenica",
@@ -83,19 +86,19 @@ Calendar._TT["INFO"] = "Informazioni sul calendario";
 
 Calendar._TT["ABOUT"] =
 "DHTML Date/Time Selector\n" +
-"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
-"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
-"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"(c) dynarch.com 2002-2005 / Autore: Mihai Bazon\n" + // don't translate this this ;-)
+"Per l'ultima versione visita: http://www.dynarch.com/projects/calendar/\n" +
+"Distribuito sotto i termini GNU LGPL.  Vedi http://gnu.org/licenses/lgpl.html per maggiori dettagli." +
 "\n\n" +
-"Date selection:\n" +
-"- Use the \xab, \xbb buttons to select year\n" +
-"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
-"- Hold mouse button on any of the above buttons for faster selection.";
+"Selezione data:\n" +
+"- Usa i tasti \xab, \xbb per selezionare l'anno\n" +
+"- Usa i tasti " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " per selezionare il mese\n" +
+"- Tieni premuto il tasto del mouse su uno qualunque dei tasti sopra per una selezione più veloce.";
 Calendar._TT["ABOUT_TIME"] = "\n\n" +
-"Time selection:\n" +
-"- Click on any of the time parts to increase it\n" +
-"- or Shift-click to decrease it\n" +
-"- or click and drag for faster selection.";
+"Selezione ora:\n" +
+"- Fai click su una delle ore per incrementarla\n" +
+"- oppure Shift-click per diminuirla\n" +
+"- oppure click e trascina per una selezione più veloce.";
 
 Calendar._TT["PREV_YEAR"] = "Anno prec. (tieni premuto per menu)";
 Calendar._TT["PREV_MONTH"] = "Mese prec. (tieni premuto per menu)";
diff --git a/public/javascripts/calendar/lang/calendar-sr-CY.js b/public/javascripts/calendar/lang/calendar-sr-CY.js
deleted file mode 100644
index a43b49e10..000000000
--- a/public/javascripts/calendar/lang/calendar-sr-CY.js
+++ /dev/null
@@ -1,127 +0,0 @@
-// ** I18N
-
-// Calendar SR language
-// Author: Dragan Matic, 
-// Encoding: any
-// Distributed under the same terms as the calendar itself.
-
-// For translators: please use UTF-8 if possible.  We strongly believe that
-// Unicode is the answer to a real internationalized world.  Also please
-// include your contact information in the header, as can be seen above.
-
-// full day names
-Calendar._DN = new Array
-("Недеља",
- "Понедељак",
- "Уторак",
- "Среда",
- "Четвртак",
- "Петак",
- "Субота",
- "Недеља");
-
-// Please note that the following array of short day names (and the same goes
-// for short month names, _SMN) isn't absolutely necessary.  We give it here
-// for exemplification on how one can customize the short day names, but if
-// they are simply the first N letters of the full name you can simply say:
-//
-//   Calendar._SDN_len = N; // short day name length
-//   Calendar._SMN_len = N; // short month name length
-//
-// If N = 3 then this is not needed either since we assume a value of 3 if not
-// present, to be compatible with translation files that were written before
-// this feature.
-
-// short day names
-Calendar._SDN = new Array
-("Нед",
- "Пон",
- "Уто",
- "Сре",
- "Чет",
- "Пет",
- "Суб",
- "Нед");
-
-// First day of the week. "0" means display Sunday first, "1" means display
-// Monday first, etc.
-Calendar._FD = 1;
-
-// full month names
-Calendar._MN = new Array
-("Јануар",
- "Фебруар",
- "Март",
- "Април",
- "Мај",
- "Јун",
- "Јул",
- "Август",
- "Септембар",
- "Октобар",
- "Новембар",
- "Децембар");
-
-// short month names
-Calendar._SMN = new Array
-("јан",
- "феб",
- "мар",
- "апр",
- "мај",
- "јун",
- "јул",
- "авг",
- "сеп",
- "окт",
- "нов",
- "дец");
-
-// tooltips
-Calendar._TT = {};
-Calendar._TT["INFO"] = "О календару";
-
-Calendar._TT["ABOUT"] =
-"DHTML бирач датума/времена\n" +
-"(c) dynarch.com 2002-2005 / Аутор: Mihai Bazon\n" + // don't translate this this ;-)
-"За новију верзију посетите: http://www.dynarch.com/projects/calendar/\n" +
-"Дистрибуира се под GNU LGPL.  Погледајте http://gnu.org/licenses/lgpl.html за детаљe." +
-"\n\n" +
-"Избор датума:\n" +
-"- Користите \xab, \xbb тастере за избор године\n" +
-"- Користите " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " тастере за избор месеца\n" +
-"- Задржите тастер миша на било ком тастеру изнад за бржи избор.";
-Calendar._TT["ABOUT_TIME"] = "\n\n" +
-"Избор времена:\n" +
-"- Кликните на било који део времена за повећање\n" +
-"- или Shift-клик за умањење\n" +
-"- или кликните и превуците за бржи одабир.";
-
-Calendar._TT["PREV_YEAR"] = "Претходна година (задржати за мени)";
-Calendar._TT["PREV_MONTH"] = "Претходни месец (задржати за мени)";
-Calendar._TT["GO_TODAY"] = "На данашњи дан";
-Calendar._TT["NEXT_MONTH"] = "Наредни месец (задржати за мени)";
-Calendar._TT["NEXT_YEAR"] = "Наредна година (задржати за мени)";
-Calendar._TT["SEL_DATE"] = "Избор датума";
-Calendar._TT["DRAG_TO_MOVE"] = "Превуците за премештање";
-Calendar._TT["PART_TODAY"] = " (данас)";
-
-// the following is to inform that "%s" is to be the first day of week
-// %s will be replaced with the day name.
-Calendar._TT["DAY_FIRST"] = "%s као први дан у седмици";
-
-// This may be locale-dependent.  It specifies the week-end days, as an array
-// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
-// means Monday, etc.
-Calendar._TT["WEEKEND"] = "6,7";
-
-Calendar._TT["CLOSE"] = "Затвори";
-Calendar._TT["TODAY"] = "Данас";
-Calendar._TT["TIME_PART"] = "(Shift-) клик или превлачење за измену вредности";
-
-// date formats
-Calendar._TT["DEF_DATE_FORMAT"] = "%d.%m.%Y.";
-Calendar._TT["TT_DATE_FORMAT"] = "%a, %e. %b";
-
-Calendar._TT["WK"] = "сед.";
-Calendar._TT["TIME"] = "Време:";
diff --git a/public/javascripts/calendar/lang/calendar-sr-yu.js b/public/javascripts/calendar/lang/calendar-sr-yu.js
new file mode 100644
index 000000000..8fd5ceb83
--- /dev/null
+++ b/public/javascripts/calendar/lang/calendar-sr-yu.js
@@ -0,0 +1,127 @@
+// ** I18N
+
+// Calendar SR language
+// Author: Dragan Matic, 
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("nedelja",
+ "ponedeljak",
+ "utorak",
+ "sreda",
+ "četvrtak",
+ "petak",
+ "subota",
+ "nedelja");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("ned",
+ "pon",
+ "uto",
+ "sre",
+ "čet",
+ "pet",
+ "sub",
+ "ned");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 1;
+
+// full month names
+Calendar._MN = new Array
+("januar",
+ "februar",
+ "mart",
+ "april",
+ "maj",
+ "jun",
+ "jul",
+ "avgust",
+ "septembar",
+ "oktobar",
+ "novembar",
+ "decembar");
+
+// short month names
+Calendar._SMN = new Array
+("jan",
+ "feb",
+ "mar",
+ "apr",
+ "maj",
+ "jun",
+ "jul",
+ "avg",
+ "sep",
+ "okt",
+ "nov",
+ "dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "O kalendaru";
+
+Calendar._TT["ABOUT"] =
+"DHTML birač datuma/vremena\n" +
+"(c) dynarch.com 2002-2005 / Autor: Mihai Bazon\n" + // don't translate this this ;-)
+"Za noviju verziju posetite: http://www.dynarch.com/projects/calendar/\n" +
+"Distribuira se pod GNU LGPL.  Pogledajte http://gnu.org/licenses/lgpl.html za detalje." +
+"\n\n" +
+"Izbor datuma:\n" +
+"- Koristite \xab, \xbb tastere za izbor godine\n" +
+"- Koristite " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " tastere za izbor meseca\n" +
+"- Zadržite taster miša na bilo kom tasteru iznad za brži izbor.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Izbor vremena:\n" +
+"- Kliknite na bilo koji deo vremena za povećanje\n" +
+"- ili Shift-klik za umanjenje\n" +
+"- ili kliknite i prevucite za brži odabir.";
+
+Calendar._TT["PREV_YEAR"] = "Prethodna godina (zadržati za meni)";
+Calendar._TT["PREV_MONTH"] = "Prethodni mesec (zadržati za meni)";
+Calendar._TT["GO_TODAY"] = "Na današnji dan";
+Calendar._TT["NEXT_MONTH"] = "Naredni mesec (zadržati za meni)";
+Calendar._TT["NEXT_YEAR"] = "Naredna godina (zadržati za meni)";
+Calendar._TT["SEL_DATE"] = "Izbor datuma";
+Calendar._TT["DRAG_TO_MOVE"] = "Prevucite za premeštanje";
+Calendar._TT["PART_TODAY"] = " (danas)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "%s kao prvi dan u sedmici";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "6,7";
+
+Calendar._TT["CLOSE"] = "Zatvori";
+Calendar._TT["TODAY"] = "Danas";
+Calendar._TT["TIME_PART"] = "(Shift-) klik ili prevlačenje za izmenu vrednosti";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d.%m.%Y.";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %e. %b";
+
+Calendar._TT["WK"] = "sed.";
+Calendar._TT["TIME"] = "Vreme:";
diff --git a/public/javascripts/calendar/lang/calendar-sr.js b/public/javascripts/calendar/lang/calendar-sr.js
index 676373349..2fa58d73c 100644
--- a/public/javascripts/calendar/lang/calendar-sr.js
+++ b/public/javascripts/calendar/lang/calendar-sr.js
@@ -1,127 +1,127 @@
-// ** I18N
-
-// Calendar SR language
-// Author: Dragan Matic, 
-// Encoding: any
-// Distributed under the same terms as the calendar itself.
-
-// For translators: please use UTF-8 if possible.  We strongly believe that
-// Unicode is the answer to a real internationalized world.  Also please
-// include your contact information in the header, as can be seen above.
-
-// full day names
-Calendar._DN = new Array
-("Nedelja",
- "Ponedeljak",
- "Utorak",
- "Sreda",
- "Četvrtak",
- "Petak",
- "Subota",
- "Nedelja");
-
-// Please note that the following array of short day names (and the same goes
-// for short month names, _SMN) isn't absolutely necessary.  We give it here
-// for exemplification on how one can customize the short day names, but if
-// they are simply the first N letters of the full name you can simply say:
-//
-//   Calendar._SDN_len = N; // short day name length
-//   Calendar._SMN_len = N; // short month name length
-//
-// If N = 3 then this is not needed either since we assume a value of 3 if not
-// present, to be compatible with translation files that were written before
-// this feature.
-
-// short day names
-Calendar._SDN = new Array
-("Ned",
- "Pon",
- "Uto",
- "Sre",
- "Čet",
- "Pet",
- "Sub",
- "Ned");
-
-// First day of the week. "0" means display Sunday first, "1" means display
-// Monday first, etc.
-Calendar._FD = 1;
-
-// full month names
-Calendar._MN = new Array
-("Januar",
- "Februar",
- "Mart",
- "April",
- "Maj",
- "Jun",
- "Jul",
- "Avgust",
- "Septembar",
- "Oktobar",
- "Novembar",
- "Decembar");
-
-// short month names
-Calendar._SMN = new Array
-("jan",
- "feb",
- "mar",
- "apr",
- "maj",
- "jun",
- "jul",
- "avg",
- "sep",
- "okt",
- "nov",
- "dec");
-
-// tooltips
-Calendar._TT = {};
-Calendar._TT["INFO"] = "O kalendaru";
-
-Calendar._TT["ABOUT"] =
-"DHTML birač datuma/vremena\n" +
-"(c) dynarch.com 2002-2005 / Autor: Mihai Bazon\n" + // don't translate this this ;-)
-"Za noviju verziju posetite: http://www.dynarch.com/projects/calendar/\n" +
-"Distribuira se pod GNU LGPL.  Pogledajte http://gnu.org/licenses/lgpl.html za detalje." +
-"\n\n" +
-"Izbor datuma:\n" +
-"- Koristite \xab, \xbb tastere za izbor godine\n" +
-"- Koristite " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " tastere za izbor meseca\n" +
-"- Zadržite taster miša na bilo kom tasteru iznad za brži izbor.";
-Calendar._TT["ABOUT_TIME"] = "\n\n" +
-"Izbor vremena:\n" +
-"- Kliknite na bilo koji deo vremena za povećanje\n" +
-"- ili Shift-klik za umanjenje\n" +
-"- ili kliknite i prevucite za brži odabir.";
-
-Calendar._TT["PREV_YEAR"] = "Prethodna godina (zadržati za meni)";
-Calendar._TT["PREV_MONTH"] = "Prethodni mesec (zadržati za meni)";
-Calendar._TT["GO_TODAY"] = "Na današnji dan";
-Calendar._TT["NEXT_MONTH"] = "Naredni mesec (zadržati za meni)";
-Calendar._TT["NEXT_YEAR"] = "Naredna godina (zadržati za meni)";
-Calendar._TT["SEL_DATE"] = "Izbor datuma";
-Calendar._TT["DRAG_TO_MOVE"] = "Prevucite za premeštanje";
-Calendar._TT["PART_TODAY"] = " (danas)";
-
-// the following is to inform that "%s" is to be the first day of week
-// %s will be replaced with the day name.
-Calendar._TT["DAY_FIRST"] = "%s kao prvi dan u sedmici";
-
-// This may be locale-dependent.  It specifies the week-end days, as an array
-// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
-// means Monday, etc.
-Calendar._TT["WEEKEND"] = "6,7";
-
-Calendar._TT["CLOSE"] = "Zatvori";
-Calendar._TT["TODAY"] = "Danas";
-Calendar._TT["TIME_PART"] = "(Shift-) klik ili prevlačenje za izmenu vrednosti";
-
-// date formats
-Calendar._TT["DEF_DATE_FORMAT"] = "%d.%m.%Y.";
-Calendar._TT["TT_DATE_FORMAT"] = "%a, %e. %b";
-
-Calendar._TT["WK"] = "sed.";
-Calendar._TT["TIME"] = "Vreme:";
+// ** I18N
+
+// Calendar SR language
+// Author: Dragan Matic, 
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("недеља",
+ "понедељак",
+ "уторак",
+ "среда",
+ "четвртак",
+ "петак",
+ "субота",
+ "недеља");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("нед",
+ "пон",
+ "уто",
+ "сре",
+ "чет",
+ "пет",
+ "суб",
+ "нед");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 1;
+
+// full month names
+Calendar._MN = new Array
+("јануар",
+ "фебруар",
+ "март",
+ "април",
+ "мај",
+ "јун",
+ "јул",
+ "август",
+ "септембар",
+ "октобар",
+ "новембар",
+ "децембар");
+
+// short month names
+Calendar._SMN = new Array
+("јан",
+ "феб",
+ "мар",
+ "апр",
+ "мај",
+ "јун",
+ "јул",
+ "авг",
+ "сеп",
+ "окт",
+ "нов",
+ "дец");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "О календару";
+
+Calendar._TT["ABOUT"] =
+"DHTML бирач датума/времена\n" +
+"(c) dynarch.com 2002-2005 / Аутор: Mihai Bazon\n" + // don't translate this this ;-)
+"За новију верзију посетите: http://www.dynarch.com/projects/calendar/\n" +
+"Дистрибуира се под GNU LGPL.  Погледајте http://gnu.org/licenses/lgpl.html за детаљe." +
+"\n\n" +
+"Избор датума:\n" +
+"- Користите \xab, \xbb тастере за избор године\n" +
+"- Користите " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " тастере за избор месеца\n" +
+"- Задржите тастер миша на било ком тастеру изнад за бржи избор.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Избор времена:\n" +
+"- Кликните на било који део времена за повећање\n" +
+"- или Shift-клик за умањење\n" +
+"- или кликните и превуците за бржи одабир.";
+
+Calendar._TT["PREV_YEAR"] = "Претходна година (задржати за мени)";
+Calendar._TT["PREV_MONTH"] = "Претходни месец (задржати за мени)";
+Calendar._TT["GO_TODAY"] = "На данашњи дан";
+Calendar._TT["NEXT_MONTH"] = "Наредни месец (задржати за мени)";
+Calendar._TT["NEXT_YEAR"] = "Наредна година (задржати за мени)";
+Calendar._TT["SEL_DATE"] = "Избор датума";
+Calendar._TT["DRAG_TO_MOVE"] = "Превуците за премештање";
+Calendar._TT["PART_TODAY"] = " (данас)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "%s као први дан у седмици";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "6,7";
+
+Calendar._TT["CLOSE"] = "Затвори";
+Calendar._TT["TODAY"] = "Данас";
+Calendar._TT["TIME_PART"] = "(Shift-) клик или превлачење за измену вредности";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d.%m.%Y.";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %e. %b";
+
+Calendar._TT["WK"] = "сед.";
+Calendar._TT["TIME"] = "Време:";
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-it.js b/public/javascripts/jstoolbar/lang/jstoolbar-it.js
index bf7fcefb2..99749b40c 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-it.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-it.js
@@ -1,3 +1,6 @@
+// Italian translation
+// by Diego Pierotto (ita.translations@tiscali.it)
+
 jsToolBar.strings = {};
 jsToolBar.strings['Strong'] = 'Grassetto';
 jsToolBar.strings['Italic'] = 'Corsivo';
@@ -8,7 +11,7 @@ jsToolBar.strings['Heading 1'] = 'Titolo 1';
 jsToolBar.strings['Heading 2'] = 'Titolo 2';
 jsToolBar.strings['Heading 3'] = 'Titolo 3';
 jsToolBar.strings['Unordered list'] = 'Elenco puntato';
-jsToolBar.strings['Ordered list'] = 'Numerazione';
+jsToolBar.strings['Ordered list'] = 'Elenco numerato';
 jsToolBar.strings['Quote'] = 'Aumenta rientro';
 jsToolBar.strings['Unquote'] = 'Riduci rientro';
 jsToolBar.strings['Preformatted text'] = 'Testo preformattato';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sr-yu.js b/public/javascripts/jstoolbar/lang/jstoolbar-sr-yu.js
new file mode 100644
index 000000000..0e231e029
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-sr-yu.js
@@ -0,0 +1,16 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Podebljano';
+jsToolBar.strings['Italic'] = 'Kurziv';
+jsToolBar.strings['Underline'] = 'Podvučeno';
+jsToolBar.strings['Deleted'] = 'Obrisano';
+jsToolBar.strings['Code'] = 'Ugrađeni kôd';
+jsToolBar.strings['Heading 1'] = 'Naslov 1';
+jsToolBar.strings['Heading 2'] = 'Naslov 2';
+jsToolBar.strings['Heading 3'] = 'Naslov 3';
+jsToolBar.strings['Unordered list'] = 'Lista nabrajanja';
+jsToolBar.strings['Ordered list'] = 'Uređena lista';
+jsToolBar.strings['Quote'] = 'Pod navodnicima';
+jsToolBar.strings['Unquote'] = 'Ukloni navodnike';
+jsToolBar.strings['Preformatted text'] = 'Prethodno formatiran tekst';
+jsToolBar.strings['Wiki link'] = 'Veza prema Wiki strani';
+jsToolBar.strings['Image'] = 'Slika';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sr.js b/public/javascripts/jstoolbar/lang/jstoolbar-sr.js
index 0e231e029..75a768ad0 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-sr.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-sr.js
@@ -1,16 +1,16 @@
-jsToolBar.strings = {};
-jsToolBar.strings['Strong'] = 'Podebljano';
-jsToolBar.strings['Italic'] = 'Kurziv';
-jsToolBar.strings['Underline'] = 'Podvučeno';
-jsToolBar.strings['Deleted'] = 'Obrisano';
-jsToolBar.strings['Code'] = 'Ugrađeni kôd';
-jsToolBar.strings['Heading 1'] = 'Naslov 1';
-jsToolBar.strings['Heading 2'] = 'Naslov 2';
-jsToolBar.strings['Heading 3'] = 'Naslov 3';
-jsToolBar.strings['Unordered list'] = 'Lista nabrajanja';
-jsToolBar.strings['Ordered list'] = 'Uređena lista';
-jsToolBar.strings['Quote'] = 'Pod navodnicima';
-jsToolBar.strings['Unquote'] = 'Ukloni navodnike';
-jsToolBar.strings['Preformatted text'] = 'Prethodno formatiran tekst';
-jsToolBar.strings['Wiki link'] = 'Veza prema Wiki strani';
-jsToolBar.strings['Image'] = 'Slika';
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Подебљано';
+jsToolBar.strings['Italic'] = 'Курзив';
+jsToolBar.strings['Underline'] = 'Подвучено';
+jsToolBar.strings['Deleted'] = 'Обрисано';
+jsToolBar.strings['Code'] = 'Уграђени кôд';
+jsToolBar.strings['Heading 1'] = 'Наслов 1';
+jsToolBar.strings['Heading 2'] = 'Наслов 2';
+jsToolBar.strings['Heading 3'] = 'Наслов 3';
+jsToolBar.strings['Unordered list'] = 'Листа набрајања';
+jsToolBar.strings['Ordered list'] = 'Уређена листа';
+jsToolBar.strings['Quote'] = 'Под наводницима';
+jsToolBar.strings['Unquote'] = 'Уклони наводнике';
+jsToolBar.strings['Preformatted text'] = 'Претходно форматиран текст';
+jsToolBar.strings['Wiki link'] = 'Веза према Wiki страни';
+jsToolBar.strings['Image'] = 'Слика';

From eefb36177dfb3e5759bf4916cff511fa70f93fea Mon Sep 17 00:00:00 2001
From: Azamat Hackimov 
Date: Thu, 19 Aug 2010 16:35:51 +0000
Subject: [PATCH 075/222] Fixing #6009 Added to all locales required strings.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4004 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 config/locales/bg.yml    | 14 +++++++++-----
 config/locales/ca.yml    |  4 ++++
 config/locales/cs.yml    |  6 +++++-
 config/locales/el.yml    |  6 +++++-
 config/locales/en-GB.yml |  5 +++++
 config/locales/eu.yml    |  4 ++++
 config/locales/hr.yml    |  4 ++++
 config/locales/lv.yml    |  4 ++++
 config/locales/mn.yml    |  4 ++++
 config/locales/nl.yml    |  6 +++++-
 config/locales/ru.yml    |  4 ++--
 config/locales/sl.yml    |  7 ++++---
 config/locales/sr-YU.yml |  4 ++++
 config/locales/sr.yml    |  6 +++++-
 config/locales/th.yml    |  6 +++++-
 config/locales/uk.yml    |  4 ++++
 16 files changed, 73 insertions(+), 15 deletions(-)

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 8b2b23704..320c2091d 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -63,7 +63,11 @@ bg:
         one:   "almost 1 year"
         other: "almost {{count}} years"
 
-  number: 
+  number:
+    format:
+      separator: "."
+      delimiter: ""
+      precision: 3
     human: 
       format: 
         precision: 1
@@ -71,13 +75,13 @@ bg:
       storage_units: 
         format: "%n %u"
         units: 
-          kb: KB
-          tb: TB
-          gb: GB
           byte: 
             one: Byte
             other: Bytes
-          mb: 'MB'
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
       
 # Used in array.to_sentence.
   support:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 1e47d3d66..913d2f3ab 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -64,6 +64,10 @@ ca:
         other: "almost {{count}} years"
 
   number:
+    format:
+      separator: "."
+      delimiter: ""
+      precision: 3
     human:
       format:
         delimiter: ""
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index de4ad44c5..9ceb21e83 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -63,7 +63,11 @@ cs:
         one:   "almost 1 year"
         other: "almost {{count}} years"
 
-  number: 
+  number:
+    format:
+      separator: "."
+      delimiter: ""
+      precision: 3
     human: 
       format: 
         precision: 1
diff --git a/config/locales/el.yml b/config/locales/el.yml
index a9146a611..cb4941c29 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -66,7 +66,11 @@ el:
         one:   "almost 1 year"
         other: "almost {{count}} years"
         
-  number: 
+  number:
+    format:
+      separator: "."
+      delimiter: ""
+      precision: 3
     human: 
       format: 
         precision: 1
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 2872df15e..24aa6e9c6 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -64,6 +64,11 @@ en-GB:
         other: "almost {{count}} years"
 
   number:
+    format:
+      separator: "."
+      delimiter: " "
+      precision: 3
+
     currency:
       format:
         format: "%u%n"
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 741d3298f..350f238c5 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -68,6 +68,10 @@ eu:
         other: "ia {{count}} urte"
 
   number:
+    format:
+      separator: "."
+      delimiter: ""
+      precision: 3
     human:
       format:
         delimiter: ""
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 728a6d8e9..442adefef 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -64,6 +64,10 @@ hr:
         other: "preko {{count}} godina"
 
   number:
+    format:
+      separator: "."
+      delimiter: ""
+      precision: 3
     human:
       format:
         delimiter: ""
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 351f8528e..70822de51 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -61,6 +61,10 @@ lv:
         other: "gandrīz {{count}} gadus"
 
   number:
+    format:
+      separator: "."
+      delimiter: ""
+      precision: 3
     human:
       format:
         delimiter: " "
diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index 568e1f341..5b4b79e86 100644
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -64,6 +64,10 @@ mn:
         other: "бараг {{count}} жил"
 
   number:
+    format:
+      separator: "."
+      delimiter: ""
+      precision: 3
     human:
       format:
         delimiter: ""
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index f2e0529e3..46c5ca867 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -63,7 +63,11 @@ nl:
         one:   "almost 1 year"
         other: "almost {{count}} years"
 
-  number: 
+  number:
+    format:
+      separator: "."
+      delimiter: ""
+      precision: 3
     human: 
       format: 
         precision: 1
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 0c2270e8b..9d9e5e030 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -41,7 +41,7 @@ ru:
 
   number:
     format:
-      separator: "."
+      separator: ","
       delimiter: " "
       precision: 3
 
@@ -64,7 +64,7 @@ ru:
     human:
       format:
         delimiter: ""
-        precision: 1
+        precision: 2
       # Rails 2.2
       # storage_units: [байт, КБ, МБ, ГБ, ТБ]
 
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index aac2e4331..a51cd972e 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -63,10 +63,11 @@ sl:
         one:   "almost 1 year"
         other: "almost {{count}} years"
 
-  number: 
+  number:
     format:
-      separator: ','
-      delimiter: '.'
+      separator: ","
+      delimiter: "."
+      precision: 3
     human: 
       format: 
         precision: 1
diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
index 2cc0c0983..bc8a854ad 100644
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -66,6 +66,10 @@ sr-YU:
         other: "skoro {{count}} god."
 
   number:
+    format:
+      separator: "."
+      delimiter: ""
+      precision: 3
     human:
       format:
         delimiter: ""
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 1bcd3616d..0c022ee9f 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -66,6 +66,10 @@ sr:
         other: "скоро {{count}} год."
 
   number:
+    format:
+      separator: "."
+      delimiter: ""
+      precision: 3
     human:
       format:
         delimiter: ""
@@ -904,4 +908,4 @@ sr:
   enumeration_doc_categories: Категорије документа
   enumeration_activities: Активности (праћење времена)
   enumeration_system_activity: Системска активност
-  
\ No newline at end of file
+  
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 2c127f3de..eaf4cc285 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -63,7 +63,11 @@ th:
         one:   "almost 1 year"
         other: "almost {{count}} years"
 
-  number: 
+  number:
+    format:
+      separator: "."
+      delimiter: ""
+      precision: 3
     human: 
       format: 
         precision: 1
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 1a590dc0b..951a546b9 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -64,6 +64,10 @@ uk:
         other: "almost {{count}} years"
 
   number: 
+    format:
+      separator: "."
+      delimiter: ""
+      precision: 3
     human: 
       format: 
         precision: 1

From 57372d9d8e8ce54eb1b6a5ed21b4cb0b3f29c69a Mon Sep 17 00:00:00 2001
From: Azamat Hackimov 
Date: Thu, 19 Aug 2010 16:57:44 +0000
Subject: [PATCH 076/222] Real RTL-theme support in locales (#6012) Now each
 locale-file have direction string (ltr - left-to-right - by default).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4005 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/layouts/base.rhtml                  |  1 +
 config/locales/bg.yml                         |  1 +
 config/locales/bs.yml                         |  1 +
 config/locales/ca.yml                         |  1 +
 config/locales/cs.yml                         |  1 +
 config/locales/da.yml                         |  1 +
 config/locales/de.yml                         |  1 +
 config/locales/el.yml                         |  1 +
 config/locales/en-GB.yml                      |  1 +
 config/locales/en.yml                         |  7 +++++
 config/locales/es.yml                         |  1 +
 config/locales/eu.yml                         |  1 +
 config/locales/fi.yml                         |  1 +
 config/locales/fr.yml                         |  1 +
 config/locales/gl.yml                         |  1 +
 config/locales/he.yml                         |  1 +
 config/locales/hr.yml                         |  1 +
 config/locales/hu.yml                         |  1 +
 config/locales/id.yml                         |  1 +
 config/locales/it.yml                         |  1 +
 config/locales/ja.yml                         |  1 +
 config/locales/ko.yml                         |  1 +
 config/locales/lt.yml                         |  1 +
 config/locales/lv.yml                         |  1 +
 config/locales/mn.yml                         |  1 +
 config/locales/nl.yml                         |  1 +
 config/locales/no.yml                         |  1 +
 config/locales/pl.yml                         |  1 +
 config/locales/pt-BR.yml                      |  1 +
 config/locales/pt.yml                         |  1 +
 config/locales/ro.yml                         |  1 +
 config/locales/ru.yml                         |  1 +
 config/locales/sk.yml                         |  1 +
 config/locales/sl.yml                         |  1 +
 config/locales/sr-YU.yml                      |  1 +
 config/locales/sr.yml                         |  1 +
 config/locales/sv.yml                         |  1 +
 config/locales/th.yml                         |  1 +
 config/locales/tr.yml                         |  1 +
 config/locales/uk.yml                         |  1 +
 config/locales/vi.yml                         |  1 +
 config/locales/zh-TW.yml                      |  1 +
 config/locales/zh.yml                         |  1 +
 .../application.css => stylesheets/rtl.css}   | 28 +++++++++++++++----
 .../themes/rtl/stylesheets/context_menu.css   |  6 ----
 45 files changed, 71 insertions(+), 12 deletions(-)
 rename public/{themes/rtl/stylesheets/application.css => stylesheets/rtl.css} (76%)
 delete mode 100644 public/themes/rtl/stylesheets/context_menu.css

diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 2daae7cb9..0393815b0 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -7,6 +7,7 @@
 
 <%= favicon %>
 <%= stylesheet_link_tag 'application', :media => 'all' %>
+<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 <%= javascript_include_tag :defaults %>
 <%= heads_for_wiki_formatter %>
 
-<% form_tag({:path => @path}, :method => 'get') do %>
+<% form_tag({:path => to_path_param(@path)}, :method => 'get') do %>
   <%= hidden_field_tag('rev', params[:rev]) if params[:rev] %>
   <%= hidden_field_tag('rev_to', params[:rev_to]) if params[:rev_to] %>
   
    

From 81a28e9ffa0d4a2279a6a2b19b3fd60f12ccdd31 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Barth 
Date: Sat, 18 Sep 2010 17:30:22 +0000
Subject: [PATCH 156/222] Adds a link to edit the associated wiki page on the
 version view. #4416
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Contributed by Felix Schäfer

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4101 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/versions/show.rhtml | 1 +
 config/locales/bg.yml         | 1 +
 config/locales/bs.yml         | 1 +
 config/locales/ca.yml         | 1 +
 config/locales/cs.yml         | 1 +
 config/locales/da.yml         | 1 +
 config/locales/de.yml         | 1 +
 config/locales/el.yml         | 1 +
 config/locales/en-GB.yml      | 1 +
 config/locales/en.yml         | 1 +
 config/locales/es.yml         | 1 +
 config/locales/eu.yml         | 1 +
 config/locales/fi.yml         | 1 +
 config/locales/fr.yml         | 1 +
 config/locales/gl.yml         | 1 +
 config/locales/he.yml         | 1 +
 config/locales/hr.yml         | 1 +
 config/locales/hu.yml         | 1 +
 config/locales/id.yml         | 1 +
 config/locales/it.yml         | 1 +
 config/locales/ja.yml         | 1 +
 config/locales/ko.yml         | 1 +
 config/locales/lt.yml         | 1 +
 config/locales/lv.yml         | 1 +
 config/locales/mk.yml         | 1 +
 config/locales/mn.yml         | 1 +
 config/locales/nl.yml         | 1 +
 config/locales/no.yml         | 1 +
 config/locales/pl.yml         | 1 +
 config/locales/pt-BR.yml      | 1 +
 config/locales/pt.yml         | 1 +
 config/locales/ro.yml         | 1 +
 config/locales/ru.yml         | 1 +
 config/locales/sk.yml         | 1 +
 config/locales/sl.yml         | 1 +
 config/locales/sr-YU.yml      | 1 +
 config/locales/sr.yml         | 1 +
 config/locales/sv.yml         | 1 +
 config/locales/th.yml         | 1 +
 config/locales/tr.yml         | 1 +
 config/locales/uk.yml         | 1 +
 config/locales/vi.yml         | 1 +
 config/locales/zh-TW.yml      | 1 +
 config/locales/zh.yml         | 1 +
 44 files changed, 44 insertions(+)

diff --git a/app/views/versions/show.rhtml b/app/views/versions/show.rhtml
index 79de5984b..6b2b09d0f 100644
--- a/app/views/versions/show.rhtml
+++ b/app/views/versions/show.rhtml
@@ -1,5 +1,6 @@
 
    
 <%= 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', :page => Wiki.titleize(@version.wiki_page_title)}, :class => 'icon icon-edit') unless @version.wiki_page_title.blank? || @project.wiki.nil? %>
 <%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
 
    
 
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 0a8c427ef..ceee5c3cf 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -909,3 +909,4 @@ bg:
   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}}"
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 741f46232..b855be9e9 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -929,3 +929,4 @@ bs:
   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}}"
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 50a389156..6ba0a8bea 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -918,3 +918,4 @@ ca:
 
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 96fb608b6..71591fa46 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -915,3 +915,4 @@ cs:
   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}}"
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 38d9d6646..b6270f0d1 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -931,3 +931,4 @@ da:
   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}}"
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 5ec7073b3..3a5ee094e 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -803,6 +803,7 @@ de:
   button_create_and_continue: Anlegen + nächstes Ticket
   button_test: Testen
   button_edit: Bearbeiten
+  button_edit_associated_wikipage: "Zugehörige Wikiseite bearbeiten: {{page_title}}"
   button_add: Hinzufügen
   button_change: Wechseln
   button_apply: Anwenden
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 22bc6a459..d0608e851 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -915,3 +915,4 @@ el:
   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}}"
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 8c0b28cf3..c0b520dfd 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -919,3 +919,4 @@ en-GB:
   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}}"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cc4e31185..81a26c82c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -786,6 +786,7 @@ en:
   button_create_and_continue: Create and continue
   button_test: Test
   button_edit: Edit
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   button_add: Add
   button_change: Change
   button_apply: Apply
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 3f848f1d1..1828558bf 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -955,3 +955,4 @@ es:
   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}}"
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 24ef38ea7..64881fe6f 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -919,3 +919,4 @@ eu:
   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}}"
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 985ab8b2a..8b56c94da 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -940,3 +940,4 @@ fi:
   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}}"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 7f96b6112..0a1ee46ea 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -933,3 +933,4 @@ fr:
   project_module_calendar: Calendar
   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}}"
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index b717d8d60..b5345de69 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -931,3 +931,4 @@ gl:
   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}}"
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 86ebe7d3a..8c55b2351 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -920,3 +920,4 @@ he:
   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}}"
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index f4a809a9a..77cda672a 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -922,3 +922,4 @@ hr:
   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}}"
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index fe1abdf36..84e714a6b 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -938,3 +938,4 @@
   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}}"
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 7c327833f..ca6444b0c 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -923,3 +923,4 @@ id:
   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}}"
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 8d5aa4ef4..6bd4096a9 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -919,3 +919,4 @@ it:
   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}}"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 09eb36690..fa3346f17 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -940,3 +940,4 @@ ja:
   enumeration_doc_categories: 文書カテゴリ
   enumeration_activities: 作業分類 (時間トラッキング)
   enumeration_system_activity: システム作業分類
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index eea667d62..771f91cef 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -971,3 +971,4 @@ ko:
   project_module_calendar: 달력
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index b12a1107b..27c5466fd 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -979,3 +979,4 @@ lt:
   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}}"
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 271140cce..5a628e5c5 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -910,3 +910,4 @@ lv:
   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}}"
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index c98761865..ac2a043d4 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -915,3 +915,4 @@ mk:
 
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index b92538a47..908e8a844 100644
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -916,3 +916,4 @@ mn:
   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}}"
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index e13e67ddf..b5933d222 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -897,3 +897,4 @@ nl:
   project_module_calendar: Kalender
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
diff --git a/config/locales/no.yml b/config/locales/no.yml
index cc95dae7d..24be1a06e 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -906,3 +906,4 @@
   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}}"
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 6621ad39e..aade4af0e 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -936,3 +936,4 @@ pl:
   project_module_calendar: Kalendarz
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 547074083..7fa9ae2f5 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -939,3 +939,4 @@ pt-BR:
   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}}"
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 28822061a..9a7547ab4 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -923,3 +923,4 @@ pt:
   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}}"
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 85fea1399..aac64cc2b 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -908,3 +908,4 @@ ro:
   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}}"
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 806b5c0ac..68a8fa6ef 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1032,3 +1032,4 @@ ru:
   notice_unable_delete_time_entry: Невозможно удалить запись журнала.
   label_overall_spent_time: Всего затрачено времени
 
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 3fd6c41b2..87c50e27a 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -910,3 +910,4 @@ sk:
   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}}"
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 68d8bb089..3b579a824 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -911,3 +911,4 @@ sl:
   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}}"
diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
index c2ac531c9..b48e90223 100644
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -915,3 +915,4 @@ sr-YU:
   project_module_calendar: Kalendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 5b5dfd461..8282a37bf 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -916,3 +916,4 @@ sr:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
 
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 8055c572d..28ce75e21 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -960,3 +960,4 @@ sv:
   enumeration_system_activity: Systemaktivitet
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 3e855995f..859cf0f08 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -912,3 +912,4 @@ th:
   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}}"
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 43871ffe9..9244d983d 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -938,3 +938,4 @@ tr:
   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}}"
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 89901d1ea..eade7c4a2 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -911,3 +911,4 @@ uk:
   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}}"
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 28351ed26..94fbad869 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -970,3 +970,4 @@ vi:
   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}}"
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 8dab78787..26f23b7fa 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1000,3 +1000,4 @@
   enumeration_system_activity: 系統活動
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index b882d277a..3b788860d 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -933,3 +933,4 @@ zh:
   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}}"

From 944d1a68bd23b722e84243fda7eda0e4a0a23459 Mon Sep 17 00:00:00 2001
From: Azamat Hackimov 
Date: Sun, 19 Sep 2010 12:00:23 +0000
Subject: [PATCH 157/222] Translations update * ru * zh-TW (#6365)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4102 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 config/locales/ru.yml    |  2 +-
 config/locales/zh-TW.yml | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 68a8fa6ef..827ed52ee 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -230,6 +230,7 @@ ru:
   button_delete: Удалить
   button_download: Загрузить
   button_edit: Редактировать
+  button_edit_associated_wikipage: "Редактировать связанную wiki-страницу: {{page_title}}"
   button_list: Список
   button_lock: Заблокировать
   button_login: Вход
@@ -1032,4 +1033,3 @@ ru:
   notice_unable_delete_time_entry: Невозможно удалить запись журнала.
   label_overall_spent_time: Всего затрачено времени
 
-  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 26f23b7fa..3cfa4248a 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -366,6 +366,7 @@
   field_redirect_existing_links: 重新導向現有連結
   field_estimated_hours: 預估工時
   field_column_names: 欄位
+  field_time_entries: 耗用工時
   field_time_zone: 時區
   field_searchable: 可用做搜尋條件
   field_default_value: 預設值
@@ -378,8 +379,9 @@
   field_group_by: 結果分組方式
   field_sharing: 共用
   field_parent_issue: 父工作項目
-  field_time_entries: 耗用工時
-    
+  field_member_of_group: 所屬群組
+  field_assigned_to_role: 所屬角色
+  
   setting_app_title: 標題
   setting_app_subtitle: 副標題
   setting_welcome_text: 歡迎詞
@@ -870,6 +872,7 @@
   button_create_and_continue: 繼續建立
   button_test: 測試
   button_edit: 編輯
+  button_edit_associated_wikipage: "編輯相關 Wiki 頁面: {{page_title}}"
   button_add: 新增
   button_change: 修改
   button_apply: 套用
@@ -998,6 +1001,4 @@
   enumeration_doc_categories: 文件分類
   enumeration_activities: 活動 (時間追蹤)
   enumeration_system_activity: 系統活動
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
-  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+

From 09331ec432bc0b3b308ecd4f44e39dcccf670eb7 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Mon, 20 Sep 2010 02:55:14 +0000
Subject: [PATCH 158/222] Turn on ssl Gravatars for all SSL requests. #5929
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Contributed by Felix Schäfer

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4103 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index eecbc5b91..6ba40eb45 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -829,7 +829,7 @@ module ApplicationHelper
   # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe ')
   def avatar(user, options = { })
     if Setting.gravatar_enabled?
-      options.merge!({:ssl => Setting.protocol == 'https', :default => Setting.gravatar_default})
+      options.merge!({:ssl => (defined?(request) && request.ssl?), :default => Setting.gravatar_default})
       email = nil
       if user.respond_to?(:mail)
         email = user.mail

From 1809eefe4cd10b47c72bac3bed0c336ac0db206b Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Mon, 20 Sep 2010 02:55:20 +0000
Subject: [PATCH 159/222] Use the correct local variables in the PDF export.
 #6382
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Contributed by Felix Schäfer

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4104 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/export/pdf.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb
index 27905b2bb..c4a2c3d90 100644
--- a/lib/redmine/export/pdf.rb
+++ b/lib/redmine/export/pdf.rb
@@ -154,7 +154,7 @@ module Redmine
           if query.grouped? && (group = query.group_by_column.value(issue)) != previous_group
             pdf.SetFontStyle('B',9)
             pdf.Cell(277, row_height, 
-              (group.blank? ? 'None' : group.to_s) + " (#{@issue_count_by_group[group]})",
+              (group.blank? ? 'None' : group.to_s) + " (#{query.issue_count_by_group[group]})",
               1, 1, 'L')
             pdf.SetFontStyle('',8)
             previous_group = group
@@ -255,7 +255,7 @@ module Redmine
         pdf.SetFontStyle('B',9)
         pdf.Cell(35,5, l(:field_description) + ":")
         pdf.SetFontStyle('',9)
-        pdf.MultiCell(155,5, @issue.description,"BR")
+        pdf.MultiCell(155,5, issue.description,"BR")
         
         pdf.Line(pdf.GetX, y0, pdf.GetX, pdf.GetY)
         pdf.Line(pdf.GetX, pdf.GetY, 170, pdf.GetY)

From f62a1827f33f9d3d2fa5e990a9f6c9475d4bdc71 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Mon, 20 Sep 2010 02:55:26 +0000
Subject: [PATCH 160/222] Updated issue delete confirmation when it has child
 issues. #6191

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4105 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/issue.rb                 | 5 +++++
 app/views/issues/_action_menu.rhtml | 2 +-
 config/locales/bg.yml               | 1 +
 config/locales/bs.yml               | 1 +
 config/locales/ca.yml               | 1 +
 config/locales/cs.yml               | 1 +
 config/locales/da.yml               | 1 +
 config/locales/de.yml               | 1 +
 config/locales/el.yml               | 1 +
 config/locales/en-GB.yml            | 1 +
 config/locales/en.yml               | 1 +
 config/locales/es.yml               | 1 +
 config/locales/eu.yml               | 1 +
 config/locales/fi.yml               | 1 +
 config/locales/fr.yml               | 1 +
 config/locales/gl.yml               | 1 +
 config/locales/he.yml               | 1 +
 config/locales/hr.yml               | 1 +
 config/locales/hu.yml               | 1 +
 config/locales/id.yml               | 1 +
 config/locales/it.yml               | 1 +
 config/locales/ja.yml               | 1 +
 config/locales/ko.yml               | 1 +
 config/locales/lt.yml               | 1 +
 config/locales/lv.yml               | 1 +
 config/locales/mk.yml               | 1 +
 config/locales/mn.yml               | 1 +
 config/locales/nl.yml               | 1 +
 config/locales/no.yml               | 1 +
 config/locales/pl.yml               | 1 +
 config/locales/pt-BR.yml            | 1 +
 config/locales/pt.yml               | 1 +
 config/locales/ro.yml               | 1 +
 config/locales/ru.yml               | 1 +
 config/locales/sk.yml               | 1 +
 config/locales/sl.yml               | 1 +
 config/locales/sr-YU.yml            | 1 +
 config/locales/sr.yml               | 1 +
 config/locales/sv.yml               | 1 +
 config/locales/th.yml               | 1 +
 config/locales/tr.yml               | 1 +
 config/locales/uk.yml               | 1 +
 config/locales/vi.yml               | 1 +
 config/locales/zh-TW.yml            | 1 +
 config/locales/zh.yml               | 1 +
 45 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 2b7362589..c49952306 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -382,6 +382,11 @@ class Issue < ActiveRecord::Base
     done_date = start_date + ((due_date - start_date+1)* done_ratio/100).floor
     return done_date <= Date.today
   end
+
+  # Does this issue have children?
+  def children?
+    !leaf?
+  end
   
   # Users the issue can be assigned to
   def assignable_users
diff --git a/app/views/issues/_action_menu.rhtml b/app/views/issues/_action_menu.rhtml
index c5d17511a..30c63ec66 100644
--- a/app/views/issues/_action_menu.rhtml
+++ b/app/views/issues/_action_menu.rhtml
@@ -6,5 +6,5 @@
 <%= link_to_if_authorized l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-duplicate' %>
 <%= link_to_if_authorized l(:button_copy), new_issue_move_path(:id => @issue, :copy_options => {:copy => 't'}), :class => 'icon icon-copy' %>
 <%= link_to_if_authorized l(:button_move), new_issue_move_path(:id => @issue), :class => 'icon icon-move' %>
-<%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
+<%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => (@issue.leaf? ? l(:text_are_you_sure) : l(:text_are_you_sure_with_children)), :method => :post, :class => 'icon icon-del' %>
    diff --git a/config/locales/bg.yml b/config/locales/bg.yml index ceee5c3cf..e99da7062 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -910,3 +910,4 @@ bg: 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? diff --git a/config/locales/bs.yml b/config/locales/bs.yml index b855be9e9..bef17900e 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -930,3 +930,4 @@ bs: 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? diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 6ba0a8bea..38092a2a7 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -919,3 +919,4 @@ ca: 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? diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 71591fa46..d3cdae5ef 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -916,3 +916,4 @@ cs: 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? diff --git a/config/locales/da.yml b/config/locales/da.yml index b6270f0d1..25d288336 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -932,3 +932,4 @@ da: 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? diff --git a/config/locales/de.yml b/config/locales/de.yml index 3a5ee094e..f9847c3f5 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -935,3 +935,4 @@ de: field_member_of_group: Member of Group field_assigned_to_role: Member of Role + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/el.yml b/config/locales/el.yml index d0608e851..2b6e3493d 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -916,3 +916,4 @@ el: 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? diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index c0b520dfd..4f5aec111 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -920,3 +920,4 @@ en-GB: 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? diff --git a/config/locales/en.yml b/config/locales/en.yml index 81a26c82c..2930d8079 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -838,6 +838,7 @@ en: text_subprojects_destroy_warning: "Its subproject(s): {{value}} will be also deleted." text_workflow_edit: Select a role and a tracker to edit the workflow text_are_you_sure: Are you sure ? + text_are_you_sure_with_children: "Delete issue and all child issues?" text_journal_changed: "{{label}} changed from {{old}} to {{new}}" text_journal_set_to: "{{label}} set to {{value}}" text_journal_deleted: "{{label}} deleted ({{old}})" diff --git a/config/locales/es.yml b/config/locales/es.yml index 1828558bf..18d56ae3e 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -956,3 +956,4 @@ es: 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? diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 64881fe6f..983fe1482 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -920,3 +920,4 @@ eu: 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? diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 8b56c94da..ea14a5c0d 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -941,3 +941,4 @@ fi: 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? diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 0a1ee46ea..0654ee736 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -934,3 +934,4 @@ fr: 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? diff --git a/config/locales/gl.yml b/config/locales/gl.yml index b5345de69..5360095f6 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -932,3 +932,4 @@ gl: 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? diff --git a/config/locales/he.yml b/config/locales/he.yml index 8c55b2351..0129eff88 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -921,3 +921,4 @@ he: 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? diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 77cda672a..9219ac660 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -923,3 +923,4 @@ hr: 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? diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 84e714a6b..e099cb9bc 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -939,3 +939,4 @@ 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? diff --git a/config/locales/id.yml b/config/locales/id.yml index ca6444b0c..185d4f21d 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -924,3 +924,4 @@ id: 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? diff --git a/config/locales/it.yml b/config/locales/it.yml index 6bd4096a9..be0da6a48 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -920,3 +920,4 @@ it: 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? diff --git a/config/locales/ja.yml b/config/locales/ja.yml index fa3346f17..2ea6b009f 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -941,3 +941,4 @@ ja: enumeration_activities: 作業分類 (時間トラッキング) enumeration_system_activity: システム作業分類 button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 771f91cef..e4dc36fb6 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -972,3 +972,4 @@ ko: 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? diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 27c5466fd..40e58b980 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -980,3 +980,4 @@ lt: 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? diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 5a628e5c5..6162f60ef 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -911,3 +911,4 @@ lv: 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? diff --git a/config/locales/mk.yml b/config/locales/mk.yml index ac2a043d4..fb2f78d29 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -916,3 +916,4 @@ mk: 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? diff --git a/config/locales/mn.yml b/config/locales/mn.yml index 908e8a844..5358657eb 100644 --- a/config/locales/mn.yml +++ b/config/locales/mn.yml @@ -917,3 +917,4 @@ mn: 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? diff --git a/config/locales/nl.yml b/config/locales/nl.yml index b5933d222..071b3919e 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -898,3 +898,4 @@ nl: 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? diff --git a/config/locales/no.yml b/config/locales/no.yml index 24be1a06e..4b76683fc 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -907,3 +907,4 @@ 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? diff --git a/config/locales/pl.yml b/config/locales/pl.yml index aade4af0e..b56fd71eb 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -937,3 +937,4 @@ pl: 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? diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 7fa9ae2f5..ee1aefac5 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -940,3 +940,4 @@ pt-BR: 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? diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 9a7547ab4..cb336e25a 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -924,3 +924,4 @@ pt: 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? diff --git a/config/locales/ro.yml b/config/locales/ro.yml index aac64cc2b..2e8f7a1ca 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -909,3 +909,4 @@ ro: 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? diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 827ed52ee..08e1acb95 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1033,3 +1033,4 @@ ru: notice_unable_delete_time_entry: Невозможно удалить запись журнала. label_overall_spent_time: Всего затрачено времени + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 87c50e27a..37c5ea6b1 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -911,3 +911,4 @@ sk: 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? diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 3b579a824..6732ef98d 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -912,3 +912,4 @@ sl: 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? diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml index b48e90223..d73fd0340 100644 --- a/config/locales/sr-YU.yml +++ b/config/locales/sr-YU.yml @@ -916,3 +916,4 @@ sr-YU: 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? diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 8282a37bf..1b6a8d334 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -917,3 +917,4 @@ sr: 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? diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 28ce75e21..439f9c7cd 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -961,3 +961,4 @@ sv: 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? diff --git a/config/locales/th.yml b/config/locales/th.yml index 859cf0f08..bc936f709 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -913,3 +913,4 @@ th: 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? diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 9244d983d..4b0e6022c 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -939,3 +939,4 @@ tr: 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? diff --git a/config/locales/uk.yml b/config/locales/uk.yml index eade7c4a2..146454da4 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -912,3 +912,4 @@ uk: 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? diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 94fbad869..8cf978d09 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -971,3 +971,4 @@ vi: 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? diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 3cfa4248a..38efcfa9d 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1002,3 +1002,4 @@ enumeration_activities: 活動 (時間追蹤) enumeration_system_activity: 系統活動 + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 3b788860d..a7611bf1d 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -934,3 +934,4 @@ zh: 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? From e58513c9767a2eafb3a101b3e466e41a85918edd Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Mon, 20 Sep 2010 02:55:32 +0000 Subject: [PATCH 161/222] Fix failing test. See http://ci.finn.de/builds/1-8-7_redmine-trunk_postgres/4100 Contributed by Holger Just git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4106 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/unit/query_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index f737b2f0c..db6173bae 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -400,7 +400,7 @@ class QueryTest < ActiveSupport::TestCase [group1.name, group1.id], [group2.name, group2.id] ] - assert_equal expected_group_list, @query.available_filters["member_of_group"][:values] + assert_equal expected_group_list.sort, @query.available_filters["member_of_group"][:values].sort end end From 1a4f5e87f2839fa2260deefd4d9a5c992ef860fe Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Mon, 20 Sep 2010 02:55:37 +0000 Subject: [PATCH 162/222] Add scm.css to news pages to allow proper syntax highlighting. #6270 Contributed by Holger Just. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4107 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/news/edit.rhtml | 4 ++++ app/views/news/index.rhtml | 1 + 2 files changed, 5 insertions(+) diff --git a/app/views/news/edit.rhtml b/app/views/news/edit.rhtml index 4be566e0b..04d64df1f 100644 --- a/app/views/news/edit.rhtml +++ b/app/views/news/edit.rhtml @@ -12,3 +12,7 @@ }, :accesskey => accesskey(:preview) %> <% end %>
    + +<% content_for :header_tags do %> + <%= stylesheet_link_tag 'scm' %> +<% end %> diff --git a/app/views/news/index.rhtml b/app/views/news/index.rhtml index 8b7cc66e1..41e8bb355 100644 --- a/app/views/news/index.rhtml +++ b/app/views/news/index.rhtml @@ -45,6 +45,7 @@ <% content_for :header_tags do %> <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %> + <%= stylesheet_link_tag 'scm' %> <% end %> <% html_title(l(:label_news_plural)) -%> From 3bc29e29e091b56bcffeb07ffb9c37c328525f99 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Mon, 20 Sep 2010 15:13:48 +0000 Subject: [PATCH 163/222] Refactor: split NewsController#new into #new and #create methods. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4163 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/news_controller.rb | 12 +++++++++--- app/views/news/index.rhtml | 2 +- app/views/news/new.rhtml | 2 +- config/routes.rb | 2 +- lib/redmine.rb | 2 +- test/functional/news_controller_test.rb | 8 ++++---- test/integration/routing_test.rb | 2 +- 7 files changed, 18 insertions(+), 12 deletions(-) diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb index 4d44158a4..f4e4b6559 100644 --- a/app/controllers/news_controller.rb +++ b/app/controllers/news_controller.rb @@ -18,9 +18,9 @@ class NewsController < ApplicationController default_search_scope :news model_object News - before_filter :find_model_object, :except => [:new, :index, :preview] - before_filter :find_project_from_association, :except => [:new, :index, :preview] - before_filter :find_project, :only => [:new, :preview] + before_filter :find_model_object, :except => [:new, :create, :index, :preview] + before_filter :find_project_from_association, :except => [:new, :create, :index, :preview] + before_filter :find_project, :only => [:new, :create, :preview] before_filter :authorize, :except => [:index, :preview] before_filter :find_optional_project, :only => :index accept_key_auth :index @@ -46,11 +46,17 @@ class NewsController < ApplicationController def new @news = News.new(:project => @project, :author => User.current) + end + + def create + @news = News.new(:project => @project, :author => User.current) if request.post? @news.attributes = params[:news] if @news.save flash[:notice] = l(:notice_successful_create) redirect_to :controller => 'news', :action => 'index', :project_id => @project + else + render :action => 'new' end end end diff --git a/app/views/news/index.rhtml b/app/views/news/index.rhtml index 41e8bb355..2b53b7f72 100644 --- a/app/views/news/index.rhtml +++ b/app/views/news/index.rhtml @@ -7,7 +7,7 @@