From 4775864d69e64f4f50e9afebfd4026c966f8ae6c Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Fri, 16 Jul 2010 03:31:31 +0000 Subject: [PATCH 001/240] Adding 1.0 stable branch to prepare for 1.0.0 RC git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3844 e93f8b46-1217-0410-a6f0-8f06a7374b81 From 4f5dc94170f004ac3025c04ace63f2fd1cf1a23e Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Fri, 16 Jul 2010 03:47:03 +0000 Subject: [PATCH 002/240] Merged r3845 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3846 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- public/favicon.ico | Bin 0 -> 7886 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/favicon.ico b/public/favicon.ico index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..51c1aeb09896dfa4de1de34d55fc062e9b6eb351 100644 GIT binary patch literal 7886 zcmeHMdu&rx82{#AecX;MptvZ|#Rp1EbiPpIWBegR@ktE&mx(4CA%L$$6OA&+d_W?> zs9=_`t*wZPNDLB!1~OpCqqpmv>j2l=c56G3fUqILkZs4`xu^H`uD$Eptwdw?C13Bk z=X~GqJFk6@JE8(Aq|#CXmD7T8L^IJUD--W4Y(#bFD=!!CUqf#C1fm=9%2jxGf%=Pv z75u*=*M~%&R>7`$!!OVMdQ#rK1MLAYOYoxM^*tXM5JUld~vxbZ1uS8m7HMRKV6$H!B2rbMw$al(jnFWe zcSb078BrDZ(hCXOj#V3B3A;;E%X3#BI^o17B2Mo;$wht|W$z z)rh`+*u|~X*nOO6-F3O+*WaJS(6QiyJ%0`E=YGAOU+)~rHD@pmx8Z&peZlnpy4!LD zhq&vhbe!7z(Dym)1Tel1&znVDXmI3?|MO&`%{XJe4%b#-?M8+%m8ceeetsblk0HJn z;q%?9zt7o#ZyWSJL9BaJsBQ!%CmsXj1z@bfhrQ>qNIoLQvi;o-&*Q^AQFVDd^nw$1 z;GW3$GWc&WuywvRTXdpdo;K)ljMLbM$CLWro6r|c$RMwfeq#4(_yf1@y7Ue7{razyx@A#GK|* z#Jq)whXZ(iPjuv}R7w3^ic~@kwZBH*_A^fruSnVcI72Cf5Dj`pV^{eC-RauJH?i&bG0aQ$rgDg9V6SGE<5s+ z8rV3H$XfziOmk@IMd4kYuH@g>{hNPCPrw$u7`&)=Z78QRilM zjQUt5buV>N_Z%nnHadw_18ezUJp55pId~RW&%=1f7>(_~*bW$Wz>R#s{Z%@9;79X8 zYmjr9;j4X!yPgZ_`J0*}B7e>Y)m>qZujaaq7#lDjclq;S9oUo2@m2dC>qvBN&{M%6yv-J8*_ME-!hxd!=GzKE}5!k$?qetMQv-OD%31|?Wx3bYk4QQ5BUhr!iW1YTJoI~STgRpZ@D>|w+v%lLQc>1 zVPEbrm(R9$FLHDvp4!Ga`*7z{iPtV^vY3Mxwcbd{|AaZF{9QVtcdfasANO;lq<(|s z=a|Ax52PcuVx2y|H<~Q|{=Huk@!WKzbO3i-ZpSy(egkgX&}i~@$niR?M%2|@GEj#4 zX7SKEW+SMTBn5RLue&($`{ivC_gY>g`pka!AXebJt431rS=1+@X0o=M?3pHLe4;L} zhu4VuNjW8IOl`cORBL5^wn(URw&*n&uk$!tLJvYOL*2pG9r}2Xo?5R4U%QeYz1aWZWVw%~e>fSPq} zYTZ{v5v2SLR?Go)Wn#ayrxeqyEvp z)AR56F~6C8-iKOwThdhGP9!_>&I&uI2 literal 0 HcmV?d00001 From a2a3dae974fff867c32bd61dd919045bcd8afe64 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 18 Jul 2010 15:53:46 +0000 Subject: [PATCH 003/240] Merged r3847 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3850 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/pt-BR.yml | 4 ++-- config/locales/ru.yml | 4 ++-- config/locales/sv.yml | 4 ++-- config/locales/zh-TW.yml | 4 ++-- config/locales/zh.yml | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index e3cf7d1c0ee..9365505d0bb 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -930,5 +930,5 @@ pt-BR: notice_failed_to_save_members: "Falha ao gravar membro(s): {{errors}}." text_zoom_out: Afastar zoom text_zoom_in: Aproximar zoom - notice_unable_delete_time_entry: Unable to delete time log entry. - label_overall_spent_time: Overall spent time + notice_unable_delete_time_entry: Não foi possível excluir a entrada no registro de horas trabalhadas. + label_overall_spent_time: Tempo gasto geral diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 5386c1fcacd..cce123622ea 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1022,5 +1022,5 @@ ru: field_principal: Глава text_zoom_out: Отдалить text_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: Невозможно удалить запись журнала. + label_overall_spent_time: Всего затрачено времени diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 30ac1700419..23450007aa5 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -203,6 +203,7 @@ sv: notice_account_pending: "Ditt konto skapades och avvaktar nu administratörens godkännande." notice_default_data_loaded: Standardkonfiguration inläst. notice_unable_delete_version: Denna version var inte möjlig att ta bort. + notice_unable_delete_time_entry: Tidloggning kunde inte tas bort. notice_issue_done_ratios_updated: % klart uppdaterade. error_can_t_load_default_data: "Standardkonfiguration gick inte att läsa in: {{value}}" @@ -689,6 +690,7 @@ sv: label_changes_details: Detaljer om alla ändringar label_issue_tracking: Ärendeuppföljning label_spent_time: Spenderad tid + label_overall_spent_time: Total tid spenderad label_f_hour: "{{value}} timme" label_f_hour_plural: "{{value}} timmar" label_time_tracking: Tidsuppföljning @@ -951,5 +953,3 @@ sv: enumeration_doc_categories: Dokumentkategorier enumeration_activities: Aktiviteter (tidsuppföljning) enumeration_system_activity: Systemaktivitet - notice_unable_delete_time_entry: Unable to delete time log entry. - label_overall_spent_time: Overall spent time diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 7d5c8091c1d..fc5f557d1cc 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -243,6 +243,7 @@ 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}}" @@ -729,6 +730,7 @@ 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: 工時追蹤 @@ -991,5 +993,3 @@ enumeration_doc_categories: 文件分類 enumeration_activities: 活動 (時間追蹤) enumeration_system_activity: 系統活動 - notice_unable_delete_time_entry: Unable to delete time log entry. - label_overall_spent_time: Overall spent time diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 49725b0a62a..6fdb33f528f 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -428,7 +428,7 @@ zh: one: 1 个项目 other: "{{count}} 个项目" label_project_all: 所有的项目 - label_project_latest: 最近更新的项目 + label_project_latest: 最近的项目 label_issue: 问题 label_issue_new: 新建问题 label_issue_plural: 问题 @@ -592,10 +592,10 @@ zh: label_all_time: 全部时间 label_yesterday: 昨天 label_this_week: 本周 - label_last_week: 下周 + label_last_week: 上周 label_last_n_days: "最后 {{count}} 天" label_this_month: 本月 - label_last_month: 下月 + label_last_month: 上月 label_this_year: 今年 label_date_range: 日期范围 label_less_than_ago: 之前天数少于 From 0ae9cc7d07bd19a6e4782187954e0b2039858ea8 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 18 Jul 2010 15:53:51 +0000 Subject: [PATCH 004/240] Merged r3848 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3851 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- doc/INSTALL | 80 +++++++++++++++++++++++++++++++++------------------ doc/UPGRADING | 60 +++++++++++++++++++++++++++----------- 2 files changed, 96 insertions(+), 44 deletions(-) diff --git a/doc/INSTALL b/doc/INSTALL index a4e4312eb4a..7a0e1a12f57 100644 --- a/doc/INSTALL +++ b/doc/INSTALL @@ -11,61 +11,85 @@ http://www.redmine.org/ * Ruby on Rails 2.3.5 (official downloadable Redmine releases are packaged with the appropriate Rails version) - + +* Rack 1.0.1 + +* RubyGems 1.3.1 + +* Rake 0.8.3 + * A database: * MySQL (tested with MySQL 5) * PostgreSQL (tested with PostgreSQL 8.1) * SQLite (tested with SQLite 3) Optional: -* SVN binaries >= 1.3 (needed for repository browsing, must be available in PATH) -* RMagick (gantt export to png) +* SCM binaries (e.g. svn), for repository browsing (must be available in PATH) +* RMagick (to enable Gantt export to png images) +* Ruby OpenID Library >= version 2 (to enable OpenID support) == Installation 1. Uncompress the program archive - + 2. Create an empty database: "redmine" for example -3. Configure database parameters in config/database.yml - for "production" environment (default database is MySQL) +3. Configure the database parameters in config/database.yml + for the "production" environment (default database is MySQL) 4. Generate a session store secret + Redmine stores session data in cookies by default, which requires - a secret to be generated. Run: - rake generate_session_store + a secret to be generated. Under the application main directory run: + rake generate_session_store + +5. Create the database structure -5. Create the database structure. Under the application main directory: - rake db:migrate RAILS_ENV="production" - It will create tables and an administrator account. + Under the application main directory run: + rake db:migrate RAILS_ENV="production" -6. Setting up permissions - The user who runs Redmine must have write permission on the following - subdirectories: files, log, tmp (create the last one if not present). + It will create all the tables and an administrator account. - Assuming you run Redmine with a user named redmine: - mkdir tmp - sudo chown -R redmine:redmine files log tmp - sudo chmod -R 755 files log tmp +6. Setting up permissions (Windows users have to skip this section) + + The user who runs Redmine must have write permission on the following + subdirectories: files, log, tmp & public/plugin_assets (create the last + two if they are not yet present). + + Assuming you run Redmine with a user named "redmine": + mkdir tmp public/plugin_assets + sudo chown -R redmine:redmine files log tmp public/plugin_assets + sudo chmod -R 755 files log tmp public/plugin_assets -7. Test the installation by running WEBrick web server: - ruby script/server -e production - +7. Test the installation by running the WEBrick web server + + Under the main application directory run: + ruby script/server -e production + Once WEBrick has started, point your browser to http://localhost:3000/ - You should now see the application welcome page + You should now see the application welcome page. -8. Use default administrator account to log in: +8. Use the default administrator account to log in: login: admin password: admin - Go to "Administration" to load the default configuration data (roles, - trackers, statuses, workflow) and adjust application settings - + Go to "Administration" to load the default configuration data (roles, + trackers, statuses, workflow) and to adjust the application settings -== Email delivery Configuration +== SMTP server Configuration Copy config/email.yml.example to config/email.yml and edit this file to adjust your SMTP settings. -Don't forget to restart the application after any change to this file. +Do not forget to restart the application after any change to this file. Please do not enter your SMTP settings in environment.rb. + +== References + +* http://www.redmine.org/wiki/redmine/RedmineInstall +* http://www.redmine.org/wiki/redmine/EmailConfiguration +* http://www.redmine.org/wiki/redmine/RedmineSettings +* http://www.redmine.org/wiki/redmine/RedmineRepositories +* http://www.redmine.org/wiki/redmine/RedmineReceivingEmails +* http://www.redmine.org/wiki/redmine/RedmineReminderEmails +* http://www.redmine.org/wiki/redmine/RedmineLDAP diff --git a/doc/UPGRADING b/doc/UPGRADING index a9b81d1775f..87f169c9d5f 100644 --- a/doc/UPGRADING +++ b/doc/UPGRADING @@ -1,4 +1,4 @@ -== Redmine upgrade procedure +== Redmine upgrade Redmine - project management software Copyright (C) 2006-2010 Jean-Philippe Lang @@ -8,26 +8,54 @@ http://www.redmine.org/ == Upgrading 1. Uncompress the program archive in a new directory - + 2. Copy your database settings (RAILS_ROOT/config/database.yml) - and SMTP settings (RAILS_ROOT/config/email.yml) - into the new config directory - DO NOT REPLACE OR EDIT ANY OTHER FILES. + and SMTP settings (RAILS_ROOT/config/email.yml) into the new + config directory + +3. Copy the RAILS_ROOT/files directory content into your new installation + This directory contains all the attached files. -3. Generate a session store secret +4. Copy the folders of the installed plugins and themes into new installation + +5. Generate a session store secret + Redmine stores session data in cookies by default, which requires - a secret to be generated. Run: - rake generate_session_store - -4. Migrate your database (please make a backup before doing this): - rake db:migrate RAILS_ENV="production" + a secret to be generated. Under the new application directory run: + rake generate_session_store + + DO NOT REPLACE OR EDIT ANY OTHER FILES. -5. Copy the RAILS_ROOT/files directory content into your new installation - This directory contains all the attached files +6. Migrate your database + + If you are upgrading to Rails 2.3.5 as part of this migration, you + need to upgrade the plugin migrations before running the plugin migrations + using: + rake db:migrate:upgrade_plugin_migrations RAILS_ENV="production" + + Please make a backup before doing this! Under the new application + directory run: + rake db:migrate RAILS_ENV="production" + + If you have installed any plugins, you should also run their database + migrations using: + rake db:migrate_plugins RAILS_ENV="production" + +7. Clean up + + Clear the cache and the existing sessions by running: + rake tmp:cache:clear + rake tmp:sessions:clear + +8. Restart the application server (e.g. mongrel, thin, passenger) + +9. Finally go to "Administration -> Roles & permissions" to check/set permissions + for new features, if any == Notes -1. Rails 2.3.5 is required for version 0.9. +* Rails 2.3.5 is required for versions 0.9.x and 1.0.x. + +== References -2. When upgrading your code with svn update, don't forget to clear - the application cache (RAILS_ROOT/tmp/cache) before restarting. +* http://www.redmine.org/wiki/redmine/RedmineUpgrade From 619c14871985d4ea36843a3b03c37f4bfabd1d45 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 18 Jul 2010 15:53:56 +0000 Subject: [PATCH 005/240] Merged r3849 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3852 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- README.rdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rdoc b/README.rdoc index fb70acaaceb..10c17047425 100644 --- a/README.rdoc +++ b/README.rdoc @@ -2,4 +2,4 @@ Redmine is a flexible project management web application written using Ruby on Rails framework. -More details can be found at http://www.redmine.org +More details can be found at in the doc directory or on the official website http://www.redmine.org From 1cc116fe5c0daa34f3efb7bb0f31abd2acc06625 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 18 Jul 2010 16:38:51 +0000 Subject: [PATCH 006/240] Merged r3853 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3855 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- doc/CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/CHANGELOG b/doc/CHANGELOG index d6b81944d38..4a100bfce38 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -4,7 +4,7 @@ Redmine - project management software Copyright (C) 2006-2010 Jean-Philippe Lang http://www.redmine.org/ -== v1.0.0 (Release candidate) +== 2010-07-18 v1.0.0 (Release candidate) #443: Adds context menu to the roadmap issue lists #443: Subtasking From 6ed2e003a142ca522ae97f1621eb806f6dc4be49 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 18 Jul 2010 16:38:56 +0000 Subject: [PATCH 007/240] Merged r3854 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3856 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/version.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb index 65aaf4bd511..5ea62f3e002 100644 --- a/lib/redmine/version.rb +++ b/lib/redmine/version.rb @@ -2,9 +2,9 @@ module Redmine module VERSION #:nodoc: - MAJOR = 0 - MINOR = 9 - TINY = 6 + MAJOR = 1 + MINOR = 0 + TINY = 0 # Branch values: # * official release: nil From 4b52b7a8df299e3850ee61ef84990eefd453415a Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 18 Jul 2010 16:39:00 +0000 Subject: [PATCH 008/240] Change version to the show this is the stable branch. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3857 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb index 5ea62f3e002..66f73dc2da6 100644 --- a/lib/redmine/version.rb +++ b/lib/redmine/version.rb @@ -10,7 +10,7 @@ module VERSION #:nodoc: # * official release: nil # * stable branch: stable # * trunk: devel - BRANCH = 'devel' + BRANCH = 'stable' def self.revision revision = nil From 8a1d45ffd6c66d76d3d9c03badef58858c98c060 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sat, 24 Jul 2010 00:20:35 +0000 Subject: [PATCH 009/240] Merged r3860 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3861 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 e5c1585b4c9..657652c9d94 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 62ba4ec22e3..62b8644a4eb 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 be52ccf01fd65b96c3bcdd258103f1886d9f156e Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sat, 24 Jul 2010 00:23:50 +0000 Subject: [PATCH 010/240] Merged r3859 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3862 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/admin/_menu.rhtml | 2 +- app/views/settings/_authentication.rhtml | 2 +- public/images/server_key.png | Bin 0 -> 746 bytes public/stylesheets/application.css | 2 ++ 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 public/images/server_key.png diff --git a/app/views/admin/_menu.rhtml b/app/views/admin/_menu.rhtml index 9b3bc66b4dc..4fc08d888b6 100644 --- a/app/views/admin/_menu.rhtml +++ b/app/views/admin/_menu.rhtml @@ -3,7 +3,7 @@
  • <%= 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' %>
    • +
  • <%= 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' %>
    • diff --git a/app/views/settings/_authentication.rhtml b/app/views/settings/_authentication.rhtml index 7e8e693df72..da29bb704fe 100644 --- a/app/views/settings/_authentication.rhtml +++ b/app/views/settings/_authentication.rhtml @@ -20,7 +20,7 @@
    - <%= link_to l(:label_ldap_authentication), :controller => 'ldap_auth_sources', :action => 'index' %> + <%= link_to l(:label_ldap_authentication), {:controller => 'ldap_auth_sources', :action => 'index'}, :class => 'icon icon-server-authentication' %>
    <%= submit_tag l(:button_save) %> diff --git a/public/images/server_key.png b/public/images/server_key.png new file mode 100644 index 0000000000000000000000000000000000000000..ecd517425f0cf0a573f091656a0c69e294b6197f GIT binary patch literal 746 zcmVR5;6} zlS@n!Q51&%dDs?eX$!L{YO$aaAT^% z8wrtxVNvT!(-=&NwM9+Zn#dzTR2m+|($3p^r?x7Vm6P0@nLFqI&VSCGVRT)`|6Kge zjaV!eR1{@UmSvtqkZ3GPl4zXp`~BxC0uqUYod_N{91g$PTn&+kplLAt5tmM<1L1J! zEP47D5Rb=CQn4Ti`>a+g<`U7ws?&F_ zfzvp|MzQqNH!H3#j~%}BVf-%##aZb_G6l4GJB;cj7tG=`j&}>Nw_Z7xnHjztyK`i@ z<3{><*+B_lKuBdOqW7yc^Z1f_jE;l*VQ=n3ZZU*Cw&q%gTbv4AZ5(1tfU;QqJva(_ zn7WS!r2xBk0P6N9ScH1;)qty~y}GH@J!&|h!zq1{)G}>Brx3Dtt?nj-%`oKk1+ZKO z44Z?gCIb|<@nc2g$}P}S;5e?>w@Rn3!6Yu>fc6sRS^`$SgVipF07*qoM6N<$f~LGuF8}}l literal 0 HcmV?d00001 diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 2067bf3dbd1..60c50d2b276 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -64,6 +64,7 @@ h4, .wiki h3 {font-size: 13px;padding: 2px 10px 1px 0px;margin-bottom: 5px; bord #admin-menu a.settings { background-image: url(../images/changeset.png); } #admin-menu a.plugins { background-image: url(../images/plugin.png); } #admin-menu a.info { background-image: url(../images/help.png); } +#admin-menu a.server_authentication { background-image: url(../images/server_key.png); } #main {background-color:#EEEEEE;} @@ -837,6 +838,7 @@ padding-bottom: 3px; .icon-report { background-image: url(../images/report.png); } .icon-comment { background-image: url(../images/comment.png); } .icon-summary { background-image: url(../images/lightning.png); } +.icon-server-authentication { background-image: url(../images/server_key.png); } .icon-file { background-image: url(../images/files/default.png); } .icon-file.text-plain { background-image: url(../images/files/text.png); } From 69f34a595dc3094a3ebbb2de56e0551645866095 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 09:34:04 +0000 Subject: [PATCH 011/240] Merged r3865 and r3866 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3867 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 05c9743eb16..46b4778d40c 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.visible.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 18bc6bc45be..79de5984b77 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 f70a8cde88df9800d4f3d5ace7737fb8cfd14f77 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 09:40:59 +0000 Subject: [PATCH 012/240] Merged r3869 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3870 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 e8d67ce416e..858f3b2e647 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 b4122707f6acc6ae1166ba2df2e31d421ffc1acf Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 09:48:51 +0000 Subject: [PATCH 013/240] Merged r3871 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3872 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 858f3b2e647..489896e09fd 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 ec526c1261ac4a15ad08f00491f2cb176e5f9884 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 09:52:07 +0000 Subject: [PATCH 014/240] Merged r3873 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3874 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 8148ae3a9fb..db18db49e29 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -79,6 +79,10 @@ def reload(*args) 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 5a0c9f87e70..ea40ccff61a 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -35,6 +35,12 @@ def setup 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 41c6d3cef6ac39d54be9f07cf41d9309d58ec95f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 09:56:07 +0000 Subject: [PATCH 015/240] Merged r3875 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3876 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 fe4f4daf5f7..0efe114eaa7 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 41e38483a67bf7af6b9a0d96076e48181351f36c Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 10:02:55 +0000 Subject: [PATCH 016/240] Merged r3877 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3878 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 5c949d48f1e..a27b5d1144a 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 8146e096f434c7b3a20576d8bf4138377f07100c Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 10:35:35 +0000 Subject: [PATCH 017/240] Merged r3879 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3880 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 7702f92e214..6d387d1c2e4 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 612739f5c6f..989065b3af9 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 52a12aaca884e1389ac0867dc91200c63d73f41a Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 10:49:08 +0000 Subject: [PATCH 018/240] Merged r3881 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3882 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 fdda12a8c15..f376d5d15bb 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 @@ def to_s; name end 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 2c0685cec1f..bcc50a4801b 100644 --- a/test/unit/issue_status_test.rb +++ b/test/unit/issue_status_test.rb @@ -32,10 +32,12 @@ def test_create 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 e771fc03bd60160f42a9aad552415c79a87e8902 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 11:49:07 +0000 Subject: [PATCH 019/240] Merged r3883, r3884 and r3885 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3886 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/gantts_controller.rb | 2 +- lib/redmine/export/pdf.rb | 17 ++++++++++------- lib/redmine/helpers/gantt.rb | 13 ++++++++++--- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/app/controllers/gantts_controller.rb b/app/controllers/gantts_controller.rb index bc2d6350c18..e762c19c81d 100644 --- a/app/controllers/gantts_controller.rb +++ b/app/controllers/gantts_controller.rb @@ -37,7 +37,7 @@ def show 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/export/pdf.rb b/lib/redmine/export/pdf.rb index c24921653db..9b1f2b8a229 100644 --- a/lib/redmine/export/pdf.rb +++ b/lib/redmine/export/pdf.rb @@ -325,7 +325,7 @@ def gantt_to_pdf(gantt, project) pdf.Ln pdf.SetFontStyle('B',9) - subject_width = 70 + subject_width = 100 header_heigth = 5 headers_heigth = header_heigth @@ -341,7 +341,7 @@ def gantt_to_pdf(gantt, project) 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 @@ -415,16 +415,19 @@ def gantt_to_pdf(gantt, project) pdf.SetY(top) pdf.SetX(15) + text = "" 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}" 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) + 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 diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb index 330b58ee740..96ba4db7c0a 100644 --- a/lib/redmine/helpers/gantt.rb +++ b/lib/redmine/helpers/gantt.rb @@ -91,12 +91,12 @@ def params_next # 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 @@ def to_image(format='PNG') 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 f682be8468f12acc0ad6cd313cb5805e58c63504 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 11:56:45 +0000 Subject: [PATCH 020/240] Merged r3887 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3888 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 489896e09fd..d9e92a4f86c 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 29e7ae969824c4f2b65e5158c48b1079678a7f93 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 12:49:15 +0000 Subject: [PATCH 021/240] Merged r3889 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3890 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 4fc08d888b6..a8de8885068 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 8f64938b9e36df0464a77cfb37621e0dedab892d Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 12:57:49 +0000 Subject: [PATCH 022/240] Merged r3891 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3892 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 60c50d2b276..b3dbfd7f2c6 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 0843b188fb8397431278367c5f58029b281b5f5f Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 29 Jul 2010 15:03:06 +0000 Subject: [PATCH 023/240] Merged r3893 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3895 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/de.yml | 1 + config/locales/he.yml | 737 +++++++++++++++++++++--------------------- config/locales/hu.yml | 34 +- 3 files changed, 389 insertions(+), 383 deletions(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index 70ea45489be..8e3c4455dab 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 125f0265f36..f84fd01feca 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 6839fb7b298..a62d07327b6 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ő From 677fee310a17bcef7404f936c8fad962c5b65c29 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 29 Jul 2010 15:03:11 +0000 Subject: [PATCH 024/240] Merged r3894 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3896 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 054bac8af7d..4d698a2348e 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -783,6 +783,10 @@ def avatar(user, options = { }) end end + def favicon + "" + end + private def wiki_helper diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml index 1873191c075..9521457d664 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 59f98693ae4739f610c232f3e8a0f0bd8adc5008 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Fri, 30 Jul 2010 19:20:46 +0000 Subject: [PATCH 025/240] Merged r3897 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3900 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 8e3c4455dab..05d5d963063 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 6fdb33f528f..3f05306b6cb 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 df120e43cd5872045852e6ec57894173b01a4d28 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Fri, 30 Jul 2010 19:20:52 +0000 Subject: [PATCH 026/240] Merged r3898 from trunk git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3901 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 0b1f10b7289..52cd60ff571 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 7459eb3527e..a95cbf81c0f 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 b3dbfd7f2c6..59a2c3eddde 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 00000000000..74f20b43cf3 --- /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 00000000000..c400d3e84e8 --- /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 9af4cb5c38af6e409ed2e56170fe15dbf2c24f18 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Fri, 30 Jul 2010 19:20:56 +0000 Subject: [PATCH 027/240] Merged r3899 from trunk git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3902 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 4d698a2348e..e4075896974 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -784,7 +784,7 @@ def avatar(user, options = { }) end def favicon - "" + "" end private From 8458dc23d4b89d6f42bf356d9589753f1f0908e5 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 19 Aug 2010 04:29:46 +0000 Subject: [PATCH 028/240] Merged r3903 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3953 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 17d19dfe18b..ce3d13f104c 100644 --- a/test/functional/account_controller_test.rb +++ b/test/functional/account_controller_test.rb @@ -153,4 +153,27 @@ def test_logout 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 c731d1120914583e226b9bc315900c72767619cb Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 19 Aug 2010 04:29:51 +0000 Subject: [PATCH 029/240] Merged r3904 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3954 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 ce3d13f104c..61ad97430d1 100644 --- a/test/functional/account_controller_test.rb +++ b/test/functional/account_controller_test.rb @@ -175,5 +175,47 @@ def test_logout 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 ae3d542664147df35742c9255f3c6f968522baec Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 19 Aug 2010 04:29:57 +0000 Subject: [PATCH 030/240] Merged r3905 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3955 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 61ad97430d1..2a8c9c66bf8 100644 --- a/test/functional/account_controller_test.rb +++ b/test/functional/account_controller_test.rb @@ -195,11 +195,7 @@ def test_logout 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 c934e1bc2d0..15a1f15702d 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -162,4 +162,13 @@ def self.should_show_the_old_and_new_values_for(prop_key, model, &block) 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 8dde6e019d041a79d7adc4e2b3c019b856085a0c Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 19 Aug 2010 04:30:03 +0000 Subject: [PATCH 031/240] Merged r3906 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3956 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 b0a5b42a7eb..5fa56b167c5 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -83,9 +83,9 @@ def register 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 @@ def activate 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 @@ def open_id_authenticate(openid_url) 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 @@ def register_by_email_activation(user, &block) # 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 db18db49e29..c5c638f938b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -164,6 +164,30 @@ def locked? 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 acaa223cf887949a307a9156045cbf0ad4671351 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 19 Aug 2010 04:30:23 +0000 Subject: [PATCH 032/240] Merged r3907 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3957 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 f39c53209a3..8f50b1b7b57 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -80,7 +80,7 @@ def issue_edit(journal) 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 051bbdaf2c0..8b2b237044e 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 d3fe0a128bf..3d476ae13ef 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 5f54930d102..1e47d3d6627 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 b005279564b..de4ad44c52d 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 069674685f4..b241a52d8b5 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 05d5d963063..f7f9043c454 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 6176a6c8e52..a9146a611ad 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 2c19c4f49ce..118efbb4b46 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 3ab25782568..fb085695ea6 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 0a7a38a9cf5..bc345dcb563 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 9f08652fcf7..741d3298fd9 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 5556252cfa0..b6b48bac091 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 0efe114eaa7..1bc12685e66 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 0652ce9e4ef..2a1d97ed7cd 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 f84fd01feca..532c6019519 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 424fc7dc533..728a6d8e904 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 a62d07327b6..088027f1a19 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 5a14cda55b5..ec6688e5d91 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 758928f2acb..bab1c6a91d3 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 dc69c9792af..c82155b8e1c 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 6ba93edc329..d79c86cb9c5 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 675c3a14b65..9bcafc71b02 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 4d49bd1207e..351f8528ed8 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 63e8080248b..568e1f341ef 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 e24d5cbb5af..4472a19d7c2 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 53bac51bef2..7d49537dfcf 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 efa2415de34..2dadc8478d2 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 9365505d0bb..a66f237187d 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 c8dafd84713..615f3164596 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 5733ddebb97..45fdd1eaaa2 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 cce123622ea..064cbc28b6c 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 22f5799f79a..0b2351e6b7f 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 77a15575728..aac2e43316f 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 11f55847042..39cc5dcb894 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 50140b7d869..f52d9e06373 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 23450007aa5..35ebc105335 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 5f68696ebfa..2c127f3def2 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 bc7bcbf7e06..db433092415 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 5ab98332558..1a590dc0bea 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 9d2af5e86a8..f8ca507bfba 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 fc5f557d1cc..5a08041c21d 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 3f05306b6cb..87d4306842e 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 f1fc2502f6e..a5932d325c6 100644 --- a/test/unit/mailer_test.rb +++ b/test/unit/mailer_test.rb @@ -352,6 +352,7 @@ def test_reminders 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 7a9fab774865b0db1f2c8485922d7acc3a899b8f Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 19 Aug 2010 04:30:29 +0000 Subject: [PATCH 033/240] Merged r3908 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3958 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 59a2c3eddde..520ed837198 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 c20e85e4dd0ed2301a42c442f9a01a43342843be Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 19 Aug 2010 04:30:35 +0000 Subject: [PATCH 034/240] Merged r3909 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3959 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 a8de8885068..bd3abebe11f 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 238ee110a12..b95166e767f 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -157,7 +157,22 @@ 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 a6408945e53063424f3e43cb950d52a9ad873591 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 19 Aug 2010 04:30:41 +0000 Subject: [PATCH 035/240] Merged r3910 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3960 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 30848e4cdf4..fbc6714c871 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 b02463184a1fca124fc2aab42e1704939d5c21b2 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 19 Aug 2010 04:30:48 +0000 Subject: [PATCH 036/240] Merged r3911 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3961 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 e4075896974..d6fd16a6e3f 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -393,6 +393,19 @@ def html_title(*args) 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 9521457d664..2daae7cb9dc 100644 --- a/app/views/layouts/base.rhtml +++ b/app/views/layouts/base.rhtml @@ -19,7 +19,7 @@ <%= yield :header_tags -%> - +
    From 19bbb6e2cb2367f0f5182d0ea8b7e01f87f76d83 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 19 Aug 2010 04:30:53 +0000 Subject: [PATCH 037/240] Merged r3912 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3962 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 6e5634dbc0b..c00b6ba42b3 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -218,6 +218,10 @@ def check_project_privacy 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 8b5d73fa3a8..d73dfebfe81 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -349,7 +349,7 @@ def context_menu @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 3f1c3fa020bc02f18d81345bbe591eb1c83011a3 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 19 Aug 2010 04:30:59 +0000 Subject: [PATCH 038/240] Merged r3913 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3963 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 bd97844ed27..348e0e098d8 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 79cfe28a044..ad047c6690e 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 4c27de7cd1e..24c84f2aeb7 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 4426fd695e9d679f3273097b2644ef494294a392 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 19 Aug 2010 04:31:06 +0000 Subject: [PATCH 039/240] Merged r3914 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3964 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 70921f4ab9a..4c71f81ba07 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 7bdf0ab72933fbf92d90796e122e3942dc7ce943 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 19 Aug 2010 04:31:12 +0000 Subject: [PATCH 040/240] Merged r3915 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3965 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 83a78b1c872..71eaaa6737c 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 102e845391137ce36dd8df8be30b20e3be3d9d23 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 19 Aug 2010 04:31:18 +0000 Subject: [PATCH 041/240] Merged r3916 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3966 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 f697a721df6..fd7aa3477bb 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -187,7 +187,7 @@ def available_filters 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 26cba2a5ec2..4b11830e8f5 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -351,4 +351,13 @@ def test_editable_by 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 9892ede7b70f39264ba44ae67742ecd06be92258 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 19 Aug 2010 04:31:24 +0000 Subject: [PATCH 042/240] Merged r3917 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3967 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 d73dfebfe81..4f6f975cdd7 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -264,15 +264,9 @@ def move 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 @@ def check_for_default_issue_status 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 2f529fd834029b5e98222ae40da5317cc4aea457 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 19 Aug 2010 04:31:30 +0000 Subject: [PATCH 043/240] Merged r3918 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3968 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 4f6f975cdd7..7fb4148ed9e 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 @@ def move 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 47388c36bf8..c216cba7c82 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 58e620eabb6..2e8a145cbcf 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -124,7 +124,7 @@ 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 b95166e767f..4196a5d7a22 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -69,7 +69,7 @@ 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 670fb2d7eb3..92e6fd30a18 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -1038,22 +1038,22 @@ def test_post_bulk_edit_should_not_redirect_back_using_the_back_url_parameter_of 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 @@ def test_bulk_move_to_another_project 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 @@ 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 :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 @@ 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 :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 @@ def test_bulk_copy_to_another_project 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 f8476df567c..51f8e71f6e8 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 7cae43314ae28d28955c782da444427a34f7df08 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 19 Aug 2010 04:31:36 +0000 Subject: [PATCH 044/240] Merged r3919 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3969 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 00000000000..0925753176d --- /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 dfe44017b609ca32fe9b8de16558ebeabedd0aff Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 19 Aug 2010 04:31:42 +0000 Subject: [PATCH 045/240] Merged r3920 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3970 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 c98f3bd4f1e..761065df83f 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 4ff607012623e9a8dbe4f9d586bd0d1b511468fd Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 19 Aug 2010 04:31:48 +0000 Subject: [PATCH 046/240] Merged r3921 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3971 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 761065df83f..88cf9b85e5f 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 31d233e56716acefee6f0499688499cb262f1754 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 19 Aug 2010 04:31:53 +0000 Subject: [PATCH 047/240] Merged r3922 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3972 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 88cf9b85e5f..aa6c5eeb02d 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 18d841553e1f5cca0bfe9c57f757ff5824b0a940 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 19 Aug 2010 04:31:59 +0000 Subject: [PATCH 048/240] Merged r3923 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3973 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- doc/CHANGELOG | 260 +++++++++++++++++++++++++------------------------- 1 file changed, 130 insertions(+), 130 deletions(-) diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 4a100bfce38..4e6be6a279a 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 c7e719fc4b44e7b92442392a457b06ec3e467643 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:32:06 +0000
Subject: [PATCH 049/240] Merged r3924 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3974 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 d6fd16a6e3f..2c334b7f0c9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -103,6 +103,23 @@ def link_to_revision(revision, project, options={})
     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 @@ def page_header_title
       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 @@ def parse_redmine_links(text, project, obj, attr, only_path, options)
             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 @@ def parse_redmine_links(text, project, obj, attr, only_path, options)
             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 044ccfb7736..3b089c111f7 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -72,7 +72,7 @@ def render_project_hierarchy(projects)
         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 594c8a79a2d..26be63693ec 100644
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -50,7 +50,7 @@ def column_content(column, issue)
     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 dc7bb97edb9..46b68e4ccbc 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 38823765ef2..dd7f48946a2 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 e95e8a557e8..8f481f09c7d 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 11a39232c62..8b7cc66e14b 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 4c71f81ba07..44129470874 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 82634b010e4..df5aec82513 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 a0ada7ccea0..6ac09c15393 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 90d342898a7..6fd21fe376a 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -597,4 +597,16 @@ def test_link_to_user_should_not_link_to_anonymous
     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 a96eb375ec0ab051c196cbf9a1aaa8cc7e3c5116 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:32:13 +0000
Subject: [PATCH 050/240] Merged r3925 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3975 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 d15bce1afd6..0857d904716 100644
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -114,12 +114,12 @@ def lastrev(path,rev)
         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 2dc5d3e8e63..6b716b9cd25 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 @@ def test_getting_all_revisions
       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 b6bc3a3665deded5046b96cb58349aa6d73ce539 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:32:19 +0000
Subject: [PATCH 051/240] Merged r3926 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3976 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 835e154d811..ab17d4a4b5c 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 @@ def get_menu_item(menu_name, item_name)
   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 0c01ca32369..200ed3976d9 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 5150da1f20b..2d32abdcb53 100644
--- a/test/unit/lib/redmine_test.rb
+++ b/test/unit/lib/redmine_test.rb
@@ -33,7 +33,7 @@ def get_menu_item(menu_name, item_name)
   end
 end
 
-class RedmineTest < Test::Unit::TestCase
+class RedmineTest < ActiveSupport::TestCase
   include RedmineMenuTestHelper
 
   def test_top_menu

From c67272599cd1916674c0512b1a17a1f827f9ebce Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:32:25 +0000
Subject: [PATCH 052/240] Merged r3927 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3977 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 fd7aa3477bb..b1f784528d0 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -219,6 +219,12 @@ def available_filters
         @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 4b11830e8f5..12ab5d93267 100644
--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -33,6 +33,15 @@ def test_system_shared_versions_should_be_available_in_global_queries
     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 36ad597b6916a8c88b626c27b9a50330c3a89ef9 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:32:31 +0000
Subject: [PATCH 053/240] Merged r3928 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3978 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 3bd26b1111c..063a4a48ced 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -76,7 +76,6 @@ def before_create
   def after_create
     scan_comment_for_issue_ids
   end
-  require 'pp'
   
   def scan_comment_for_issue_ids
     return if comments.blank?

From 597266e5a2c1d51367ac07511f28faf804d51fd0 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:32:36 +0000
Subject: [PATCH 054/240] Merged r3929 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3979 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 94751efb2d6..d840cfc3e79 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -82,7 +82,7 @@ def self.edit_membership(id, new_attributes, principal=nil)
   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 b5b8d34d942f7fb486f344629a622f81a6ef008f Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:32:42 +0000
Subject: [PATCH 055/240] Merged r3930 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3980 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 7fb4148ed9e..a7e227c8523 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -251,6 +251,18 @@ def bulk_edit
   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 @@ def move
       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 358ee2ef2ef87402174021871f6531dbc508b518 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:32:47 +0000
Subject: [PATCH 056/240] Merged r3931 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3981 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 7addff78c3c..e234848d036 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -55,8 +55,7 @@ def report
 
       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 @@ def load_available_criterias
     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 72ce3e18f8bfb2cb288d6401429d035ad6562ce4 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:32:53 +0000
Subject: [PATCH 057/240] Merged r3932 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3982 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 a7e227c8523..46c61ea0f87 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -251,25 +251,14 @@ def bulk_edit
   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 @@ def build_new_issue_from_params
     @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 7ca197b37f9c8aba08560f985ec063d1c6d70a8a Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:32:59 +0000
Subject: [PATCH 058/240] Merged r3933 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3983 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 2a8c9c66bf8..1d66d01d37e 100644
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -67,6 +67,13 @@ def test_login_with_openid_for_existing_user
     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 22481136e01..70418fde7ea 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 @@ def self.normalize_identifier(identifier)
 
       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 5345a2dd8979da186e83e7e3475422454a609bf2 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:33:05 +0000
Subject: [PATCH 059/240] Merged r3934 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3984 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 4bd732fc120..29e4e4b07d7 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -141,14 +141,22 @@ def edit_membership
     @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 f19cd783110..023352d8abb 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -123,14 +123,22 @@ def edit_membership
     @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 ab5ce45b4362af6452a4024ccefb0a9f2b700576 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:33:11 +0000
Subject: [PATCH 060/240] Merged r3935 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3985 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 023352d8abb..0354d165d78 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -53,10 +53,8 @@ def show
     @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 d178f8f85ba..640ce868568 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -96,6 +96,16 @@ def test_show_inactive_by_admin
     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 fab5064643372d91da29bb7dacb6025e9d498f3b Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:33:18 +0000
Subject: [PATCH 061/240] Merged r3936 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3986 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 00000000000..1999930df64
--- /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 46c61ea0f87..50a6f08e700 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -249,44 +249,6 @@ def bulk_edit
     @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 @@ def build_new_issue_from_params
     @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 @@ def check_for_default_issue_status
       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 00000000000..b58b4ce5a8b
--- /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 c216cba7c82..2dc971df2fa 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 693b4923790..c5d17511a42 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 d9e92a4f86c..dc11b5fdb46 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 2e8a145cbcf..6f71cb65896 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -102,7 +102,9 @@
       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 @@
       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 @@
       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 @@
     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 4196a5d7a22..1d8dbea18ab 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -69,7 +69,7 @@
     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 00000000000..083959c7406
--- /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 92e6fd30a18..6b23a651137 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -1037,95 +1037,6 @@ def test_post_bulk_edit_should_not_redirect_back_using_the_back_url_parameter_of
     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 @@ def test_context_menu_one_issue
                             :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 @@ def test_context_menu_multiple_issues_of_same_project
                             :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 51f8e71f6e8..af66f7417d3 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 00000000000..b2ffb60421b
--- /dev/null
+++ b/test/unit/helpers/issue_moves_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class IssueMovesHelperTest < ActionView::TestCase
+end

From 7af610631f47c004a7242d20c34459d52f06fd01 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:33:23 +0000
Subject: [PATCH 062/240] Merged r3937 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3987 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 083959c7406..7c40057675d 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 6e5f56734653b9e6e563b299ff1d20ce6ffcf036 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:33:29 +0000
Subject: [PATCH 063/240] Merged r3938 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3988 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 c00b6ba42b3..3e482cf4ba2 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -201,7 +201,23 @@ def find_model_object
   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 1999930df64..37068fad566 100644
--- a/app/controllers/issue_moves_controller.rb
+++ b/app/controllers/issue_moves_controller.rb
@@ -52,23 +52,6 @@ def prepare_for_issue_move
     @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 50a6f08e700..e05d19390b9 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -359,22 +359,6 @@ def find_issue
     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 10a76f5e733acdc89fbe6a6994d3e1298f590375 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:33:34 +0000
Subject: [PATCH 064/240] Merged r3939 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3989 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 73e13abf4fc..36e86403f7f 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 8ca6941a33276bd745f6786f9a27f92abad950b0 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:33:40 +0000
Subject: [PATCH 065/240] Merged r3940 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3990 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 3e482cf4ba2..e5909e69b36 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -365,6 +365,21 @@ def render_attachment_warning_if_needed(obj)
     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 37068fad566..6ac46a1eea7 100644
--- a/app/controllers/issue_moves_controller.rb
+++ b/app/controllers/issue_moves_controller.rb
@@ -52,18 +52,6 @@ def prepare_for_issue_move
     @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 e05d19390b9..7518e3751cd 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -408,17 +408,6 @@ def build_new_issue_from_params
     @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 2012c60bfdf613ad69e5f8abdac5774754ae6a1b Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:33:46 +0000
Subject: [PATCH 066/240] Merged r3941 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3991 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 7518e3751cd..eaa6dbc350a 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 @@ def update
     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 e9fe9099de2..10450970c7b 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 @@ def find_journal
   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 cf877243074..c8d53f253be 100644
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -22,7 +22,7 @@ def render_notes(issue, journal, options={})
     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 6f71cb65896..08cd1005565 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -124,7 +124,7 @@
       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 1d8dbea18ab..e92f67b73b7 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -63,10 +63,10 @@
                                   :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 6b23a651137..0c1172f602c 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -634,20 +634,6 @@ def test_update_edit_form
     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 0a11bab3e49..7d8345b2889 100644
--- a/test/functional/journals_controller_test.rb
+++ b/test/functional/journals_controller_test.rb
@@ -31,6 +31,20 @@ def setup
     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 af66f7417d3..b9eac552e52 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 758feaccab22f2e76b2c66279634f442d177d9f8 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:33:51 +0000
Subject: [PATCH 067/240] Merged r3942 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3992 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 541fefada33..fa82218de30 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 1c93f99a55299c2b0f6c61bd5a3c593328e33eb3 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:33:57 +0000
Subject: [PATCH 068/240] Merged r3943 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3993 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 e762c19c81d..cdfef5238a5 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 e92f67b73b7..d390cda2642 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -183,6 +183,7 @@
   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 bc57078b128cf994495dfa35a5df0cbcc875ff19 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:34:02 +0000
Subject: [PATCH 069/240] Merged r3944 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3994 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 f2af58086a7..1115691a158 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 d390cda2642..073e52d2dc9 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -184,6 +184,7 @@
   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 a12a073a6e3090a092f253c662cbea102f0ece43 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:34:08 +0000
Subject: [PATCH 070/240] Merged r3945 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3995 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 00000000000..1438106f608
--- /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 eaa6dbc350a..4981f43ee40 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 @@ def preview
     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 1e3beaf8517..ccb7a55a3d6 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 08cd1005565..910087ab9e3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -104,7 +104,8 @@
   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 073e52d2dc9..aa9fe75d118 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -58,7 +58,8 @@
     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 00000000000..25e75fc4ba0
--- /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 0c1172f602c..948cf85984e 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -1123,20 +1123,6 @@ def test_preview_notes
     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 b9eac552e52..607df5b066a 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 80e833cd88b06f3ee2f05ec9bd376bd9712e5dae Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:34:14 +0000
Subject: [PATCH 071/240] Merged r3946 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3996 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 4981f43ee40..239c23e71af 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -301,21 +301,6 @@ def update_form
     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 00000000000..e1c64465369
--- /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 0c01f80beb0..ec36b145923 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 839286bdbb1..310085d7cc4 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 910087ab9e3..956ce054b91 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -105,6 +105,8 @@
 
   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 948cf85984e..22f528b7b72 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -1107,22 +1107,6 @@ def test_context_menu_multiple_issues_of_different_project
                                              :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 00000000000..63456d1d059
--- /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 607df5b066a..01a96b7aa44 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 d1a9f81fc6d129700e58c3038f717afe73cafc01 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:34:20 +0000
Subject: [PATCH 072/240] Merged r3947 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3997 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 239c23e71af..a0264bc5696 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 b9f23bedb74876552737a2385e450aca11eeff34 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:34:26 +0000
Subject: [PATCH 073/240] Merged r3948 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3998 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 00000000000..02ce1b2a8dd
--- /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 d457f90fcd75ad2518601ff09fbf067648b367f5 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:34:31 +0000
Subject: [PATCH 074/240] Merged r3949 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3999 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 e5909e69b36..725bde788a6 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -258,7 +258,7 @@ def redirect_back_or_default(default)
   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 @@ def render_403
     
   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 @@ def render_error(msg)
     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 @@ def render_error(msg)
       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 00000000000..03d407d2489
--- /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 3e692a908b99e2e1963e8db53f891c9406e2a358 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:34:37 +0000
Subject: [PATCH 075/240] Merged r3950 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4000 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 c8d2dd6193a..288ed724fec 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 047bf692b36943d61fa1cfd84b95f634ea5b3953 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:34:42 +0000
Subject: [PATCH 076/240] Merged r3951 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4001 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 03d407d2489..001bf50d2a5 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 15a1f15702d..dc04fa82d6a 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -86,6 +86,12 @@ def with_settings(options, &block)
     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 ccbc9f8ff963e51f81016e92e1277c224e85dd9d Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Thu, 19 Aug 2010 04:34:48 +0000
Subject: [PATCH 077/240] Merged r3952 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4002 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 60798fedfa5..61782298683 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -30,12 +30,14 @@ def issue_list(issues, &block)
   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 9e5d2100b612cc51576c689100a63187a6ae01e2 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Sun, 22 Aug 2010 19:48:26 +0000
Subject: [PATCH 078/240] Merged r4003 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4015 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 f7f9043c454..411e9e9ff1b 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 bc345dcb563..e7abd4347dc 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 bab1c6a91d3..aec2c8ea06b 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 c82155b8e1c..4c513fef24d 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 4472a19d7c2..f2e0529e33a 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 064cbc28b6c..4812e2adcb6 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 39cc5dcb894..00000000000
--- 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 00000000000..2cc0c0983af
--- /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 f52d9e06373..1bcd3616d15 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 35ebc105335..42f0bc97a56 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 fbc80c935e0..2c3379c7331 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 a43b49e1055..00000000000
--- 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 00000000000..8fd5ceb8351
--- /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 67637334992..2fa58d73c6a 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 bf7fcefb2dd..99749b40c24 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 00000000000..0e231e0291a
--- /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 0e231e0291a..75a768ad020 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 d60cc50d99b4509bb0f7ece323a0913a9cdecf03 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Sun, 22 Aug 2010 19:48:32 +0000
Subject: [PATCH 079/240] Merged r4004 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4016 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 8b2b237044e..320c2091d83 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 1e47d3d6627..913d2f3ab5c 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 de4ad44c52d..9ceb21e83de 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 a9146a611ad..cb4941c29d4 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 118efbb4b46..ad99fec74ec 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 741d3298fd9..350f238c5a5 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 728a6d8e904..442adefef65 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 351f8528ed8..70822de51f2 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 568e1f341ef..5b4b79e8668 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 f2e0529e33a..46c5ca867c3 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 4812e2adcb6..468be454091 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 aac2e43316f..a51cd972ec0 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 2cc0c0983af..bc8a854ad5b 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 1bcd3616d15..0c022ee9f78 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 2c127f3def2..eaf4cc285e5 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 1a590dc0bea..951a546b998 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 86e986f01452ecf3c2bdf8156f2e0d2c8c0dee07 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Sun, 22 Aug 2010 19:48:38 +0000
Subject: [PATCH 080/240] Merged r4005 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4017 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 2daae7cb9dc..0393815b0af 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 7dbc8b4f971c86aaeab83fc0c8c19bc96c308dbf Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Mon, 20 Sep 2010 04:06:58 +0000
Subject: [PATCH 143/240] Merged r4102 from trunk.

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

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index aab2caff8c7..fe0b014c21c 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: Вход
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 56d8c9b2918..eece2528d96 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,3 +1001,4 @@
   enumeration_doc_categories: 文件分類
   enumeration_activities: 活動 (時間追蹤)
   enumeration_system_activity: 系統活動
+

From 8bd0ff03a08a0980cd3e3a203bd6d4196be6bf51 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Mon, 20 Sep 2010 04:07:04 +0000
Subject: [PATCH 144/240] Merged r4103 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4159 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 2ef22c4c6fc..e825630a9b4 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -824,7 +824,7 @@ def has_content?(name)
   # +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 b0b321bd11c311efc228ece74f1a44551201e140 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Mon, 20 Sep 2010 04:07:09 +0000
Subject: [PATCH 145/240] Merged r4104 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4160 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 9b1f2b8a229..5639b66e513 100644
--- a/lib/redmine/export/pdf.rb
+++ b/lib/redmine/export/pdf.rb
@@ -154,7 +154,7 @@ def issues_to_pdf(issues, project, query)
           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 @@ def issue_to_pdf(issue)
         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 1c63c443b6948abd6b6011a2c8b2f8136e6c2331 Mon Sep 17 00:00:00 2001
From: Eric Davis 
Date: Mon, 20 Sep 2010 04:07:16 +0000
Subject: [PATCH 146/240] Merged r4105 from trunk.

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

diff --git a/app/models/issue.rb b/app/models/issue.rb
index af75f530c61..631769fa8f2 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -357,6 +357,11 @@ def closing?
   def overdue?
     !due_date.nil? && (due_date < Date.today) && !status.is_closed?
   end
+
+  # Does this issue have children?
+  def children?
+    !leaf?
+  end
   
   # Users the issue can be assigned to
   def assignable_users
diff --git a/app/views/issues/_action_menu.rhtml b/app/views/issues/_action_menu.rhtml
index c5d17511a42..30c63ec6605 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 f334633e274..ea696648428 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -907,3 +907,8 @@ bg: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 90ec9dea237..74a31a4fe28 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -927,3 +927,8 @@ bs: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/ca.yml b/config/locales/ca.yml index b5c28d98ec0..4c9010d98e4 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -915,4 +915,8 @@ ca: enumeration_doc_categories: Categories del document enumeration_activities: Activitats (seguidor de temps) enumeration_system_activity: Activitat del sistema + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/cs.yml b/config/locales/cs.yml index f2b11460517..4cfc05ce59e 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -913,3 +913,8 @@ cs: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/da.yml b/config/locales/da.yml index 4d30dc6f346..bd3a13c3d07 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -929,3 +929,8 @@ da: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/de.yml b/config/locales/de.yml index 78cc99d4a59..d512a64f3ed 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -932,3 +932,7 @@ de: enumeration_activities: Aktivitäten (Zeiterfassung) enumeration_system_activity: System-Aktivität + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/el.yml b/config/locales/el.yml index e4487c59fe3..fa538886f5b 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -913,3 +913,8 @@ el: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 9b43961a924..219c5104f47 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -917,3 +917,8 @@ en-GB: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/en.yml b/config/locales/en.yml index 26b4ef289fe..d91d8103a47 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -835,6 +835,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 4ffdaf3f680..bad6cc42f4c 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -953,3 +953,8 @@ es: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 236c5bb7d08..983fe1482e6 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -917,3 +917,7 @@ eu: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 9aeee5f6ee8..ea14a5c0dcc 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -938,3 +938,7 @@ fi: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/fr.yml b/config/locales/fr.yml index aac446a0927..9a62181ec2d 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -931,3 +931,8 @@ fr: notice_unable_delete_time_entry: Impossible de supprimer le temps passé. label_overall_spent_time: Temps passé global field_time_entries: Log time + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Modifier la page de Wiki associée: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/gl.yml b/config/locales/gl.yml index db64fabdcbf..81ad5ff9fee 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -929,3 +929,8 @@ gl: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/he.yml b/config/locales/he.yml index 50f31c29428..ed3dfa08127 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -918,3 +918,8 @@ he: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 5727a629ecd..9219ac66041 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -920,3 +920,7 @@ hr: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/hu.yml b/config/locales/hu.yml index c895f4c964a..e099cb9bcf9 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -936,3 +936,7 @@ field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/id.yml b/config/locales/id.yml index 65140c2d0ba..185d4f21d75 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -921,3 +921,7 @@ id: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/it.yml b/config/locales/it.yml index 34a7820d257..be0da6a488b 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -917,3 +917,7 @@ it: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 68c4d24aa2e..7a9ded16a87 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -938,3 +938,5 @@ ja: enumeration_doc_categories: 文書カテゴリ 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 0a5fa44e160..511c8b55eea 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -962,10 +962,15 @@ ko: field_principal: Principal label_my_page_block: My page block notice_failed_to_save_members: "Failed to save member(s): {{errors}}." - text_zoom_out: Zoom out - text_zoom_in: Zoom in - notice_unable_delete_time_entry: Unable to delete time log entry. - label_overall_spent_time: Overall spent time - field_time_entries: Log time - project_module_gantt: Gantt - project_module_calendar: Calendar + text_zoom_out: 더 작게 + text_zoom_in: 더 크게 + notice_unable_delete_time_entry: 시간 기록 항목을 삭제할 수 없습니다. + label_overall_spent_time: 총 소요시간 + field_time_entries: 기록된 시간 + project_module_gantt: Gantt 챠트 + project_module_calendar: 달력 + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 9a3684e910b..ace5c8d0537 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -977,3 +977,8 @@ lt: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 0ec9b4f4f80..fc1c4b6ce21 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -908,3 +908,8 @@ lv: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/mk.yml b/config/locales/mk.yml index c680f900cd7..fb2f78d2963 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -913,3 +913,7 @@ mk: enumeration_activities: Активности (следење на време) enumeration_system_activity: Системска активност + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/mn.yml b/config/locales/mn.yml index 73791bb74e3..8676b223528 100644 --- a/config/locales/mn.yml +++ b/config/locales/mn.yml @@ -914,3 +914,8 @@ mn: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/nl.yml b/config/locales/nl.yml index c55dadb47b4..615dbe4fbd6 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -895,3 +895,8 @@ nl: field_time_entries: Log tijd project_module_gantt: Gantt project_module_calendar: Kalender + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/no.yml b/config/locales/no.yml index b1746fd4195..4b76683fce8 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -904,3 +904,7 @@ field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/pl.yml b/config/locales/pl.yml index d48b3d93514..b977fbd5cde 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -913,24 +913,29 @@ pl: label_board_locked: Zamknięta permission_export_wiki_pages: Eksport stron wiki permission_manage_project_activities: Zarządzanie aktywnościami projektu - setting_cache_formatted_text: Cache formatted text - error_unable_delete_issue_status: Unable to delete issue status - label_profile: Profile - permission_manage_subtasks: Manage subtasks - field_parent_issue: Parent task - label_subtask_plural: Subtasks - label_project_copy_notifications: Send email notifications during the project copy - error_can_not_delete_custom_field: Unable to delete custom field - error_unable_to_connect: Unable to connect ({{value}}) - error_can_not_remove_role: This role is in use and can not be deleted. - error_can_not_delete_tracker: This tracker contains issues and can't be deleted. - field_principal: Principal - label_my_page_block: My page block - notice_failed_to_save_members: "Failed to save member(s): {{errors}}." - text_zoom_out: Zoom out - text_zoom_in: Zoom in - notice_unable_delete_time_entry: Unable to delete time log entry. - label_overall_spent_time: Overall spent time - field_time_entries: Log time - project_module_gantt: Gantt - project_module_calendar: Calendar + setting_cache_formatted_text: Buforuj sformatowany tekst + error_unable_delete_issue_status: Nie można usunąć statusu zagadnienia + label_profile: Profil + permission_manage_subtasks: Zarządzanie podzagadnieniami + field_parent_issue: Zagadnienie nadrzędne + label_subtask_plural: Podzagadnienia + label_project_copy_notifications: Wyślij powiadomienia mailowe przy kopiowaniu projektu + error_can_not_delete_custom_field: Nie można usunąć tego pola + error_unable_to_connect: Nie można połączyć ({{value}}) + error_can_not_remove_role: Ta rola przypisana jest niektórym użytkownikom i nie może zostać usunięta. + error_can_not_delete_tracker: Ten typ przypisany jest do części zagadnień i nie może zostać usunięty. + field_principal: Przełożony + label_my_page_block: Elementy + notice_failed_to_save_members: "Nie można zapisać uczestników: {{errors}}." + text_zoom_out: Zmniejsz czcionkę + text_zoom_in: Powiększ czcionkę + notice_unable_delete_time_entry: Nie można usunąć wpisu z dziennika. + label_overall_spent_time: Przepracowany czas + field_time_entries: Dziennik + project_module_gantt: Diagram Gantta + project_module_calendar: Kalendarz + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index c41e4e0dcd9..64e99d897b2 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -937,3 +937,8 @@ pt-BR: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 3127f4044e9..29b4e4d61cf 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -921,3 +921,8 @@ pt: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/ro.yml b/config/locales/ro.yml index a0458932c42..6796e304826 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -906,3 +906,8 @@ ro: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/ru.yml b/config/locales/ru.yml index fe0b014c21c..6f01a7dc6bc 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1031,3 +1031,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 52c57c79c43..57ef8e3cdd3 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -908,3 +908,8 @@ sk: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 8ee68f15d2e..282804cb946 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -909,3 +909,8 @@ sl: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml index e5df0e42786..8e034580c16 100644 --- a/config/locales/sr-YU.yml +++ b/config/locales/sr-YU.yml @@ -910,6 +910,11 @@ sr-YU: enumeration_activities: Aktivnosti (praćenje vremena) enumeration_system_activity: Sistemska aktivnost - field_time_entries: Log time - project_module_gantt: Gantt - project_module_calendar: Calendar + field_time_entries: Vreme evidencije + project_module_gantt: Gantov dijagram + project_module_calendar: Kalendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 3641c709112..2f7b7bb7b1f 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -910,6 +910,12 @@ sr: enumeration_activities: Активности (праћење времена) enumeration_system_activity: Системска активност - field_time_entries: Log time - project_module_gantt: Gantt - project_module_calendar: Calendar + field_time_entries: Време евиденције + project_module_gantt: Гантов дијаграм + project_module_calendar: Календар + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 657a9adcd6f..13c3c6712eb 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -958,3 +958,8 @@ sv: enumeration_doc_categories: Dokumentkategorier enumeration_activities: Aktiviteter (tidsuppföljning) 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}}" + 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 67bf3c4cc05..466f334629e 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -910,3 +910,8 @@ th: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/tr.yml b/config/locales/tr.yml index e0f23078dc5..94e2fd83bed 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -936,3 +936,8 @@ tr: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/uk.yml b/config/locales/uk.yml index d0191618b6c..2c15108fd20 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -909,3 +909,8 @@ uk: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 66fdbc115d1..0e709be20d3 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -968,3 +968,8 @@ vi: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? + diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index eece2528d96..37d830d3d08 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 6ef01fdffe3..35d5bb81824 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -931,3 +931,7 @@ zh: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendar + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? From d44a90045a4062a8cbd2a1509b721ab23e0b6abe Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Mon, 20 Sep 2010 04:07:21 +0000 Subject: [PATCH 147/240] Merged r4107 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4162 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 4be566e0bc4..04d64df1fc0 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 8b7cc66e14b..41e8bb355bf 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 65b6b7f5a97dee63aae48d28aa38e7c940370006 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 22:32:21 +0000 Subject: [PATCH 148/240] Merged r4164 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4190 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/user.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/models/user.rb b/app/models/user.rb index c5c638f938b..5ae7a56d308 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -352,6 +352,12 @@ def allowed_to?(action, project, options={}) false end end + + # Is the user allowed to do the specified action on any project? + # See allowed_to? for the actions and valid options. + def allowed_to_globally?(action, options) + allowed_to?(action, nil, options.reverse_merge(:global => true)) + end def self.current=(user) @current_user = user From c51f9b8907f904cad4161f9e1aaf89462ed39d58 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 22:32:26 +0000 Subject: [PATCH 149/240] Merged r4165 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4191 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/issues/_form.rhtml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml index 0b1a0749994..136e1decc5a 100644 --- a/app/views/issues/_form.rhtml +++ b/app/views/issues/_form.rhtml @@ -1,3 +1,5 @@ +<%= call_hook(:view_issues_form_details_top, { :issue => @issue, :form => f }) %> +
    >

    <%= f.select :tracker_id, @project.trackers.collect {|t| [t.name, t.id]}, :required => true %>

    <%= observe_field :issue_tracker_id, :url => { :action => :new, :project_id => @project, :id => @issue }, From 47b969de00e3d221d01e5a1e0f4910743802ee72 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 22:32:32 +0000 Subject: [PATCH 150/240] Merged r4166 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4192 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/issues_helper.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 61782298683..2e175f87692 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -28,7 +28,16 @@ def issue_list(issues, &block) ancestors << issue unless issue.leaf? end end - + + # Renders a HTML/CSS tooltip + # + # To use, a trigger div is needed. This is a div with the class of "tooltip" + # that contains this method wrapped in a span with the class of "tip" + # + #
    <%= link_to_issue(issue) %> + # <%= render_issue_tooltip(issue) %> + #
    + # def render_issue_tooltip(issue) @cached_label_status ||= l(:field_status) @cached_label_start_date ||= l(:field_start_date) From 945cd3933e37c0d1dac861503799f68d542d9bd1 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 22:32:38 +0000 Subject: [PATCH 151/240] Merged r4167 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4193 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/mailer.rb | 5 +++++ lib/tasks/reminder.rake | 4 +++- test/unit/mailer_test.rb | 10 ++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 8f50b1b7b57..6db5a997bbf 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -15,6 +15,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +require 'ar_condition' + class Mailer < ActionMailer::Base layout 'mailer' helper :application @@ -306,13 +308,16 @@ def deliver!(mail = @mail) # * :days => how many days in the future to remind about (defaults to 7) # * :tracker => id of tracker for filtering issues (defaults to all trackers) # * :project => id or identifier of project to process (defaults to all projects) + # * :users => array of user ids who should be reminded def self.reminders(options={}) days = options[:days] || 7 project = options[:project] ? Project.find(options[:project]) : nil tracker = options[:tracker] ? Tracker.find(options[:tracker]) : nil + user_ids = options[:users] s = ARCondition.new ["#{IssueStatus.table_name}.is_closed = ? AND #{Issue.table_name}.due_date <= ?", false, days.day.from_now.to_date] s << "#{Issue.table_name}.assigned_to_id IS NOT NULL" + s << ["#{Issue.table_name}.assigned_to_id IN (?)", user_ids] if user_ids.present? s << "#{Project.table_name}.status = #{Project::STATUS_ACTIVE}" s << "#{Issue.table_name}.project_id = #{project.id}" if project s << "#{Issue.table_name}.tracker_id = #{tracker.id}" if tracker diff --git a/lib/tasks/reminder.rake b/lib/tasks/reminder.rake index 73844fb799a..d11c7cebbdc 100644 --- a/lib/tasks/reminder.rake +++ b/lib/tasks/reminder.rake @@ -22,9 +22,10 @@ Available options: * days => number of days to remind about (defaults to 7) * tracker => id of tracker (defaults to all trackers) * project => id or identifier of project (defaults to all projects) + * users => comma separated list of user ids who should be reminded Example: - rake redmine:send_reminders days=7 RAILS_ENV="production" + rake redmine:send_reminders days=7 users="1,23, 56" RAILS_ENV="production" END_DESC namespace :redmine do @@ -33,6 +34,7 @@ namespace :redmine do options[:days] = ENV['days'].to_i if ENV['days'] options[:project] = ENV['project'] if ENV['project'] options[:tracker] = ENV['tracker'].to_i if ENV['tracker'] + options[:users] = (ENV['users'] || '').split(',').each(&:strip!) Mailer.reminders(options) end diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb index a5932d325c6..77bcb36f654 100644 --- a/test/unit/mailer_test.rb +++ b/test/unit/mailer_test.rb @@ -355,6 +355,16 @@ def test_reminders assert_equal '1 issue(s) due in the next 42 days', mail.subject end + def test_reminders_for_users + Mailer.reminders(:days => 42, :users => ['5']) + assert_equal 0, ActionMailer::Base.deliveries.size # No mail for dlopper + Mailer.reminders(:days => 42, :users => ['3']) + assert_equal 1, ActionMailer::Base.deliveries.size # No mail for dlopper + mail = ActionMailer::Base.deliveries.last + assert mail.bcc.include?('dlopper@somenet.foo') + assert mail.body.include?('Bug #3: Error 281 when updating a recipe') + end + def last_email mail = ActionMailer::Base.deliveries.last assert_not_nil mail From 7d55572bd125c38cb8223faef00a8aa06a538e56 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 22:32:44 +0000 Subject: [PATCH 152/240] Merged r4169 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4194 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- 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 | 3 +++ 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 | 2 +- config/locales/hr.yml | 1 + config/locales/hu.yml | 1 + config/locales/id.yml | 1 + config/locales/it.yml | 1 + config/locales/ja.yml | 5 +++-- config/locales/ko.yml | 2 +- config/locales/lt.yml | 2 +- config/locales/lv.yml | 2 +- config/locales/mk.yml | 1 + config/locales/mn.yml | 2 +- config/locales/nl.yml | 2 +- config/locales/no.yml | 1 + 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 | 1 + config/locales/sk.yml | 2 +- config/locales/sl.yml | 2 +- config/locales/sr-YU.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 | 4 ++-- config/locales/zh.yml | 1 + 43 files changed, 48 insertions(+), 23 deletions(-) diff --git a/config/locales/bg.yml b/config/locales/bg.yml index ea696648428..a9b480e71c5 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -911,4 +911,5 @@ bg: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? + field_text: Text field diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 74a31a4fe28..25eb94b8227 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -931,4 +931,5 @@ bs: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? + field_text: Text field diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 4c9010d98e4..a418038e9bb 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -919,4 +919,5 @@ ca: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? + field_text: Text field diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 4cfc05ce59e..63417365059 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -917,4 +917,5 @@ cs: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? + field_text: Text field diff --git a/config/locales/da.yml b/config/locales/da.yml index bd3a13c3d07..f7d27a3690e 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -933,4 +933,5 @@ da: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? + field_text: Text field diff --git a/config/locales/de.yml b/config/locales/de.yml index d512a64f3ed..806fa81fe58 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -935,4 +935,5 @@ 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? + field_text: Text field diff --git a/config/locales/el.yml b/config/locales/el.yml index fa538886f5b..396f925fb57 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -917,4 +917,5 @@ el: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? + field_text: Text field diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 219c5104f47..808673e302f 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -921,4 +921,5 @@ en-GB: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? + field_text: Text field diff --git a/config/locales/en.yml b/config/locales/en.yml index d91d8103a47..c1befee4e1c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -293,6 +293,9 @@ en: field_group_by: Group results by field_sharing: Sharing field_parent_issue: Parent task + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role + field_text: Text field setting_app_title: Application title setting_app_subtitle: Application subtitle diff --git a/config/locales/es.yml b/config/locales/es.yml index bad6cc42f4c..e837c868d66 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -957,4 +957,5 @@ es: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? + field_text: Text field diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 983fe1482e6..69c405ce206 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -921,3 +921,4 @@ eu: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? + field_text: Text field diff --git a/config/locales/fi.yml b/config/locales/fi.yml index ea14a5c0dcc..376ebdf03e9 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -942,3 +942,4 @@ fi: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? + field_text: Text field diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 9a62181ec2d..087c8339166 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -935,4 +935,5 @@ fr: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Modifier la page de Wiki associée: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? + field_text: Text field diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 81ad5ff9fee..7d5f292571b 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -933,4 +933,5 @@ gl: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? + field_text: Text field diff --git a/config/locales/he.yml b/config/locales/he.yml index ed3dfa08127..a51da345e86 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -922,4 +922,4 @@ he: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? - + field_text: Text field diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 9219ac66041..c31a4bf36d1 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -924,3 +924,4 @@ hr: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? + field_text: Text field diff --git a/config/locales/hu.yml b/config/locales/hu.yml index e099cb9bcf9..ef712b62570 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -940,3 +940,4 @@ field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? + field_text: Text field diff --git a/config/locales/id.yml b/config/locales/id.yml index 185d4f21d75..1c6e1c2d2a6 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -925,3 +925,4 @@ id: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? + field_text: Text field diff --git a/config/locales/it.yml b/config/locales/it.yml index be0da6a488b..cdf12cd9efd 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -921,3 +921,4 @@ it: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? + field_text: Text field diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 7a9ded16a87..a305ce77f97 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -810,6 +810,7 @@ ja: button_create_and_continue: 連続作成 button_test: テスト button_edit: 編集 + button_edit_associated_wikipage: "関連するWikiページを編集: {{page_title}}" button_add: 追加 button_change: 変更 button_apply: 適用 @@ -861,6 +862,7 @@ ja: text_subprojects_destroy_warning: "サブプロジェクト {{value}} も削除されます。" text_workflow_edit: ワークフローを編集するロールとトラッカーを選んでください text_are_you_sure: よろしいですか？ + text_are_you_sure_with_children: チケットとその子チケット全てを削除しますか? text_journal_changed: "{{label}} を {{old}} から {{new}} に変更" text_journal_set_to: "{{label}} を {{value}} にセット" text_journal_deleted: "{{label}} を削除 ({{old}})" @@ -938,5 +940,4 @@ ja: enumeration_doc_categories: 文書カテゴリ 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? + field_text: Text field diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 511c8b55eea..4534893a979 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -973,4 +973,4 @@ ko: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? - + field_text: Text field diff --git a/config/locales/lt.yml b/config/locales/lt.yml index ace5c8d0537..fcaf1e161c4 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -981,4 +981,4 @@ lt: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? - + field_text: Text field diff --git a/config/locales/lv.yml b/config/locales/lv.yml index fc1c4b6ce21..15e3a5e5af7 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -912,4 +912,4 @@ lv: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? - + field_text: Text field diff --git a/config/locales/mk.yml b/config/locales/mk.yml index fb2f78d2963..ae02f401296 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -917,3 +917,4 @@ mk: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? + field_text: Text field diff --git a/config/locales/mn.yml b/config/locales/mn.yml index 8676b223528..cf5f2b63dee 100644 --- a/config/locales/mn.yml +++ b/config/locales/mn.yml @@ -918,4 +918,4 @@ mn: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? - + field_text: Text field diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 615dbe4fbd6..c38e37d92bb 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -899,4 +899,4 @@ nl: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? - + field_text: Text field diff --git a/config/locales/no.yml b/config/locales/no.yml index 4b76683fce8..6fc5abeac39 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -908,3 +908,4 @@ field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? + field_text: Text field diff --git a/config/locales/pl.yml b/config/locales/pl.yml index b977fbd5cde..fe2bde0d718 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -938,4 +938,4 @@ pl: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? - + field_text: Text field diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 64e99d897b2..6f51354037d 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -941,4 +941,4 @@ pt-BR: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? - + field_text: Text field diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 29b4e4d61cf..4646e28cec7 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -925,4 +925,4 @@ pt: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? - + field_text: Text field diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 6796e304826..f9285e5f3e5 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -910,4 +910,4 @@ ro: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? - + field_text: Text field diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 6f01a7dc6bc..8be88534aba 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -369,6 +369,7 @@ ru: field_subject: Тема field_subproject: Подпроект field_summary: Сводка + field_text: Текстовое поле field_time_entries: Затраченное время field_time_zone: Часовой пояс field_title: Название diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 57ef8e3cdd3..d1c9109d7e3 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -912,4 +912,4 @@ sk: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? - + field_text: Text field diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 282804cb946..48616ec4003 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -913,4 +913,4 @@ sl: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? - + field_text: Text field diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml index 8e034580c16..f7b2d54293a 100644 --- a/config/locales/sr-YU.yml +++ b/config/locales/sr-YU.yml @@ -917,4 +917,4 @@ sr-YU: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? - + field_text: Text field diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 2f7b7bb7b1f..c98e5c1245d 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -918,4 +918,4 @@ sr: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? - + field_text: Text field diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 13c3c6712eb..1bc1c78b090 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -962,4 +962,4 @@ sv: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? - + field_text: Text field diff --git a/config/locales/th.yml b/config/locales/th.yml index 466f334629e..9c8029cade0 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -914,4 +914,4 @@ th: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? - + field_text: Text field diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 94e2fd83bed..e9904fdfeda 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -940,4 +940,4 @@ tr: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? - + field_text: Text field diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 2c15108fd20..ae5acabc180 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -913,4 +913,4 @@ uk: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? - + field_text: Text field diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 0e709be20d3..a024173639e 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -972,4 +972,4 @@ vi: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? - + field_text: Text field diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 37d830d3d08..039bdfc7eb7 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -924,6 +924,7 @@ text_subprojects_destroy_warning: "下列子專案： {{value}} 將一併被刪除。" text_workflow_edit: 選擇角色與追蹤標籤以設定其工作流程 text_are_you_sure: 確定執行？ + text_are_you_sure_with_children: "確定刪除此工作項目及其子項目？" text_journal_changed: "{{label}} 從 {{old}} 變更為 {{new}}" text_journal_set_to: "{{label}} 設定為 {{value}}" text_journal_deleted: "{{label}} 已刪除 ({{old}})" @@ -1001,5 +1002,4 @@ enumeration_doc_categories: 文件分類 enumeration_activities: 活動 (時間追蹤) enumeration_system_activity: 系統活動 - - text_are_you_sure_with_children: Delete issue and all child issues? + field_text: Text field diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 35d5bb81824..76bd9d98892 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -935,3 +935,4 @@ zh: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? + field_text: Text field From 5e7e11440c26310b30c6106c3375547f383863cf Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 22:32:50 +0000 Subject: [PATCH 153/240] Merged r4171 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4195 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/ru.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 8be88534aba..a16a7cb88d7 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -898,7 +898,8 @@ ru: status_active: активен status_locked: заблокирован status_registered: зарегистрирован - + + text_are_you_sure_with_children: Удалить задачу и все ее подзадачи? text_are_you_sure: Подтвердите text_assign_time_entries_to_project: Прикрепить зарегистрированное время к проекту text_caracters_maximum: "Максимум {{count}} символов(а)." @@ -1032,4 +1033,3 @@ ru: notice_unable_delete_time_entry: Невозможно удалить запись журнала. label_overall_spent_time: Всего затрачено времени - text_are_you_sure_with_children: Delete issue and all child issues? From 3909d2c8ba5181b506e5b7b14374a9dc632faf31 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 22:32:55 +0000 Subject: [PATCH 154/240] Merged r4173 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4196 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/cs.yml | 2 +- config/locales/ja.yml | 4 +++- config/locales/zh-TW.yml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 63417365059..f17a839e43b 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -394,7 +394,7 @@ cs: label_attachment_delete: Odstranit soubor label_attachment_plural: Soubory label_file_added: Soubor přidán - label_report: Přeheled + label_report: Přehled label_report_plural: Přehledy label_news: Novinky label_news_new: Přidat novinku diff --git a/config/locales/ja.yml b/config/locales/ja.yml index a305ce77f97..dcc8fc59b2f 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -319,6 +319,9 @@ ja: field_group_by: グループ条件 field_sharing: 共有 field_parent_issue: 親チケット + field_member_of_group: 担当者のグループ + field_assigned_to_role: 担当者のロール + field_text: テキスト setting_app_title: アプリケーションのタイトル setting_app_subtitle: アプリケーションのサブタイトル @@ -940,4 +943,3 @@ ja: enumeration_doc_categories: 文書カテゴリ enumeration_activities: 作業分類 (時間トラッキング) enumeration_system_activity: システム作業分類 - field_text: Text field diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 039bdfc7eb7..9dc635724e1 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -381,6 +381,7 @@ field_parent_issue: 父工作項目 field_member_of_group: 所屬群組 field_assigned_to_role: 所屬角色 + field_text: 內容文字 setting_app_title: 標題 setting_app_subtitle: 副標題 @@ -1002,4 +1003,4 @@ enumeration_doc_categories: 文件分類 enumeration_activities: 活動 (時間追蹤) enumeration_system_activity: 系統活動 - field_text: Text field + From ef90132cf3635544ff33a3f13d294b6a7f071918 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 22:33:01 +0000 Subject: [PATCH 155/240] Merged r4175 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4197 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/cs.yml | 341 +++++++++++++++++++++--------------------- 1 file changed, 170 insertions(+), 171 deletions(-) diff --git a/config/locales/cs.yml b/config/locales/cs.yml index f17a839e43b..edb0fdc18e8 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -24,8 +24,8 @@ cs: time: "%H:%M" short: "%d %b %H:%M" long: "%B %d, %Y %H:%M" - am: "am" - pm: "pm" + am: "dop." + pm: "odp." datetime: distance_in_words: @@ -61,8 +61,8 @@ cs: one: "více než 1 rok" other: "více než {{count}} roky" almost_x_years: - one: "almost 1 year" - other: "almost {{count}} years" + one: "témeř 1 rok" + other: "téměř {{count}} roky" number: format: @@ -116,7 +116,7 @@ cs: greater_than_start_date: "musí být větší než počáteční datum" not_same_project: "nepatří stejnému projektu" circular_dependency: "Tento vztah by vytvořil cyklickou závislost" - cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks" + cant_link_an_issue_with_a_descendant: "Úkol nemůže být spojen s jedním z jeho dílčích úkolů" # Updated by Josef Liška # CZ translation by Maxim Krušina | Massimo Filippi, s.r.o. | maxim@mxm.cz @@ -150,19 +150,19 @@ cs: notice_successful_connection: Úspěšné připojení. notice_file_not_found: Stránka na kterou se snažíte zobrazit neexistuje nebo byla smazána. notice_locking_conflict: Údaje byly změněny jiným uživatelem. - notice_scm_error: Entry and/or revision doesn't exist in the repository. + notice_scm_error: Záznam a/nebo revize neexistuje v repozitáři. notice_not_authorized: Nemáte dostatečná práva pro zobrazení této stránky. notice_email_sent: "Na adresu {{value}} byl odeslán email" notice_email_error: "Při odesílání emailu nastala chyba ({{value}})" notice_feeds_access_key_reseted: Váš klíč pro přístup k RSS byl resetován. - notice_failed_to_save_issues: "Failed to save {{count}} issue(s) on {{total}} selected: {{ids}}." + notice_failed_to_save_issues: "Chyba při uložení {{count}} úkolu(ů) z {{total}} vybraných: {{ids}}." notice_no_issue_selected: "Nebyl zvolen žádný úkol. Prosím, zvolte úkoly, které chcete editovat" notice_account_pending: "Váš účet byl vytvořen, nyní čeká na schválení administrátorem." notice_default_data_loaded: Výchozí konfigurace úspěšně nahrána. error_can_t_load_default_data: "Výchozí konfigurace nebyla nahrána: {{value}}" - error_scm_not_found: "Položka a/nebo revize neexistují v repository." - error_scm_command_failed: "Při pokusu o přístup k repository došlo k chybě: {{value}}" + error_scm_not_found: "Položka a/nebo revize neexistují v repozitáři." + error_scm_command_failed: "Při pokusu o přístup k repozitáři došlo k chybě: {{value}}" error_issue_not_found_in_project: 'Úkol nebyl nalezen nebo nepatří k tomuto projektu' mail_subject_lost_password: "Vaše heslo ({{value}})" @@ -210,10 +210,10 @@ cs: field_due_date: Uzavřít do field_assigned_to: Přiřazeno field_priority: Priorita - field_fixed_version: Přiřazeno k verzi + field_fixed_version: Cílová verze field_user: Uživatel field_role: Role - field_homepage: Homepage + field_homepage: Domovská stránka field_is_public: Veřejný field_parent: Nadřazený projekt field_is_in_roadmap: Úkoly zobrazené v plánu @@ -265,18 +265,18 @@ cs: setting_app_subtitle: Podtitulek aplikace setting_welcome_text: Uvítací text setting_default_language: Výchozí jazyk - setting_login_required: Auten. vyžadována + setting_login_required: Autentifikace vyžadována setting_self_registration: Povolena automatická registrace setting_attachment_max_size: Maximální velikost přílohy setting_issues_export_limit: Limit pro export úkolů setting_mail_from: Odesílat emaily z adresy setting_bcc_recipients: Příjemci skryté kopie (bcc) - setting_host_name: Host name + setting_host_name: Jméno serveru setting_text_formatting: Formátování textu - setting_wiki_compression: Komperese historie Wiki - setting_feeds_limit: Feed content limit + setting_wiki_compression: Komprese historie Wiki + setting_feeds_limit: Limit obsahu příspěvků setting_default_projects_public: Nové projekty nastavovat jako veřejné - setting_autofetch_changesets: Autofetch commits + setting_autofetch_changesets: Automaticky stahovat commity setting_sys_api_enabled: Povolit WS pro správu repozitory setting_commit_ref_keywords: Klíčová slova pro odkazy setting_commit_fix_keywords: Klíčová slova pro uzavření @@ -290,8 +290,8 @@ cs: setting_protocol: Protokol setting_per_page_options: Povolené počty řádků na stránce setting_user_format: Formát zobrazení uživatele - setting_activity_days_default: Days displayed on project activity - setting_display_subprojects_issues: Display subprojects issues on main projects by default + setting_activity_days_default: Dny zobrazené v činnosti projektu + setting_display_subprojects_issues: Automaticky zobrazit úkoly podprojektu v hlavním projektu project_module_issue_tracking: Sledování úkolů project_module_time_tracking: Sledování času @@ -299,7 +299,7 @@ cs: project_module_documents: Dokumenty project_module_files: Soubory project_module_wiki: Wiki - project_module_repository: Repository + project_module_repository: Repozitář project_module_boards: Diskuse label_user: Uživatel @@ -309,16 +309,16 @@ cs: label_project_new: Nový projekt label_project_plural: Projekty label_x_projects: - zero: no projects - one: 1 project - other: "{{count}} projects" + zero: žádné projekty + one: 1 projekt + other: "{{count}} projekty(ů)" label_project_all: Všechny projekty label_project_latest: Poslední projekty label_issue: Úkol label_issue_new: Nový úkol label_issue_plural: Úkoly label_issue_view_all: Všechny úkoly - label_issues_by: "Úkoly od uživatele {{value}}" + label_issues_by: "Úkoly podle {{value}}" label_issue_added: Úkol přidán label_issue_updated: Úkol aktualizován label_document: Dokument @@ -335,7 +335,7 @@ cs: label_tracker: Fronta label_tracker_plural: Fronty label_tracker_new: Nová fronta - label_workflow: Workflow + label_workflow: Průběh práce label_issue_status: Stav úkolu label_issue_status_plural: Stavy úkolů label_issue_status_new: Nový stav @@ -378,14 +378,14 @@ cs: label_list: Seznam label_date: Datum label_integer: Celé číslo - label_float: Desetiné číslo + label_float: Desetinné číslo label_boolean: Ano/Ne label_string: Text label_text: Dlouhý text label_attribute: Atribut label_attribute_plural: Atributy - label_download: "{{count}} Download" - label_download_plural: "{{count}} Downloads" + label_download: "{{count}} stažení" + label_download_plural: "{{count}} stažení" label_no_data: Žádné položky label_change_status: Změnit stav label_history: Historie @@ -416,17 +416,17 @@ cs: label_closed_issues: uzavřený label_closed_issues_plural: uzavřené label_x_open_issues_abbr_on_total: - zero: 0 open / {{total}} - one: 1 open / {{total}} - other: "{{count}} open / {{total}}" + zero: 0 otevřených / {{total}} + one: 1 otevřený / {{total}} + other: "{{count}} otevřených / {{total}}" label_x_open_issues_abbr: - zero: 0 open - one: 1 open - other: "{{count}} open" + zero: 0 otevřených + one: 1 otevřený + other: "{{count}} otevřených" label_x_closed_issues_abbr: - zero: 0 closed - one: 1 closed - other: "{{count}} closed" + zero: 0 uzavřených + one: 1 uzavřený + other: "{{count}} uzavřených" label_total: Celkem label_permissions: Práva label_current_status: Aktuální stav @@ -450,9 +450,9 @@ cs: label_comment: Komentář label_comment_plural: Komentáře label_x_comments: - zero: no comments - one: 1 comment - other: "{{count}} comments" + zero: žádné komentáře + one: 1 komentář + other: "{{count}} komentářů" label_comment_add: Přidat komentáře label_comment_added: Komentář přidán label_comment_delete: Odstranit komentář @@ -482,8 +482,8 @@ cs: label_contains: obsahuje label_not_contains: neobsahuje label_day_plural: dny - label_repository: Repository - label_repository_plural: Repository + label_repository: Repozitář + label_repository_plural: Repozitáře label_browse: Procházet label_modification: "{{count}} změna" label_modification_plural: "{{count}} změn" @@ -532,7 +532,7 @@ cs: label_diff_inline: uvnitř label_diff_side_by_side: vedle sebe label_options: Nastavení - label_copy_workflow_from: Kopírovat workflow z + label_copy_workflow_from: Kopírovat průběh práce z label_permissions_report: Přehled práv label_watched_issues: Sledované úkoly label_related_issues: Související úkoly @@ -553,7 +553,7 @@ cs: label_stay_logged_in: Zůstat přihlášený label_disabled: zakázán label_show_completed_versions: Ukázat dokončené verze - label_me: mě + label_me: já label_board: Fórum label_board_new: Nové fórum label_board_plural: Fóra @@ -576,12 +576,12 @@ cs: label_module_plural: Moduly label_added_time_by: "Přidáno uživatelem {{author}} před {{age}}" label_updated_time: "Aktualizováno před {{value}}" - label_jump_to_a_project: Zvolit projekt... + label_jump_to_a_project: Vyberte projekt... label_file_plural: Soubory label_changeset_plural: Changesety label_default_columns: Výchozí sloupce label_no_change_option: (beze změny) - label_bulk_edit_selected_issues: Bulk edit selected issues + label_bulk_edit_selected_issues: Hromadná úprava vybraných úkolů label_theme: Téma label_default: Výchozí label_search_titles_only: Vyhledávat pouze v názvech @@ -600,7 +600,7 @@ cs: label_scm: SCM label_plugins: Doplňky label_ldap_authentication: Autentifikace LDAP - label_downloads_abbr: D/L + label_downloads_abbr: Staž. label_optional_description: Volitelný popis label_add_another_file: Přidat další soubor label_preferences: Nastavení @@ -653,7 +653,7 @@ cs: text_regexp_info: např. ^[A-Z0-9]+$ text_min_max_length_info: 0 znamená bez limitu text_project_destroy_confirmation: Jste si jisti, že chcete odstranit tento projekt a všechna související data ? - text_workflow_edit: Vyberte roli a frontu k editaci workflow + text_workflow_edit: Vyberte roli a frontu k editaci průběhu práce text_are_you_sure: Jste si jisti? text_tip_task_begin_day: úkol začíná v tento den text_tip_task_end_day: úkol končí v tento den @@ -662,24 +662,24 @@ cs: text_caracters_maximum: "{{count}} znaků maximálně." text_caracters_minimum: "Musí být alespoň {{count}} znaků dlouhé." text_length_between: "Délka mezi {{min}} a {{max}} znaky." - text_tracker_no_workflow: Pro tuto frontu není definován žádný workflow + text_tracker_no_workflow: Pro tuto frontu není definován žádný průběh práce text_unallowed_characters: Nepovolené znaky text_comma_separated: Povoleno více hodnot (oddělěné čárkou). - text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages + text_issues_ref_in_commit_messages: Odkazování a opravování úkolů ve zprávách commitů text_issue_added: "Úkol {{id}} byl vytvořen uživatelem {{author}}." text_issue_updated: "Úkol {{id}} byl aktualizován uživatelem {{author}}." - text_wiki_destroy_confirmation: Opravdu si přejete odstranit tuto WIKI a celý její obsah? + text_wiki_destroy_confirmation: Opravdu si přejete odstranit tuto Wiki a celý její obsah? text_issue_category_destroy_question: "Některé úkoly ({{count}}) jsou přiřazeny k této kategorii. Co s nimi chtete udělat?" text_issue_category_destroy_assignments: Zrušit přiřazení ke kategorii text_issue_category_reassign_to: Přiřadit úkoly do této kategorie text_user_mail_option: "U projektů, které nebyly vybrány, budete dostávat oznámení pouze o vašich či o sledovaných položkách (např. o položkách jejichž jste autor nebo ke kterým jste přiřazen(a))." - text_no_configuration_data: "Role, fronty, stavy úkolů ani workflow nebyly zatím nakonfigurovány.\nVelice doporučujeme nahrát výchozí konfiguraci.Po té si můžete vše upravit" + text_no_configuration_data: "Role, fronty, stavy úkolů ani průběh práce nebyly zatím nakonfigurovány.\nVelice doporučujeme nahrát výchozí konfiguraci. Po té si můžete vše upravit" text_load_default_configuration: Nahrát výchozí konfiguraci text_status_changed_by_changeset: "Použito v changesetu {{value}}." text_issues_destroy_confirmation: 'Opravdu si přejete odstranit všechny zvolené úkoly?' text_select_project_modules: 'Aktivní moduly v tomto projektu:' text_default_administrator_account_changed: Výchozí nastavení administrátorského účtu změněno - text_file_repository_writable: Povolen zápis do repository + text_file_repository_writable: Povolen zápis do adresáře ukládání souborů text_rmagick_available: RMagick k dispozici (volitelné) text_destroy_time_entries_question: "U úkolů, které chcete odstranit je evidováno {{hours}} práce. Co chete udělat?" text_destroy_time_entries: Odstranit evidované hodiny. @@ -693,7 +693,7 @@ cs: default_tracker_feature: Požadavek default_tracker_support: Podpora default_issue_status_new: Nový - default_issue_status_in_progress: In Progress + default_issue_status_in_progress: Ve vývoji default_issue_status_resolved: Vyřešený default_issue_status_feedback: Čeká se default_issue_status_closed: Uzavřený @@ -705,7 +705,7 @@ cs: default_priority_high: Vysoká default_priority_urgent: Urgentní default_priority_immediate: Okamžitá - default_activity_design: Design + default_activity_design: Návhr default_activity_development: Vývoj enumeration_issue_priorities: Priority úkolů @@ -718,8 +718,8 @@ cs: mail_body_reminder: "{{count}} úkol(ů), které máte přiřazeny má termín během několik dní ({{days}}):" mail_subject_reminder: "{{count}} úkol(ů) má termín během několik dní ({{days}})" text_user_wrote: "{{value}} napsal:" - label_duplicated_by: duplicated by - setting_enabled_scm: Povoleno SCM + label_duplicated_by: duplikováno od + setting_enabled_scm: Povolené SCM text_enumeration_category_reassign_to: 'Přeřadit je do této:' text_enumeration_destroy_question: "Několik ({{count}}) objektů je přiřazeno k této hodnotě." label_incoming_emails: Příchozí e-maily @@ -745,22 +745,22 @@ cs: permission_view_changesets: Zobrazování sady změn permission_view_time_entries: Zobrazení stráveného času permission_manage_versions: Spravování verzí - permission_manage_wiki: Spravování wiki + permission_manage_wiki: Spravování Wiki permission_manage_categories: Spravování kategorií úkolů - permission_protect_wiki_pages: Zabezpečení wiki stránek + permission_protect_wiki_pages: Zabezpečení Wiki stránek permission_comment_news: Komentování novinek permission_delete_messages: Mazání zpráv permission_select_project_modules: Výběr modulů projektu permission_manage_documents: Správa dokumentů - permission_edit_wiki_pages: Upravování stránek wiki + permission_edit_wiki_pages: Upravování stránek Wiki permission_add_issue_watchers: Přidání sledujících uživatelů permission_view_gantt: Zobrazené Ganttova diagramu permission_move_issues: Přesouvání úkolů permission_manage_issue_relations: Spravování vztahů mezi úkoly - permission_delete_wiki_pages: Mazání stránek na wiki + permission_delete_wiki_pages: Mazání stránek na Wiki permission_manage_boards: Správa diskusních fór permission_delete_wiki_pages_attachments: Mazání příloh - permission_view_wiki_edits: Prohlížení historie wiki + permission_view_wiki_edits: Prohlížení historie Wiki permission_add_messages: Posílání zpráv permission_view_messages: Prohlížení zpráv permission_manage_files: Spravování souborů @@ -772,26 +772,26 @@ cs: permission_delete_issues: Mazání úkolů permission_view_issue_watchers: Zobrazení seznamu sledujícíh uživatelů permission_manage_repository: Spravování repozitáře - permission_commit_access: Commit access + permission_commit_access: Commit přístup permission_browse_repository: Procházení repozitáře permission_view_documents: Prohlížení dokumentů permission_edit_project: Úprava projektů permission_add_issue_notes: Přidávání poznámek permission_save_queries: Ukládání dotazů - permission_view_wiki_pages: Prohlížení wiki - permission_rename_wiki_pages: Přejmenovávání wiki stránek + permission_view_wiki_pages: Prohlížení Wiki + permission_rename_wiki_pages: Přejmenovávání Wiki stránek permission_edit_time_entries: Upravování záznamů o stráveném času permission_edit_own_issue_notes: Upravování vlastních poznámek setting_gravatar_enabled: Použít uživatelské ikony Gravatar label_example: Příklad - text_repository_usernames_mapping: "Vybrat nebo upravit mapování mezi Redmine uživateli a uživatelskými jmény nalezenými v logu repozitáře.\nUživatelé se shodným Redmine uživateslkým jménem a uživatelským jménem v repozitáři jsou mapovaní automaticky." + text_repository_usernames_mapping: "Vybrat nebo upravit mapování mezi Redmine uživateli a uživatelskými jmény nalezenými v logu repozitáře.\nUživatelé se shodným Redmine uživatelským jménem a uživatelským jménem v repozitáři jsou mapovaní automaticky." permission_edit_own_messages: Upravit vlastní zprávy permission_delete_own_messages: Smazat vlastní zprávy label_user_activity: "Aktivita uživatele: {{value}}" label_updated_time_by: "Akutualizováno: {{author}} před: {{age}}" text_diff_truncated: '... Rozdílový soubor je zkrácen, protože jeho délka přesahuje max. limit.' setting_diff_max_lines_displayed: Maximální počet zobrazenách řádků rozdílů - text_plugin_assets_writable: Plugin assets directory writable + text_plugin_assets_writable: Možnost zápisu do adresáře plugin assets warning_attachments_not_saved: "{{count}} soubor(ů) nebylo možné uložit." button_create_and_continue: Vytvořit a pokračovat text_custom_field_possible_values_info: 'Každá hodnota na novém řádku' @@ -810,112 +810,111 @@ cs: label_date_from_to: Od {{start}} do {{end}} label_greater_or_equal: ">=" label_less_or_equal: <= - text_wiki_page_destroy_question: This page has {{descendants}} child page(s) and descendant(s). What do you want to do? - text_wiki_page_reassign_children: Reassign child pages to this parent page - text_wiki_page_nullify_children: Keep child pages as root pages - text_wiki_page_destroy_children: Delete child pages and all their descendants - setting_password_min_length: Minimum password length - field_group_by: Group results by - mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated" - label_wiki_content_added: Wiki page added - mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" - mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}. - label_wiki_content_updated: Wiki page updated - mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}. - permission_add_project: Create project - setting_new_project_user_role_id: Role given to a non-admin user who creates a project - label_view_all_revisions: View all revisions + text_wiki_page_destroy_question: Tato stránka má {{descendants}} podstránek a potomků. Co chcete udělat? + text_wiki_page_reassign_children: Přiřadit podstránky k tomuto rodiči + text_wiki_page_nullify_children: Ponechat podstránky jako kořenové stránky + text_wiki_page_destroy_children: Smazat podstránky a všechny jejich potomky + setting_password_min_length: Minimální délka hesla + field_group_by: Seskupovat výsledky podle + mail_subject_wiki_content_updated: "'{{page}}' Wiki stránka byla aktualizována" + label_wiki_content_added: Wiki stránka přidána + mail_subject_wiki_content_added: "'{{page}}' Wiki stránka byla přidána" + mail_body_wiki_content_added: "'{{page}}' Wiki stránka byla přidána od {{author}}." + label_wiki_content_updated: Wiki stránka aktualizována + mail_body_wiki_content_updated: "'{{page}}' Wiki stránka byla aktualizována od {{author}}." + permission_add_project: Vytvořit projekt + setting_new_project_user_role_id: Role přiřazená uživateli bez práv administrátora, který projekt vytvořil + label_view_all_revisions: Zobrazit všechny revize label_tag: Tag label_branch: Branch - error_no_tracker_in_project: No tracker is associated to this project. Please check the Project settings. - error_no_default_issue_status: No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses"). - text_journal_changed: "{{label}} changed from {{old}} to {{new}}" - text_journal_set_to: "{{label}} set to {{value}}" - text_journal_deleted: "{{label}} deleted ({{old}})" - label_group_plural: Groups - label_group: Group - label_group_new: New group - label_time_entry_plural: Spent time - text_journal_added: "{{label}} {{value}} added" - field_active: Active - enumeration_system_activity: System Activity - permission_delete_issue_watchers: Delete watchers - version_status_closed: closed - version_status_locked: locked - version_status_open: open - error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened - label_user_anonymous: Anonymous - button_move_and_follow: Move and follow - setting_default_projects_modules: Default enabled modules for new projects - setting_gravatar_default: Default Gravatar image - field_sharing: Sharing - label_version_sharing_hierarchy: With project hierarchy - label_version_sharing_system: With all projects - label_version_sharing_descendants: With subprojects - label_version_sharing_tree: With project tree - label_version_sharing_none: Not shared - error_can_not_archive_project: This project can not be archived - button_duplicate: Duplicate - button_copy_and_follow: Copy and follow - label_copy_source: Source - setting_issue_done_ratio: Calculate the issue done ratio with - setting_issue_done_ratio_issue_status: Use the issue status - error_issue_done_ratios_not_updated: Issue done ratios not updated. - error_workflow_copy_target: Please select target tracker(s) and role(s) - setting_issue_done_ratio_issue_field: Use the issue field - label_copy_same_as_target: Same as target - label_copy_target: Target - notice_issue_done_ratios_updated: Issue done ratios updated. - error_workflow_copy_source: Please select a source tracker or role - label_update_issue_done_ratios: Update issue done ratios - setting_start_of_week: Start calendars on - permission_view_issues: View Issues - label_display_used_statuses_only: Only display statuses that are used by this tracker - label_revision_id: Revision {{value}} - label_api_access_key: API access key - label_api_access_key_created_on: API access key created {{value}} ago - label_feeds_access_key: RSS access key - notice_api_access_key_reseted: Your API access key was reset. - setting_rest_api_enabled: Enable REST web service - label_missing_api_access_key: Missing an API access key - label_missing_feeds_access_key: Missing a RSS access key - button_show: Show - text_line_separated: Multiple values allowed (one line for each value). - setting_mail_handler_body_delimiters: Truncate emails after one of these lines - permission_add_subprojects: Create subprojects - label_subproject_new: New subproject + error_no_tracker_in_project: Žádná fronta nebyla přiřazena tomuto projektu. Prosím zkontroluje nastavení projektu. + error_no_default_issue_status: Není nastaven výchozí stav úkolu. Prosím zkontrolujte nastavení ("Administrace -> Stavy úkolů"). + text_journal_changed: "{{label}} změněn z {{old}} na {{new}}" + text_journal_set_to: "{{label}} nastaven na {{value}}" + text_journal_deleted: "{{label}} smazán ({{old}})" + label_group_plural: Skupiny + label_group: Skupina + label_group_new: Nová skupina + label_time_entry_plural: Strávený čas + text_journal_added: "{{label}} {{value}} přidán" + field_active: Aktivní + enumeration_system_activity: Systémová aktivita + permission_delete_issue_watchers: Smazat přihlížející + version_status_closed: zavřený + version_status_locked: uzamčený + version_status_open: otevřený + error_can_not_reopen_issue_on_closed_version: Úkol přiřazený k uzavřené verzi nemůže být znovu otevřen + label_user_anonymous: Anonymní + button_move_and_follow: Přesunout a následovat + setting_default_projects_modules: Výchozí zapnutné moduly pro nový projekt + setting_gravatar_default: Výchozí Gravatar + field_sharing: Sdílení + label_version_sharing_hierarchy: S hierarchií projektu + label_version_sharing_system: Se všemi projekty + label_version_sharing_descendants: S podprojekty + label_version_sharing_tree: Se stromem projektu + label_version_sharing_none: Nesdíleno + error_can_not_archive_project: Tento projekt nemůže být archivován + button_duplicate: Duplikát + button_copy_and_follow: Kopírovat a následovat + label_copy_source: Zdroj + setting_issue_done_ratio: Spočítat koeficient dokončení úkolu s + setting_issue_done_ratio_issue_status: Použít stav úkolu + error_issue_done_ratios_not_updated: Koeficient dokončení úkolu nebyl aktualizován. + error_workflow_copy_target: Prosím vyberte cílovou frontu(y) a roly(e) + setting_issue_done_ratio_issue_field: Použít pole úkolu + label_copy_same_as_target: Stejný jako cíl + label_copy_target: Cíl + notice_issue_done_ratios_updated: Koeficienty dokončení úkolu byly aktualizovány. + error_workflow_copy_source: Prosím vyberte zdrojovou frontu nebo roly + label_update_issue_done_ratios: Aktualizovat koeficienty dokončení úkolů + setting_start_of_week: Začínat kalendáře + permission_view_issues: Zobrazit úkoly + label_display_used_statuses_only: Zobrazit pouze stavy které jsou použité touto frontou + label_revision_id: Revize {{value}} + label_api_access_key: API přístupový klíč + label_api_access_key_created_on: API přístupový klíč vytvořen {{value}} + label_feeds_access_key: RSS přístupový klíč + notice_api_access_key_reseted: Váš API přístupový klíč byl resetován. + setting_rest_api_enabled: Zapnout službu REST + label_missing_api_access_key: Chybějící přístupový klíč API + label_missing_feeds_access_key: Chybějící přístupový klíč RSS + button_show: Zobrazit + text_line_separated: Více hodnot povoleno (jeden řádek pro každou hodnotu). + setting_mail_handler_body_delimiters: Zkrátit e-maily po jednom z těchto řádků + permission_add_subprojects: Vytvořit podprojekty + label_subproject_new: Nový podprojekt text_own_membership_delete_confirmation: |- - You are about to remove some or all of your permissions and may no longer be able to edit this project after that. - Are you sure you want to continue? - label_close_versions: Close completed versions - label_board_sticky: Sticky - label_board_locked: Locked - permission_export_wiki_pages: Export wiki pages - setting_cache_formatted_text: Cache formatted text - permission_manage_project_activities: Manage project activities - error_unable_delete_issue_status: Unable to delete issue status - label_profile: Profile - permission_manage_subtasks: Manage subtasks - field_parent_issue: Parent task - label_subtask_plural: Subtasks - label_project_copy_notifications: Send email notifications during the project copy - error_can_not_delete_custom_field: Unable to delete custom field - error_unable_to_connect: Unable to connect ({{value}}) - error_can_not_remove_role: This role is in use and can not be deleted. - error_can_not_delete_tracker: This tracker contains issues and can't be deleted. - field_principal: Principal - label_my_page_block: My page block - notice_failed_to_save_members: "Failed to save member(s): {{errors}}." - text_zoom_out: Zoom out - text_zoom_in: Zoom in - notice_unable_delete_time_entry: Unable to delete time log entry. - label_overall_spent_time: Overall spent time - field_time_entries: Log time + Chystáte se odebrat si některá nebo všechny svá oprávnění a potom již nemusíte být schopni upravit tento projekt. + Opravdu chcete pokračovat? + label_close_versions: Zavřít dokončené verze + label_board_sticky: Nálepka + label_board_locked: Uzamčeno + permission_export_wiki_pages: Exportovat Wiki stránky + setting_cache_formatted_text: Ukládat formátovaný text do vyrovnávací paměti + permission_manage_project_activities: Spravovat aktivity projektu + error_unable_delete_issue_status: Nelze smazat stavy úkolů + label_profile: Profil + permission_manage_subtasks: Spravovat podúkoly + field_parent_issue: Rodičovský úkol + label_subtask_plural: Podúkol + label_project_copy_notifications: Odeslat email oznámení v průběhu kopie projektu + error_can_not_delete_custom_field: Nelze smazat volitelné pole + error_unable_to_connect: Nelze se připojit ({{value}}) + error_can_not_remove_role: Tato role je právě používaná a nelze ji smazat. + error_can_not_delete_tracker: Tato fronta obsahuje úkoly a nemůže být smazán. + field_principal: Hlavní + label_my_page_block: Bloky na mé stránce + notice_failed_to_save_members: "Nepodařilo se uložit člena(y): {{errors}}." + text_zoom_out: Oddálit + text_zoom_in: Přiblížit + notice_unable_delete_time_entry: Nelze smazat čas ze záznamu. + label_overall_spent_time: Celkově strávený čas + field_time_entries: Zaznamenaný čas project_module_gantt: Gantt - project_module_calendar: Calendar - field_member_of_group: Member of Group - field_assigned_to_role: Member of Role - button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" - text_are_you_sure_with_children: Delete issue and all child issues? - field_text: Text field - + project_module_calendar: Kalendář + field_member_of_group: Člen skupiny + field_assigned_to_role: Člen role + button_edit_associated_wikipage: "Upravit přiřazenou Wiki stránku: {{page_title}}" + text_are_you_sure_with_children: Smazat úkol včetně všech podúkolů? + field_text: Textové pole From 22bcce63aad6fc2b9e6cb8d6e94fcc653a0080a7 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 22:33:06 +0000 Subject: [PATCH 156/240] Merged r4177 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4198 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/files_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index fe5eb48c8b4..7868d0ddfb5 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -26,7 +26,7 @@ def new attachments = Attachment.attach_files(container, params[:attachments]) render_attachment_warning_if_needed(container) - if !attachments.empty? && Setting.notified_events.include?('file_added') + if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added') Mailer.deliver_attachments_added(attachments[:files]) end redirect_to :controller => 'files', :action => 'index', :id => @project From 324baf60a611ce91118b7e02bae180e34f30826b Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 22:33:11 +0000 Subject: [PATCH 157/240] Merged r4180 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4199 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/pt-BR.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 6f51354037d..f23d49a5704 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -917,7 +917,7 @@ pt-BR: permission_export_wiki_pages: Exportar páginas wiki setting_cache_formatted_text: Realizar cache de texto formatado permission_manage_project_activities: Gerenciar atividades do projeto - error_unable_delete_issue_status: Impossível excluir situação da tarefa + error_unable_delete_issue_status: Não foi possível excluir situação da tarefa label_profile: Perfil permission_manage_subtasks: Gerenciar subtarefas field_parent_issue: Tarefa pai @@ -936,9 +936,9 @@ pt-BR: label_overall_spent_time: Tempo gasto geral field_time_entries: Log time project_module_gantt: Gantt - project_module_calendar: Calendar - field_member_of_group: Member of Group - field_assigned_to_role: Member of Role - button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" - text_are_you_sure_with_children: Delete issue and all child issues? - field_text: Text field + project_module_calendar: Calendário + field_member_of_group: Mebro do grupo + field_assigned_to_role: Membro com o papel + button_edit_associated_wikipage: "Editar páginas wiki relacionadas: {{page_title}}" + text_are_you_sure_with_children: Excluir a tarefa e suas subtarefas? + field_text: Campo de texto From c4e123b2f002878393f83d865beace0517acca74 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 22:33:17 +0000 Subject: [PATCH 158/240] Merged r4181 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4200 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/issues_controller.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 928badd178f..c11971ac27b 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -283,6 +283,7 @@ def update_issue_from_params end # TODO: Refactor, lots of extra code in here + # TODO: Changing tracker on an existing issue should not trigger this def build_new_issue_from_params if params[:id].blank? @issue = Issue.new @@ -301,7 +302,9 @@ def build_new_issue_from_params end if params[:issue].is_a?(Hash) @issue.safe_attributes = params[:issue] - @issue.watcher_user_ids = params[:issue]['watcher_user_ids'] if User.current.allowed_to?(:add_issue_watchers, @project) + if User.current.allowed_to?(:add_issue_watchers, @project) && @issue.new_record? + @issue.watcher_user_ids = params[:issue]['watcher_user_ids'] + end end @issue.author = User.current @issue.start_date ||= Date.today From 25b2ffb8fd852f2a257940ef28b8a7df77d17bad Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 22:33:22 +0000 Subject: [PATCH 159/240] Merged r4182 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4201 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/environments/production.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/environments/production.rb b/config/environments/production.rb index ac11f52193c..91af89ce24f 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -11,7 +11,10 @@ # config.logger = SyslogLogger.new # # Rotate logs bigger than 1MB, keeps no more than 7 rotated logs around. +# When setting a new Logger, make sure to set it's log level too. +# # config.logger = Logger.new(config.log_path, 7, 1048576) +# config.logger.level = Logger::INFO # Full error reports are disabled and caching is turned on config.action_controller.consider_all_requests_local = false From eb05880717bc96f864395a1c7a1bb2aaa0ed0efe Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 22:33:28 +0000 Subject: [PATCH 160/240] Merged r4183 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4202 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/initializers/10-patches.rb | 14 ++++++++++++++ lib/redmine/i18n.rb | 4 ++-- test/unit/lib/redmine/i18n_test.rb | 8 ++++---- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb index cdc3bfd7912..4753dae3d51 100644 --- a/config/initializers/10-patches.rb +++ b/config/initializers/10-patches.rb @@ -78,3 +78,17 @@ module AsynchronousMailer end ActionMailer::Base.send :include, AsynchronousMailer + +# TODO: Hack to support i18n 4.x on Rails 2.3.5. Remove post 2.3.6. +# See http://www.redmine.org/issues/6428 and http://www.redmine.org/issues/5608 +module I18n + module Backend + module Base + def warn_syntax_deprecation! + return if @skip_syntax_deprecation + warn "The {{key}} interpolation syntax in I18n messages is deprecated. Please use %{key} instead.\nDowngrade your i18n gem to 0.3.7 (everything above must be deinstalled) to remove this warning, see http://www.redmine.org/issues/5608 for more information." + @skip_syntax_deprecation = true + end + end + end +end diff --git a/lib/redmine/i18n.rb b/lib/redmine/i18n.rb index 1bfca81e441..e7aac9f7ec4 100644 --- a/lib/redmine/i18n.rb +++ b/lib/redmine/i18n.rb @@ -37,7 +37,7 @@ def ll(lang, str, value=nil) def format_date(date) return nil unless date - Setting.date_format.blank? ? ::I18n.l(date.to_date) : date.strftime(Setting.date_format) + Setting.date_format.blank? ? ::I18n.l(date.to_date, :count => date.strftime('%d')) : date.strftime(Setting.date_format) end def format_time(time, include_date = true) @@ -45,7 +45,7 @@ def format_time(time, include_date = true) time = time.to_time if time.is_a?(String) zone = User.current.time_zone local = zone ? time.in_time_zone(zone) : (time.utc? ? time.localtime : time) - Setting.time_format.blank? ? ::I18n.l(local, :format => (include_date ? :default : :time)) : + Setting.time_format.blank? ? ::I18n.l(local, :count => local.strftime('%d'), :format => (include_date ? :default : :time)) : ((include_date ? "#{format_date(time)} " : "") + "#{local.strftime(Setting.time_format)}") end diff --git a/test/unit/lib/redmine/i18n_test.rb b/test/unit/lib/redmine/i18n_test.rb index 666bd7481f2..df1942e95b5 100644 --- a/test/unit/lib/redmine/i18n_test.rb +++ b/test/unit/lib/redmine/i18n_test.rb @@ -29,7 +29,7 @@ def test_date_format_default set_language_if_valid 'en' today = Date.today Setting.date_format = '' - assert_equal I18n.l(today), format_date(today) + assert_equal I18n.l(today, :count => today.strftime('%d')), format_date(today) end def test_date_format @@ -47,7 +47,7 @@ def test_date_and_time_for_each_language format_date(Date.today) format_time(Time.now) format_time(Time.now, false) - assert_not_equal 'default', ::I18n.l(Date.today, :format => :default), "date.formats.default missing in #{lang}" + assert_not_equal 'default', ::I18n.l(Date.today, :count => Date.today.strftime('%d'), :format => :default), "date.formats.default missing in #{lang}" assert_not_equal 'time', ::I18n.l(Time.now, :format => :time), "time.formats.time missing in #{lang}" end assert l('date.day_names').is_a?(Array) @@ -63,8 +63,8 @@ def test_time_format_default now = Time.now Setting.date_format = '' Setting.time_format = '' - assert_equal I18n.l(now), format_time(now) - assert_equal I18n.l(now, :format => :time), format_time(now, false) + assert_equal I18n.l(now, :count => now.strftime('%d')), format_time(now) + assert_equal I18n.l(now, :count => now.strftime('%d'), :format => :time), format_time(now, false) end def test_time_format From 98eaff414f12b80d4cd0e336cf6852e4e3248b00 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 22:33:33 +0000 Subject: [PATCH 161/240] Merged r4185 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4203 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/projects_controller.rb | 4 ++-- test/functional/projects_controller_test.rb | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index f1634932915..c3efbfd9f2d 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -125,13 +125,13 @@ def copy if validate_parent_id && @project.copy(@source_project, :only => params[:only]) @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id') flash[:notice] = l(:notice_successful_create) - redirect_to :controller => 'admin', :action => 'projects' + redirect_to :controller => 'projects', :action => 'settings' elsif !@project.new_record? # Project was created # But some objects were not copied due to validation failures # (eg. issues from disabled trackers) # TODO: inform about that - redirect_to :controller => 'admin', :action => 'projects' + redirect_to :controller => 'projects', :action => 'settings' end end end diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb index 636cb17519e..8a9bbe6d599 100644 --- a/test/functional/projects_controller_test.rb +++ b/test/functional/projects_controller_test.rb @@ -389,6 +389,17 @@ def test_copy_without_project assert_redirected_to :controller => 'admin', :action => 'projects' end + context "POST :copy" do + should "TODO: test the rest of the method" + + should "redirect to the project settings when successful" do + @request.session[:user_id] = 1 # admin + post :copy, :id => 1, :project => {:name => 'Copy', :identifier => 'unique-copy'} + assert_response :redirect + assert_redirected_to :controller => 'projects', :action => 'settings' + end + end + def test_jump_should_redirect_to_active_tab get :show, :id => 1, :jump => 'issues' assert_redirected_to 'projects/ecookbook/issues' From dd91dc4cb7859595d24f8283aaa8d5826e1fad0d Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 22:33:39 +0000 Subject: [PATCH 162/240] Merged r4186 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4204 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/issue.rb | 6 +++--- test/fixtures/issues.yml | 1 + test/unit/issue_test.rb | 18 +++++++++++++++--- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index 631769fa8f2..3b53f84ecde 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -245,7 +245,7 @@ def safe_attributes=(attrs, user=User.current) end def done_ratio - if Issue.use_status_for_done_ratio? && status && status.default_done_ratio? + if Issue.use_status_for_done_ratio? && status && status.default_done_ratio status.default_done_ratio else read_attribute(:done_ratio) @@ -308,7 +308,7 @@ def validate # Set the done_ratio using the status if that setting is set. This will keep the done_ratios # even if the user turns off the setting later def update_done_ratio_from_issue_status - if Issue.use_status_for_done_ratio? && status && status.default_done_ratio? + if Issue.use_status_for_done_ratio? && status && status.default_done_ratio self.done_ratio = status.default_done_ratio end end @@ -689,7 +689,7 @@ def recalculate_attributes_for(issue_id) end # done ratio = weighted average ratio of leaves - unless Issue.use_status_for_done_ratio? && p.status && p.status.default_done_ratio? + unless Issue.use_status_for_done_ratio? && p.status && p.status.default_done_ratio leaves_count = p.leaves.count if leaves_count > 0 average = p.leaves.average(:estimated_hours).to_f diff --git a/test/fixtures/issues.yml b/test/fixtures/issues.yml index 3adda31215b..eec014ff4fb 100644 --- a/test/fixtures/issues.yml +++ b/test/fixtures/issues.yml @@ -38,6 +38,7 @@ issues_002: lft: 1 rgt: 2 lock_version: 3 + done_ratio: 30 issues_003: created_on: 2006-07-19 21:07:27 +02:00 project_id: 1 diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb index e0eb479d96f..64307648385 100644 --- a/test/unit/issue_test.rb +++ b/test/unit/issue_test.rb @@ -571,6 +571,9 @@ def test_saving_twice_should_not_duplicate_journal_details @issue = Issue.find(1) @issue_status = IssueStatus.find(1) @issue_status.update_attribute(:default_done_ratio, 50) + @issue2 = Issue.find(2) + @issue_status2 = IssueStatus.find(2) + @issue_status2.update_attribute(:default_done_ratio, 0) end context "with Setting.issue_done_ratio using the issue_field" do @@ -580,6 +583,7 @@ def test_saving_twice_should_not_duplicate_journal_details should "read the issue's field" do assert_equal 0, @issue.done_ratio + assert_equal 30, @issue2.done_ratio end end @@ -590,6 +594,7 @@ def test_saving_twice_should_not_duplicate_journal_details should "read the Issue Status's default done ratio" do assert_equal 50, @issue.done_ratio + assert_equal 0, @issue2.done_ratio end end end @@ -599,6 +604,9 @@ def test_saving_twice_should_not_duplicate_journal_details @issue = Issue.find(1) @issue_status = IssueStatus.find(1) @issue_status.update_attribute(:default_done_ratio, 50) + @issue2 = Issue.find(2) + @issue_status2 = IssueStatus.find(2) + @issue_status2.update_attribute(:default_done_ratio, 0) end context "with Setting.issue_done_ratio using the issue_field" do @@ -608,8 +616,10 @@ def test_saving_twice_should_not_duplicate_journal_details should "not change the issue" do @issue.update_done_ratio_from_issue_status + @issue2.update_done_ratio_from_issue_status - assert_equal 0, @issue.done_ratio + assert_equal 0, @issue.read_attribute(:done_ratio) + assert_equal 30, @issue2.read_attribute(:done_ratio) end end @@ -618,10 +628,12 @@ def test_saving_twice_should_not_duplicate_journal_details Setting.issue_done_ratio = 'issue_status' end - should "not change the issue's done ratio" do + should "change the issue's done ratio" do @issue.update_done_ratio_from_issue_status + @issue2.update_done_ratio_from_issue_status - assert_equal 50, @issue.done_ratio + assert_equal 50, @issue.read_attribute(:done_ratio) + assert_equal 0, @issue2.read_attribute(:done_ratio) end end end From 2c91d15c58b2df55a3c770a46cc22c6d41575e40 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 22:33:45 +0000 Subject: [PATCH 163/240] Merged r4187 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4205 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/scm/adapters/git_adapter.rb | 4 ++-- test/unit/lib/redmine/scm/adapters/git_adapter_test.rb | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index 0857d904716..9a79bbb07df 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -86,7 +86,7 @@ def entries(path=nil, identifier=nil) def lastrev(path,rev) return nil if path.nil? - cmd = "#{GIT_BIN} --git-dir #{target('')} log --pretty=fuller --no-merges -n 1 " + cmd = "#{GIT_BIN} --git-dir #{target('')} log --date=iso --pretty=fuller --no-merges -n 1 " cmd << " #{shell_quote rev} " if rev cmd << "-- #{path} " unless path.empty? shellout(cmd) do |io| @@ -94,7 +94,7 @@ def lastrev(path,rev) id = io.gets.split[1] author = io.gets.match('Author:\s+(.*)$')[1] 2.times { io.gets } - time = io.gets.match('CommitDate:\s+(.*)$')[1] + time = Time.parse(io.gets.match('CommitDate:\s+(.*)$')[1]).localtime Revision.new({ :identifier => id, 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 6b716b9cd25..f51d4a31f1b 100644 --- a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb @@ -29,6 +29,14 @@ def test_annotate assert_equal "jsmith", annotate.revisions[4].author end + def test_last_rev + last_rev = @adapter.lastrev("README", "4f26664364207fa8b1af9f8722647ab2d4ac5d43") + assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8", last_rev.scmid + assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8", last_rev.identifier + assert_equal "Adam Soltys ", last_rev.author + assert_equal "2009-06-24 05:27:38".to_time, last_rev.time + end + def test_annotate_moved_file annotate = @adapter.annotate('renamed_test.txt') assert_kind_of Redmine::Scm::Adapters::Annotate, annotate From 924bb8da0b23bca6af10ae82e4db176ba1c83d80 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 22:33:52 +0000 Subject: [PATCH 164/240] Merged r4188 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4206 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/scm/adapters/git_adapter.rb | 4 ++-- .../repositories/git_repository.tar.gz | Bin 19452 -> 20118 bytes .../repositories_git_controller_test.rb | 3 ++- .../redmine/scm/adapters/git_adapter_test.rb | 22 ++++++++++++++---- test/unit/repository_git_test.rb | 8 +++---- 5 files changed, 25 insertions(+), 12 deletions(-) diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index 9a79bbb07df..f455a57f588 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -88,7 +88,7 @@ def lastrev(path,rev) return nil if path.nil? cmd = "#{GIT_BIN} --git-dir #{target('')} log --date=iso --pretty=fuller --no-merges -n 1 " cmd << " #{shell_quote rev} " if rev - cmd << "-- #{path} " unless path.empty? + cmd << "-- #{shell_quote path} " unless path.empty? shellout(cmd) do |io| begin id = io.gets.split[1] @@ -121,7 +121,7 @@ def revisions(path, identifier_from, identifier_to, options={}) 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? + cmd << " -- #{shell_quote path}" if path && !path.empty? shellout(cmd) do |io| files=[] diff --git a/test/fixtures/repositories/git_repository.tar.gz b/test/fixtures/repositories/git_repository.tar.gz index 8158d583244a12064c1d48d20eb64427d56d3159..8a07a230cc9202a7396d5f4ed6e207087ec63d03 100644 GIT binary patch literal 20118 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 literal 19452 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%0A>0n{OjKsIMt(ySXTBznrqD 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 diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb index 317261a13d6..bea9663c296 100644 --- a/test/functional/repositories_git_controller_test.rb +++ b/test/functional/repositories_git_controller_test.rb @@ -50,7 +50,7 @@ def test_browse_root assert_response :success assert_template 'show' assert_not_nil assigns(:entries) - assert_equal 7, assigns(:entries).size + assert_equal 8, assigns(:entries).size assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'} assert assigns(:entries).detect {|e| e.name == 'this_is_a_really_long_and_verbose_directory_name' && e.kind == 'dir'} assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'} @@ -58,6 +58,7 @@ def test_browse_root assert assigns(:entries).detect {|e| e.name == 'copied_README' && e.kind == 'file'} assert assigns(:entries).detect {|e| e.name == 'new_file.txt' && e.kind == 'file'} assert assigns(:entries).detect {|e| e.name == 'renamed_test.txt' && e.kind == 'file'} + assert assigns(:entries).detect {|e| e.name == 'filemane with spaces.txt' && e.kind == 'file'} end def test_browse_branch 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 f51d4a31f1b..76dca9ed6e7 100644 --- a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb @@ -13,13 +13,17 @@ def test_branches end def test_getting_all_revisions - assert_equal 13, @adapter.revisions('',nil,nil,:all => true).length + assert_equal 14, @adapter.revisions('',nil,nil,:all => true).length end def test_getting_certain_revisions assert_equal 1, @adapter.revisions('','899a15d^','899a15d').length end + def test_getting_revisions_with_spaces_in_filename + assert_equal 1, @adapter.revisions("filemane with spaces.txt", nil, nil, :all => true).length + end + def test_annotate annotate = @adapter.annotate('sources/watchers_controller.rb') assert_kind_of Redmine::Scm::Adapters::Annotate, annotate @@ -29,6 +33,12 @@ def test_annotate assert_equal "jsmith", annotate.revisions[4].author end + def test_annotate_moved_file + annotate = @adapter.annotate('renamed_test.txt') + assert_kind_of Redmine::Scm::Adapters::Annotate, annotate + assert_equal 2, annotate.lines.size + end + def test_last_rev last_rev = @adapter.lastrev("README", "4f26664364207fa8b1af9f8722647ab2d4ac5d43") assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8", last_rev.scmid @@ -37,10 +47,12 @@ def test_last_rev assert_equal "2009-06-24 05:27:38".to_time, last_rev.time end - def test_annotate_moved_file - annotate = @adapter.annotate('renamed_test.txt') - assert_kind_of Redmine::Scm::Adapters::Annotate, annotate - assert_equal 2, annotate.lines.size + def test_last_rev_with_spaces_in_filename + last_rev = @adapter.lastrev("filemane with spaces.txt", "ed5bb786bbda2dee66a2d50faf51429dbc043a7b") + assert_equal "ed5bb786bbda2dee66a2d50faf51429dbc043a7b", last_rev.scmid + assert_equal "ed5bb786bbda2dee66a2d50faf51429dbc043a7b", last_rev.identifier + assert_equal "Felix Schäfer ", last_rev.author + assert_equal "2010-09-18 19:59:46".to_time, last_rev.time end else puts "Git test repository NOT FOUND. Skipping unit tests !!!" diff --git a/test/unit/repository_git_test.rb b/test/unit/repository_git_test.rb index dad5610aee8..4f60875111b 100644 --- a/test/unit/repository_git_test.rb +++ b/test/unit/repository_git_test.rb @@ -34,8 +34,8 @@ def test_fetch_changesets_from_scratch @repository.fetch_changesets @repository.reload - assert_equal 13, @repository.changesets.count - assert_equal 22, @repository.changes.count + assert_equal 14, @repository.changesets.count + assert_equal 23, @repository.changes.count commit = @repository.changesets.find(:first, :order => 'committed_on ASC') assert_equal "Initial import.\nThe repository contains 3 files.", commit.comments @@ -57,10 +57,10 @@ def test_fetch_changesets_incremental # Remove the 3 latest changesets @repository.changesets.find(:all, :order => 'committed_on DESC', :limit => 3).each(&:destroy) @repository.reload - assert_equal 10, @repository.changesets.count + assert_equal 11, @repository.changesets.count @repository.fetch_changesets - assert_equal 13, @repository.changesets.count + assert_equal 14, @repository.changesets.count end else puts "Git test repository NOT FOUND. Skipping unit tests !!!" From babcd3991844f174bebe71c0505b957259843a16 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 22:33:59 +0000 Subject: [PATCH 165/240] Merged r4189 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4207 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/scm/adapters/git_adapter.rb | 6 +++--- .../repositories/git_repository.tar.gz | Bin 20118 -> 20711 bytes .../repositories_git_controller_test.rb | 3 ++- .../redmine/scm/adapters/git_adapter_test.rb | 10 +++++++++- test/unit/repository_git_test.rb | 8 ++++---- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index f455a57f588..5ed57c26429 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -65,7 +65,7 @@ def entries(path=nil, identifier=nil) shellout(cmd) do |io| io.each_line do |line| e = line.chomp.to_s - if e =~ /^\d+\s+(\w+)\s+([0-9a-f]{40})\s+([0-9-]+)\s+(.+)$/ + if e =~ /^\d+\s+(\w+)\s+([0-9a-f]{40})\s+([0-9-]+)\t(.+)$/ type = $1 sha = $2 size = $3 @@ -165,13 +165,13 @@ def revisions(path, identifier_from, identifier_to, options={}) parsing_descr = 1 changeset[:description] = "" elsif (parsing_descr == 1 || parsing_descr == 2) \ - && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\s+(.+)$/ + && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\t(.+)$/ parsing_descr = 2 fileaction = $1 filepath = $2 files << {:action => fileaction, :path => filepath} elsif (parsing_descr == 1 || parsing_descr == 2) \ - && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\d+\s+(\S+)\s+(.+)$/ + && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\d+\s+(\S+)\t(.+)$/ parsing_descr = 2 fileaction = $1 filepath = $3 diff --git a/test/fixtures/repositories/git_repository.tar.gz b/test/fixtures/repositories/git_repository.tar.gz index 8a07a230cc9202a7396d5f4ed6e207087ec63d03..17cb22943b34d75268ded8cbbacb66a5cbda3d8b 100644 GIT binary patch literal 20711 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 literal 20118 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 diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb index bea9663c296..941fbcf1bf2 100644 --- a/test/functional/repositories_git_controller_test.rb +++ b/test/functional/repositories_git_controller_test.rb @@ -50,7 +50,7 @@ def test_browse_root assert_response :success assert_template 'show' assert_not_nil assigns(:entries) - assert_equal 8, assigns(:entries).size + assert_equal 9, assigns(:entries).size assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'} assert assigns(:entries).detect {|e| e.name == 'this_is_a_really_long_and_verbose_directory_name' && e.kind == 'dir'} assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'} @@ -59,6 +59,7 @@ def test_browse_root assert assigns(:entries).detect {|e| e.name == 'new_file.txt' && e.kind == 'file'} assert assigns(:entries).detect {|e| e.name == 'renamed_test.txt' && e.kind == 'file'} assert assigns(:entries).detect {|e| e.name == 'filemane with spaces.txt' && e.kind == 'file'} + assert assigns(:entries).detect {|e| e.name == ' filename with a leading space.txt ' && e.kind == 'file'} end def test_browse_branch 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 76dca9ed6e7..45e3a5adb9c 100644 --- a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb @@ -13,7 +13,7 @@ def test_branches end def test_getting_all_revisions - assert_equal 14, @adapter.revisions('',nil,nil,:all => true).length + assert_equal 15, @adapter.revisions('',nil,nil,:all => true).length end def test_getting_certain_revisions @@ -24,6 +24,14 @@ def test_getting_revisions_with_spaces_in_filename assert_equal 1, @adapter.revisions("filemane with spaces.txt", nil, nil, :all => true).length end + def test_getting_revisions_with_leading_and_trailing_spaces_in_filename + assert_equal " filename with a leading space.txt ", @adapter.revisions(" filename with a leading space.txt ", nil, nil, :all => true)[0].paths[0][:path] + end + + def test_getting_entries_with_leading_and_trailing_spaces_in_filename + assert_equal " filename with a leading space.txt ", @adapter.entries('', '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c')[3].name + end + def test_annotate annotate = @adapter.annotate('sources/watchers_controller.rb') assert_kind_of Redmine::Scm::Adapters::Annotate, annotate diff --git a/test/unit/repository_git_test.rb b/test/unit/repository_git_test.rb index 4f60875111b..5ae889492ed 100644 --- a/test/unit/repository_git_test.rb +++ b/test/unit/repository_git_test.rb @@ -34,8 +34,8 @@ def test_fetch_changesets_from_scratch @repository.fetch_changesets @repository.reload - assert_equal 14, @repository.changesets.count - assert_equal 23, @repository.changes.count + assert_equal 15, @repository.changesets.count + assert_equal 24, @repository.changes.count commit = @repository.changesets.find(:first, :order => 'committed_on ASC') assert_equal "Initial import.\nThe repository contains 3 files.", commit.comments @@ -57,10 +57,10 @@ def test_fetch_changesets_incremental # Remove the 3 latest changesets @repository.changesets.find(:all, :order => 'committed_on DESC', :limit => 3).each(&:destroy) @repository.reload - assert_equal 11, @repository.changesets.count + assert_equal 12, @repository.changesets.count @repository.fetch_changesets - assert_equal 14, @repository.changesets.count + assert_equal 15, @repository.changesets.count end else puts "Git test repository NOT FOUND. Skipping unit tests !!!" From 7bbf4af0c15966a6f03fa3adddbe66025066a364 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 22:34:05 +0000 Subject: [PATCH 166/240] Locales update git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4208 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/ru.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/locales/ru.yml b/config/locales/ru.yml index a16a7cb88d7..f06ebfd104f 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1033,3 +1033,5 @@ ru: notice_unable_delete_time_entry: Невозможно удалить запись журнала. label_overall_spent_time: Всего затрачено времени + field_member_of_group: Member of Group + field_assigned_to_role: Member of Role From 77ba8bbfc08df863c630835c41c62afcff61f5f6 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 22:41:50 +0000 Subject: [PATCH 167/240] Merged r4209 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4211 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- doc/CHANGELOG | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/doc/CHANGELOG b/doc/CHANGELOG index b1e2c4bd1ad..fb3d3da28db 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -4,6 +4,62 @@ Redmine - project management software Copyright (C) 2006-2010 Jean-Philippe Lang http://www.redmine.org/ +== 2010-09-26 v1.0.2 + +* #2285: issue-refinement: pressing enter should result to an "apply" +* #3411: Allow mass status update trough context menu +* #5929: https-enabled gravatars when called over https +* #6189: Japanese Translation for r4011 +* #6197: Traditional Chinese language file (to r4036) +* #6198: Updated german translation +* #6208: Macedonian translation +* #6210: Swedish Translation for r4039 +* #6248: nl translation update for r4050 +* #6263: Catalan translation update +* #6275: After submitting a related issue, the Issue field should be re-focused +* #6289: Checkboxes in issues list shouldn't be displayed when printing +* #6290: Make journals theming easier +* #6291: User#allowed_to? is not tested +* #6306: Traditional Chinese language file (to r4061) +* #6307: Korean translation update for 4066(4061) +* #6316: pt_BR update +* #6339: SERBIAN Updated +* #6358: Updated Polish translation +* #6363: Japanese Translation for r4080 +* #6365: Traditional Chinese language file (to r4081) +* #6382: Issue PDF export variable usage +* #6428: Interim solution for i18n >= 0.4 +* #6441: Japanese Translation for r4162 +* #6451: Traditional Chinese language file (to r4167) +* #6465: Japanese Translation for r4171 +* #6466: Traditional Chinese language file (to r4171) +* #6490: pt-BR translation for 1.0.2 +* Fixed #3935: stylesheet_link_tag with plugin doesn't take into account relative_url_root +* Fixed #4998: Global issue list's context menu has enabled options for parent menus but there are no valid selections +* Fixed #5170: Done ratio can not revert to 0% if status is used for done ratio +* Fixed #5608: broken with i18n 0.4.0 +* Fixed #6054: Error 500 on filenames with whitespace in git reposities +* Fixed #6135: Default logger configuration grows without bound. +* Fixed #6191: Deletion of a main task deletes all subtasks +* Fixed #6195: Missing move issues between projects +* Fixed #6242: can't switch between inline and side-by-side diff +* Fixed #6249: Create and continue returns 404 +* Fixed #6267: changing the authentication mode from ldap to internal with setting the password +* Fixed #6270: diff coderay malformed in the "news" page +* Fixed #6278: missing "cant_link_an_issue_with_a_descendant"from locale files +* Fixed #6333: Create and continue results in a 404 Error +* Fixed #6346: Age column on repository view is skewed for git, probably CVS too +* Fixed #6351: Context menu on roadmap broken +* Fixed #6388: New Subproject leads to a 404 +* Fixed #6392: Updated/Created links to activity broken +* Fixed #6413: Error in SQL +* Fixed #6443: Redirect to project settings after Copying a Project +* Fixed #6448: Saving a wiki page with no content has a translation missing +* Fixed #6452: Unhandled exception on creating File +* Fixed #6471: Typo in label_report in Czech translation +* Fixed #6479: Changing tracker type will lose watchers +* Fixed #6499: Files with leading or trailing whitespace are not shown in git. + == 2010-08-22 v1.0.1 * #819: Add a body ID and class to all pages From 38a2beb2c06ff5b160a46b0fcc7d0c5f54bef4f3 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 22:41:55 +0000 Subject: [PATCH 168/240] Merged r4210 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4212 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb index 77f0e2271c1..e7280527492 100644 --- a/lib/redmine/version.rb +++ b/lib/redmine/version.rb @@ -4,7 +4,7 @@ module Redmine module VERSION #:nodoc: MAJOR = 1 MINOR = 0 - TINY = 1 + TINY = 2 # Branch values: # * official release: nil From a8eef8366cdb0983d3efb568d911cad260eecdae Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:54:56 +0000 Subject: [PATCH 169/240] Merged r4237 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4313 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/de.yml | 2 +- config/locales/he.yml | 120 +++++++++-------- config/locales/ja.yml | 8 +- config/locales/pt-BR.yml | 8 +- config/locales/pt.yml | 278 +++++++++++++++++++-------------------- config/locales/ru.yml | 4 + config/locales/sv.yml | 2 +- config/locales/zh-TW.yml | 6 +- 8 files changed, 228 insertions(+), 200 deletions(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index 806fa81fe58..61f21829f41 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -800,7 +800,7 @@ de: button_uncheck_all: Alles abwählen button_delete: Löschen button_create: Anlegen - button_create_and_continue: Anlegen + nächstes Ticket + button_create_and_continue: Anlegen und weiter button_test: Testen button_edit: Bearbeiten button_add: Hinzufügen diff --git a/config/locales/he.yml b/config/locales/he.yml index a51da345e86..0cce40ce116 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -104,7 +104,7 @@ he: inclusion: "לא נכלל ברשימה" exclusion: "לא זמין" invalid: "לא ולידי" - confirmation: "לא תואם לאישורו" + confirmation: "לא תואם לאישור" accepted: "חייב באישור" empty: "חייב להכלל" blank: "חייב להכלל" @@ -122,8 +122,8 @@ he: even: "חייב להיות זוגי" greater_than_start_date: "חייב להיות מאוחר יותר מתאריך ההתחלה" not_same_project: "לא שייך לאותו הפרויקט" - circular_dependency: "הקשר הזה יצור תלות מעגלית" - cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks" + circular_dependency: "קשר זה יצור תלות מעגלית" + cant_link_an_issue_with_a_descendant: "לא ניתן לקשר נושא לתת־משימה שלו" actionview_instancetag_blank_option: בחר בבקשה @@ -144,7 +144,7 @@ he: notice_account_wrong_password: סיסמה שגויה notice_account_register_done: החשבון נוצר בהצלחה. להפעלת החשבון לחץ על הקישור שנשלח לדוא"ל שלך. notice_account_unknown_email: משתמש לא מוכר. - notice_can_t_change_password: החשבון הזה משתמש במקור אימות חיצוני. שינוי סיסמה הינו בילתי אפשר + notice_can_t_change_password: החשבון הזה משתמש במקור הזדהות חיצוני. שינוי סיסמה הינו בילתי אפשר notice_account_lost_email_sent: דוא"ל עם הוראות לבחירת סיסמה חדשה נשלח אליך. notice_account_activated: חשבונך הופעל. אתה יכול להתחבר כעת. notice_successful_create: יצירה מוצלחת. @@ -155,7 +155,7 @@ he: notice_locking_conflict: המידע עודכן על ידי משתמש אחר. notice_not_authorized: אינך מורשה לראות דף זה. notice_email_sent: "דואל נשלח לכתובת {{value}}" - notice_email_error: "ארעה שגיאה בעט שליחת הדואל ({{value}})" + notice_email_error: "ארעה שגיאה בעת שליחת הדואל ({{value}})" notice_feeds_access_key_reseted: מפתח ה־RSS שלך אופס. notice_api_access_key_reseted: מפתח הגישה שלך ל־API אופס. notice_failed_to_save_issues: "נכשרת בשמירת {{count}} נושא\ים ב {{total}} נבחרו: {{ids}}." @@ -168,7 +168,7 @@ he: notice_issue_done_ratios_updated: אחוזי התקדמות לנושא עודכנו. error_can_t_load_default_data: "אפשרויות ברירת המחדל לא הצליחו להיטען: {{value}}" - error_scm_not_found: כניסה ו\או גירסה אינם קיימים במאגר. + error_scm_not_found: כניסה ו\או מהדורה אינם קיימים במאגר. error_scm_command_failed: "ארעה שגיאה בעת ניסון גישה למאגר: {{value}}" error_scm_annotate: "הכניסה לא קיימת או שלא ניתן לתאר אותה." error_issue_not_found_in_project: 'הנושאים לא נמצאו או אינם שיכים לפרויקט' @@ -194,7 +194,7 @@ he: mail_body_account_information: פרטי החשבון שלך mail_subject_account_activation_request: "בקשת הפעלה לחשבון {{value}}" mail_body_account_activation_request: "משתמש חדש ({{value}}) נרשם. החשבון שלו מחכה לאישור שלך:" - mail_subject_reminder: "{{count}} נושאים מיעדים להגשה בימים הקרובים ({{days}})" + mail_subject_reminder: "{{count}} נושאים מיועדים להגשה בימים הקרובים ({{days}})" mail_body_reminder: "{{count}} נושאים שמיועדים אליך מיועדים להגשה בתוך {{days}} ימים:" mail_subject_wiki_content_added: "דף ה־wiki ‏'{{page}}' נוסף" mail_body_wiki_content_added: דף ה־wiki ‏'{{page}}' נוסף ע"י {{author}}. @@ -248,7 +248,7 @@ he: field_login: שם משתמש field_mail_notification: הודעות דוא"ל field_admin: ניהול - field_last_login_on: חיבור אחרון + field_last_login_on: התחברות אחרונה field_language: שפה field_effective_date: תאריך field_password: סיסמה @@ -267,7 +267,7 @@ he: field_onthefly: יצירת משתמשים זריזה field_start_date: תאריך התחלה field_done_ratio: % גמור - field_auth_source: מצב אימות + field_auth_source: מקור הזדהות field_hide_mail: החבא את כתובת הדוא"ל שלי field_comments: הערות field_url: URL @@ -284,6 +284,7 @@ he: field_redirect_existing_links: העבר קישורים קיימים field_estimated_hours: זמן משוער field_column_names: עמודות + field_time_entries: רישום זמנים field_time_zone: איזור זמן field_searchable: ניתן לחיפוש field_default_value: ערך ברירת מחדל @@ -296,13 +297,16 @@ he: field_group_by: קבץ את התוצאות לפי field_sharing: שיתוף field_parent_issue: משימת אב + field_member_of_group: חבר בקבוצה + field_assigned_to_role: בעל תפקיד + field_text: שדה טקסט setting_app_title: כותרת ישום setting_app_subtitle: תת־כותרת ישום setting_welcome_text: טקסט "ברוך הבא" setting_default_language: שפת ברירת מחדל - setting_login_required: דרוש אימות - setting_self_registration: אפשר הרשמות עצמית + setting_login_required: דרושה הזדהות + setting_self_registration: אפשר הרשמה עצמית setting_attachment_max_size: גודל דבוקה מקסימאלי setting_issues_export_limit: גבול יצוא נושאים setting_mail_from: כתובת שליחת דוא"ל @@ -310,14 +314,14 @@ he: setting_plain_text_mail: טקסט פשוט בלבד (ללא HTML) setting_host_name: שם שרת setting_text_formatting: עיצוב טקסט - setting_wiki_compression: כיווץ היסטורית WIKI + setting_wiki_compression: כיווץ היסטורית wiki setting_feeds_limit: גבול תוכן הזנות setting_default_projects_public: פרויקטים חדשים הינם פומביים כברירת מחדל - setting_autofetch_changesets: משיכה אוטומטית של עידכונים + setting_autofetch_changesets: משיכה אוטומטית של שינויים setting_sys_api_enabled: אפשר שירות רשת לניהול המאגר setting_commit_ref_keywords: מילות מפתח מקשרות setting_commit_fix_keywords: מילות מפתח מתקנות - setting_autologin: חיבור אוטומטי + setting_autologin: התחברות אוטומטית setting_date_format: פורמט תאריך setting_time_format: פורמט זמן setting_cross_project_issue_relations: הרשה קישור נושאים בין פרויקטים @@ -339,17 +343,18 @@ he: setting_gravatar_default: תמונת Gravatar ברירת מחדל setting_diff_max_lines_displayed: מספר מירבי של שורות בתצוגת שינויים setting_file_max_size_displayed: גודל מירבי של מלל המוצג בתוך השורה - setting_repository_log_display_limit: מספר מירבי של גירסאות המוצגות ביומן קובץ + setting_repository_log_display_limit: מספר מירבי של מהדורות המוצגות ביומן קובץ setting_openid: אפשר התחברות ורישום באמצעות OpenID - setting_password_min_length: אורך סיסמא מינימאלי + setting_password_min_length: אורך סיסמה מינימאלי setting_new_project_user_role_id: התפקיד שמוגדר למשתמש פשוט אשר יוצר פרויקט setting_default_projects_modules: מודולים מאופשרים בברירת מחדל עבור פרויקטים חדשים setting_issue_done_ratio: חשב אחוז התקדמות בנושא עם setting_issue_done_ratio_issue_field: השתמש בשדה הנושא setting_issue_done_ratio_issue_status: השתמש במצב הנושא - setting_start_of_week: התחל יומנים לפי + setting_start_of_week: השבוע מתחיל ביום setting_rest_api_enabled: אפשר שירות רשת REST setting_cache_formatted_text: שמור טקסט מעוצב במטמון + setting_default_notification_option: אפשרות התראה ברירת־מחדל permission_add_project: יצירת פרויקט permission_add_subprojects: יצירת תתי־פרויקט @@ -376,9 +381,9 @@ he: permission_add_issue_watchers: הוספת צופים permission_delete_issue_watchers: הסרת צופים permission_log_time: תיעוד זמן שהושקע - permission_view_time_entries: צפיה בזמן שהושקע + permission_view_time_entries: צפיה ברישום זמנים permission_edit_time_entries: עריכת רישום זמנים - permission_edit_own_time_entries: עריכת לוג הזמן של עצמו + permission_edit_own_time_entries: עריכת רישום הזמנים של עצמו permission_manage_news: ניהול חדשות permission_comment_news: תגובה לחדשות permission_manage_documents: ניהול מסמכים @@ -395,7 +400,7 @@ he: permission_protect_wiki_pages: הגנה על כל דפי wiki permission_manage_repository: ניהול מאגר permission_browse_repository: סיור במאגר - permission_view_changesets: צפיה בקבוצות שינויים + permission_view_changesets: צפיה בסדרות שינויים permission_commit_access: אישור הפקדות permission_manage_boards: ניהול לוחות permission_view_messages: צפיה בהודעות @@ -415,6 +420,8 @@ he: project_module_wiki: Wiki project_module_repository: מאגר project_module_boards: לוחות + project_module_calendar: לוח שנה + project_module_gantt: גאנט label_user: משתמש label_user_plural: משתמשים @@ -439,7 +446,7 @@ he: label_document: מסמך label_document_new: מסמך חדש label_document_plural: מסמכים - label_document_added: מוסמך נוסף + label_document_added: מסמך נוסף label_role: תפקיד label_role_plural: תפקידים label_role_new: תפקיד חדש @@ -464,7 +471,7 @@ he: label_enumeration_new: ערך חדש label_information: מידע label_information_plural: מידע - label_please_login: התחבר בבקשה + label_please_login: נא התחבר label_register: הרשמה label_login_with_open_id_option: או התחבר באמצעות OpenID label_password_lost: אבדה הסיסמה? @@ -479,7 +486,7 @@ he: label_help: עזרה label_reported_issues: נושאים שדווחו label_assigned_to_me_issues: נושאים שהוצבו לי - label_last_login: חיבור אחרון + label_last_login: התחברות אחרונה label_registered_on: נרשם בתאריך label_activity: פעילות label_overall_activity: פעילות כוללת @@ -487,10 +494,10 @@ he: label_new: חדש label_logged_as: מחובר כ label_environment: סביבה - label_authentication: אישור - label_auth_source: מצב אישור - label_auth_source_new: מצב אישור חדש - label_auth_source_plural: מצבי אישור + label_authentication: הזדהות + label_auth_source: מקור הזדהות + label_auth_source_new: מקור הזדהות חדש + label_auth_source_plural: מקורות הזדהות label_subproject_plural: תת־פרויקטים label_subproject_new: תת־פרויקט חדש label_and_its_subprojects: "{{value}} וכל תתי־הפרויקטים שלו" @@ -521,7 +528,7 @@ he: label_news_plural: חדשות label_news_latest: חדשות אחרונות label_news_view_all: צפה בכל החדשות - label_news_added: חדשות הוספו + label_news_added: חדשות נוספו label_settings: הגדרות label_overview: מבט רחב label_version: גירסה @@ -575,7 +582,7 @@ he: one: הערה אחת other: "{{count}} הערות" label_comment_add: הוסף תגובה - label_comment_added: תגובה הוספה + label_comment_added: תגובה נוספה label_comment_delete: מחק תגובות label_query: שאילתה אישית label_query_plural: שאילתות אישיות @@ -593,7 +600,7 @@ he: label_all_time: תמיד label_yesterday: אתמול label_this_week: השבוע - label_last_week: שבוע שעבר + label_last_week: השבוע שעבר label_last_n_days: "ב־{{count}} ימים אחרונים" label_this_month: החודש label_last_month: חודש שעבר @@ -612,19 +619,19 @@ he: label_modification_plural: "{{count}} שינויים" label_branch: ענף label_tag: סימון - label_revision: גירסה - label_revision_plural: גירסאות - label_revision_id: גירסה {{value}} - label_associated_revisions: גירסאות קשורות + label_revision: מהדורה + label_revision_plural: מהדורות + label_revision_id: מהדורה {{value}} + label_associated_revisions: מהדורות קשורות label_added: נוסף label_modified: שונה label_copied: הועתק label_renamed: השם שונה label_deleted: נמחק - label_latest_revision: גירסה אחרונה - label_latest_revision_plural: גירסאות אחרונות - label_view_revisions: צפה בגירסאות - label_view_all_revisions: צפה בכל הגירסאות + label_latest_revision: מהדורה אחרונה + label_latest_revision_plural: מהדורות אחרונות + label_view_revisions: צפה במהדורות + label_view_all_revisions: צפה בכל המהדורות label_max_size: גודל מקסימאלי label_sort_highest: הזז לראשית label_sort_higher: הזז למעלה @@ -638,10 +645,10 @@ he: label_result_plural: תוצאות label_all_words: כל המילים label_wiki: Wiki - label_wiki_edit: ערוך Wiki - label_wiki_edit_plural: עריכות Wiki + label_wiki_edit: ערוך wiki + label_wiki_edit_plural: עריכות wiki label_wiki_page: דף Wiki - label_wiki_page_plural: דפי Wiki + label_wiki_page_plural: דפי wiki label_index_by_title: סדר על פי כותרת label_index_by_date: סדר על פי תאריך label_current_version: גירסה נוכחית @@ -694,7 +701,7 @@ he: label_message_plural: הודעות label_message_last: הודעה אחרונה label_message_new: הודעה חדשה - label_message_posted: הודעה הוספה + label_message_posted: הודעה נוספה label_reply_plural: השבות label_send_information: שלח מידע על חשבון למשתמש label_year: שנה @@ -703,18 +710,18 @@ he: label_date_from: מתאריך label_date_to: עד label_language_based: מבוסס שפה - label_sort_by: "מין לפי {{value}}" + label_sort_by: "מיין לפי {{value}}" label_send_test_email: שלח דוא"ל בדיקה label_feeds_access_key: מפתח גישה ל־RSS label_missing_feeds_access_key: חסר מפתח גישה ל־RSS label_feeds_access_key_created_on: "מפתח הזנת RSS נוצר לפני{{value}}" label_module_plural: מודולים - label_added_time_by: "נוסף על ידי {{author}} לפני {{age}} " + label_added_time_by: 'נוסף ע"י {{author}} לפני {{age}}' label_updated_time_by: 'עודכן ע"י {{author}} לפני {{age}}' label_updated_time: "עודכן לפני {{value}} " label_jump_to_a_project: קפוץ לפרויקט... label_file_plural: קבצים - label_changeset_plural: אוסף שינוים + label_changeset_plural: סדרות שינויים label_default_columns: עמודת ברירת מחדל label_no_change_option: (אין שינוים) label_bulk_edit_selected_issues: ערוך את הנושאים המסומנים @@ -724,6 +731,9 @@ he: label_user_mail_option_all: "לכל אירוע בכל הפרויקטים שלי" label_user_mail_option_selected: "לכל אירוע בפרויקטים שבחרתי בלבד..." label_user_mail_option_none: "רק לנושאים שאני צופה או קשור אליהם" + label_user_mail_option_only_my_events: עבור דברים שאני צופה או מעורב בהם בלבד + label_user_mail_option_only_assigned: עבור דברים שאני אחראי עליהם בלבד + label_user_mail_option_only_owner: עבור דברים שאני הבעלים שלהם בלבד label_user_mail_no_self_notified: "אני לא רוצה שיודיעו לי על שינויים שאני מבצע" label_registration_activation_by_email: הפעל חשבון באמצעות דוא"ל label_registration_manual_activation: הפעלת חשבון ידנית @@ -735,7 +745,7 @@ he: label_more: עוד label_scm: מערכת ניהול תצורה label_plugins: תוספים - label_ldap_authentication: אימות LDAP + label_ldap_authentication: הזדהות LDAP label_downloads_abbr: D/L label_optional_description: תיאור רשות label_add_another_file: הוסף עוד קובץ @@ -752,8 +762,8 @@ he: label_ascending: בסדר עולה label_descending: בסדר יורד label_date_from_to: 'מתאריך {{start}} ועד תאריך {{end}}' - label_wiki_content_added: הדף נוסף ל־wiki - label_wiki_content_updated: דף ה־wiki עודכן + label_wiki_content_added: נוסף דף ל־wiki + label_wiki_content_updated: דף wiki עודכן label_group: קבוצה label_group_plural: קבוצות label_group_new: קבוצה חדשה @@ -785,6 +795,7 @@ he: button_create_and_continue: צור ופתח חדש button_test: בדוק button_edit: ערוך + button_edit_associated_wikipage: "ערוך דף wiki מקושר: {{page_title}}" button_add: הוסף button_change: שנה button_apply: החל @@ -800,8 +811,8 @@ he: button_cancel: בטל button_activate: הפעל button_sort: מיין - button_log_time: זמן לוג - button_rollback: חזור לגירסה זו + button_log_time: רישום זמנים + button_rollback: חזור למהדורה זו button_watch: צפה button_unwatch: בטל צפיה button_reply: השב @@ -809,7 +820,7 @@ he: button_unarchive: הוצא מהארכיון button_reset: אפס button_rename: שנה שם - button_change_password: שנה סיסמא + button_change_password: שנה סיסמה button_copy: העתק button_copy_and_follow: העתק ועקוב button_annotate: הוסף תיאור מסגרת @@ -836,6 +847,7 @@ he: text_subprojects_destroy_warning: "תת־הפרויקט\ים: {{value}} ימחקו גם כן." text_workflow_edit: בחר תפקיד וסיווג כדי לערוך את זרימת העבודה text_are_you_sure: האם אתה בטוח? + text_are_you_sure_with_children: האם למחוק את הנושא ואת כל בניו? text_journal_changed: "{{label}} השתנה מ{{old}} ל{{new}}" text_journal_set_to: "{{label}} נקבע ל{{value}}" text_journal_deleted: "{{label}} נמחק ({{old}})" @@ -852,8 +864,8 @@ he: text_comma_separated: הכנסת ערכים מרובים מותרת (מופרדים בפסיקים). text_line_separated: ניתן להזין מספר ערכים (שורה אחת לכל ערך). text_issues_ref_in_commit_messages: קישור ותיקום נושאים בהודעות הפקדה - text_issue_added: "הנושא {{id}} דווח (by {{author}})." - text_issue_updated: "הנושא {{id}} עודכן (by {{author}})." + 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: הסר הצבת קטגוריה @@ -875,7 +887,7 @@ he: 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_email_delivery_not_configured: 'לא נקבעה תצורה לשליחת דואר, וההתראות כבויות.\nקבע את תצורת שרת ה־SMTP בקובץ /etc/redmine/<instance>/email.yml והתחל את האפליקציה מחדש ע"מ לאפשר אותם.' text_repository_usernames_mapping: "בחר או עדכן את משתמש Redmine הממופה לכל שם משתמש ביומן המאגר.\nמשתמשים בעלי שם או כתובת דואר זהה ב־Redmine ובמאגר ממופים באופן אוטומטי." text_diff_truncated: '... השינויים עוברים את מספר השורות המירבי לתצוגה, ולכן הם קוצצו.' text_custom_field_possible_values_info: שורה אחת לכל ערך diff --git a/config/locales/ja.yml b/config/locales/ja.yml index dcc8fc59b2f..1db5a593346 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -376,6 +376,7 @@ ja: setting_issue_done_ratio_issue_status: チケットのステータスを使用する setting_start_of_week: 週の開始曜日 setting_rest_api_enabled: RESTによるWebサービスを有効にする + setting_default_notification_option: デフォルトのメール通知オプション permission_add_project: プロジェクトの追加 permission_add_subprojects: サブプロジェクトの追加 @@ -701,7 +702,7 @@ ja: label_relation_delete: 関連の削除 label_relates_to: 関係している label_duplicates: 重複している - label_duplicated_by: 重複している + label_duplicated_by: 重複されている label_blocks: ブロックしている label_blocked_by: ブロックされている label_precedes: 先行する @@ -752,7 +753,10 @@ ja: label_search_titles_only: タイトルのみ label_user_mail_option_all: "参加しているプロジェクトの全ての通知" label_user_mail_option_selected: "選択したプロジェクトの全ての通知..." - label_user_mail_option_none: "ウォッチまたは関係している事柄のみ" + label_user_mail_option_none: "通知しない" + label_user_mail_option_only_my_events: "ウォッチまたは関係している事柄のみ" + label_user_mail_option_only_assigned: "自分が担当している事柄のみ" + label_user_mail_option_only_owner: "自分が作成した事柄のみ" label_user_mail_no_self_notified: 自分自身による変更の通知は不要 label_registration_activation_by_email: メールでアカウントを有効化 label_registration_manual_activation: 手動でアカウントを有効化 diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index f23d49a5704..a783bc97e3c 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -937,8 +937,12 @@ pt-BR: field_time_entries: Log time project_module_gantt: Gantt project_module_calendar: Calendário - field_member_of_group: Mebro do grupo + field_member_of_group: Membro do grupo field_assigned_to_role: Membro com o papel - button_edit_associated_wikipage: "Editar páginas wiki relacionadas: {{page_title}}" + button_edit_associated_wikipage: "Editar página wiki relacionada: {{page_title}}" text_are_you_sure_with_children: Excluir a tarefa e suas subtarefas? field_text: Campo de texto + label_user_mail_option_only_owner: Somente para as coisas que eu criei + setting_default_notification_option: Opção padrão de notificação + label_user_mail_option_only_my_events: Somente para as coisas que eu esteja observando ou esteja envolvido + label_user_mail_option_only_assigned: Somente para as coisas que estejam atribuídas a mim diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 4646e28cec7..e658aefd38d 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -128,7 +128,7 @@ pt: greater_than_start_date: "deve ser maior que a data inicial" not_same_project: "não pertence ao mesmo projecto" circular_dependency: "Esta relação iria criar uma dependência circular" - cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks" + cant_link_an_issue_with_a_descendant: "Não é possível ligar uma tarefa a uma sub-tarefa que lhe é pertencente" ## Translated by: Pedro Araújo actionview_instancetag_blank_option: Seleccione @@ -152,7 +152,7 @@ pt: notice_account_unknown_email: Utilizador desconhecido. notice_can_t_change_password: Esta conta utiliza uma fonte de autenticação externa. Não é possível alterar a palavra-chave. notice_account_lost_email_sent: Foi-lhe enviado um e-mail com as instruções para escolher uma nova palavra-chave. - notice_account_activated: A sua conta foi activada. Já pode autenticar-se. + notice_account_activated: A sua conta foi activada. É agora possível autenticar-se. notice_successful_create: Criado com sucesso. notice_successful_update: Alterado com sucesso. notice_successful_delete: Apagado com sucesso. @@ -176,9 +176,9 @@ pt: error_issue_not_found_in_project: 'A tarefa não foi encontrada ou não pertence a este projecto.' mail_subject_lost_password: "Palavra-chave de {{value}}" - mail_body_lost_password: 'Para mudar a sua palavra-chave, clique no link abaixo:' + mail_body_lost_password: 'Para mudar a sua palavra-chave, clique na ligação abaixo:' mail_subject_register: "Activação de conta de {{value}}" - mail_body_register: 'Para activar a sua conta, clique no link abaixo:' + mail_body_register: 'Para activar a sua conta, clique na ligação abaixo:' mail_body_account_information_external: "Pode utilizar a conta {{value}} para autenticar-se." mail_body_account_information: Informação da sua conta mail_subject_account_activation_request: "Pedido de activação da conta {{value}}" @@ -224,7 +224,7 @@ pt: field_priority: Prioridade field_fixed_version: Versão field_user: Utilizador - field_role: Papel + field_role: Função field_homepage: Página field_is_public: Público field_parent: Sub-projecto de @@ -264,8 +264,8 @@ pt: field_is_filter: Usado como filtro field_issue_to: Tarefa relacionada field_delay: Atraso - field_assignable: As tarefas podem ser associados a este papel - field_redirect_existing_links: Redireccionar links existentes + field_assignable: As tarefas podem ser associados a esta função + field_redirect_existing_links: Redireccionar ligações existentes field_estimated_hours: Tempo estimado field_column_names: Colunas field_time_zone: Fuso horário @@ -343,17 +343,17 @@ pt: label_document_new: Novo documento label_document_plural: Documentos label_document_added: Documento adicionado - label_role: Papel - label_role_plural: Papéis - label_role_new: Novo papel - label_role_and_permissions: Papéis e permissões + label_role: Função + label_role_plural: Funções + label_role_new: Nova função + label_role_and_permissions: Funções e permissões label_member: Membro label_member_new: Novo membro label_member_plural: Membros label_tracker: Tipo label_tracker_plural: Tipos label_tracker_new: Novo tipo - label_workflow: Workflow + label_workflow: Fluxo de trabalho label_issue_status: Estado da tarefa label_issue_status_plural: Estados da tarefa label_issue_status_new: Novo estado @@ -553,7 +553,7 @@ pt: label_diff_inline: inline label_diff_side_by_side: lado a lado label_options: Opções - label_copy_workflow_from: Copiar workflow de + label_copy_workflow_from: Copiar fluxo de trabalho de label_permissions_report: Relatório de permissões label_watched_issues: Tarefas observadas label_related_issues: Tarefas relacionadas @@ -681,7 +681,7 @@ pt: text_min_max_length_info: 0 siginifica sem restrição text_project_destroy_confirmation: Tem a certeza que deseja apagar o projecto e todos os dados relacionados? text_subprojects_destroy_warning: "O(s) seu(s) sub-projecto(s): {{value}} também será/serão apagado(s)." - text_workflow_edit: Seleccione um papel e um tipo de tarefa para editar o workflow + text_workflow_edit: Seleccione uma função e um tipo de tarefa para editar o fluxo de trabalho text_are_you_sure: Tem a certeza? text_tip_task_begin_day: tarefa a começar neste dia text_tip_task_end_day: tarefa a acabar neste dia @@ -690,7 +690,7 @@ pt: text_caracters_maximum: "máximo {{count}} caracteres." text_caracters_minimum: "Deve ter pelo menos {{count}} caracteres." text_length_between: "Deve ter entre {{min}} e {{max}} caracteres." - text_tracker_no_workflow: Sem workflow definido para este tipo de tarefa. + text_tracker_no_workflow: Sem fluxo de trabalho definido para este tipo de tarefa. text_unallowed_characters: Caracteres não permitidos text_comma_separated: Permitidos múltiplos valores (separados por vírgula). text_issues_ref_in_commit_messages: Referenciando e fechando tarefas em mensagens de commit @@ -701,7 +701,7 @@ pt: text_issue_category_destroy_assignments: Remover as atribuições à categoria text_issue_category_reassign_to: Re-atribuir as tarefas para esta categoria text_user_mail_option: "Para projectos não seleccionados, apenas receberá notificações acerca de coisas que está a observar ou está envolvido (ex. tarefas das quais foi o criador ou lhes foram atribuídas)." - text_no_configuration_data: "Papeis, tipos de tarefas, estados das tarefas e workflows ainda não foram configurados.\nÉ extremamente recomendado carregar as configurações padrão. Será capaz de as modificar depois de estarem carregadas." + text_no_configuration_data: "Perfis, tipos de tarefas, estados das tarefas e workflows ainda não foram configurados.\nÉ extremamente recomendado carregar as configurações padrão. Será capaz de as modificar depois de estarem carregadas." text_load_default_configuration: Carregar as configurações padrão text_status_changed_by_changeset: "Aplicado no changeset {{value}}." text_issues_destroy_confirmation: 'Tem a certeza que deseja apagar a(s) tarefa(s) seleccionada(s)?' @@ -725,7 +725,7 @@ pt: default_tracker_feature: Funcionalidade default_tracker_support: Suporte default_issue_status_new: Novo - default_issue_status_in_progress: In Progress + default_issue_status_in_progress: Em curso default_issue_status_resolved: Resolvido default_issue_status_feedback: Feedback default_issue_status_closed: Fechado @@ -790,7 +790,7 @@ pt: permission_rename_wiki_pages: Renomear páginas de wiki permission_edit_time_entries: Editar entradas de tempo permission_edit_own_issue_notes: Editar as prórpias notas - setting_gravatar_enabled: Utilizar icons Gravatar + setting_gravatar_enabled: Utilizar ícones Gravatar label_example: Exemplo text_repository_usernames_mapping: "Seleccionar ou actualizar o utilizador de Redmine mapeado a cada nome de utilizador encontrado no repositório.\nUtilizadores com o mesmo nome de utilizador ou email no Redmine e no repositório são mapeados automaticamente." permission_edit_own_messages: Editar as próprias mensagens @@ -799,130 +799,130 @@ pt: label_updated_time_by: "Actualizado por {{author}} há {{age}}" text_diff_truncated: '... Este diff foi truncado porque excede o tamanho máximo que pode ser mostrado.' setting_diff_max_lines_displayed: Número máximo de linhas de diff mostradas - text_plugin_assets_writable: Plugin assets directory writable - warning_attachments_not_saved: "{{count}} file(s) could not be saved." - button_create_and_continue: Create and continue - text_custom_field_possible_values_info: 'One line for each value' - label_display: Display - field_editable: Editable - setting_repository_log_display_limit: Maximum number of revisions displayed on file log - setting_file_max_size_displayed: Max size of text files displayed inline - field_watcher: Watcher - setting_openid: Allow OpenID login and registration - field_identity_url: OpenID URL - label_login_with_open_id_option: or login with OpenID - field_content: Content - label_descending: Descending - label_sort: Sort - label_ascending: Ascending - label_date_from_to: From {{start}} to {{end}} + text_plugin_assets_writable: Escrita na pasta de activos dos módulos de extensão possível + warning_attachments_not_saved: "Não foi possível gravar {{count}} ficheiro(s) ." + button_create_and_continue: Criar e continuar + text_custom_field_possible_values_info: 'Uma linha para cada valor' + label_display: Mostrar + field_editable: Editável + setting_repository_log_display_limit: Número máximo de revisões exibido no relatório de ficheiro + setting_file_max_size_displayed: Tamanho máximo dos ficheiros de texto exibidos inline + field_watcher: Observador + setting_openid: Permitir início de sessão e registo com OpenID + field_identity_url: URL do OpenID + label_login_with_open_id_option: ou início de sessão com OpenID + field_content: Conteúdo + label_descending: Descendente + label_sort: Ordenar + label_ascending: Ascendente + label_date_from_to: De {{start}} a {{end}} label_greater_or_equal: ">=" label_less_or_equal: <= - text_wiki_page_destroy_question: This page has {{descendants}} child page(s) and descendant(s). What do you want to do? - text_wiki_page_reassign_children: Reassign child pages to this parent page - text_wiki_page_nullify_children: Keep child pages as root pages - text_wiki_page_destroy_children: Delete child pages and all their descendants - setting_password_min_length: Minimum password length - field_group_by: Group results by - mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated" - label_wiki_content_added: Wiki page added - mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" - mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}. - label_wiki_content_updated: Wiki page updated - mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}. - permission_add_project: Create project - setting_new_project_user_role_id: Role given to a non-admin user who creates a project - label_view_all_revisions: View all revisions - label_tag: Tag - label_branch: Branch - error_no_tracker_in_project: No tracker is associated to this project. Please check the Project settings. - error_no_default_issue_status: No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses"). - label_group_plural: Groups - label_group: Group - label_group_new: New group - label_time_entry_plural: Spent time - text_journal_changed: "{{label}} changed from {{old}} to {{new}}" - text_journal_set_to: "{{label}} set to {{value}}" - text_journal_deleted: "{{label}} deleted ({{old}})" - text_journal_added: "{{label}} {{value}} added" - field_active: Active - enumeration_system_activity: System Activity - permission_delete_issue_watchers: Delete watchers - version_status_closed: closed - version_status_locked: locked - version_status_open: open - error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened - label_user_anonymous: Anonymous - button_move_and_follow: Move and follow - setting_default_projects_modules: Default enabled modules for new projects - setting_gravatar_default: Default Gravatar image - field_sharing: Sharing - label_version_sharing_hierarchy: With project hierarchy - label_version_sharing_system: With all projects - label_version_sharing_descendants: With subprojects - label_version_sharing_tree: With project tree - label_version_sharing_none: Not shared - error_can_not_archive_project: This project can not be archived - button_duplicate: Duplicate - button_copy_and_follow: Copy and follow - label_copy_source: Source - setting_issue_done_ratio: Calculate the issue done ratio with - setting_issue_done_ratio_issue_status: Use the issue status - error_issue_done_ratios_not_updated: Issue done ratios not updated. - error_workflow_copy_target: Please select target tracker(s) and role(s) - setting_issue_done_ratio_issue_field: Use the issue field - label_copy_same_as_target: Same as target - label_copy_target: Target - notice_issue_done_ratios_updated: Issue done ratios updated. - error_workflow_copy_source: Please select a source tracker or role - label_update_issue_done_ratios: Update issue done ratios - setting_start_of_week: Start calendars on - permission_view_issues: View Issues - label_display_used_statuses_only: Only display statuses that are used by this tracker - label_revision_id: Revision {{value}} - label_api_access_key: API access key - label_api_access_key_created_on: API access key created {{value}} ago - label_feeds_access_key: RSS access key - notice_api_access_key_reseted: Your API access key was reset. - setting_rest_api_enabled: Enable REST web service - label_missing_api_access_key: Missing an API access key - label_missing_feeds_access_key: Missing a RSS access key - button_show: Show - text_line_separated: Multiple values allowed (one line for each value). - setting_mail_handler_body_delimiters: Truncate emails after one of these lines - permission_add_subprojects: Create subprojects - label_subproject_new: New subproject + text_wiki_page_destroy_question: Esta página tem {{descendants}} página(s) subordinada(s) e descendente(s). O que deseja fazer? + text_wiki_page_reassign_children: Reatribuir páginas subordinadas a esta página principal + text_wiki_page_nullify_children: Manter páginas subordinadas como páginas raíz + text_wiki_page_destroy_children: Apagar as páginas subordinadas e todos os seus descendentes + setting_password_min_length: Tamanho mínimo de palavra-chave + field_group_by: Agrupar resultados por + mail_subject_wiki_content_updated: "A página Wiki '{{page}}' foi actualizada" + label_wiki_content_added: Página Wiki adicionada + mail_subject_wiki_content_added: "A página Wiki '{{page}}' foi adicionada" + mail_body_wiki_content_added: A página Wiki '{{page}}' foi adicionada por {{author}}. + label_wiki_content_updated: Página Wiki actualizada + mail_body_wiki_content_updated: A página Wiki '{{page}}' foi actualizada por {{author}}. + permission_add_project: Criar projecto + setting_new_project_user_role_id: Função atribuída a um utilizador não-administrador que cria um projecto + label_view_all_revisions: Ver todas as revisões + label_tag: Etiqueta + label_branch: Ramo + error_no_tracker_in_project: Este projecto não tem associado nenhum tipo de tarefas. Verifique as definições do projecto. + error_no_default_issue_status: Não está definido um estado padrão para as tarefas. Verifique a sua configuração (dirija-se a "Administração -> Estados da tarefa"). + label_group_plural: Grupos + label_group: Grupo + label_group_new: Novo grupo + label_time_entry_plural: Tempo registado + text_journal_changed: "{{label}} alterado de {{old}} para {{new}}" + text_journal_set_to: "{{label}} configurado como {{value}}" + text_journal_deleted: "{{label}} apagou ({{old}})" + text_journal_added: "{{label}} {{value}} adicionado" + field_active: Activo + enumeration_system_activity: Actividade de sistema + permission_delete_issue_watchers: Apagar observadores + version_status_closed: fechado + version_status_locked: protegido + version_status_open: aberto + error_can_not_reopen_issue_on_closed_version: Não é possível voltar a abrir uma tarefa atribuída a uma versão fechada + label_user_anonymous: Anónimo + button_move_and_follow: Mover e seguir + setting_default_projects_modules: Módulos activos por predefinição para novos projectos + setting_gravatar_default: Imagem Gravatar predefinida + field_sharing: Partilha + label_version_sharing_hierarchy: Com hierarquia do projecto + label_version_sharing_system: Com todos os projectos + label_version_sharing_descendants: Com os sub-projectos + label_version_sharing_tree: Com árvore do projecto + label_version_sharing_none: Não partilhado + error_can_not_archive_project: Não é possível arquivar este projecto + button_duplicate: Duplicar + button_copy_and_follow: Copiar e seguir + label_copy_source: Origem + setting_issue_done_ratio: Calcular a percentagem de progresso da tarefa + setting_issue_done_ratio_issue_status: Através do estado da tarefa + error_issue_done_ratios_not_updated: Percentagens de progresso da tarefa não foram actualizadas. + error_workflow_copy_target: Seleccione os tipos de tarefas e funções desejadas + setting_issue_done_ratio_issue_field: Através do campo da tarefa + label_copy_same_as_target: Mesmo que o alvo + label_copy_target: Alvo + notice_issue_done_ratios_updated: Percentagens de progresso da tarefa actualizadas. + error_workflow_copy_source: Seleccione um tipo de tarefa ou função de origem + label_update_issue_done_ratios: Actualizar percentagens de progresso da tarefa + setting_start_of_week: Iniciar calendários a + permission_view_issues: Ver tarefas + label_display_used_statuses_only: Só exibir estados empregues por este tipo de tarefa + label_revision_id: Revisão {{value}} + label_api_access_key: Chave de acesso API + label_api_access_key_created_on: Chave de acesso API criada há {{value}} + label_feeds_access_key: Chave de acesso RSS + notice_api_access_key_reseted: A sua chave de acesso API foi reinicializada. + setting_rest_api_enabled: Activar serviço Web REST + label_missing_api_access_key: Chave de acesso API em falta + label_missing_feeds_access_key: Chave de acesso RSS em falta + button_show: Mostrar + text_line_separated: Vários valores permitidos (uma linha para cada valor). + setting_mail_handler_body_delimiters: Truncar mensagens de correio electrónico após uma destas linhas + permission_add_subprojects: Criar sub-projectos + label_subproject_new: Novo sub-projecto text_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. + Está prestes a eliminar parcial ou totalmente as suas permissões. É possível que não possa editar o projecto após esta acção. + Tem a certeza de que deseja continuar? + label_close_versions: Fechar versões completas + label_board_sticky: Fixar mensagem + label_board_locked: Proteger + permission_export_wiki_pages: Exportar páginas Wiki + setting_cache_formatted_text: Colocar formatação do texto na memória cache + permission_manage_project_activities: Gerir actividades do projecto + error_unable_delete_issue_status: Não foi possível apagar o estado da tarefa + label_profile: Perfil + permission_manage_subtasks: Gerir sub-tarefas + field_parent_issue: Tarefa principal + label_subtask_plural: Sub-tarefa + label_project_copy_notifications: Enviar notificações por e-mail durante a cópia do projecto + error_can_not_delete_custom_field: Não foi possível apagar o campo personalizado + error_unable_to_connect: Não foi possível ligar ({{value}}) + error_can_not_remove_role: Esta função está actualmente em uso e não pode ser apagada. + error_can_not_delete_tracker: Existem ainda tarefas nesta categoria. Não é possível apagar este tipo de tarefa. field_principal: Principal - label_my_page_block: My page block - notice_failed_to_save_members: "Failed to save member(s): {{errors}}." - text_zoom_out: Zoom out - text_zoom_in: Zoom in - notice_unable_delete_time_entry: Unable to delete time log entry. - label_overall_spent_time: Overall spent time - field_time_entries: Log time + label_my_page_block: Bloco da minha página + notice_failed_to_save_members: "Erro ao guardar o(s) membro(s): {{errors}}." + text_zoom_out: Ampliar + text_zoom_in: Reduzir + notice_unable_delete_time_entry: Não foi possível apagar a entrada de tempo registado. + label_overall_spent_time: Total de tempo registado + field_time_entries: Tempo registado project_module_gantt: Gantt - project_module_calendar: Calendar - field_member_of_group: Member of Group - field_assigned_to_role: Member of Role - button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" - text_are_you_sure_with_children: Delete issue and all child issues? + project_module_calendar: Calendário + field_member_of_group: Membro do Grupo + field_assigned_to_role: Membro do Perfil + button_edit_associated_wikipage: "Editar página Wiki associada: {{page_title}}" + text_are_you_sure_with_children: Apagar tarefa e todas as sub-tarefas? field_text: Text field diff --git a/config/locales/ru.yml b/config/locales/ru.yml index f06ebfd104f..3212fef2e26 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -703,6 +703,9 @@ ru: label_user_mail_option_all: "О всех событиях во всех моих проектах" label_user_mail_option_none: "Только о тех событиях, которые я отслеживаю или в которых я участвую" label_user_mail_option_selected: "О всех событиях только в выбранном проекте..." + label_user_mail_option_only_owner: Только для объектов, для которых я являюсь владельцем + label_user_mail_option_only_my_events: Только для объектов, которые я отслеживаю или в которых участвую + label_user_mail_option_only_assigned: Только для объектов, которые назначены мне label_user_new: Новый пользователь label_user_plural: Пользователи label_version: Версия @@ -865,6 +868,7 @@ ru: setting_cross_project_issue_relations: Разрешить пересечение задач по проектам setting_date_format: Формат даты setting_default_language: Язык по умолчанию + setting_default_notification_option: Способ оповещения по умолчанию setting_default_projects_public: Новые проекты являются общедоступными setting_diff_max_lines_displayed: Максимальное число строк для diff setting_display_subprojects_issues: Отображение подпроектов по умолчанию diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 1bc1c78b090..42513a7915b 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -568,7 +568,7 @@ sv: label_news_view_all: Visa alla nyheter label_news_added: Nyhet tillagd label_settings: Inställningar - label_overview: Överblick + label_overview: Översikt label_version: Version label_version_new: Ny version label_version_plural: Versioner diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 9dc635724e1..06214be3cfa 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -436,7 +436,8 @@ setting_start_of_week: 週的第一天 setting_rest_api_enabled: 啟用 REST 網路服務技術（Web Service） setting_cache_formatted_text: 快取已格式化文字 - + setting_default_notification_option: 預設通知選項 + permission_add_project: 建立專案 permission_add_subprojects: 建立子專案 permission_edit_project: 編輯專案 @@ -812,6 +813,9 @@ label_user_mail_option_all: "提醒與我的專案有關的全部事件" label_user_mail_option_selected: "只提醒我所選擇專案中的事件..." label_user_mail_option_none: "只提醒我觀察中或參與中的事件" + label_user_mail_option_only_my_events: "只提醒我觀察中或參與中的事物" + label_user_mail_option_only_assigned: "只提醒我被指派的事物" + label_user_mail_option_only_owner: "只提醒我作為擁有者的事物" label_user_mail_no_self_notified: "不提醒我自己所做的變更" label_registration_activation_by_email: 透過電子郵件啟用帳戶 label_registration_manual_activation: 手動啟用帳戶 From c18d96bd8b7dc74e9be05fb7763d2d60fb1628c5 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:55:02 +0000 Subject: [PATCH 170/240] Merged r4238 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4314 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/calendars/show.html.erb | 6 +++--- config/locales/bg.yml | 6 +++--- config/locales/bs.yml | 6 +++--- config/locales/ca.yml | 6 +++--- config/locales/cs.yml | 6 +++--- config/locales/da.yml | 6 +++--- config/locales/de.yml | 6 +++--- config/locales/el.yml | 6 +++--- config/locales/en-GB.yml | 6 +++--- config/locales/en.yml | 6 +++--- config/locales/es.yml | 6 +++--- config/locales/eu.yml | 6 +++--- config/locales/fi.yml | 6 +++--- config/locales/fr.yml | 6 +++--- config/locales/gl.yml | 6 +++--- config/locales/he.yml | 6 +++--- config/locales/hr.yml | 6 +++--- config/locales/hu.yml | 6 +++--- config/locales/id.yml | 6 +++--- config/locales/it.yml | 6 +++--- config/locales/ja.yml | 6 +++--- config/locales/ko.yml | 6 +++--- config/locales/lt.yml | 6 +++--- config/locales/lv.yml | 6 +++--- config/locales/mk.yml | 6 +++--- config/locales/mn.yml | 6 +++--- config/locales/nl.yml | 6 +++--- config/locales/no.yml | 6 +++--- config/locales/pl.yml | 8 ++++---- config/locales/pt-BR.yml | 6 +++--- config/locales/pt.yml | 6 +++--- config/locales/ro.yml | 6 +++--- config/locales/ru.yml | 6 +++--- config/locales/sk.yml | 6 +++--- config/locales/sl.yml | 6 +++--- config/locales/sr-YU.yml | 6 +++--- config/locales/sr.yml | 6 +++--- config/locales/sv.yml | 6 +++--- config/locales/th.yml | 6 +++--- config/locales/tr.yml | 6 +++--- config/locales/uk.yml | 6 +++--- config/locales/vi.yml | 6 +++--- config/locales/zh-TW.yml | 6 +++--- config/locales/zh.yml | 6 +++--- 44 files changed, 133 insertions(+), 133 deletions(-) diff --git a/app/views/calendars/show.html.erb b/app/views/calendars/show.html.erb index e94cb677d86..2ec86038a76 100644 --- a/app/views/calendars/show.html.erb +++ b/app/views/calendars/show.html.erb @@ -36,9 +36,9 @@ <%= render :partial => 'common/calendar', :locals => {:calendar => @calendar} %>

    - <%= l(:text_tip_task_begin_day) %> - <%= l(:text_tip_task_end_day) %> - <%= l(:text_tip_task_begin_end_day) %> + <%= l(:text_tip_issue_begin_day) %> + <%= l(:text_tip_issue_end_day) %> + <%= l(:text_tip_issue_begin_end_day) %>

    <% end %> diff --git a/config/locales/bg.yml b/config/locales/bg.yml index a9b480e71c5..42170f34728 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -562,9 +562,9 @@ bg: text_project_destroy_confirmation: Сигурни ли сте, че искате да изтриете проекта и данните в него? text_workflow_edit: Изберете роля и тракер за да редактирате работния процес text_are_you_sure: Сигурни ли сте? - text_tip_task_begin_day: задача започваща този ден - text_tip_task_end_day: задача завършваща този ден - text_tip_task_begin_end_day: задача започваща и завършваща този ден + text_tip_issue_begin_day: задача започваща този ден + text_tip_issue_end_day: задача завършваща този ден + text_tip_issue_begin_end_day: задача започваща и завършваща този ден text_project_identifier_info: 'Позволени са малки букви (a-z), цифри и тирета.
    Невъзможна промяна след запис.' text_caracters_maximum: "До {{count}} символа." text_length_between: "От {{min}} до {{max}} символа." diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 25eb94b8227..aa5d27920b5 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -750,9 +750,9 @@ bs: text_subprojects_destroy_warning: "Podprojekt(i): {{value}} će takođe biti izbrisani." text_workflow_edit: Odaberite ulogu i područje aktivnosti za ispravku toka promjena na aktivnosti text_are_you_sure: Da li ste sigurni ? - text_tip_task_begin_day: zadatak počinje danas - text_tip_task_end_day: zadatak završava danas - text_tip_task_begin_end_day: zadatak započinje i završava danas + text_tip_issue_begin_day: zadatak počinje danas + text_tip_issue_end_day: zadatak završava danas + text_tip_issue_begin_end_day: zadatak započinje i završava danas text_project_identifier_info: 'Samo mala slova (a-z), brojevi i crtice su dozvoljeni.
    Nakon snimanja, identifikator se ne može mijenjati.' text_caracters_maximum: "maksimum {{count}} karaktera." text_caracters_minimum: "Dužina mora biti najmanje {{count}} znakova." diff --git a/config/locales/ca.yml b/config/locales/ca.yml index a418038e9bb..0780a583d41 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -842,9 +842,9 @@ ca: text_journal_set_to: "{{label}} s'ha establert a {{value}}" text_journal_deleted: "{{label}} s'ha suprimit ({{old}})" text_journal_added: "S'ha afegit {{label}} {{value}}" - text_tip_task_begin_day: "tasca que s'inicia aquest dia" - text_tip_task_end_day: tasca que finalitza aquest dia - text_tip_task_begin_end_day: "tasca que s'inicia i finalitza aquest dia" + text_tip_issue_begin_day: "tasca que s'inicia aquest dia" + text_tip_issue_end_day: tasca que finalitza aquest dia + text_tip_issue_begin_end_day: "tasca que s'inicia i finalitza aquest dia" text_project_identifier_info: "Es permeten lletres en minúscules (a-z), números i guions.
    Un cop desat, l'identificador no es pot modificar." text_caracters_maximum: "{{count}} caràcters com a màxim." text_caracters_minimum: "Com a mínim ha de tenir {{count}} caràcters." diff --git a/config/locales/cs.yml b/config/locales/cs.yml index edb0fdc18e8..8f90e6d5191 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -655,9 +655,9 @@ cs: text_project_destroy_confirmation: Jste si jisti, že chcete odstranit tento projekt a všechna související data ? text_workflow_edit: Vyberte roli a frontu k editaci průběhu práce text_are_you_sure: Jste si jisti? - text_tip_task_begin_day: úkol začíná v tento den - text_tip_task_end_day: úkol končí v tento den - text_tip_task_begin_end_day: úkol začíná a končí v tento den + text_tip_issue_begin_day: úkol začíná v tento den + text_tip_issue_end_day: úkol končí v tento den + text_tip_issue_begin_end_day: úkol začíná a končí v tento den text_project_identifier_info: 'Jsou povolena malá písmena (a-z), čísla a pomlčky.
    Po uložení již není možné identifikátor změnit.' text_caracters_maximum: "{{count}} znaků maximálně." text_caracters_minimum: "Musí být alespoň {{count}} znaků dlouhé." diff --git a/config/locales/da.yml b/config/locales/da.yml index f7d27a3690e..3d1006852cd 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -657,9 +657,9 @@ da: text_project_destroy_confirmation: Er du sikker på at du vil slette dette projekt og alle relaterede data? text_workflow_edit: Vælg en rolle samt en type, for at redigere arbejdsgangen text_are_you_sure: Er du sikker? - text_tip_task_begin_day: opgaven begynder denne dag - text_tip_task_end_day: opaven slutter denne dag - text_tip_task_begin_end_day: opgaven begynder og slutter denne dag + text_tip_issue_begin_day: opgaven begynder denne dag + text_tip_issue_end_day: opaven slutter denne dag + text_tip_issue_begin_end_day: opgaven begynder og slutter denne dag text_project_identifier_info: 'Små bogstaver (a-z), numre og bindestreg er tilladt.
    Denne er en unik identifikation for projektet, og kan defor ikke rettes senere.' text_caracters_maximum: "max {{count}} karakterer." text_caracters_minimum: "Skal være mindst {{count}} karakterer lang." diff --git a/config/locales/de.yml b/config/locales/de.yml index 61f21829f41..54a83d1e301 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -858,9 +858,9 @@ de: text_journal_set_to: "{{label}} wurde auf {{value}} gesetzt" text_journal_deleted: "{{label}} {{old}} wurde gelöscht" text_journal_added: "{{label}} {{value}} wurde hinzugefügt" - text_tip_task_begin_day: Aufgabe, die an diesem Tag beginnt - text_tip_task_end_day: Aufgabe, die an diesem Tag endet - text_tip_task_begin_end_day: Aufgabe, die an diesem Tag beginnt und endet + text_tip_issue_begin_day: Aufgabe, die an diesem Tag beginnt + text_tip_issue_end_day: Aufgabe, die an diesem Tag endet + text_tip_issue_begin_end_day: Aufgabe, die an diesem Tag beginnt und endet text_project_identifier_info: 'Kleinbuchstaben (a-z), Ziffern und Bindestriche erlaubt.
    Einmal gespeichert, kann die Kennung nicht mehr geändert werden.' text_caracters_maximum: "Max. {{count}} Zeichen." text_caracters_minimum: "Muss mindestens {{count}} Zeichen lang sein." diff --git a/config/locales/el.yml b/config/locales/el.yml index 396f925fb57..609d6b8d02a 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -761,9 +761,9 @@ el: text_subprojects_destroy_warning: "Επίσης το(α) επιμέρους έργο(α): {{value}} θα διαγραφούν." text_workflow_edit: Επιλέξτε ένα ρόλο και έναν ανιχνευτή για να επεξεργαστείτε τη ροή εργασίας text_are_you_sure: Είστε σίγουρος ; - text_tip_task_begin_day: καθήκοντα που ξεκινάνε σήμερα - text_tip_task_end_day: καθήκοντα που τελειώνουν σήμερα - text_tip_task_begin_end_day: καθήκοντα που ξεκινάνε και τελειώνουν σήμερα + text_tip_issue_begin_day: καθήκοντα που ξεκινάνε σήμερα + text_tip_issue_end_day: καθήκοντα που τελειώνουν σήμερα + text_tip_issue_begin_end_day: καθήκοντα που ξεκινάνε και τελειώνουν σήμερα text_project_identifier_info: 'Επιτρέπονται μόνο μικρά πεζά γράμματα (a-z), αριθμοί και παύλες.
    Μετά την αποθήκευση, το αναγνωριστικό δεν μπορεί να αλλάξει.' text_caracters_maximum: "μέγιστος αριθμός {{count}} χαρακτήρες." text_caracters_minimum: "Πρέπει να περιέχει τουλάχιστον {{count}} χαρακτήρες." diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 808673e302f..693793774da 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -825,9 +825,9 @@ en-GB: text_journal_set_to: "{{label}} set to {{value}}" text_journal_deleted: "{{label}} deleted ({{old}})" text_journal_added: "{{label}} {{value}} added" - text_tip_task_begin_day: task beginning this day - text_tip_task_end_day: task ending this day - text_tip_task_begin_end_day: task beginning and ending this day + text_tip_issue_begin_day: task beginning this day + text_tip_issue_end_day: task ending this day + text_tip_issue_begin_end_day: task beginning and ending this day text_project_identifier_info: 'Only lower case letters (a-z), numbers and dashes are allowed.
    Once saved, the identifier can not be changed.' text_caracters_maximum: "{{count}} characters maximum." text_caracters_minimum: "Must be at least {{count}} characters long." diff --git a/config/locales/en.yml b/config/locales/en.yml index c1befee4e1c..7742c7148f0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -843,9 +843,9 @@ en: text_journal_set_to: "{{label}} set to {{value}}" text_journal_deleted: "{{label}} deleted ({{old}})" text_journal_added: "{{label}} {{value}} added" - text_tip_task_begin_day: task beginning this day - text_tip_task_end_day: task ending this day - text_tip_task_begin_end_day: task beginning and ending this day + text_tip_issue_begin_day: issue beginning this day + text_tip_issue_end_day: issue ending this day + text_tip_issue_begin_end_day: issue beginning and ending this day text_project_identifier_info: 'Only lower case letters (a-z), numbers and dashes are allowed.
    Once saved, the identifier can not be changed.' text_caracters_maximum: "{{count}} characters maximum." text_caracters_minimum: "Must be at least {{count}} characters long." diff --git a/config/locales/es.yml b/config/locales/es.yml index e837c868d66..a4c73070351 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -821,9 +821,9 @@ es: text_select_project_modules: 'Seleccione los módulos a activar para este proyecto:' text_status_changed_by_changeset: "Aplicado en los cambios {{value}}" text_subprojects_destroy_warning: "Los proyectos secundarios: {{value}} también se eliminarán" - text_tip_task_begin_day: tarea que comienza este día - text_tip_task_begin_end_day: tarea que comienza y termina este día - text_tip_task_end_day: tarea que termina este día + text_tip_issue_begin_day: tarea que comienza este día + text_tip_issue_begin_end_day: tarea que comienza y termina este día + text_tip_issue_end_day: tarea que termina este día text_tracker_no_workflow: No hay ningún flujo de trabajo definido para este tipo de petición text_unallowed_characters: Caracteres no permitidos text_user_mail_option: "De los proyectos no seleccionados, sólo recibirá notificaciones sobre elementos monitorizados o elementos en los que esté involucrado (por ejemplo, peticiones de las que usted sea autor o asignadas a usted)." diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 69c405ce206..0404a39da53 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -821,9 +821,9 @@ eu: text_journal_set_to: "{{label}}-k {{value}} balioa hartu du" text_journal_deleted: "{{label}} ezabatuta ({{old}})" text_journal_added: "{{label}} {{value}} gehituta" - text_tip_task_begin_day: gaur hasten diren atazak - text_tip_task_end_day: gaur bukatzen diren atazak - text_tip_task_begin_end_day: gaur hasi eta bukatzen diren atazak + text_tip_issue_begin_day: gaur hasten diren atazak + text_tip_issue_end_day: gaur bukatzen diren atazak + text_tip_issue_begin_end_day: gaur hasi eta bukatzen diren atazak text_project_identifier_info: 'Letra xeheak (a-z), zenbakiak eta marrak erabil daitezke bakarrik.
    Gorde eta gero identifikadorea ezin da aldatu.' text_caracters_maximum: "{{count}} karaktere gehienez." text_caracters_minimum: "Gutxienez {{count}} karaktereetako luzerakoa izan behar du." diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 376ebdf03e9..0edf0a662c5 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -636,9 +636,9 @@ fi: text_project_destroy_confirmation: Oletko varma että haluat poistaa tämän projektin ja kaikki siihen kuuluvat tiedot? text_workflow_edit: Valitse rooli ja tapahtuma muokataksesi työnkulkua text_are_you_sure: Oletko varma? - text_tip_task_begin_day: tehtävä joka alkaa tänä päivänä - text_tip_task_end_day: tehtävä joka loppuu tänä päivänä - text_tip_task_begin_end_day: tehtävä joka alkaa ja loppuu tänä päivänä + text_tip_issue_begin_day: tehtävä joka alkaa tänä päivänä + text_tip_issue_end_day: tehtävä joka loppuu tänä päivänä + text_tip_issue_begin_end_day: tehtävä joka alkaa ja loppuu tänä päivänä text_project_identifier_info: 'Pienet kirjaimet (a-z), numerot ja viivat ovat sallittu.
    Tallentamisen jälkeen tunnistetta ei voi muuttaa.' text_caracters_maximum: "{{count}} merkkiä enintään." text_caracters_minimum: "Täytyy olla vähintään {{count}} merkkiä pitkä." diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 087c8339166..c724f9c35b1 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -835,9 +835,9 @@ fr: text_subprojects_destroy_warning: "Ses sous-projets : {{value}} seront également supprimés." text_workflow_edit: Sélectionner un tracker et un rôle pour éditer le workflow text_are_you_sure: Êtes-vous sûr ? - text_tip_task_begin_day: tâche commençant ce jour - text_tip_task_end_day: tâche finissant ce jour - text_tip_task_begin_end_day: tâche commençant et finissant ce jour + text_tip_issue_begin_day: tâche commençant ce jour + text_tip_issue_end_day: tâche finissant ce jour + text_tip_issue_begin_end_day: tâche commençant et finissant ce jour text_project_identifier_info: 'Seuls les lettres minuscules (a-z), chiffres et tirets sont autorisés.
    Un fois sauvegardé, l''identifiant ne pourra plus être modifié.' text_caracters_maximum: "{{count}} caractères maximum." text_caracters_minimum: "{{count}} caractères minimum." diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 7d5f292571b..42905ed74d3 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -798,9 +798,9 @@ gl: text_select_project_modules: 'Seleccione os módulos a activar para este proxecto:' text_status_changed_by_changeset: "Aplicado nos cambios {{value}}" text_subprojects_destroy_warning: "Os proxectos secundarios: {{value}} tamén se eliminarán" - text_tip_task_begin_day: tarefa que comeza este día - text_tip_task_begin_end_day: tarefa que comeza e remata este día - text_tip_task_end_day: tarefa que remata este día + text_tip_issue_begin_day: tarefa que comeza este día + text_tip_issue_begin_end_day: tarefa que comeza e remata este día + text_tip_issue_end_day: tarefa que remata este día text_tracker_no_workflow: Non hai ningún fluxo de traballo definido para este tipo de petición text_unallowed_characters: Caracteres non permitidos text_user_mail_option: "Dos proxectos non seleccionados, só recibirá notificacións sobre elementos monitorizados ou elementos nos que estea involucrado (por exemplo, peticións das que vostede sexa autor ou asignadas a vostede)." diff --git a/config/locales/he.yml b/config/locales/he.yml index 0cce40ce116..afdd9886fa1 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -852,9 +852,9 @@ he: 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_tip_issue_begin_day: מטלה המתחילה היום + text_tip_issue_end_day: מטלה המסתיימת היום + text_tip_issue_begin_end_day: מטלה המתחילה ומסתיימת היום text_project_identifier_info: 'אותיות לטיניות (a-z), מספרים ומקפים.
    ברגע שנשמר, לא ניתן לשנות את המזהה.' text_caracters_maximum: "מקסימום {{count}} תווים." text_caracters_minimum: "חייב להיות לפחות באורך של {{count}} תווים." diff --git a/config/locales/hr.yml b/config/locales/hr.yml index c31a4bf36d1..8e47b051321 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -815,9 +815,9 @@ hr: text_journal_set_to: "{{label}} postavi na {{value}}" text_journal_deleted: "{{label}} izbrisano ({{old}})" text_journal_added: "{{label}} {{value}} added" - text_tip_task_begin_day: Zadaci koji počinju ovog dana - text_tip_task_end_day: zadaci koji se završavaju ovog dana - text_tip_task_begin_end_day: Zadaci koji počinju i završavaju se ovog dana + text_tip_issue_begin_day: Zadaci koji počinju ovog dana + text_tip_issue_end_day: zadaci koji se završavaju ovog dana + text_tip_issue_begin_end_day: Zadaci koji počinju i završavaju se ovog dana text_project_identifier_info: 'mala slova (a-z), brojevi i crtice su dozvoljeni.
    Jednom snimljen identifikator se ne može mijenjati!' text_caracters_maximum: "Najviše {{count}} znakova." text_caracters_minimum: "Mora biti dugačko najmanje {{count}} znakova." diff --git a/config/locales/hu.yml b/config/locales/hu.yml index ef712b62570..723d5667f49 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -682,9 +682,9 @@ text_subprojects_destroy_warning: "Az alprojekt(ek): {{value}} szintén törlésre kerülnek." text_workflow_edit: Válasszon egy szerepkört, és egy feladat típust a workflow szerkesztéséhez text_are_you_sure: Biztos benne ? - text_tip_task_begin_day: a feladat ezen a napon kezdődik - text_tip_task_end_day: a feladat ezen a napon ér véget - text_tip_task_begin_end_day: a feladat ezen a napon kezdődik és ér véget + text_tip_issue_begin_day: a feladat ezen a napon kezdődik + text_tip_issue_end_day: a feladat ezen a napon ér véget + text_tip_issue_begin_end_day: a feladat ezen a napon kezdődik és ér véget text_project_identifier_info: 'Kis betűk (a-z), számok és kötőjel megengedett.
    Mentés után az azonosítót megváltoztatni nem lehet.' text_caracters_maximum: "maximum {{count}} karakter." text_caracters_minimum: "Legkevesebb {{count}} karakter hosszúnek kell lennie." diff --git a/config/locales/id.yml b/config/locales/id.yml index 1c6e1c2d2a6..8f627f242e3 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -796,9 +796,9 @@ id: text_journal_set_to: "{{label}} di set ke {{value}}" text_journal_deleted: "{{label}} dihapus ({{old}})" text_journal_added: "{{label}} {{value}} ditambahkan" - text_tip_task_begin_day: tugas dimulai hari itu - text_tip_task_end_day: tugas berakhir hari itu - text_tip_task_begin_end_day: tugas dimulai dan berakhir hari itu + text_tip_issue_begin_day: tugas dimulai hari itu + text_tip_issue_end_day: tugas berakhir hari itu + text_tip_issue_begin_end_day: tugas dimulai dan berakhir hari itu text_project_identifier_info: 'Yang diijinkan hanya huruf kecil (a-z), angka dan tanda minus.
    Sekali disimpan, pengenal tidak bisa diubah.' text_caracters_maximum: "maximum {{count}} karakter." text_caracters_minimum: "Setidaknya harus sepanjang {{count}} karakter." diff --git a/config/locales/it.yml b/config/locales/it.yml index cdf12cd9efd..0aee29d495d 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -572,9 +572,9 @@ it: text_project_destroy_confirmation: Sei sicuro di voler eliminare il progetto e tutti i dati ad esso collegati? text_workflow_edit: Seleziona un ruolo ed un tracker per modificare il workflow text_are_you_sure: Sei sicuro ? - text_tip_task_begin_day: attività che iniziano in questa giornata - text_tip_task_end_day: attività che terminano in questa giornata - text_tip_task_begin_end_day: attività che iniziano e terminano in questa giornata + text_tip_issue_begin_day: attività che iniziano in questa giornata + text_tip_issue_end_day: attività che terminano in questa giornata + text_tip_issue_begin_end_day: attività che iniziano e terminano in questa giornata text_project_identifier_info: "Lettere minuscole (a-z), numeri e trattini permessi.
    Una volta salvato, l'identificativo non può essere modificato." text_caracters_maximum: "massimo {{count}} caratteri." text_length_between: "Lunghezza compresa tra {{min}} e {{max}} caratteri." diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 1db5a593346..0e021d25ca8 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -874,9 +874,9 @@ ja: 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_tip_issue_begin_day: この日に開始するタスク + text_tip_issue_end_day: この日に終了するタスク + text_tip_issue_begin_end_day: この日のうちに開始して終了するタスク text_project_identifier_info: '英小文字(a-z)と数字とダッシュ(-)が使えます。
    一度保存すると、識別子は変更できません。' text_caracters_maximum: "最大{{count}}文字です。" text_caracters_minimum: "最低{{count}}文字の長さが必要です" diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 4534893a979..fb41db4154d 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -810,9 +810,9 @@ ko: text_subprojects_destroy_warning: "하위 프로젝트({{value}})이(가) 자동으로 지워질 것입니다." text_workflow_edit: 업무흐름 수정하려면 역할과 일감유형을 선택하세요. text_are_you_sure: 계속 진행 하시겠습니까? - text_tip_task_begin_day: 오늘 시작하는 업무(task) - text_tip_task_end_day: 오늘 종료하는 업무(task) - text_tip_task_begin_end_day: 오늘 시작하고 종료하는 업무(task) + text_tip_issue_begin_day: 오늘 시작하는 업무(task) + text_tip_issue_end_day: 오늘 종료하는 업무(task) + text_tip_issue_begin_end_day: 오늘 시작하고 종료하는 업무(task) text_project_identifier_info: '영문 소문자(a-z) 및 숫자, 대쉬(-) 가능.
    저장된후에는 식별자 변경 불가능.' text_caracters_maximum: "최대 {{count}} 글자 가능" text_caracters_minimum: "최소한 {{count}} 글자 이상이어야 합니다." diff --git a/config/locales/lt.yml b/config/locales/lt.yml index fcaf1e161c4..dcdc2c8b25c 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -852,9 +852,9 @@ lt: text_journal_set_to: "{{label}} pakeista į {{value}}" text_journal_deleted: "{{label}} ištrintas ({{old}})" text_journal_added: "{{label}} {{value}} pridėtas" - text_tip_task_begin_day: užduotis, prasidedanti šią dieną - text_tip_task_end_day: užduotis, pasibaigianti šią dieną - text_tip_task_begin_end_day: užduotis, prasidedanti ir pasibaigianti šią dieną + text_tip_issue_begin_day: užduotis, prasidedanti šią dieną + text_tip_issue_end_day: užduotis, pasibaigianti šią dieną + text_tip_issue_begin_end_day: užduotis, prasidedanti ir pasibaigianti šią dieną text_project_identifier_info: 'Mažosios raidės (a-z), skaičiai ir brūkšniai galimi.
    Išsaugojus, identifikuotojas negali būti keičiamas.' text_caracters_maximum: "{{count}} simbolių maksimumas." text_caracters_minimum: "Turi būti mažiausiai {{count}} simbolių ilgio." diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 15e3a5e5af7..a6445d7408e 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -816,9 +816,9 @@ lv: text_journal_set_to: "{{label}} iestatīts uz {{value}}" text_journal_deleted: "{{label}} dzēsts ({{old}})" text_journal_added: "{{label}} {{value}} pievienots" - text_tip_task_begin_day: uzdevums sākas šodien - text_tip_task_end_day: uzdevums beidzas šodien - text_tip_task_begin_end_day: uzdevums sākas un beidzas šodien + text_tip_issue_begin_day: uzdevums sākas šodien + text_tip_issue_end_day: uzdevums beidzas šodien + text_tip_issue_begin_end_day: uzdevums sākas un beidzas šodien text_project_identifier_info: 'Tikai mazie burti (a-z), cipari un domuzīmes ir atļauti.
    Kad saglabāts, identifikators nevar tikt mainīts.' text_caracters_maximum: "{{count}} simboli maksimāli." text_caracters_minimum: "Jābūt vismaz {{count}} simbolu garumā." diff --git a/config/locales/mk.yml b/config/locales/mk.yml index ae02f401296..ceaba30ab5d 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -839,9 +839,9 @@ mk: text_journal_set_to: "{{label}} set to {{value}}" text_journal_deleted: "{{label}} избришан ({{old}})" text_journal_added: "{{label}} {{value}} додаден" - text_tip_task_begin_day: задачи што почнуваат овој ден - text_tip_task_end_day: задачи што завршуваат овој ден - text_tip_task_begin_end_day: задачи што почнуваат и завршуваат овој ден + text_tip_issue_begin_day: задачи што почнуваат овој ден + text_tip_issue_end_day: задачи што завршуваат овој ден + text_tip_issue_begin_end_day: задачи што почнуваат и завршуваат овој ден text_project_identifier_info: 'Само мали букви (a-z), бројки и dashes се дозволени
    По зачувувањето, идентификаторот неможе да се смени.' text_caracters_maximum: "{{count}} знаци максимум." text_caracters_minimum: "Мора да е најмалку {{count}} знаци долго." diff --git a/config/locales/mn.yml b/config/locales/mn.yml index cf5f2b63dee..5709651dc31 100644 --- a/config/locales/mn.yml +++ b/config/locales/mn.yml @@ -821,9 +821,9 @@ mn: 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_tip_issue_begin_day: энэ өдөр эхлэх ажил + text_tip_issue_end_day: энэ өдөр дуусах ажил + text_tip_issue_begin_end_day: энэ өдөр эхлээд мөн дуусч байгаа ажил text_project_identifier_info: 'Зөвхөн жижиг үсгүүд болон (a-z), тоо and дундуур зураас ашиглаж болно.
    Нэгэнт хадгалсан хойно, төслийн глобал нэрийг өөрлчөх боломжгүй.' text_caracters_maximum: "дээд тал нь {{count}} үсэг." text_caracters_minimum: "Хамгийн багадаа ядаж {{count}} тэмдэгт байх." diff --git a/config/locales/nl.yml b/config/locales/nl.yml index c38e37d92bb..5a4c4d381e2 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -765,9 +765,9 @@ nl: text_select_project_modules: 'Selecteer de modules die u wilt gebruiken voor dit project:' text_status_changed_by_changeset: "Toegepast in changeset {{value}}." text_subprojects_destroy_warning: "De subprojecten: {{value}} zullen ook verwijderd worden." - text_tip_task_begin_day: taak die op deze dag begint - text_tip_task_begin_end_day: taak die op deze dag begint en eindigt - text_tip_task_end_day: taak die op deze dag eindigt + text_tip_issue_begin_day: issue die op deze dag begint + text_tip_issue_begin_end_day: issue die op deze dag begint en eindigt + text_tip_issue_end_day: issue die op deze dag eindigt text_tracker_no_workflow: Geen workflow gedefinieerd voor deze tracker text_unallowed_characters: Niet toegestane tekens text_user_mail_option: "Bij niet-geselecteerde projecten zult u enkel notificaties ontvangen voor issues die u monitort of waar u bij betrokken bent (als auteur of toegewezen persoon)." diff --git a/config/locales/no.yml b/config/locales/no.yml index 6fc5abeac39..0ac85d9f575 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -654,9 +654,9 @@ text_subprojects_destroy_warning: "Underprojekt(ene): {{value}} vil også bli slettet." text_workflow_edit: Velg en rolle og en sakstype for å endre arbeidsflyten text_are_you_sure: Er du sikker ? - text_tip_task_begin_day: oppgaven starter denne dagen - text_tip_task_end_day: oppgaven avsluttes denne dagen - text_tip_task_begin_end_day: oppgaven starter og avsluttes denne dagen + text_tip_issue_begin_day: oppgaven starter denne dagen + text_tip_issue_end_day: oppgaven avsluttes denne dagen + text_tip_issue_begin_end_day: oppgaven starter og avsluttes denne dagen text_project_identifier_info: 'Små bokstaver (a-z), nummer og bindestrek tillatt.
    Identifikatoren kan ikke endres etter den er lagret.' text_caracters_maximum: "{{count}} tegn maksimum." text_caracters_minimum: "Må være minst {{count}} tegn langt." diff --git a/config/locales/pl.yml b/config/locales/pl.yml index fe2bde0d718..372cbdf6a86 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -797,10 +797,10 @@ pl: text_select_project_modules: 'Wybierz moduły do aktywacji w tym projekcie:' text_status_changed_by_changeset: "Zastosowane w zmianach {{value}}." text_subprojects_destroy_warning: "Podprojekt(y): {{value}} zostaną także usunięte." - text_tip_task_begin_day: zadanie zaczynające się dzisiaj - text_tip_task_begin_end_day: zadanie zaczynające i kończące się dzisiaj - text_tip_task_end_day: zadanie kończące się dzisiaj - text_tracker_no_workflow: Brak przepływu zefiniowanego dla tego typu zagadnienia + text_tip_issue_begin_day: zadanie zaczynające się dzisiaj + text_tip_issue_begin_end_day: zadanie zaczynające i kończące się dzisiaj + text_tip_issue_end_day: zadanie kończące się dzisiaj + text_tracker_no_workflow: Brak przepływu zdefiniowanego dla tego typu zagadnienia text_unallowed_characters: Niedozwolone znaki text_user_mail_option: "W przypadku niezaznaczonych projektów, będziesz otrzymywał powiadomienia tylko na temat zagadnien, które obserwujesz, lub w których bierzesz udział (np. jesteś autorem lub adresatem)." text_user_wrote: "{{value}} napisał:" diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index a783bc97e3c..23a34780368 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -696,9 +696,9 @@ pt-BR: text_subprojects_destroy_warning: "Seu(s) subprojeto(s): {{value}} também serão excluídos." text_workflow_edit: Selecione um papel e um tipo de tarefa para editar o fluxo de trabalho text_are_you_sure: Você tem certeza? - text_tip_task_begin_day: tarefa inicia neste dia - text_tip_task_end_day: tarefa termina neste dia - text_tip_task_begin_end_day: tarefa inicia e termina neste dia + text_tip_issue_begin_day: tarefa inicia neste dia + text_tip_issue_end_day: tarefa termina neste dia + text_tip_issue_begin_end_day: tarefa inicia e termina neste dia text_project_identifier_info: 'Letras minúsculas (a-z), números e hífens permitidos.
    Uma vez salvo, o identificador não poderá ser alterado.' text_caracters_maximum: "máximo {{count}} caracteres" text_caracters_minimum: "deve ter ao menos {{count}} caracteres." diff --git a/config/locales/pt.yml b/config/locales/pt.yml index e658aefd38d..89be2358053 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -683,9 +683,9 @@ pt: text_subprojects_destroy_warning: "O(s) seu(s) sub-projecto(s): {{value}} também será/serão apagado(s)." text_workflow_edit: Seleccione uma função e um tipo de tarefa para editar o fluxo de trabalho text_are_you_sure: Tem a certeza? - text_tip_task_begin_day: tarefa a começar neste dia - text_tip_task_end_day: tarefa a acabar neste dia - text_tip_task_begin_end_day: tarefa a começar e acabar neste dia + text_tip_issue_begin_day: tarefa a começar neste dia + text_tip_issue_end_day: tarefa a acabar neste dia + text_tip_issue_begin_end_day: tarefa a começar e acabar neste dia text_project_identifier_info: 'Apenas são permitidos letras minúsculas (a-z), números e hífens.
    Uma vez guardado, o identificador não poderá ser alterado.' text_caracters_maximum: "máximo {{count}} caracteres." text_caracters_minimum: "Deve ter pelo menos {{count}} caracteres." diff --git a/config/locales/ro.yml b/config/locales/ro.yml index f9285e5f3e5..b80defb2bd3 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -737,9 +737,9 @@ ro: text_subprojects_destroy_warning: "Se vor șterge și sub-proiectele: {{value}}." text_workflow_edit: Selectați un rol și un tip de tichet pentru a edita modul de lucru text_are_you_sure: Sunteți sigur(ă)? - text_tip_task_begin_day: sarcină care începe în această zi - text_tip_task_end_day: sarcină care se termină în această zi - text_tip_task_begin_end_day: sarcină care începe și se termină în această zi + text_tip_issue_begin_day: sarcină care începe în această zi + text_tip_issue_end_day: sarcină care se termină în această zi + text_tip_issue_begin_end_day: sarcină care începe și se termină în această zi text_project_identifier_info: 'Sunt permise doar litere mici (a-z), numere și cratime.
    Odată salvat, identificatorul nu mai poate fi modificat.' text_caracters_maximum: "maxim {{count}} caractere." text_caracters_minimum: "Trebuie să fie minim {{count}} caractere." diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 3212fef2e26..25982846864 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -943,9 +943,9 @@ ru: text_select_project_modules: 'Выберите модули, которые будут использованы в проекте:' text_status_changed_by_changeset: "Реализовано в {{value}} редакции." text_subprojects_destroy_warning: "Подпроекты: {{value}} также будут удалены." - text_tip_task_begin_day: дата начала задачи - text_tip_task_begin_end_day: начало задачи и окончание ее в этот день - text_tip_task_end_day: дата завершения задачи + text_tip_issue_begin_day: дата начала задачи + text_tip_issue_begin_end_day: начало задачи и окончание ее в этот день + text_tip_issue_end_day: дата завершения задачи text_tracker_no_workflow: Для этого трекера последовательность действий не определена text_unallowed_characters: Запрещенные символы text_user_mail_option: "Для невыбранных проектов, Вы будете получать уведомления только о том что просматриваете или в чем участвуете (например, вопросы, автором которых Вы являетесь или которые Вам назначены)." diff --git a/config/locales/sk.yml b/config/locales/sk.yml index d1c9109d7e3..1fb57aa889a 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -649,9 +649,9 @@ sk: text_project_destroy_confirmation: Ste si istý, že chcete odstránit tento projekt a všetky súvisiace dáta ? text_workflow_edit: Vyberte rolu a frontu k úprave workflow text_are_you_sure: Ste si istý? - text_tip_task_begin_day: úloha začína v tento deň - text_tip_task_end_day: úloha končí v tento deň - text_tip_task_begin_end_day: úloha začína a končí v tento deň + text_tip_issue_begin_day: úloha začína v tento deň + text_tip_issue_end_day: úloha končí v tento deň + text_tip_issue_begin_end_day: úloha začína a končí v tento deň text_project_identifier_info: 'Povolené znaky sú malé písmena (a-z), čísla a pomlčka.
    Po uložení už nieje možné identifikátor zmeniť.' text_caracters_maximum: "{{count}} znakov maximálne." text_caracters_minimum: "Musí byť aspoň {{count}} znaky/ov dlhé." diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 48616ec4003..6521b4354d2 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -725,9 +725,9 @@ sl: text_subprojects_destroy_warning: "Njegov(i) podprojekt(i): {{value}} bodo prav tako izbrisani." text_workflow_edit: Izberite vlogo in zahtevek za urejanje poteka dela text_are_you_sure: Ali ste prepričani? - text_tip_task_begin_day: naloga z začetkom na ta dan - text_tip_task_end_day: naloga z zaključkom na ta dan - text_tip_task_begin_end_day: naloga ki se začne in konča ta dan + text_tip_issue_begin_day: naloga z začetkom na ta dan + text_tip_issue_end_day: naloga z zaključkom na ta dan + text_tip_issue_begin_end_day: naloga ki se začne in konča ta dan text_project_identifier_info: 'Dovoljene so samo male črke (a-z), številke in vezaji.
    Enkrat shranjen identifikator ne more biti spremenjen.' text_caracters_maximum: "največ {{count}} znakov." text_caracters_minimum: "Mora biti vsaj dolg vsaj {{count}} znakov." diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml index f7b2d54293a..f949d7101d1 100644 --- a/config/locales/sr-YU.yml +++ b/config/locales/sr-YU.yml @@ -836,9 +836,9 @@ sr-YU: text_journal_set_to: "{{label}} postavljen u {{value}}" text_journal_deleted: "{{label}} izbrisano ({{old}})" text_journal_added: "{{label}} {{value}} dodato" - text_tip_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_tip_issue_begin_day: zadatak počinje ovog dana + text_tip_issue_end_day: zadatak se završava ovog dana + text_tip_issue_begin_end_day: zadatak počinje i završava ovog dana text_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}}." diff --git a/config/locales/sr.yml b/config/locales/sr.yml index c98e5c1245d..5a42c8d6009 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -836,9 +836,9 @@ sr: text_journal_set_to: "{{label}} постављен у {{value}}" text_journal_deleted: "{{label}} избрисано ({{old}})" text_journal_added: "{{label}} {{value}} додато" - text_tip_task_begin_day: задатак почиње овог дана - text_tip_task_end_day: задатак се завршава овог дана - text_tip_task_begin_end_day: задатак почиње и завршава овог дана + text_tip_issue_begin_day: задатак почиње овог дана + text_tip_issue_end_day: задатак се завршава овог дана + text_tip_issue_begin_end_day: задатак почиње и завршава овог дана text_project_identifier_info: 'Дозвољена су само мала слова (a-ш), бројеви и цртице.
    Једном снимљен идентификатор више се не може променити.' text_caracters_maximum: "Највише {{count}} знак(ова)." text_caracters_minimum: "Број знакова мора бити најмање {{count}}." diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 42513a7915b..d98679d1e88 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -885,9 +885,9 @@ sv: text_journal_set_to: "{{label}} satt till {{value}}" text_journal_deleted: "{{label}} borttagen ({{old}})" text_journal_added: "{{label}} {{value}} tillagd" - text_tip_task_begin_day: arbetsuppgift som börjar denna dag - text_tip_task_end_day: arbetsuppgift som slutar denna dag - text_tip_task_begin_end_day: arbetsuppgift börjar och slutar denna dag + text_tip_issue_begin_day: arbetsuppgift som börjar denna dag + text_tip_issue_end_day: arbetsuppgift som slutar denna dag + text_tip_issue_begin_end_day: arbetsuppgift börjar och slutar denna dag text_project_identifier_info: 'Små bokstäver (a-z), siffror och streck tillåtna.
    När den är sparad kan identifieraren inte ändras.' text_caracters_maximum: "max {{count}} tecken." text_caracters_minimum: "Måste vara minst {{count}} tecken lång." diff --git a/config/locales/th.yml b/config/locales/th.yml index 9c8029cade0..4de7312d163 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -655,9 +655,9 @@ th: text_subprojects_destroy_warning: "โครงการย่อย: {{value}} จะถูกลบด้วย." text_workflow_edit: เลือกบทบาทและการติดตาม เพื่อแก้ไขลำดับงาน text_are_you_sure: คุณแน่ใจไหม ? - text_tip_task_begin_day: งานที่เริ่มวันนี้ - text_tip_task_end_day: งานที่จบวันนี้ - text_tip_task_begin_end_day: งานที่เริ่มและจบวันนี้ + text_tip_issue_begin_day: งานที่เริ่มวันนี้ + text_tip_issue_end_day: งานที่จบวันนี้ + text_tip_issue_begin_end_day: งานที่เริ่มและจบวันนี้ text_project_identifier_info: 'ภาษาอังกฤษตัวเล็ก(a-z), ตัวเลข(0-9) และขีด (-) เท่านั้น.
    เมื่อจัดเก็บแล้ว, ชื่อเฉพาะไม่สามารถเปลี่ยนแปลงได้' text_caracters_maximum: "สูงสุด {{count}} ตัวอักษร." text_caracters_minimum: "ต้องยาวอย่างน้อย {{count}} ตัวอักษร." diff --git a/config/locales/tr.yml b/config/locales/tr.yml index e9904fdfeda..d273d858e6d 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -680,9 +680,9 @@ tr: text_subprojects_destroy_warning: "Ayrıca {{value}} alt proje silinecek." text_workflow_edit: İşakışını düzenlemek için bir rol ve takipçi seçin text_are_you_sure: Emin misiniz ? - text_tip_task_begin_day: Bugün başlayan görevler - text_tip_task_end_day: Bugün sona eren görevler - text_tip_task_begin_end_day: Bugün başlayan ve sona eren görevler + text_tip_issue_begin_day: Bugün başlayan görevler + text_tip_issue_end_day: Bugün sona eren görevler + text_tip_issue_begin_end_day: Bugün başlayan ve sona eren görevler text_project_identifier_info: 'Küçük harfler (a-z), sayılar ve noktalar kabul edilir.
    Bir kere kaydedildiğinde,tanımlayıcı değiştirilemez.' text_caracters_maximum: "En çok {{count}} karakter." text_caracters_minimum: "En az {{count}} karakter uzunluğunda olmalı." diff --git a/config/locales/uk.yml b/config/locales/uk.yml index ae5acabc180..b725a50534e 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -597,9 +597,9 @@ uk: text_project_destroy_confirmation: Ви наполягаєте на видаленні цього проекту і всієї інформації, що відноситься до нього? text_workflow_edit: Виберіть роль і координатор для редагування послідовності дій text_are_you_sure: Ви впевнені? - text_tip_task_begin_day: день початку задачі - text_tip_task_end_day: день завершення задачі - text_tip_task_begin_end_day: початок задачі і закінчення цього дня + text_tip_issue_begin_day: день початку задачі + text_tip_issue_end_day: день завершення задачі + text_tip_issue_begin_end_day: початок задачі і закінчення цього дня text_project_identifier_info: 'Рядкові букви (a-z), допустимі цифри і дефіс.
    Збережений ідентифікатор не може бути змінений.' text_caracters_maximum: "{{count}} символів(а) максимум." text_caracters_minimum: "Повинно мати якнайменше {{count}} символів(а) у довжину." diff --git a/config/locales/vi.yml b/config/locales/vi.yml index a024173639e..ea6803bd5e1 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -728,9 +728,9 @@ vi: text_subprojects_destroy_warning: "Its subproject(s): {{value}} will be also deleted." text_workflow_edit: Select a role and a tracker to edit the workflow text_are_you_sure: Bạn chắc chứ? - text_tip_task_begin_day: ngày bắt đầu - text_tip_task_end_day: ngày kết thúc - text_tip_task_begin_end_day: bắt đầu và kết thúc cùng ngày + text_tip_issue_begin_day: ngày bắt đầu + text_tip_issue_end_day: ngày kết thúc + text_tip_issue_begin_end_day: bắt đầu và kết thúc cùng ngày text_project_identifier_info: 'Chỉ cho phép chữ cái thường (a-z), con số và dấu gạch ngang.
    Sau khi lưu, chỉ số ID không thể thay đổi.' text_caracters_maximum: "Tối đa {{count}} ký tự." text_caracters_minimum: "Phải gồm ít nhất {{count}} ký tự." diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 06214be3cfa..bc32b25126b 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -934,9 +934,9 @@ 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_tip_issue_begin_day: 今天起始的工作 + text_tip_issue_end_day: 今天截止的的工作 + text_tip_issue_begin_end_day: 今天起始與截止的工作 text_project_identifier_info: '只允許小寫英文字母（a-z）、阿拉伯數字與連字符號（-）。
    儲存後，代碼不可再被更改。' text_caracters_maximum: "最多 {{count}} 個字元." text_caracters_minimum: "長度必須大於 {{count}} 個字元." diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 76bd9d98892..651a817df74 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -835,9 +835,9 @@ zh: text_journal_set_to: "{{label}} 被设置为 {{value}}" text_journal_deleted: "{{label}} 已删除 ({{old}})" text_journal_added: "{{label}} {{value}} 已添加" - text_tip_task_begin_day: 今天开始的任务 - text_tip_task_end_day: 今天结束的任务 - text_tip_task_begin_end_day: 今天开始并结束的任务 + text_tip_issue_begin_day: 今天开始的任务 + text_tip_issue_end_day: 今天结束的任务 + text_tip_issue_begin_end_day: 今天开始并结束的任务 text_project_identifier_info: '只允许使用小写字母（a-z），数字和连字符（-）。
    请注意，标识符保存后将不可修改。' text_caracters_maximum: "最多 {{count}} 个字符。" text_caracters_minimum: "至少需要 {{count}} 个字符。" From e29696ea3740759cdac7b809ac6bedfae5355395 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:55:09 +0000 Subject: [PATCH 171/240] Merged r4240 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4315 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/issue.rb | 4 +++- test/unit/issue_test.rb | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index 3b53f84ecde..a0a860bf106 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -365,7 +365,9 @@ def children? # Users the issue can be assigned to def assignable_users - project.assignable_users + users = project.assignable_users + users << author if author + users.sort end # Versions that the issue can be assigned to diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb index 64307648385..d0f04f488cb 100644 --- a/test/unit/issue_test.rb +++ b/test/unit/issue_test.rb @@ -510,9 +510,19 @@ def test_overdue assert !Issue.new(:due_date => nil).overdue? assert !Issue.new(:due_date => 1.day.ago.to_date, :status => IssueStatus.find(:first, :conditions => {:is_closed => true})).overdue? end - - def test_assignable_users - assert_kind_of User, Issue.find(1).assignable_users.first + + context "#assignable_users" do + should "be Users" do + assert_kind_of User, Issue.find(1).assignable_users.first + end + + should "include the issue author" do + project = Project.find(1) + non_project_member = User.generate! + issue = Issue.generate_for_project!(project, :author => non_project_member) + + assert issue.assignable_users.include?(non_project_member) + end end def test_create_should_send_email_notification From 05432cfc3d0fd0f5381ca59be76b433a10055c7c Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:55:14 +0000 Subject: [PATCH 172/240] Merged r4241 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4316 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/issue.rb | 2 +- test/unit/issue_test.rb | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index a0a860bf106..d7d752d2bf2 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -367,7 +367,7 @@ def children? def assignable_users users = project.assignable_users users << author if author - users.sort + users.uniq.sort end # Versions that the issue can be assigned to diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb index d0f04f488cb..a5d6c1a38d4 100644 --- a/test/unit/issue_test.rb +++ b/test/unit/issue_test.rb @@ -523,6 +523,15 @@ def test_overdue assert issue.assignable_users.include?(non_project_member) end + + should "not show the issue author twice" do + assignable_user_ids = Issue.find(1).assignable_users.collect(&:id) + assert_equal 2, assignable_user_ids.length + + assignable_user_ids.each do |user_id| + assert_equal 1, assignable_user_ids.count(user_id), "User #{user_id} appears more or less than once" + end + end end def test_create_should_send_email_notification From a63c92388f0e8774d9ed9afeb409a719c12e7e3b Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:55:19 +0000 Subject: [PATCH 173/240] Merged r4245 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4317 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/calendars_controller.rb | 2 ++ test/functional/calendars_controller_test.rb | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb index 1115691a158..7ac4823275e 100644 --- a/app/controllers/calendars_controller.rb +++ b/app/controllers/calendars_controller.rb @@ -8,6 +8,8 @@ class CalendarsController < ApplicationController helper :projects helper :queries include QueriesHelper + helper :sort + include SortHelper def show if params[:year] and params[:year].to_i > 1900 diff --git a/test/functional/calendars_controller_test.rb b/test/functional/calendars_controller_test.rb index ad047c6690e..3fb9ad1f0f0 100644 --- a/test/functional/calendars_controller_test.rb +++ b/test/functional/calendars_controller_test.rb @@ -16,6 +16,16 @@ def test_cross_project_calendar assert_template 'calendar' assert_not_nil assigns(:calendar) end + + context "GET :show" do + should "run custom queries" do + @query = Query.generate_default! + + get :show, :query_id => @query.id + assert_response :success + end + + end def test_week_number_calculation Setting.start_of_week = 7 From 0078d40ba1ccde9e367a4b2e4160ef9e64a07ff8 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:55:25 +0000 Subject: [PATCH 174/240] Merged r4249 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4318 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/users/_general.rhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/_general.rhtml b/app/views/users/_general.rhtml index e962056a23b..bdce285395e 100644 --- a/app/views/users/_general.rhtml +++ b/app/views/users/_general.rhtml @@ -1,7 +1,7 @@ <% labelled_tabular_form_for :user, @user, :url => { :controller => 'users', :action => "edit", :tab => nil }, :html => { :class => nil } do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> <% if @user.active? -%> -

    +

    <% end -%>

    <%= submit_tag l(:button_save) %>

    <% end %> From 95ecc56e06643a456f22f5643a43228760f568e1 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:55:29 +0000 Subject: [PATCH 175/240] Merged r4254 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4319 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/tasks/locales.rake | 58 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/lib/tasks/locales.rake b/lib/tasks/locales.rake index 9bf8e26d102..51253847534 100644 --- a/lib/tasks/locales.rake +++ b/lib/tasks/locales.rake @@ -28,4 +28,62 @@ namespace :locales do lang.close end end + + desc <<-END_DESC +Removes a translation string from all locale file (only works for top-level childless non-multiline keys, probably doesn\'t work on windows). + +Options: + key=key_1,key_2 Comma-separated list of keys to delete + skip=en,de Comma-separated list of locale files to ignore (filename without extension) +END_DESC + + task :remove_key do + dir = ENV['DIR'] || './config/locales' + files = Dir.glob(File.join(dir,'*.yml')) + skips = ENV['skip'] ? Regexp.union(ENV['skip'].split(',')) : nil + deletes = ENV['key'] ? Regexp.union(ENV['key'].split(',')) : nil + # Ignore multiline keys (begin with | or >) and keys with children (nothing meaningful after :) + delete_regex = /\A #{deletes}: +[^\|>\s#].*\z/ + + files.each do |path| + # Skip certain locales + (puts "Skipping #{path}"; next) if File.basename(path, ".yml") =~ skips + puts "Deleting selected keys from #{path}" + orig_content = File.open(path, 'r') {|file| file.read} + File.open(path, 'w') {|file| orig_content.each_line {|line| file.puts line unless line.chomp =~ delete_regex}} + end + end + + desc <<-END_DESC +Adds a new top-level translation string to all locale file (only works for childless keys, probably doesn\'t work on windows, doesn't check for duplicates). + +Options: + key="some_key=foo" + key1="another_key=bar" + key_fb="foo=bar" Keys to add in the form key=value, every option of the form key[,\\d,_*] will be recognised + skip=en,de Comma-separated list of locale files to ignore (filename without extension) +END_DESC + + task :add_key do + dir = ENV['DIR'] || './config/locales' + files = Dir.glob(File.join(dir,'*.yml')) + skips = ENV['skip'] ? Regexp.union(ENV['skip'].split(',')) : nil + keys_regex = /\Akey(\d+|_.+)?\z/ + adds = ENV.reject {|k,v| !(k =~ keys_regex)}.values.collect {|v| Array.new v.split("=",2)} + key_list = adds.collect {|v| v[0]}.join(", ") + + files.each do |path| + # Skip certain locales + (puts "Skipping #{path}"; next) if File.basename(path, ".yml") =~ skips + # TODO: Check for dupliate/existing keys + puts "Adding #{key_list} to #{path}" + File.open(path, 'a') do |file| + adds.each do |kv| + Hash[*kv].to_yaml.each_line do |line| + file.puts " #{line}" unless (line =~ /^---/ || line.empty?) + end + end + end + end + end end From 0093e08a44bcd97796dc7e2db086f2b5bd2f0e7b Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:55:34 +0000 Subject: [PATCH 176/240] Merged r4256 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4320 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/tasks/email.rake | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/lib/tasks/email.rake b/lib/tasks/email.rake index 87b5e03ce06..957d9d44c04 100644 --- a/lib/tasks/email.rake +++ b/lib/tasks/email.rake @@ -165,5 +165,22 @@ END_DESC Redmine::POP3.check(pop_options, options) end + + desc "Send a test email to the user with the provided login name" + task :test, :login, :needs => :environment do |task, args| + include Redmine::I18n + abort l(:notice_email_error, "Please include the user login to test with. Example: login=examle-login") if args[:login].blank? + + user = User.find_by_login(args[:login]) + abort l(:notice_email_error, "User #{args[:login]} not found") unless user.logged? + + ActionMailer::Base.raise_delivery_errors = true + begin + Mailer.deliver_test(User.current) + puts l(:notice_email_sent, user.mail) + rescue Exception => e + abort l(:notice_email_error, e.message) + end + end end end From 79a0d9242180f1dd607dd6b20cc2c87153ab96da Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:55:40 +0000 Subject: [PATCH 177/240] Merged r4257 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4321 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/application_helper.rb | 18 ++---------------- test/unit/helpers/application_helper_test.rb | 9 --------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e825630a9b4..b8dabf7a817 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -34,25 +34,11 @@ def authorize_for(controller, action) # Display a link if user is authorized # # @param [String] name Anchor text (passed to link_to) - # @param [Hash, String] options Hash params or url for the link target (passed to link_to). - # This will checked by authorize_for to see if the user is authorized + # @param [Hash] options Hash params. This will checked by authorize_for to see if the user is authorized # @param [optional, Hash] html_options Options passed to link_to # @param [optional, Hash] parameters_for_method_reference Extra parameters for link_to def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference) - if options.is_a?(String) - begin - route = ActionController::Routing::Routes.recognize_path(options.gsub(/\?.*/,''), :method => options[:method] || :get) - link_controller = route[:controller] - link_action = route[:action] - rescue ActionController::RoutingError # Parse failed, not a route - link_controller, link_action = nil, nil - end - else - link_controller = options[:controller] || params[:controller] - link_action = options[:action] - end - - link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(link_controller, link_action) + link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action]) end # Display a link to remote if user is authorized diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb index 1936a981b86..ad2be56aa12 100644 --- a/test/unit/helpers/application_helper_test.rb +++ b/test/unit/helpers/application_helper_test.rb @@ -49,15 +49,6 @@ def setup assert_match /href/, response end - should "allow using the url for the target link" do - User.current = User.find_by_login('admin') - - @project = Issue.first.project # Used by helper - response = link_to_if_authorized("By url", - new_issue_move_path(:id => Issue.first.id)) - assert_match /href/, response - end - end def test_auto_links From 50cb1be8fde7e9bb540f5c01b42f04f97eca18c6 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:55:45 +0000 Subject: [PATCH 178/240] Merged r4258 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4322 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/issues/_action_menu.rhtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/issues/_action_menu.rhtml b/app/views/issues/_action_menu.rhtml index 30c63ec6605..3a9e28b9570 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), 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_copy), {:controller => 'issue_moves', :action => 'new', :id => @issue, :copy_options => {:copy => 't'}}, :class => 'icon icon-copy' %> +<%= link_to_if_authorized l(:button_move), {:controller => 'issue_moves', :action => 'new', :id => @issue}, :class => 'icon icon-move' %> <%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => (@issue.leaf? ? l(:text_are_you_sure) : l(:text_are_you_sure_with_children)), :method => :post, :class => 'icon icon-del' %>
    From 2b69a96d6db89eb089fa14dc824e91ec7d33f463 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:55:50 +0000 Subject: [PATCH 179/240] Merged r4263 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4323 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/issue.rb | 4 ++-- test/unit/issue_test.rb | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index d7d752d2bf2..0301ee85701 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -68,8 +68,8 @@ class Issue < ActiveRecord::Base :conditions => ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"] before_create :default_assign - before_save :reschedule_following_issues, :close_duplicates, :update_done_ratio_from_issue_status - after_save :update_nested_set_attributes, :update_parent_attributes, :create_journal + before_save :close_duplicates, :update_done_ratio_from_issue_status + after_save :reschedule_following_issues, :update_nested_set_attributes, :update_parent_attributes, :create_journal after_destroy :destroy_children after_destroy :update_parent_attributes diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb index a5d6c1a38d4..d96a46906e5 100644 --- a/test/unit/issue_test.rb +++ b/test/unit/issue_test.rb @@ -503,6 +503,17 @@ def test_unblocked_issues_allow_closed_statuses assert !closed_statuses.empty? end + def test_rescheduling_an_issue_should_reschedule_following_issue + issue1 = Issue.create!(:project_id => 1, :tracker_id => 1, :author_id => 1, :status_id => 1, :subject => '-', :start_date => Date.today, :due_date => Date.today + 2) + issue2 = Issue.create!(:project_id => 1, :tracker_id => 1, :author_id => 1, :status_id => 1, :subject => '-', :start_date => Date.today, :due_date => Date.today + 2) + IssueRelation.create!(:issue_from => issue1, :issue_to => issue2, :relation_type => IssueRelation::TYPE_PRECEDES) + assert_equal issue1.due_date + 1, issue2.reload.start_date + + issue1.due_date = Date.today + 5 + issue1.save! + assert_equal issue1.due_date + 1, issue2.reload.start_date + end + def test_overdue assert Issue.new(:due_date => 1.day.ago.to_date).overdue? assert !Issue.new(:due_date => Date.today).overdue? From a8e4e703fb69f5568deef9fa0cbfc708b21b97b9 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:55:55 +0000 Subject: [PATCH 180/240] Merged r4273 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4324 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- doc/git.rdoc | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 doc/git.rdoc diff --git a/doc/git.rdoc b/doc/git.rdoc new file mode 100644 index 00000000000..739e7df43d2 --- /dev/null +++ b/doc/git.rdoc @@ -0,0 +1,40 @@ += Contributing to Redmine with git and github + +(This is a beta document. If you can improve it, fork it and send a patch/pull request.) + +The official repository is at http://github.com/edavis10/redmine + +Official branches: + +* master - is automatically mirrored to svn trunk. DO NOT COMMIT OR MERGE INTO THIS BRANCH +* [0.6, 0.7, 0.8, 0.9, 1.0,...]-stable - is automatically mirrored to svn release branches. DO NOT COMMIT OR MERGE INTO THIS BRANCH +* integration-to-svn-trunk - this branch is a git-only branch that will track master (trunk). Any code in here will be eventually merged into master but it may be rebased as any time (git-svn needs to rebase to commit to svn) +* integration-to-svn-stable-1.0 - this branch is a git-only branch that will track the 1.0-stable branch in svn. Any code in here will be eventually merged into master and 1.0-stable but it may be rebased as any time (git-svn needs to rebase to commit to svn) + +I (edavis10) might have some other branches on the repository for work in progress. + +== Branch naming standards + +Redmine has two kinds of development: + +* bug fixes +* new feature development + +Both bug fixes and new feature development should be done in a branch named after the issue number on Redmine.org. So if you are fixing Issue #6244 your branch should be named: + +* 6244 +* 6244-sort-people-by-display-name (optional description) +* issue/6244 (optional "issue" prefix) +* issue/6244-sort-people-by-display-name (optional prefix and description) + +That way when the branch is merged into the Redmine core, the correct issue can be updated. + +Longer term feature development might require multiple branches. Just your best judgment and try to keep the issue id in the name. + +If you don't have an issue for your patch, create an issue on redmine.org and say it's a placeholder issue for your work. Better yet, add a brief overview of what you are working on to the issue and you might get some help with it. + +== Coding Standards + +Follow the coding standards on the Redmine wiki: http://www.redmine.org/wiki/redmine/Coding_Standards#Commits. Make sure you commit logs conform to the standards, otherwise someone else will have to rewrite them for you and you might lose attribution during the conversion to svn. + + From 1b4012323f8a25280218baa0998eb61ab59592cc Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:56:00 +0000 Subject: [PATCH 181/240] Merged r4275 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4325 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/issues/_form.rhtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml index 136e1decc5a..7e9a29ee551 100644 --- a/app/views/issues/_form.rhtml +++ b/app/views/issues/_form.rhtml @@ -26,11 +26,11 @@
    <% if @issue.new_record? %> -

    <%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form' %>

    +

    <%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form' %>

    <% end %> <% if @issue.new_record? && User.current.allowed_to?(:add_issue_watchers, @project) -%> -

    +

    <% @issue.project.users.sort.each do |user| -%> <% end -%> From 494c149df63de1b2483a28ff050ff37309d859b3 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:56:05 +0000 Subject: [PATCH 182/240] Merged r4284 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4326 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/fr.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index c724f9c35b1..50b3e425744 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -931,9 +931,16 @@ fr: notice_unable_delete_time_entry: Impossible de supprimer le temps passé. label_overall_spent_time: Temps passé global field_time_entries: Log time - field_member_of_group: Member of Group - field_assigned_to_role: Member of Role - button_edit_associated_wikipage: "Modifier la page de Wiki associée: {{page_title}}" - text_are_you_sure_with_children: Delete issue and all child issues? - field_text: Text field + project_module_gantt: Gantt + project_module_calendar: Calendrier + button_edit_associated_wikipage: "Modifier la page wiki associée: {{page_title}}" + text_are_you_sure_with_children: Supprimer la demande et toutes ses sous-demandes ? + field_text: Champ texte + label_user_mail_option_only_owner: Seulement pour ce que j'ai créé + setting_default_notification_option: Option de notification par défaut + label_user_mail_option_only_my_events: Seulement pour ce que je surveille + label_user_mail_option_only_assigned: Seulement pour ce qui m'est assigné + label_user_mail_option_none: Aucune notification + field_member_of_group: Groupe de l'assigné + field_assigned_to_role: Rôle de l'assigné From a04bbfb16575f43b030f00d6b0e49d0bab46a90c Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:56:10 +0000 Subject: [PATCH 183/240] Merged r4287 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4327 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/wiki_formatting/textile/formatter.rb | 2 +- test/unit/helpers/application_helper_test.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/redmine/wiki_formatting/textile/formatter.rb b/lib/redmine/wiki_formatting/textile/formatter.rb index a622e803985..6794f82c79e 100644 --- a/lib/redmine/wiki_formatting/textile/formatter.rb +++ b/lib/redmine/wiki_formatting/textile/formatter.rb @@ -121,7 +121,7 @@ def inline_toc(text) (\S+?) # url (\/)? # slash ) - ([^\w\=\/;\(\)]*?) # post + ((?:>)?|[^\w\=\/;\(\)]*?) # post (?=<|\s|$) }x unless const_defined?(:AUTO_LINK_RE) diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb index ad2be56aa12..16ef6018276 100644 --- a/test/unit/helpers/application_helper_test.rb +++ b/test/unit/helpers/application_helper_test.rb @@ -79,6 +79,8 @@ def test_auto_links 'http://example.net/path!602815048C7B5C20!302.html' => 'http://example.net/path!602815048C7B5C20!302.html', # escaping 'http://foo"bar' => 'http://foo"bar', + # wrap in angle brackets + '' => '<http://foo.bar>' } to_test.each { |text, result| assert_equal "

    #{result}

    ", textilizable(text) } end From e2266a92da367b040c88e6dd80b8b48b308a5197 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:56:15 +0000 Subject: [PATCH 184/240] Merged r4288 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4328 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- extra/svn/reposman.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/extra/svn/reposman.rb b/extra/svn/reposman.rb index b72ad126391..c92e32c5daf 100755 --- a/extra/svn/reposman.rb +++ b/extra/svn/reposman.rb @@ -180,7 +180,9 @@ def self.create(path) log("This script requires activeresource.\nRun 'gem install activeresource' to install it.", :exit => true) end -class Project < ActiveResource::Base; end +class Project < ActiveResource::Base + self.headers["User-agent"] = "Redmine repository manager/#{Version}" +end log("querying Redmine for projects...", :level => 1); From 527cd5734a981fe28afabfac65b9b2392ab8717f Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:56:20 +0000 Subject: [PATCH 185/240] Merged r4291 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4329 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/issue_moves_controller.rb | 2 +- app/views/issue_moves/new.rhtml | 5 +++++ test/functional/issue_moves_controller_test.rb | 13 +++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/controllers/issue_moves_controller.rb b/app/controllers/issue_moves_controller.rb index 6ac46a1eea7..804ecb7bbbe 100644 --- a/app/controllers/issue_moves_controller.rb +++ b/app/controllers/issue_moves_controller.rb @@ -54,7 +54,7 @@ def prepare_for_issue_move def extract_changed_attributes_for_move(params) changed_attributes = {} - [:assigned_to_id, :status_id, :start_date, :due_date].each do |valid_attribute| + [:assigned_to_id, :status_id, :start_date, :due_date, :priority_id].each do |valid_attribute| unless params[valid_attribute].blank? changed_attributes[valid_attribute] = (params[valid_attribute] == 'none' ? nil : params[valid_attribute]) end diff --git a/app/views/issue_moves/new.rhtml b/app/views/issue_moves/new.rhtml index 2dc971df2fa..946ddab95a3 100644 --- a/app/views/issue_moves/new.rhtml +++ b/app/views/issue_moves/new.rhtml @@ -33,6 +33,11 @@ <%= select_tag('status_id', "" + options_from_collection_for_select(@available_statuses, :id, :name)) %>

    +

    + + <%= select_tag('priority_id', "" + options_from_collection_for_select(IssuePriority.all, :id, :name)) %> +

    +

    <%= text_field_tag 'start_date', '', :size => 10 %><%= calendar_for('start_date') %> diff --git a/test/functional/issue_moves_controller_test.rb b/test/functional/issue_moves_controller_test.rb index 7c40057675d..62593ac37fe 100644 --- a/test/functional/issue_moves_controller_test.rb +++ b/test/functional/issue_moves_controller_test.rb @@ -40,6 +40,19 @@ def test_bulk_create_to_another_tracker assert_equal 2, Issue.find(2).tracker_id end + context "#create via bulk move" do + should "allow changing the issue priority" do + @request.session[:user_id] = 2 + post :create, :ids => [1, 2], :priority_id => 6 + + assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook' + assert_equal 6, Issue.find(1).priority_id + assert_equal 6, Issue.find(2).priority_id + + end + + end + def test_bulk_copy_to_another_project @request.session[:user_id] = 2 assert_difference 'Issue.count', 2 do From 1ee7954f44d69a905f568ee0c4122728c8c4ad41 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:56:26 +0000 Subject: [PATCH 186/240] Merged r4292 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4330 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/issue_moves_controller.rb | 3 +++ app/views/issue_moves/new.rhtml | 5 +++++ test/functional/issue_moves_controller_test.rb | 14 +++++++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/app/controllers/issue_moves_controller.rb b/app/controllers/issue_moves_controller.rb index 804ecb7bbbe..9e8227fb444 100644 --- a/app/controllers/issue_moves_controller.rb +++ b/app/controllers/issue_moves_controller.rb @@ -18,6 +18,7 @@ def create @issues.each do |issue| issue.reload issue.init_journal(User.current) + issue.current_journal.notes = @notes if @notes.present? call_hook(:controller_issues_move_before_save, { :params => params, :issue => issue, :target_project => @target_project, :copy => !!@copy }) if r = issue.move_to_project(@target_project, new_tracker, {:copy => @copy, :attributes => extract_changed_attributes_for_move(params)}) moved_issues << r @@ -50,6 +51,8 @@ def prepare_for_issue_move @target_project ||= @project @trackers = @target_project.trackers @available_statuses = Workflow.available_statuses(@project) + @notes = params[:notes] + @notes ||= '' end def extract_changed_attributes_for_move(params) diff --git a/app/views/issue_moves/new.rhtml b/app/views/issue_moves/new.rhtml index 946ddab95a3..c51399eb6df 100644 --- a/app/views/issue_moves/new.rhtml +++ b/app/views/issue_moves/new.rhtml @@ -48,6 +48,11 @@ <%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %>

    +
    <%= l(:field_notes) %> +<%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %> +<%= wikitoolbar_for 'notes' %> +
    + <%= call_hook(:view_issues_move_bottom, :issues => @issues, :target_project => @target_project, :copy => !!@copy) %>
    diff --git a/test/functional/issue_moves_controller_test.rb b/test/functional/issue_moves_controller_test.rb index 62593ac37fe..dc19ddc8dc3 100644 --- a/test/functional/issue_moves_controller_test.rb +++ b/test/functional/issue_moves_controller_test.rb @@ -41,8 +41,11 @@ def test_bulk_create_to_another_tracker end context "#create via bulk move" do - should "allow changing the issue priority" do + setup do @request.session[:user_id] = 2 + end + + should "allow changing the issue priority" do post :create, :ids => [1, 2], :priority_id => 6 assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook' @@ -50,6 +53,15 @@ def test_bulk_create_to_another_tracker assert_equal 6, Issue.find(2).priority_id end + + should "allow adding a note when moving" do + post :create, :ids => [1, 2], :notes => 'Moving two issues' + + assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook' + assert_equal 'Moving two issues', Issue.find(1).journals.last.notes + assert_equal 'Moving two issues', Issue.find(2).journals.last.notes + + end end From cbacc0ce3040f942a6f000e522018de8fc1a9d62 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:56:31 +0000 Subject: [PATCH 187/240] Merged r4293 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4331 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/plugin.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/redmine/plugin.rb b/lib/redmine/plugin.rb index 11255e02d3a..f30277ad1da 100644 --- a/lib/redmine/plugin.rb +++ b/lib/redmine/plugin.rb @@ -89,6 +89,13 @@ def self.find(id) def self.clear @registered_plugins = {} end + + # Checks if a plugin is installed + # + # @param [String] id name of the plugin + def self.installed?(id) + registered_plugins[id.to_sym].present? + end def initialize(id) @id = id.to_sym From 7c485cd387608c2a6eb3c65d9b66e72af620a04b Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:56:36 +0000 Subject: [PATCH 188/240] Merged r4297 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4332 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/bg.yml | 558 ++++++++++++++++++++------------------- config/locales/ja.yml | 1 + config/locales/mk.yml | 2 +- config/locales/sv.yml | 7 + config/locales/zh-TW.yml | 6 +- 5 files changed, 294 insertions(+), 280 deletions(-) diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 42170f34728..de3cb1657f2 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -9,12 +9,12 @@ bg: short: "%b %d" long: "%B %d, %Y" - day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday] - abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat] + day_names: [Неделя, Понеделник, Вторник, Сряда, Четвъртък, Петък, Събота] + abbr_day_names: [Нед, Пон, Вто, Сря, Чет, Пет, Съб] # Don't forget the nil at the beginning; there's no such thing as a 0th month - month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December] - abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec] + month_names: [~, Януари, Февруари, Март, Април, Май, Юни, Юли, Август, Септември, Октомври, Ноември, Декември] + abbr_month_names: [~, Яну, Фев, Мар, Апр, Май, Юни, Юли, Авг, Сеп, Окт, Ное, Дек] # Used in date_select and datime_select. order: [ :year, :month, :day ] @@ -31,38 +31,38 @@ bg: distance_in_words: half_a_minute: "half a minute" less_than_x_seconds: - one: "less than 1 second" - other: "less than {{count}} seconds" + one: "по-малко от 1 секунда" + other: "по-малко от {{count}} секунди" x_seconds: - one: "1 second" - other: "{{count}} seconds" + one: "1 секунда" + other: "{{count}} секунди" less_than_x_minutes: - one: "less than a minute" - other: "less than {{count}} minutes" + one: "по-малко от 1 минута" + other: "по-малко от {{count}} минути" x_minutes: - one: "1 minute" - other: "{{count}} minutes" + one: "1 минута" + other: "{{count}} минути" about_x_hours: - one: "about 1 hour" - other: "about {{count}} hours" + one: "около 1 час" + other: "около {{count}} часа" x_days: - one: "1 day" - other: "{{count}} days" + one: "1 ден" + other: "{{count}} дена" about_x_months: - one: "about 1 month" - other: "about {{count}} months" + one: "около 1 месец" + other: "около {{count}} месеца" x_months: - one: "1 month" - other: "{{count}} months" + one: "1 месец" + other: "{{count}} месеца" about_x_years: - one: "about 1 year" - other: "about {{count}} years" + one: "около 1 година" + other: "около {{count}} години" over_x_years: - one: "over 1 year" - other: "over {{count}} years" + one: "над 1 година" + other: "над {{count}} години" almost_x_years: - one: "almost 1 year" - other: "almost {{count}} years" + one: "почти 1 година" + other: "почти {{count}} години" number: format: @@ -87,7 +87,7 @@ bg: # Used in array.to_sentence. support: array: - sentence_connector: "and" + sentence_connector: "и" skip_last_comma: false activerecord: @@ -106,17 +106,16 @@ bg: taken: "вече съществува" not_a_number: "не е число" not_a_date: "е невалидна дата" - greater_than: "must be greater than {{count}}" - greater_than_or_equal_to: "must be greater than or equal to {{count}}" - equal_to: "must be equal to {{count}}" - less_than: "must be less than {{count}}" - less_than_or_equal_to: "must be less than or equal to {{count}}" - odd: "must be odd" - even: "must be even" + greater_than: "трябва да бъде по-голям[a/о] от {{count}}" + greater_than_or_equal_to: "трябва да бъде по-голям[a/о] от или равен[a/o] на {{count}}" + equal_to: "трябва да бъде равен[a/o] на {{count}}" + less_than: "трябва да бъде по-малък[a/o] от {{count}}" + less_than_or_equal_to: "трябва да бъде по-малък[a/o] от или равен[a/o] на {{count}}" + odd: "трябва да бъде нечетен[a/o]" + even: "трябва да бъде четен[a/o]" greater_than_start_date: "трябва да е след началната дата" not_same_project: "не е от същия проект" circular_dependency: "Тази релация ще доведе до безкрайна зависимост" - cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks" actionview_instancetag_blank_option: Изберете @@ -171,7 +170,7 @@ bg: field_mail: Email field_filename: Файл field_filesize: Големина - field_downloads: Downloads + field_downloads: Изтеглени файлове field_author: Автор field_created_on: От дата field_updated_on: Обновена @@ -186,10 +185,10 @@ bg: field_title: Заглавие field_project: Проект field_issue: Задача - field_status: Статус + field_status: Състояние field_notes: Бележка field_is_closed: Затворена задача - field_is_default: Статус по подразбиране + field_is_default: Състояние по подразбиране field_tracker: Тракер field_subject: Относно field_due_date: Крайна дата @@ -217,10 +216,10 @@ bg: field_port: Порт field_account: Профил field_base_dn: Base DN - field_attr_login: Login attribute - field_attr_firstname: Firstname attribute - field_attr_lastname: Lastname attribute - field_attr_mail: Email attribute + field_attr_login: Атрибут Login + field_attr_firstname: Атрибут Първо име (Firstname) + field_attr_lastname: Атрибут Фамилия (Lastname) + field_attr_mail: Атрибут Email field_onthefly: Динамично създаване на потребител field_start_date: Начална дата field_done_ratio: % Прогрес @@ -249,12 +248,12 @@ bg: setting_login_required: Изискване за вход в системата setting_self_registration: Регистрация от потребители setting_attachment_max_size: Максимална големина на прикачен файл - setting_issues_export_limit: Лимит за експорт на задачи + setting_issues_export_limit: Максимален брой задачи за експорт setting_mail_from: E-mail адрес за емисии setting_host_name: Хост setting_text_formatting: Форматиране на текста setting_wiki_compression: Wiki компресиране на историята - setting_feeds_limit: Лимит на Feeds + setting_feeds_limit: Максимален брой за емисии setting_autofetch_changesets: Автоматично обработване на ревизиите setting_sys_api_enabled: Разрешаване на WS за управление setting_commit_ref_keywords: Отбелязващи ключови думи @@ -270,9 +269,9 @@ bg: label_project_new: Нов проект label_project_plural: Проекти label_x_projects: - zero: no projects - one: 1 project - other: "{{count}} projects" + zero: 0 проекти + one: 1 проект + other: "{{count}} проекта" label_project_all: Всички проекти label_project_latest: Последни проекти label_issue: Задача @@ -293,9 +292,9 @@ bg: label_tracker_plural: Тракери label_tracker_new: Нов тракер label_workflow: Работен процес - label_issue_status: Статус на задача - label_issue_status_plural: Статуси на задачи - label_issue_status_new: Нов статус + label_issue_status: Състояние на задача + label_issue_status_plural: Състояния на задачи + label_issue_status_new: Ново състояние label_issue_category: Категория задача label_issue_category_plural: Категории задачи label_issue_category_new: Нова категория @@ -323,14 +322,14 @@ bg: label_registered_on: Регистрация label_activity: Дейност label_new: Нов - label_logged_as: Логнат като + label_logged_as: Влязъл като label_environment: Среда label_authentication: Оторизация label_auth_source: Начин на оторозация label_auth_source_new: Нов начин на оторизация label_auth_source_plural: Начини на оторизация label_subproject_plural: Подпроекти - label_min_max_length: Мин. - Макс. дължина + label_min_max_length: Минимална - максимална дължина label_list: Списък label_date: Дата label_integer: Целочислен @@ -339,10 +338,10 @@ bg: label_text: Дълъг текст label_attribute: Атрибут label_attribute_plural: Атрибути - label_download: "{{count}} Download" - label_download_plural: "{{count}} Downloads" + label_download: "{{count}} изтегляне" + label_download_plural: "{{count}} изтегляния" label_no_data: Няма изходни данни - label_change_status: Промяна на статуса + label_change_status: Промяна на състоянието label_history: История label_attachment: Файл label_attachment_new: Нов файл @@ -369,21 +368,21 @@ bg: label_closed_issues: затворена label_closed_issues_plural: затворени label_x_open_issues_abbr_on_total: - zero: 0 open / {{total}} - one: 1 open / {{total}} - other: "{{count}} open / {{total}}" + zero: 0 отворени / {{total}} + one: 1 отворена / {{total}} + other: "{{count}} отворени / {{total}}" label_x_open_issues_abbr: - zero: 0 open - one: 1 open - other: "{{count}} open" + zero: 0 отворени + one: 1 отворена + other: "{{count}} отворени" label_x_closed_issues_abbr: - zero: 0 closed - one: 1 closed - other: "{{count}} closed" + zero: 0 затворени + one: 1 затворена + other: "{{count}} затворени" label_total: Общо label_permissions: Права - label_current_status: Текущ статус - label_new_statuses_allowed: Позволени статуси + label_current_status: Текущо състояние + label_new_statuses_allowed: Позволени състояния label_all: всички label_none: никакви label_next: Следващ @@ -394,7 +393,7 @@ bg: label_per_page: На страница label_calendar: Календар label_months_from: месеца от - label_gantt: Gantt + label_gantt: Мрежов график label_internal: Вътрешен label_last_changes: "последни {{count}} промени" label_change_view_all: Виж всички промени @@ -402,9 +401,9 @@ bg: label_comment: Коментар label_comment_plural: Коментари label_x_comments: - zero: no comments - one: 1 comment - other: "{{count}} comments" + zero: 0 коментари + one: 1 коментар + other: "{{count}} коментари" label_comment_add: Добавяне на коментар label_comment_added: Добавен коментар label_comment_delete: Изтриване на коментари @@ -453,13 +452,13 @@ bg: label_wiki: Wiki label_wiki_edit: Wiki редакция label_wiki_edit_plural: Wiki редакции - label_wiki_page: Wiki page - label_wiki_page_plural: Wiki pages + 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: Feeds + label_feed_plural: Емисии label_changes_details: Подробни промени label_issue_tracking: Тракинг label_spent_time: Отделено време @@ -478,7 +477,7 @@ bg: label_permissions_report: Справка за права label_watched_issues: Наблюдавани задачи label_related_issues: Свързани задачи - label_applied_status: Промени статуса на + label_applied_status: Установено състояние label_loading: Зареждане... label_relation_new: Нова релация label_relation_delete: Изтриване на релация @@ -488,10 +487,10 @@ bg: label_blocked_by: блокирана от label_precedes: предшества label_follows: изпълнява се след - 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: край към начало + label_end_to_end: край към край + label_start_to_start: начало към начало + label_start_to_end: начало към край label_stay_logged_in: Запомни ме label_disabled: забранено label_show_completed_versions: Показване на реализирани версии @@ -534,7 +533,7 @@ bg: button_clear: Изчисти button_lock: Заключване button_unlock: Отключване - button_download: Download + button_download: Изтегляне button_list: Списък button_view: Преглед button_move: Преместване @@ -544,8 +543,8 @@ bg: button_sort: Сортиране button_log_time: Отделяне на време button_rollback: Върни се към тази ревизия - button_watch: Наблюдавай - button_unwatch: Спри наблюдението + button_watch: Наблюдаване + button_unwatch: Край на наблюдението button_reply: Отговор button_archive: Архивиране button_unarchive: Разархивиране @@ -562,9 +561,9 @@ bg: text_project_destroy_confirmation: Сигурни ли сте, че искате да изтриете проекта и данните в него? text_workflow_edit: Изберете роля и тракер за да редактирате работния процес text_are_you_sure: Сигурни ли сте? - text_tip_issue_begin_day: задача започваща този ден - text_tip_issue_end_day: задача завършваща този ден - text_tip_issue_begin_end_day: задача започваща и завършваща този ден + text_tip_task_begin_day: задача започваща този ден + text_tip_task_end_day: задача завършваща този ден + text_tip_task_begin_end_day: задача започваща и завършваща този ден text_project_identifier_info: 'Позволени са малки букви (a-z), цифри и тирета.
    Невъзможна промяна след запис.' text_caracters_maximum: "До {{count}} символа." text_length_between: "От {{min}} до {{max}} символа." @@ -582,11 +581,11 @@ bg: default_role_manager: Мениджър default_role_developer: Разработчик default_role_reporter: Публикуващ - default_tracker_bug: Бъг + default_tracker_bug: Грешка default_tracker_feature: Функционалност default_tracker_support: Поддръжка default_issue_status_new: Нова - default_issue_status_in_progress: In Progress + default_issue_status_in_progress: Изпълнение default_issue_status_resolved: Приключена default_issue_status_feedback: Обратна връзка default_issue_status_closed: Затворена @@ -648,7 +647,7 @@ bg: label_age: Възраст notice_default_data_loaded: Примерната информацията е успешно заредена. text_load_default_configuration: Зареждане на примерна информация - text_no_configuration_data: "Все още не са конфигурирани Роли, тракери, статуси на задачи и работен процес.\nСтрого се препоръчва зареждането на примерната информация. Веднъж заредена ще имате възможност да я редактирате." + text_no_configuration_data: "Все още не са конфигурирани Роли, тракери, състояния на задачи и работен процес.\nСтрого се препоръчва зареждането на примерната информация. Веднъж заредена ще имате възможност да я редактирате." error_can_t_load_default_data: "Грешка при зареждане на примерната информация: {{value}}" button_update: Обновяване label_change_properties: Промяна на настройки @@ -707,209 +706,216 @@ bg: setting_default_projects_public: Новите проекти са публични по подразбиране error_scm_annotate: "Обектът не съществува или не може да бъде анотиран." label_planning: Планиране - text_subprojects_destroy_warning: "Its subproject(s): {{value}} will be also deleted." - label_and_its_subprojects: "{{value}} and its subprojects" - mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:" - mail_subject_reminder: "{{count}} issue(s) due in the next {{days}} days" - text_user_wrote: "{{value}} wrote:" - label_duplicated_by: duplicated by - setting_enabled_scm: Enabled SCM - text_enumeration_category_reassign_to: 'Reassign them to this value:' - text_enumeration_destroy_question: "{{count}} objects are assigned to this value." - label_incoming_emails: Incoming emails - label_generate_key: Generate a key - setting_mail_handler_api_enabled: Enable WS for incoming emails - setting_mail_handler_api_key: API key - text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them." - field_parent_title: Parent page - label_issue_watchers: Watchers - setting_commit_logs_encoding: Commit messages encoding - button_quote: Quote - setting_sequential_project_identifiers: Generate sequential project identifiers - notice_unable_delete_version: Unable to delete version - label_renamed: renamed - label_copied: copied - setting_plain_text_mail: plain text only (no HTML) - permission_view_files: View files - permission_edit_issues: Edit issues - permission_edit_own_time_entries: Edit own time logs - permission_manage_public_queries: Manage public queries - permission_add_issues: Add issues + text_subprojects_destroy_warning: "Неговите подпроекти: {{value}} също ще бъдат изтрити." + label_and_its_subprojects: "{{value}} и неговите подпроекти" + mail_body_reminder: "{{count}} задачи, назначени на вас са с краен срок в следващите {{days}} дни:" + mail_subject_reminder: "{{count}} задачи с краен срок с следващите {{days}} дни" + text_user_wrote: "{{value}} написа:" + label_duplicated_by: дублирана от + setting_enabled_scm: Разрешена SCM + text_enumeration_category_reassign_to: 'Пресвържете ги към тази стойност:' + text_enumeration_destroy_question: "{{count}} обекта са свързани с тази стойност." + label_incoming_emails: Входящи e-mail-и + label_generate_key: Генериране на ключ + setting_mail_handler_api_enabled: Разрешаване на WS за входящи e-mail-и + setting_mail_handler_api_key: API ключ + text_email_delivery_not_configured: "Изпращането на e-mail-и не е конфигурирано и известията не са разрешени.\nКонфигурирайте вашия SMTP сървър в config/email.yml и рестартирайте Redmine, за да ги разрешите." + field_parent_title: Родителска страница + label_issue_watchers: Наблюдатели + setting_commit_logs_encoding: Кодова таблица на съобщенията при поверяване + button_quote: Цитат + setting_sequential_project_identifiers: Генериране на последователни проектни идентификатори + notice_unable_delete_version: Невъзможност за изтриване на версия + label_renamed: преименуван + label_copied: копиран + setting_plain_text_mail: само чист текст (без HTML) + permission_view_files: Разглеждане на файлове + permission_edit_issues: Редактиране на задачи + permission_edit_own_time_entries: Редактиране на собствените time logs + permission_manage_public_queries: Управление на публичните заявки + permission_add_issues: Добавяне на задачи permission_log_time: Log spent time - permission_view_changesets: View changesets - permission_view_time_entries: View spent time - permission_manage_versions: Manage versions - permission_manage_wiki: Manage wiki - permission_manage_categories: Manage issue categories - permission_protect_wiki_pages: Protect wiki pages - permission_comment_news: Comment news - permission_delete_messages: Delete messages - permission_select_project_modules: Select project modules - permission_manage_documents: Manage documents - permission_edit_wiki_pages: Edit wiki pages - permission_add_issue_watchers: Add watchers - permission_view_gantt: View gantt chart - permission_move_issues: Move issues - permission_manage_issue_relations: Manage issue relations - permission_delete_wiki_pages: Delete wiki pages - permission_manage_boards: Manage boards - permission_delete_wiki_pages_attachments: Delete attachments - permission_view_wiki_edits: View wiki history - permission_add_messages: Post messages - permission_view_messages: View messages - permission_manage_files: Manage files - permission_edit_issue_notes: Edit notes - permission_manage_news: Manage news - permission_view_calendar: View calendrier - permission_manage_members: Manage members - permission_edit_messages: Edit messages - permission_delete_issues: Delete issues - permission_view_issue_watchers: View watchers list - permission_manage_repository: Manage repository - permission_commit_access: Commit access - permission_browse_repository: Browse repository - permission_view_documents: View documents - permission_edit_project: Edit project - permission_add_issue_notes: Add notes - permission_save_queries: Save queries - permission_view_wiki_pages: View wiki - permission_rename_wiki_pages: Rename wiki pages - permission_edit_time_entries: Edit time logs - permission_edit_own_issue_notes: Edit own notes - setting_gravatar_enabled: Use Gravatar user icons - label_example: Example + permission_view_changesets: Разглеждане на changesets + permission_view_time_entries: Разглеждане на изразходваното време + permission_manage_versions: Управление на версиите + permission_manage_wiki: Управление на wiki + permission_manage_categories: Управление на категориите задачи + permission_protect_wiki_pages: Заключване на wiki страници + permission_comment_news: Коментиране на новини + permission_delete_messages: Изтриване на съобщения + permission_select_project_modules: Избор на проектни модули + permission_manage_documents: Управление на документи + permission_edit_wiki_pages: Редактиране на wiki страници + permission_add_issue_watchers: Добавяне на наблюдатели + permission_view_gantt: Разглеждане на мрежов график + permission_move_issues: Преместване на задачи + permission_manage_issue_relations: Управление на връзките между задачите + permission_delete_wiki_pages: Изтриване на wiki страници + permission_manage_boards: Управление на boards + permission_delete_wiki_pages_attachments: Изтриване на прикачени файлове + permission_view_wiki_edits: Разглеждане на wiki история + permission_add_messages: Публикуване на съобщения + permission_view_messages: Разглеждане на съобщения + permission_manage_files: Управление на файлове + permission_edit_issue_notes: Редактиране на бележки + permission_manage_news: Управление на новини + permission_view_calendar: Разглеждане на календари + permission_manage_members: Управление на членовете (на екип) + permission_edit_messages: Редактиране на съобщения + permission_delete_issues: Изтриване на задачи + permission_view_issue_watchers: Разглеждане на списък с наблюдатели + permission_manage_repository: Управление на хранилища + permission_commit_access: Поверяване + permission_browse_repository: Разглеждане на хранилища + permission_view_documents: Разглеждане на документи + permission_edit_project: Редактиране на проект + permission_add_issue_notes: Добаване на бележки + permission_save_queries: Запис на запитвания (queries) + permission_view_wiki_pages: Разглеждане на wiki + permission_rename_wiki_pages: Преименуване на wiki страници + permission_edit_time_entries: Редактиране на time logs + permission_edit_own_issue_notes: Редактиране на собствени бележки + setting_gravatar_enabled: Използване на портребителски икони от Gravatar + label_example: Пример 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: Edit own messages - permission_delete_own_messages: Delete own messages - label_user_activity: "{{value}}'s activity" - label_updated_time_by: "Updated by {{author}} {{age}} ago" - text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.' - setting_diff_max_lines_displayed: Max number of diff lines displayed - text_plugin_assets_writable: Plugin assets directory writable - warning_attachments_not_saved: "{{count}} file(s) could not be saved." - button_create_and_continue: Create and continue - text_custom_field_possible_values_info: 'One line for each value' + permission_edit_own_messages: Редактиране на собствени съобщения + permission_delete_own_messages: Изтриване на собствени съобщения + label_user_activity: "Активност на {{value}}" + label_updated_time_by: "Обновена от {{author}} преди {{age}}" + text_diff_truncated: '... Този diff не е пълен, понеже е надхвърля максималния размер, който може да бъде показан.' + setting_diff_max_lines_displayed: Максимален брой показани diff редове + text_plugin_assets_writable: Папката на приставките е разрешена за запис + warning_attachments_not_saved: "{{count}} файла не бяха записани." + button_create_and_continue: Създаване и продължаване + text_custom_field_possible_values_info: 'Една стойност на ред' label_display: Display field_editable: Editable - setting_repository_log_display_limit: Maximum number of revisions displayed on file log - setting_file_max_size_displayed: Max size of text files displayed inline - field_watcher: Watcher - setting_openid: Allow OpenID login and registration + setting_repository_log_display_limit: Максимален брой на показванете ревизии в лог файла + setting_file_max_size_displayed: Максимален размер на текстовите файлове, показвани inline + field_watcher: Наблюдател + setting_openid: Рарешаване на OpenID вход и регистрация field_identity_url: OpenID URL - label_login_with_open_id_option: or login with OpenID - field_content: Content - label_descending: Descending - label_sort: Sort - label_ascending: Ascending - label_date_from_to: From {{start}} to {{end}} + label_login_with_open_id_option: или вход чрез OpenID + field_content: Съдържание + label_descending: Намаляващ + label_sort: Сортиране + label_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: Minimum password length - field_group_by: Group results by - mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated" - label_wiki_content_added: Wiki page added - mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" - mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}. - label_wiki_content_updated: Wiki page updated - mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}. - permission_add_project: Create project - setting_new_project_user_role_id: Role given to a non-admin user who creates a project - label_view_all_revisions: View all revisions - label_tag: Tag - label_branch: Branch - error_no_tracker_in_project: No tracker is associated to this project. Please check the Project settings. - error_no_default_issue_status: No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses"). - text_journal_changed: "{{label}} changed from {{old}} to {{new}}" - text_journal_set_to: "{{label}} set to {{value}}" - text_journal_deleted: "{{label}} deleted ({{old}})" - label_group_plural: Groups - label_group: Group - label_group_new: New group - label_time_entry_plural: Spent time - text_journal_added: "{{label}} {{value}} added" - field_active: Active - enumeration_system_activity: System Activity - permission_delete_issue_watchers: Delete watchers - version_status_closed: closed - version_status_locked: locked - version_status_open: open - error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened - label_user_anonymous: Anonymous - button_move_and_follow: Move and follow - setting_default_projects_modules: Default enabled modules for new projects - setting_gravatar_default: Default Gravatar image + text_wiki_page_destroy_question: Тази страница има {{descendants}} страници деца и descendant(s). Какво желаете да правите? + text_wiki_page_reassign_children: Преназначаване на страниците деца на тази родителска страница + text_wiki_page_nullify_children: Запазване на тези страници като коренни страници + text_wiki_page_destroy_children: Изтриване на страниците деца и всички техни descendants + setting_password_min_length: Минимална дължина на парола + field_group_by: Групиране на резултатите по + mail_subject_wiki_content_updated: "Wiki страницата '{{id}}' не беше обновена" + label_wiki_content_added: Wiki страница беше добавена + mail_subject_wiki_content_added: "Wiki страницата '{{id}}' беше добавена" + mail_body_wiki_content_added: Wiki страницата '{{id}}' беше добавена от {{author}}. + label_wiki_content_updated: Wiki страница беше обновена + mail_body_wiki_content_updated: Wiki страницата '{{id}}' беше обновена от {{author}}. + permission_add_project: Създаване на проект + setting_new_project_user_role_id: Роля, давана на потребител, създаващ проекти, който не е администратор + label_view_all_revisions: Разглеждане на всички ревизии + label_tag: Версия + label_branch: работен вариант + error_no_tracker_in_project: Няма асоциирани тракери с този проект. Проверете настройките на проекта. + error_no_default_issue_status: Няма установено подразбиращо се състояние за задачите. Моля проверете вашата конфигурация (Вижте "Администрация -> Състояния на задачи"). + text_journal_changed: "{{label}} променен от {{old}} на {{new}}" + text_journal_set_to: "{{label}} установен на {{value}}" + text_journal_deleted: "{{label}} изтрит ({{old}})" + label_group_plural: Групи + label_group: Група + label_group_new: Нова група + label_time_entry_plural: Използвано време + text_journal_added: "Добавено {{label}} {{value}}" + field_active: Активен + enumeration_system_activity: Системна активност + permission_delete_issue_watchers: Изтриване на наблюдатели + version_status_closed: затворена + version_status_locked: заключена + version_status_open: отворена + error_can_not_reopen_issue_on_closed_version: Задача, асоциирана със затворена версия не може да бъде отворена отново + label_user_anonymous: Анонимен + button_move_and_follow: Преместване и продължаване + setting_default_projects_modules: Активирани модули по подразбиране за нов проект + setting_gravatar_default: Подразбиращо се изображение от Gravatar 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 + label_version_sharing_hierarchy: С проектна йерархия + label_version_sharing_system: С всички проекти + label_version_sharing_descendants: С подпроекти + label_version_sharing_tree: С дърво на проектите + label_version_sharing_none: Не споделен + error_can_not_archive_project: Този проект не може да бъде архивиран + button_duplicate: Дублиране + button_copy_and_follow: Копиране и продължаване + label_copy_source: Източник + setting_issue_done_ratio: Изчисление на процента на готово задачи с + setting_issue_done_ratio_issue_status: Използване на състояниетона задачите + error_issue_done_ratios_not_updated: Процентът на завършените задачи не е обновен. + error_workflow_copy_target: Моля изберете тракер(и) и роля (роли). + setting_issue_done_ratio_issue_field: Използване на поле 'задача' + label_copy_same_as_target: Също като целта + label_copy_target: Цел + notice_issue_done_ratios_updated: Обновен процент на завършените задачи. + error_workflow_copy_source: Моля изберете source тракер или роля + label_update_issue_done_ratios: Обновяване на процента на завършените задачи + setting_start_of_week: Първи ден на седмицата + permission_view_issues: Разглеждане на задачите + label_display_used_statuses_only: Показване само на състоянията, използвани от този тракер + label_revision_id: Ревизия {{value}} + label_api_access_key: API ключ за достъп + label_api_access_key_created_on: API ключ за достъп е създаден преди {{value}} + label_feeds_access_key: RSS access ключ + notice_api_access_key_reseted: Вашият API ключ за достъп беше изчистен. + setting_rest_api_enabled: Разрешаване на REST web сървис + label_missing_api_access_key: Липсващ API ключ + label_missing_feeds_access_key: Липсващ RSS ключ за достъп + button_show: Показване + text_line_separated: Позволени са много стойности (по едно на ред). + setting_mail_handler_body_delimiters: Отрязване на e-mail-ите след един от тези редове + permission_add_subprojects: Създаване на подпроекти + label_subproject_new: Нов подпроект 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_close_versions: Затваряне на завършените версии label_board_sticky: Sticky - label_board_locked: Locked - permission_export_wiki_pages: Export wiki pages + label_board_locked: Заключена + permission_export_wiki_pages: Експорт на wiki страници 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. + permission_manage_project_activities: Управление на дейностите на проекта + error_unable_delete_issue_status: Невъзможност за изтриване на състояние на задача + label_profile: Профил + permission_manage_subtasks: Управление на подзадачите + field_parent_issue: Родителска задача + label_subtask_plural: Подзадачи + label_project_copy_notifications: Изпращане на Send e-mail известия по време на копирането на проекта + error_can_not_delete_custom_field: Невъзможност за изтриване на потребителско поле + error_unable_to_connect: Невъзможност за свързване с ({{value}}) + error_can_not_remove_role: Тази роля се използва и не може да бъде изтрита. + error_can_not_delete_tracker: Този тракер съдържа задачи и не може да бъде изтрит. 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 + notice_failed_to_save_members: "Невъзможност за запис на член(ове): {{errors}}." + text_zoom_out: Намаляване + text_zoom_in: Увеличаване + notice_unable_delete_time_entry: Невъзможност за изтриване на запис на time log. + label_overall_spent_time: Общо употребено време field_time_entries: Log time + notice_not_authorized_archived_project: The project you're trying to access has been archived. + text_tip_issue_end_day: issue ending this day + field_text: Text field + label_user_mail_option_only_owner: Only for things I am the owner of + field_member_of_group: Assignee's group project_module_gantt: Gantt + text_are_you_sure_with_children: Delete issue and all child issues? + text_tip_issue_begin_end_day: issue beginning and ending this day + setting_default_notification_option: Default notification option project_module_calendar: Calendar - field_member_of_group: Member of Group - field_assigned_to_role: Member of Role + label_user_mail_option_only_my_events: Only for things I watch or I'm involved in + text_tip_issue_begin_day: issue beginning this day + label_user_mail_option_only_assigned: Only for things I am assigned to button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" - text_are_you_sure_with_children: Delete issue and all child issues? - field_text: Text field - + field_assigned_to_role: Assignee's role diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 0e021d25ca8..aacb5ab0748 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -175,6 +175,7 @@ ja: notice_file_not_found: アクセスしようとしたページは存在しないか削除されています。 notice_locking_conflict: 別のユーザがデータを更新しています。 notice_not_authorized: このページにアクセスするには認証が必要です。 + notice_not_authorized_archived_project: プロジェクトは書庫に保存されています。 notice_email_sent: "{{value}} 宛にメールを送信しました。" notice_email_error: "メール送信中にエラーが発生しました ({{value}})" notice_feeds_access_key_reseted: RSSアクセスキーを初期化しました。 diff --git a/config/locales/mk.yml b/config/locales/mk.yml index ceaba30ab5d..4653d9feeb0 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -852,7 +852,7 @@ mk: text_line_separated: Дозволени се повеќе вредности (една линија за секоја вредност). text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages text_issue_added: "Задачата {{id}} е пријавена од {{author}}." - text_issue_updated: "Зачата {{id}} е ажурирана од {{author}}." + text_issue_updated: "Задачата {{id}} е ажурирана од {{author}}." text_wiki_destroy_confirmation: Дали сте сигурни дека сакате да го избришете ова вики и целата негова содржина? text_issue_category_destroy_question: "Некои задачи ({{count}}) се доделени на оваа категорија. Што сакате да правите?" text_issue_category_destroy_assignments: Remove category assignments diff --git a/config/locales/sv.yml b/config/locales/sv.yml index d98679d1e88..360ca754c28 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -195,6 +195,7 @@ sv: notice_file_not_found: Sidan du försökte komma åt existerar inte eller är borttagen. notice_locking_conflict: Data har uppdaterats av en annan användare. notice_not_authorized: Du saknar behörighet att komma åt den här sidan. + notice_not_authorized_archived_project: Projektet du försöker komma åt har arkiverats. notice_email_sent: "Ett mail skickades till {{value}}" notice_email_error: "Ett fel inträffade när mail skickades ({{value}})" notice_feeds_access_key_reseted: Din RSS-nyckel återställdes. @@ -339,6 +340,9 @@ sv: field_group_by: Gruppera resultat efter field_sharing: Delning field_parent_issue: Förälderaktivitet + field_member_of_group: Tilldelad användares grupp + field_assigned_to_role: Tilldelad användares roll + field_text: Textfält setting_app_title: Applikationsrubrik setting_app_subtitle: Applikationsunderrubrik @@ -393,6 +397,7 @@ sv: setting_start_of_week: Första dagen i veckan setting_rest_api_enabled: Aktivera REST webbtjänst setting_cache_formatted_text: Cacha formaterad text + setting_default_notification_option: Standard notifieringsalternativ permission_add_project: Skapa projekt permission_add_subprojects: Skapa underprojekt @@ -830,6 +835,7 @@ sv: button_create_and_continue: Skapa och fortsätt button_test: Testa button_edit: Ändra + button_edit_associated_wikipage: "Ändra associerad Wikisida: {{page_title}}" button_add: Lägg till button_change: Ändra button_apply: Verkställ @@ -881,6 +887,7 @@ sv: text_subprojects_destroy_warning: "Alla underprojekt: {{value}} kommer också tas bort." text_workflow_edit: Välj en roll och en ärendetyp för att ändra arbetsflöde text_are_you_sure: Är du säker ? + text_are_you_sure_with_children: Ta bort ärende och alla underärenden? text_journal_changed: "{{label}} ändrad från {{old}} till {{new}}" text_journal_set_to: "{{label}} satt till {{value}}" text_journal_deleted: "{{label}} borttagen ({{old}})" diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index bc32b25126b..be724bf32ec 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -235,6 +235,7 @@ notice_file_not_found: 您想要存取的頁面已經不存在或被搬移至其他位置。 notice_locking_conflict: 資料已被其他使用者更新。 notice_not_authorized: 你未被授權存取此頁面。 + notice_not_authorized_archived_project: 您欲存取的專案已經被歸檔封存。 notice_email_sent: "郵件已經成功寄送至以下收件者： {{value}}" notice_email_error: "寄送郵件的過程中發生錯誤 ({{value}})" notice_feeds_access_key_reseted: 您的 RSS 存取金鑰已被重新設定。 @@ -379,8 +380,8 @@ field_group_by: 結果分組方式 field_sharing: 共用 field_parent_issue: 父工作項目 - field_member_of_group: 所屬群組 - field_assigned_to_role: 所屬角色 + field_member_of_group: "被指派者的群組" + field_assigned_to_role: "被指派者的角色" field_text: 內容文字 setting_app_title: 標題 @@ -1007,4 +1008,3 @@ enumeration_doc_categories: 文件分類 enumeration_activities: 活動 (時間追蹤) enumeration_system_activity: 系統活動 - From 3a401f78acc7d11d6d317606eb271d27d727e182 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:56:41 +0000 Subject: [PATCH 189/240] Merged r4298 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4333 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/de.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index 54a83d1e301..42795c2cdd9 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -831,7 +831,7 @@ de: button_copy: Kopieren button_copy_and_follow: Kopieren und Ticket anzeigen button_annotate: Annotieren - button_update: Aktualisieren + button_update: Bearbeiten button_configure: Konfigurieren button_quote: Zitieren button_duplicate: Duplizieren @@ -936,4 +936,9 @@ de: field_assigned_to_role: Member of Role text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + setting_default_notification_option: Default notification option + notice_not_authorized_archived_project: The project you're trying to access has been archived. + label_user_mail_option_none: "Only for things I watch or I'm involved in" + field_member_of_group: Assignee's group + field_assigned_to_role: Assignee's role From 01728eaf7a8ab8f30c7183e7872bc35cf3c73927 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:56:47 +0000 Subject: [PATCH 190/240] Merged r4299 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4334 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- 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/mk.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-YU.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 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/config/locales/bg.yml b/config/locales/bg.yml index de3cb1657f2..2dc2eedae8f 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -221,7 +221,6 @@ bg: field_attr_lastname: Атрибут Фамилия (Lastname) field_attr_mail: Атрибут Email field_onthefly: Динамично създаване на потребител - field_start_date: Начална дата field_done_ratio: % Прогрес field_auth_source: Начин на оторизация field_hide_mail: Скрий e-mail адреса ми @@ -919,3 +918,4 @@ bg: label_user_mail_option_only_assigned: Only for things I am assigned to button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" field_assigned_to_role: Assignee's role + field_start_date: Start date diff --git a/config/locales/bs.yml b/config/locales/bs.yml index aa5d27920b5..cebfe46f525 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -252,7 +252,6 @@ bs: field_attr_lastname: Atribut za prezime field_attr_mail: Atribut za email field_onthefly: 'Kreiranje korisnika "On-the-fly"' - field_start_date: Početak field_done_ratio: % Realizovano field_auth_source: Mod za authentifikaciju field_hide_mail: Sakrij moju email adresu @@ -933,3 +932,4 @@ bs: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 0780a583d41..effc8bd69de 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -264,7 +264,6 @@ ca: field_attr_lastname: Atribut del cognom field_attr_mail: Atribut del correu electrònic field_onthefly: "Creació de l'usuari «al vol»" - field_start_date: Inici field_done_ratio: % realitzat field_auth_source: "Mode d'autenticació" field_hide_mail: "Oculta l'adreça de correu electrònic" @@ -921,3 +920,4 @@ ca: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 8f90e6d5191..8996c09c6d8 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -237,7 +237,6 @@ cs: field_attr_lastname: Příjemní (atribut) field_attr_mail: Email (atribut) field_onthefly: Automatické vytváření uživatelů - field_start_date: Začátek field_done_ratio: % Hotovo field_auth_source: Autentifikační mód field_hide_mail: Nezobrazovat můj email @@ -918,3 +917,4 @@ cs: button_edit_associated_wikipage: "Upravit přiřazenou Wiki stránku: {{page_title}}" text_are_you_sure_with_children: Smazat úkol včetně všech podúkolů? field_text: Textové pole + field_start_date: Start date diff --git a/config/locales/da.yml b/config/locales/da.yml index 3d1006852cd..03bbe6f468b 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -250,7 +250,6 @@ da: field_attr_lastname: Efternavn attribut field_attr_mail: Email attribut field_onthefly: løbende brugeroprettelse - field_start_date: Start field_done_ratio: % Færdig field_auth_source: Sikkerhedsmetode field_hide_mail: Skjul min email @@ -935,3 +934,4 @@ da: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/de.yml b/config/locales/de.yml index 42795c2cdd9..470d2b3ae81 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -280,7 +280,6 @@ de: field_attr_lastname: Name-Attribut field_attr_mail: E-Mail-Attribut field_onthefly: On-the-fly-Benutzererstellung - field_start_date: Beginn field_done_ratio: % erledigt field_auth_source: Authentifizierungs-Modus field_hide_mail: E-Mail-Adresse nicht anzeigen @@ -942,3 +941,4 @@ de: field_member_of_group: Assignee's group field_assigned_to_role: Assignee's role + field_start_date: Start date diff --git a/config/locales/el.yml b/config/locales/el.yml index 609d6b8d02a..242cdb40e27 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -247,7 +247,6 @@ el: field_attr_lastname: Ιδιότητα επωνύμου field_attr_mail: Ιδιότητα email field_onthefly: Άμεση δημιουργία χρήστη - field_start_date: Εκκίνηση field_done_ratio: % επιτεύχθη field_auth_source: Τρόπος πιστοποίησης field_hide_mail: Απόκρυψη διεύθυνσης email @@ -919,3 +918,4 @@ el: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 693793774da..5a693f36649 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -257,7 +257,7 @@ en-GB: field_attr_lastname: Lastname attribute field_attr_mail: Email attribute field_onthefly: On-the-fly user creation - field_start_date: Start + field_start_date: Start Date field_done_ratio: % Done field_auth_source: Authentication mode field_hide_mail: Hide my email address diff --git a/config/locales/en.yml b/config/locales/en.yml index 7742c7148f0..94ea1e80230 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -261,7 +261,7 @@ en: field_attr_lastname: Lastname attribute field_attr_mail: Email attribute field_onthefly: On-the-fly user creation - field_start_date: Start + field_start_date: Start Date field_done_ratio: % Done field_auth_source: Authentication mode field_hide_mail: Hide my email address diff --git a/config/locales/es.yml b/config/locales/es.yml index a4c73070351..e364c143cfa 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -313,7 +313,6 @@ es: field_role: Perfil field_searchable: Incluir en las búsquedas field_spent_on: Fecha - field_start_date: Fecha de inicio field_start_page: Página principal field_status: Estado field_subject: Tema @@ -959,3 +958,4 @@ es: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 0404a39da53..16b1445c854 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -257,7 +257,6 @@ eu: field_attr_lastname: Abizenak atributua field_attr_mail: Eposta atributua field_onthefly: Zuzeneko erabiltzaile sorrera - field_start_date: Hasiera field_done_ratio: Egindako % field_auth_source: Autentikazio modua field_hide_mail: Nire eposta helbidea ezkutatu @@ -922,3 +921,4 @@ eu: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 0edf0a662c5..f51c16d9dfd 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -262,7 +262,6 @@ fi: field_attr_lastname: Sukunimenmääre field_attr_mail: Sähköpostinmääre field_onthefly: Automaattinen käyttäjien luonti - field_start_date: Alku field_done_ratio: % Tehty field_auth_source: Varmennusmuoto field_hide_mail: Piiloita sähköpostiosoitteeni @@ -943,3 +942,4 @@ fi: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 50b3e425744..ddc7606a3cb 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -271,7 +271,6 @@ fr: field_attr_lastname: Attribut Nom field_attr_mail: Attribut Email field_onthefly: Création des utilisateurs à la volée - field_start_date: Début field_done_ratio: % réalisé field_auth_source: Mode d'authentification field_hide_mail: Cacher mon adresse mail @@ -944,3 +943,4 @@ fr: field_member_of_group: Groupe de l'assigné field_assigned_to_role: Rôle de l'assigné + field_start_date: Start date diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 42905ed74d3..243070351ed 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -290,7 +290,6 @@ gl: field_role: Perfil field_searchable: Incluír nas búsquedas field_spent_on: Data - field_start_date: Data de inicio field_start_page: Páxina principal field_status: Estado field_subject: Tema @@ -935,3 +934,4 @@ gl: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/he.yml b/config/locales/he.yml index afdd9886fa1..0af979b7807 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -265,7 +265,6 @@ he: field_attr_lastname: תכונת שם משפחה field_attr_mail: תכונת דוא"ל field_onthefly: יצירת משתמשים זריזה - field_start_date: תאריך התחלה field_done_ratio: % גמור field_auth_source: מקור הזדהות field_hide_mail: החבא את כתובת הדוא"ל שלי @@ -935,3 +934,4 @@ he: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 8e47b051321..3937f25b042 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -253,7 +253,6 @@ hr: field_attr_lastname: Atribut prezimena field_attr_mail: Atribut e-pošte field_onthefly: "Izrada korisnika \"u hodu\"" - field_start_date: Pocetak field_done_ratio: % Učinjeno field_auth_source: Vrsta prijavljivanja field_hide_mail: Sakrij moju adresu e-pošte @@ -925,3 +924,4 @@ hr: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 723d5667f49..b8c072b66ba 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -260,7 +260,6 @@ field_attr_lastname: Vezetéknév field_attr_mail: E-mail field_onthefly: On-the-fly felhasználó létrehozás - field_start_date: Kezdés dátuma field_done_ratio: Elkészült (%) field_auth_source: Azonosítási mód field_hide_mail: Rejtse el az e-mail címem @@ -941,3 +940,4 @@ button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/id.yml b/config/locales/id.yml index 8f627f242e3..5e1a567c16f 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -251,7 +251,6 @@ id: field_attr_lastname: Atribut nama belakang field_attr_mail: Atribut email field_onthefly: Pembuatan pengguna seketika - field_start_date: Mulai field_done_ratio: % Selesai field_auth_source: Mode otentikasi field_hide_mail: Sembunyikan email saya @@ -926,3 +925,4 @@ id: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/it.yml b/config/locales/it.yml index 0aee29d495d..32c26c9f695 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -232,7 +232,6 @@ it: field_attr_lastname: Attributo cognome field_attr_mail: Attributo email field_onthefly: Creazione utente "al volo" - field_start_date: Inizio field_done_ratio: % completato field_auth_source: Modalità di autenticazione field_hide_mail: Nascondi il mio indirizzo email @@ -922,3 +921,4 @@ it: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/ja.yml b/config/locales/ja.yml index aacb5ab0748..c68b51ca9ab 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -288,7 +288,6 @@ ja: field_attr_lastname: 苗字属性 field_attr_mail: メール属性 field_onthefly: あわせてユーザを作成 - field_start_date: 開始日 field_done_ratio: 進捗 % field_auth_source: 認証方式 field_hide_mail: メールアドレスを隠す @@ -948,3 +947,4 @@ ja: enumeration_doc_categories: 文書カテゴリ enumeration_activities: 作業分類 (時間トラッキング) enumeration_system_activity: システム作業分類 + field_start_date: Start date diff --git a/config/locales/ko.yml b/config/locales/ko.yml index fb41db4154d..15d9f8b8b1e 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -299,7 +299,6 @@ ko: field_attr_lastname: 성 속성 field_attr_mail: 메일 속성 field_onthefly: 동적 사용자 생성 - field_start_date: 시작시간 field_done_ratio: 진척도 field_auth_source: 인증 공급자 field_hide_mail: 메일 주소 숨기기 @@ -974,3 +973,4 @@ ko: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/lt.yml b/config/locales/lt.yml index dcdc2c8b25c..f977980f6f1 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -310,7 +310,6 @@ lt: field_attr_lastname: Pavardės priskiria field_attr_mail: Elektroninio pašto požymis field_onthefly: Automatinis vartotojų registravimas - field_start_date: Pradėti field_done_ratio: % atlikta field_auth_source: Autentiškumo nustatymo būdas field_hide_mail: Paslėpkite mano elektroninio pašto adresą @@ -982,3 +981,4 @@ lt: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/lv.yml b/config/locales/lv.yml index a6445d7408e..280af883a30 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -248,7 +248,6 @@ lv: field_attr_lastname: Uzvārda atribūts field_attr_mail: "E-pasta atribūts" field_onthefly: "Lietotāja izveidošana on-the-fly" - field_start_date: Sākuma datums field_done_ratio: % padarīti field_auth_source: Pilnvarošanas režīms field_hide_mail: "Paslēpt manu e-pasta adresi" @@ -913,3 +912,4 @@ lv: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 4653d9feeb0..0443c60ad56 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -261,7 +261,6 @@ mk: field_attr_lastname: Lastname attribute field_attr_mail: Email attribute field_onthefly: Моментално (On-the-fly) креирање на корисници - field_start_date: Почеток field_done_ratio: % Завршено field_auth_source: Режим на автентикација field_hide_mail: Криј ја мојата адреса на е-пошта @@ -918,3 +917,4 @@ mk: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/mn.yml b/config/locales/mn.yml index 5709651dc31..6e9c191e05c 100644 --- a/config/locales/mn.yml +++ b/config/locales/mn.yml @@ -252,7 +252,6 @@ mn: field_attr_lastname: Овог аттрибут field_attr_mail: Имэйл аттрибут field_onthefly: Хүссэн үедээ хэрэглэгч үүсгэх - field_start_date: Эхлэл field_done_ratio: %% Гүйцэтгэсэн field_auth_source: Нэвтрэх арга field_hide_mail: Миний имэйл хаягийг нуу @@ -919,3 +918,4 @@ mn: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 5a4c4d381e2..6be9743c1d3 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -256,7 +256,6 @@ nl: field_role: Rol field_searchable: Doorzoekbaar field_spent_on: Datum - field_start_date: Startdatum field_start_page: Startpagina field_status: Status field_subject: Onderwerp @@ -900,3 +899,4 @@ nl: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/no.yml b/config/locales/no.yml index 0ac85d9f575..2eed6ba7f45 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -231,7 +231,6 @@ field_attr_lastname: Etternavnsattributt field_attr_mail: E-post-attributt field_onthefly: On-the-fly brukeropprettelse - field_start_date: Start field_done_ratio: % Ferdig field_auth_source: Autentifikasjonsmodus field_hide_mail: Skjul min e-post-adresse @@ -909,3 +908,4 @@ button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 372cbdf6a86..434f0afe161 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -277,7 +277,6 @@ pl: field_role: Rola field_searchable: Przeszukiwalne field_spent_on: Data - field_start_date: Start field_start_page: Strona startowa field_status: Status field_subject: Temat @@ -939,3 +938,4 @@ pl: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 23a34780368..8234d04561c 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -264,7 +264,6 @@ pt-BR: field_attr_lastname: Atributo para sobrenome field_attr_mail: Atributo para e-mail field_onthefly: Criar usuários dinamicamente ("on-the-fly") - field_start_date: Início field_done_ratio: % Terminado field_auth_source: Modo de autenticação field_hide_mail: Ocultar meu e-mail @@ -946,3 +945,4 @@ pt-BR: setting_default_notification_option: Opção padrão de notificação label_user_mail_option_only_my_events: Somente para as coisas que eu esteja observando ou esteja envolvido label_user_mail_option_only_assigned: Somente para as coisas que estejam atribuídas a mim + field_start_date: Start date diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 89be2358053..3eb5a0069cc 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -249,7 +249,6 @@ pt: field_attr_lastname: Atributo último nome field_attr_mail: Atributo e-mail field_onthefly: Criação de utilizadores na hora - field_start_date: Início field_done_ratio: % Completo field_auth_source: Modo de autenticação field_hide_mail: Esconder endereço de e-mail @@ -926,3 +925,4 @@ pt: button_edit_associated_wikipage: "Editar página Wiki associada: {{page_title}}" text_are_you_sure_with_children: Apagar tarefa e todas as sub-tarefas? field_text: Text field + field_start_date: Start date diff --git a/config/locales/ro.yml b/config/locales/ro.yml index b80defb2bd3..70ae2feb50d 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -232,7 +232,6 @@ ro: field_attr_lastname: Atribut nume field_attr_mail: Atribut email field_onthefly: Creare utilizator pe loc - field_start_date: Data începerii field_done_ratio: Realizat (%) field_auth_source: Mod autentificare field_hide_mail: Nu se afișează adresa de email @@ -911,3 +910,4 @@ ro: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 25982846864..f6d27705042 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -363,7 +363,6 @@ ru: field_role: Роль field_searchable: Доступно для поиска field_spent_on: Дата - field_start_date: Начата field_start_page: Стартовая страница field_status: Статус field_subject: Тема @@ -1039,3 +1038,4 @@ ru: field_member_of_group: Member of Group field_assigned_to_role: Member of Role + field_start_date: Start date diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 1fb57aa889a..90c9c3a1863 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -231,7 +231,6 @@ sk: field_attr_lastname: Priezvisko (atribut) field_attr_mail: Email (atribut) field_onthefly: Automatické vytváranie užívateľov - field_start_date: Začiatok field_done_ratio: % hotovo field_auth_source: Autentifikačný mód field_hide_mail: Nezobrazovať môj email @@ -913,3 +912,4 @@ sk: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 6521b4354d2..895e012910d 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -236,7 +236,6 @@ sl: field_attr_lastname: Oznaka za priimek field_attr_mail: Oznaka za e-naslov field_onthefly: Sprotna izdelava uporabnikov - field_start_date: Začetek field_done_ratio: % Narejeno field_auth_source: Način overovljanja field_hide_mail: Skrij moj e-naslov @@ -914,3 +913,4 @@ sl: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml index f949d7101d1..a17c67a3aa8 100644 --- a/config/locales/sr-YU.yml +++ b/config/locales/sr-YU.yml @@ -261,7 +261,6 @@ sr-YU: 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 @@ -918,3 +917,4 @@ sr-YU: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 5a42c8d6009..ed4be207bb3 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -261,7 +261,6 @@ sr: field_attr_lastname: Атрибут презимена field_attr_mail: Атрибут е-адресе field_onthefly: Креирање корисника у току рада - field_start_date: Почетак field_done_ratio: % урађено field_auth_source: Режим потврде идентитета field_hide_mail: Сакриј моју е-адресу @@ -919,3 +918,4 @@ sr: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 360ca754c28..0bd528608f8 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -308,7 +308,6 @@ sv: field_attr_lastname: Efternamnsattribut field_attr_mail: Mailattribut field_onthefly: Skapa användare on-the-fly - field_start_date: Start field_done_ratio: % Klart field_auth_source: Autentiseringsläge field_hide_mail: Dölj min mailadress @@ -970,3 +969,4 @@ sv: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/th.yml b/config/locales/th.yml index 4de7312d163..a09d9973ac3 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -233,7 +233,6 @@ th: field_attr_lastname: นามสกุล attribute field_attr_mail: อีเมล์ attribute field_onthefly: สร้างผู้ใช้ทันที - field_start_date: เริ่ม field_done_ratio: % สำเร็จ field_auth_source: วิธีการยืนยันตัวตน field_hide_mail: ซ่อนอีเมล์ของฉัน @@ -915,3 +914,4 @@ th: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/tr.yml b/config/locales/tr.yml index d273d858e6d..9d204178b7e 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -260,7 +260,6 @@ tr: field_attr_lastname: Soyad Niteliği field_attr_mail: E-Posta Niteliği field_onthefly: Anında kullanıcı oluşturma - field_start_date: Başlangıç field_done_ratio: % tamamlandı field_auth_source: Kimlik Denetim Modu field_hide_mail: E-posta adresimi gizle @@ -941,3 +940,4 @@ tr: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/uk.yml b/config/locales/uk.yml index b725a50534e..61e1e737130 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -227,7 +227,6 @@ uk: field_attr_lastname: Атрибут Прізвище field_attr_mail: Атрибут Email field_onthefly: Створення користувача на льоту - field_start_date: Початок field_done_ratio: % зроблено field_auth_source: Режим аутентифікації field_hide_mail: Приховувати мій email @@ -914,3 +913,4 @@ uk: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/vi.yml b/config/locales/vi.yml index ea6803bd5e1..5b734df8d82 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -294,7 +294,6 @@ vi: field_attr_lastname: Lastname attribute field_attr_mail: Email attribute field_onthefly: On-the-fly user creation - field_start_date: Bắt đầu field_done_ratio: Tiến độ field_auth_source: Authentication mode field_hide_mail: Không làm lộ email của bạn @@ -973,3 +972,4 @@ vi: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index be724bf32ec..7b84f331afe 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -348,7 +348,6 @@ field_attr_lastname: 姓氏屬性 field_attr_mail: 電子郵件信箱屬性 field_onthefly: 即時建立使用者 - field_start_date: 開始日期 field_done_ratio: 完成百分比 field_auth_source: 認證模式 field_hide_mail: 隱藏我的電子郵件 @@ -1008,3 +1007,4 @@ enumeration_doc_categories: 文件分類 enumeration_activities: 活動 (時間追蹤) enumeration_system_activity: 系統活動 + field_start_date: Start date diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 651a817df74..476a50f36bf 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -272,7 +272,6 @@ zh: field_attr_lastname: 姓氏属性 field_attr_mail: 邮件属性 field_onthefly: 即时用户生成 - field_start_date: 开始 field_done_ratio: 完成度 field_auth_source: 认证模式 field_hide_mail: 隐藏我的邮件地址 @@ -936,3 +935,4 @@ zh: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field + field_start_date: Start date From 004f9eaf73544ad99b702c960fd94dcd0f0c2433 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:56:52 +0000 Subject: [PATCH 191/240] Merged r4300 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4335 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 5a693f36649..19c4a6eae07 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -84,7 +84,7 @@ en-GB: byte: one: "Byte" other: "Bytes" - kb: "KB" + kb: "kB" mb: "MB" gb: "GB" tb: "TB" diff --git a/config/locales/en.yml b/config/locales/en.yml index 94ea1e80230..7bdb6aeb6c8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -81,7 +81,7 @@ en: byte: one: "Byte" other: "Bytes" - kb: "KB" + kb: "kB" mb: "MB" gb: "GB" tb: "TB" From aba28ff0682041257d55a3d6265073e701c3c711 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:56:57 +0000 Subject: [PATCH 192/240] Merged r4301 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4336 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/ru.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/config/locales/ru.yml b/config/locales/ru.yml index f6d27705042..c9477ff6063 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1035,7 +1035,8 @@ ru: text_zoom_in: Приблизить notice_unable_delete_time_entry: Невозможно удалить запись журнала. label_overall_spent_time: Всего затрачено времени + label_user_mail_option_none: Нет событий + field_member_of_group: Группа назначенного + field_assigned_to_role: Роль назначенного + notice_not_authorized_archived_project: Запрашиваемый проект был архивирован. - field_member_of_group: Member of Group - field_assigned_to_role: Member of Role - field_start_date: Start date From 93fae4151297d5c2057a3d0c44f4c7cb9859de04 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:57:02 +0000 Subject: [PATCH 193/240] Merged r4302 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4337 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/context_menus/issues.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/context_menus/issues.html.erb b/app/views/context_menus/issues.html.erb index 94d4e802f3f..f17c6f72fe9 100644 --- a/app/views/context_menus/issues.html.erb +++ b/app/views/context_menus/issues.html.erb @@ -9,7 +9,7 @@ :class => 'icon-edit', :disabled => !@can[:edit] %> <% end %> - <% unless @allowed_statuses.empty? %> + <% if @allowed_statuses.present? %>
  • <%= l(:field_status) %>
      @@ -58,7 +58,7 @@
    • <% end %> - <% unless @assignables.nil? || @assignables.empty? -%> + <% if @assignables.present? -%>
  • <%= l(:field_assigned_to) %>
      From 17ccc33e74bb998acece57919d851a8fd2e01cc5 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:57:07 +0000 Subject: [PATCH 194/240] Merged r4304 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4338 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/he.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/config/locales/he.yml b/config/locales/he.yml index 0af979b7807..e96c31ed73c 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -154,6 +154,7 @@ he: notice_file_not_found: הדף שאתה מנסה לגשת אליו אינו קיים או שהוסר. notice_locking_conflict: המידע עודכן על ידי משתמש אחר. notice_not_authorized: אינך מורשה לראות דף זה. + notice_not_authorized_archived_project: הפרויקט שאתה מנסה לגשת אליו נמצא בארכיון. notice_email_sent: "דואל נשלח לכתובת {{value}}" notice_email_error: "ארעה שגיאה בעת שליחת הדואל ({{value}})" notice_feeds_access_key_reseted: מפתח ה־RSS שלך אופס. @@ -926,12 +927,7 @@ he: enumeration_doc_categories: קטגוריות מסמכים enumeration_activities: פעילויות (מעקב אחר זמנים) enumeration_system_activity: פעילות מערכת - field_time_entries: Log time - project_module_gantt: Gantt - project_module_calendar: Calendar - field_member_of_group: Member of Group - field_assigned_to_role: Member of Role - button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" - text_are_you_sure_with_children: Delete issue and all child issues? - field_text: Text field + label_user_mail_option_none: No events + field_member_of_group: Assignee's group + field_assigned_to_role: Assignee's role field_start_date: Start date From 0ceea884539bb27593a336a96992ee75d8cd7e5a Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:57:12 +0000 Subject: [PATCH 195/240] Merged r4305 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4339 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/zh-TW.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 7b84f331afe..e5c86049403 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -174,7 +174,7 @@ odd: "必須是奇數" even: "必須是偶數" # Append your own errors here or at the model/attributes scope. - greater_than_start_date: "必須在起始日期之後" + greater_than_start_date: "必須在開始日期之後" not_same_project: "不屬於同一個專案" circular_dependency: "這個關聯會導致環狀相依" cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks" @@ -348,6 +348,7 @@ field_attr_lastname: 姓氏屬性 field_attr_mail: 電子郵件信箱屬性 field_onthefly: 即時建立使用者 + field_start_date: 開始日期 field_done_ratio: 完成百分比 field_auth_source: 認證模式 field_hide_mail: 隱藏我的電子郵件 @@ -1007,4 +1008,4 @@ enumeration_doc_categories: 文件分類 enumeration_activities: 活動 (時間追蹤) enumeration_system_activity: 系統活動 - field_start_date: Start date + From 86ee82384a73ba4602d60727a275de150412c49a Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:57:18 +0000 Subject: [PATCH 196/240] Merged r4306 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4340 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/settings/_authentication.rhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/settings/_authentication.rhtml b/app/views/settings/_authentication.rhtml index da29bb704fe..11220534fee 100644 --- a/app/views/settings/_authentication.rhtml +++ b/app/views/settings/_authentication.rhtml @@ -3,7 +3,7 @@

      <%= setting_check_box :login_required %>

      -

      <%= setting_select :autologin, [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]}, :blank => :label_disabled %>

      +

      <%= setting_select :autologin, [[l(:label_disabled), 0]] + [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]} %>

      <%= setting_select :self_registration, [[l(:label_disabled), "0"], [l(:label_registration_activation_by_email), "1"], From 39cc1276cdff6ed4bc56fa00694657121f6280c4 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:57:23 +0000 Subject: [PATCH 197/240] Merged r4307 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4341 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/projects/settings/_versions.rhtml | 4 ++-- app/views/versions/show.rhtml | 1 + config/locales/en.yml | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/projects/settings/_versions.rhtml b/app/views/projects/settings/_versions.rhtml index dc81f626595..e75a6f300f1 100644 --- a/app/views/projects/settings/_versions.rhtml +++ b/app/views/projects/settings/_versions.rhtml @@ -6,7 +6,7 @@ <%= l(:field_description) %> <%= l(:field_status) %> <%= l(:field_sharing) %> - <%= l(:label_wiki_page) unless @project.wiki.nil? %> + <%= l(:label_wiki_page) %> @@ -17,7 +17,7 @@ <%=h version.description %> <%= l("version_status_#{version.status}") %> <%=h format_version_sharing(version.sharing) %> - <%= link_to(h(version.wiki_page_title), :controller => 'wiki', :page => Wiki.titleize(version.wiki_page_title)) unless version.wiki_page_title.blank? || @project.wiki.nil? %> + <%= link_to_if_authorized(h(version.wiki_page_title), {:controller => 'wiki', :action => 'index', :id => version.project, :page => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %> <% if version.project == @project %> <%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %> diff --git a/app/views/versions/show.rhtml b/app/views/versions/show.rhtml index 79de5984b77..51d17a7fb4d 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', :id => @version.project, :page => Wiki.titleize(@version.wiki_page_title)}, :class => 'icon icon-edit') unless @version.wiki_page_title.blank? || @version.project.wiki.nil? %> <%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
      diff --git a/config/locales/en.yml b/config/locales/en.yml index 7bdb6aeb6c8..0ff7eeb9786 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -820,6 +820,7 @@ en: button_quote: Quote button_duplicate: Duplicate button_show: Show + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" status_active: active status_registered: registered From 2cf5656ad0dbb4d992aa713e31b1e315e35b393f Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:57:28 +0000 Subject: [PATCH 198/240] Merged r4308 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4342 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- public/help/wiki_syntax_detailed.html | 40 +++++++++++++++++++-------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/public/help/wiki_syntax_detailed.html b/public/help/wiki_syntax_detailed.html index 0f9d2a82086..a1af336a884 100644 --- a/public/help/wiki_syntax_detailed.html +++ b/public/help/wiki_syntax_detailed.html @@ -66,7 +66,7 @@

      Redmine links

      Wiki links are displayed in red if the page doesn't exist yet, eg: Nonexistent page.

      -

      Links to others resources (0.7):

      +

      Links to other resources:

      • Documents: @@ -74,6 +74,7 @@

        Redmine links

      • document#17 (link to document with id 17)
      • document:Greetings (link to the document with title "Greetings")
      • document:"Some document" (double quotes can be used when document title contains spaces)
        • +
      • document:some_project:"Some document" (link to a document with title "Some document" in other project "some_project")
    @@ -95,19 +96,36 @@

    Redmine links

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

    Escaping (0.7):

      +
    • Forum messages: +
        +
      • message#1218 (link to message with id 1218)
        • +
      • +
    + +
      +
    • Projects: +
        +
      • project#3 (link to project with id 3)
        • +
      • project:someproject (link to project named "someproject")
        • +
      • +
    + + +

    Escaping:

    + +
    • You can prevent Redmine links from being parsed by preceding them with an exclamation mark: !
    @@ -219,7 +237,7 @@

    Macros

    Code highlighting

    -

    Code highlightment relies on CodeRay, a fast syntax highlighting library written completely in Ruby. It currently supports c, html, javascript, rhtml, ruby, scheme, xml languages.

    +

    Code highlightment relies on CodeRay, a fast syntax highlighting library written completely in Ruby. It currently supports c, cpp, css, delphi, groovy, html, java, javascript, json, php, python, rhtml, ruby, scheme, sql, xml and yaml languages.

    You can highlight code in your wiki page using this syntax:

    From 60af09793dca0e58441ef7a2c45d1cec909c853a Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:57:33 +0000 Subject: [PATCH 199/240] Merged r4309 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4343 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- extra/svn/Redmine.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/svn/Redmine.pm b/extra/svn/Redmine.pm index 091e2193034..c96b248c58b 100644 --- a/extra/svn/Redmine.pm +++ b/extra/svn/Redmine.pm @@ -331,7 +331,7 @@ sub is_member { $sthldap->execute($auth_source_id); while (my @rowldap = $sthldap->fetchrow_array) { my $ldap = Authen::Simple::LDAP->new( - host => ($rowldap[2] eq "1" || $rowldap[2] eq "t") ? "ldaps://$rowldap[0]" : $rowldap[0], + host => ($rowldap[2] eq "1" || $rowldap[2] eq "t") ? "ldaps://$rowldap[0]:$rowldap[1]" : $rowldap[0], port => $rowldap[1], basedn => $rowldap[5], binddn => $rowldap[3] ? $rowldap[3] : "", From a472f86bfac3b6572a1c95e72c60e09bf77600fc Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:57:38 +0000 Subject: [PATCH 200/240] Merged r4310 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4344 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/scm/adapters/git_adapter.rb | 8 ++++---- .../repositories/git_repository.tar.gz | Bin 20711 -> 20730 bytes 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index 5ed57c26429..1db57c7d652 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -35,7 +35,7 @@ def info def branches return @branches if @branches @branches = [] - cmd = "#{GIT_BIN} --git-dir #{target('')} branch" + cmd = "#{GIT_BIN} --git-dir #{target('')} branch --no-color" shellout(cmd) do |io| io.each_line do |line| @branches << line.match('\s*\*?\s*(.*)$')[1] @@ -86,7 +86,7 @@ def entries(path=nil, identifier=nil) def lastrev(path,rev) return nil if path.nil? - cmd = "#{GIT_BIN} --git-dir #{target('')} log --date=iso --pretty=fuller --no-merges -n 1 " + cmd = "#{GIT_BIN} --git-dir #{target('')} log --no-color --date=iso --pretty=fuller --no-merges -n 1 " cmd << " #{shell_quote rev} " if rev cmd << "-- #{shell_quote path} " unless path.empty? shellout(cmd) do |io| @@ -114,7 +114,7 @@ def lastrev(path,rev) def revisions(path, identifier_from, identifier_to, options={}) revisions = Revisions.new - cmd = "#{GIT_BIN} --git-dir #{target('')} log --raw --date=iso --pretty=fuller " + cmd = "#{GIT_BIN} --git-dir #{target('')} log --no-color --raw --date=iso --pretty=fuller " cmd << " --reverse " if options[:reverse] cmd << " --all " if options[:all] cmd << " -n #{options[:limit]} " if options[:limit] @@ -209,7 +209,7 @@ def diff(path, identifier_from, identifier_to=nil) path ||= '' if identifier_to - cmd = "#{GIT_BIN} --git-dir #{target('')} diff #{shell_quote identifier_to} #{shell_quote identifier_from}" + cmd = "#{GIT_BIN} --git-dir #{target('')} diff --no-color #{shell_quote identifier_to} #{shell_quote identifier_from}" else cmd = "#{GIT_BIN} --git-dir #{target('')} show #{shell_quote identifier_from}" end diff --git a/test/fixtures/repositories/git_repository.tar.gz b/test/fixtures/repositories/git_repository.tar.gz index 17cb22943b34d75268ded8cbbacb66a5cbda3d8b..58b4df5fdb0c97b8a3f06b48f44eb33032cd3899 100644 GIT binary patch literal 20730 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

    A)uYMp8!9pMt6Xry}wj&PY;SZjGx95!H8hM#` zw+IdeYH;p>!T<1UzihST2eS^=wVUtCAX(n;-e##QP2);&99@DfNj$P{m-2OrHS=Zs zIam7}*WKYo$!e1QCz4@&8j>oKdW}gA^P3h{`=MuL{~qCGt49%O;kEiKBNXVzKOVpg zB=I7gXFg>g{?NQrydPExi`#u!8gP!%pu8@>^GIf zx!5(EB^QInO^?d#?C4iaFK&-xmq{h&-J={)qPQRxV|OR)JPr;~w77QnPYLgm=I6C3 z*5~<%RtYKS+_~y4FP}N3Qr`1+pD(hP=MLu zXq2GkTMk+1neYtsZl|COguS(AttjcxdxmwB2;I(F z4mP#*X72CTlp1xpR{cT{f=9l0>RRfK&YutDZoXgMeYa{ju>N)T9Dpq-VL7Tp>iu`q zJn4=^!TK_*MziB#caqwACiL(@QhK;}Ii6Sg8HYsn-Ia+6spepYRl3`azVQ&fpcs&QO%)tyPkr?`iuX}P@e{g1`{1m|06=z4y<-; zM3pcM`Hy(iO)u#}Ll~l6$N!!&kHHTLmmtpE;QxY%Hy|<2UO<{K54@LfSvy;l_gnmk znx6Wy$O3YwDEs{%9gl`Ck)FC|`*eaYXW+`S_4?Ri0as@_N;Xev<@RM*ShYy=ZJD$8 znLT~=)oZAaj;#e9;|}_e#Zlsy3-&h%D8%N@l7$M-z%;sTuZi3x+Q>4rXGi|zUHJwM zV7<^0I47RTG&|p-nnbGqg@l`dBn8Hofg|t|yllrK&%UaZ7hmAfFMRw#6Zx|ZRslJ( zUk!|GX3?;COsm!fwWkIP8}DK0F96&(H|Li^E=|r)+)JN=(Sj$El?|~f5S9nw*#lBb2RTs=V4!CeQDv5mZ-_b1L;bKZ45m}(f90xzf;74`} zYr-*xzo;Qhk1%=uc=VIL(z~@FC5d36;{kmBUo7z0*l6u^EYXbL@~*}tbV

    2?JRNXW)KuWor(jmrM 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 Date: Sun, 31 Oct 2010 23:57:44 +0000 Subject: [PATCH 201/240] Merged r4311 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4345 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/issues/_form.rhtml | 4 ++-- app/views/issues/new.rhtml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml index 7e9a29ee551..2f4996a9398 100644 --- a/app/views/issues/_form.rhtml +++ b/app/views/issues/_form.rhtml @@ -8,8 +8,8 @@

    <%= f.text_field :subject, :size => 80, :required => true %>

    -<% unless (@issue.new_record? && @issue.parent_issue_id.nil?) || !User.current.allowed_to?(:manage_subtasks, @project) %> -

    <%= f.text_field :parent_issue_id, :size => 10 %>

    +<% if User.current.allowed_to?(:manage_subtasks, @project) %> +

    <%= f.text_field :parent_issue_id, :size => 10 %>

    <%= javascript_tag "observeParentIssueField('#{auto_complete_issues_path(:id => @issue, :project_id => @project) }')" %> <% end %> diff --git a/app/views/issues/new.rhtml b/app/views/issues/new.rhtml index 310085d7cc4..13992382f9b 100644 --- a/app/views/issues/new.rhtml +++ b/app/views/issues/new.rhtml @@ -1,7 +1,7 @@

    <%=l(:label_issue_new)%>

    <% labelled_tabular_form_for :issue, @issue, :url => {:controller => 'issues', :action => 'create', :project_id => @project}, - :html => {:multipart => true, :id => 'issue-form'} do |f| %> + :html => {:multipart => true, :id => 'issue-form', :class => 'tabular new-issue-form'} do |f| %> <%= error_messages_for 'issue' %>
    <%= render :partial => 'issues/form', :locals => {:f => f} %> From e2877d9287f6df945a3da34ba83555b25ddc29fe Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:57:50 +0000 Subject: [PATCH 202/240] Merged r4312 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4346 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/groups/_users.html.erb | 2 +- app/views/projects/settings/_members.rhtml | 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 | 4 +++- 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/mk.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-YU.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 ++ 45 files changed, 89 insertions(+), 3 deletions(-) diff --git a/app/views/groups/_users.html.erb b/app/views/groups/_users.html.erb index d3a789936dd..580851d5a6c 100644 --- a/app/views/groups/_users.html.erb +++ b/app/views/groups/_users.html.erb @@ -29,7 +29,7 @@ <% remote_form_for(:group, @group, :url => {:controller => 'groups', :action => 'add_users', :id => @group}, :method => :post) do |f| %>
    <%=l(:label_user_new)%> -

    <%= text_field_tag 'user_search', nil %>

    +

    <%= label_tag "user_search", l(:label_user_search) %><%= text_field_tag 'user_search', nil %>

    <%= observe_field(:user_search, :frequency => 0.5, :update => :users, diff --git a/app/views/projects/settings/_members.rhtml b/app/views/projects/settings/_members.rhtml index 88345b43d6d..d1c1675665e 100644 --- a/app/views/projects/settings/_members.rhtml +++ b/app/views/projects/settings/_members.rhtml @@ -58,7 +58,7 @@ <% remote_form_for(:member, @member, :url => {:controller => 'members', :action => 'new', :id => @project}, :method => :post) do |f| %>
    <%=l(:label_member_new)%> -

    <%= text_field_tag 'principal_search', nil %>

    +

    <%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %>

    <%= observe_field(:principal_search, :frequency => 0.5, :update => :principals, diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 2dc2eedae8f..816873b76d7 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -919,3 +919,5 @@ bg: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" field_assigned_to_role: Assignee's role field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/bs.yml b/config/locales/bs.yml index cebfe46f525..a836fde41fe 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -933,3 +933,5 @@ bs: field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/ca.yml b/config/locales/ca.yml index effc8bd69de..c131820d68d 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -921,3 +921,5 @@ ca: field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 8996c09c6d8..362e2dee42a 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -918,3 +918,5 @@ cs: text_are_you_sure_with_children: Smazat úkol včetně všech podúkolů? field_text: Textové pole field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/da.yml b/config/locales/da.yml index 03bbe6f468b..0bbfa0b7108 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -935,3 +935,5 @@ da: field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/de.yml b/config/locales/de.yml index 470d2b3ae81..a3b79f57de4 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -791,6 +791,8 @@ de: label_profile: Profil label_subtask_plural: Unteraufgaben label_project_copy_notifications: Sende Mailbenachrichtigungen beim Kopieren des Projekts. + label_principal_search: "Nach Benutzer oder Gruppe suchen:" + label_user_search: "Nach Benutzer suchen:" button_login: Anmelden button_submit: OK diff --git a/config/locales/el.yml b/config/locales/el.yml index 242cdb40e27..2c141af731b 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -919,3 +919,5 @@ el: field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 19c4a6eae07..4dff6fa09a3 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -922,4 +922,6 @@ en-GB: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field - + notice_not_authorized_archived_project: The project you're trying to access has been archived. + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/en.yml b/config/locales/en.yml index 0ff7eeb9786..6a1c9893369 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -776,6 +776,8 @@ en: label_profile: Profile label_subtask_plural: Subtasks label_project_copy_notifications: Send email notifications during the project copy + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" button_login: Login button_submit: Submit diff --git a/config/locales/es.yml b/config/locales/es.yml index e364c143cfa..51a7e7b9a59 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -959,3 +959,5 @@ es: field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 16b1445c854..6c7b3236e48 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -922,3 +922,5 @@ eu: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/fi.yml b/config/locales/fi.yml index f51c16d9dfd..8b71961758a 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -943,3 +943,5 @@ fi: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index ddc7606a3cb..4d5f8b3b283 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -774,6 +774,8 @@ fr: label_profile: Profil label_subtask_plural: Sous-tâches label_project_copy_notifications: Envoyer les notifications durant la copie du projet + label_principal_search: "Rechercher un utilisateur ou un groupe :" + label_user_search: "Rechercher un utilisateur :" button_login: Connexion button_submit: Soumettre diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 243070351ed..6fea5d5c18b 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -935,3 +935,5 @@ gl: field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/he.yml b/config/locales/he.yml index e96c31ed73c..50107c3201f 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -931,3 +931,5 @@ he: field_member_of_group: Assignee's group field_assigned_to_role: Assignee's role field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 3937f25b042..414ff561390 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -925,3 +925,5 @@ hr: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/hu.yml b/config/locales/hu.yml index b8c072b66ba..4c59ecd5e07 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -941,3 +941,5 @@ text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/id.yml b/config/locales/id.yml index 5e1a567c16f..93fc17b7896 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -926,3 +926,5 @@ id: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/it.yml b/config/locales/it.yml index 32c26c9f695..787e1427d3b 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -922,3 +922,5 @@ it: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/ja.yml b/config/locales/ja.yml index c68b51ca9ab..d2a70f7f05e 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -948,3 +948,5 @@ ja: enumeration_activities: 作業分類 (時間トラッキング) enumeration_system_activity: システム作業分類 field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 15d9f8b8b1e..dabe06e48b2 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -974,3 +974,5 @@ ko: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/lt.yml b/config/locales/lt.yml index f977980f6f1..f3eaa0cea2e 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -982,3 +982,5 @@ lt: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 280af883a30..b241c556e51 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -913,3 +913,5 @@ lv: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 0443c60ad56..a209f991fec 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -918,3 +918,5 @@ mk: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/mn.yml b/config/locales/mn.yml index 6e9c191e05c..604b620277d 100644 --- a/config/locales/mn.yml +++ b/config/locales/mn.yml @@ -919,3 +919,5 @@ mn: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 6be9743c1d3..780d9365b1f 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -900,3 +900,5 @@ nl: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/no.yml b/config/locales/no.yml index 2eed6ba7f45..bef22e0fb86 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -909,3 +909,5 @@ text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 434f0afe161..1d1587f74a0 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -939,3 +939,5 @@ pl: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 8234d04561c..dfff5ab3d68 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -946,3 +946,5 @@ pt-BR: label_user_mail_option_only_my_events: Somente para as coisas que eu esteja observando ou esteja envolvido label_user_mail_option_only_assigned: Somente para as coisas que estejam atribuídas a mim field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 3eb5a0069cc..d767b5af40f 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -926,3 +926,5 @@ pt: text_are_you_sure_with_children: Apagar tarefa e todas as sub-tarefas? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 70ae2feb50d..fad5b3c0370 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -911,3 +911,5 @@ ro: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/ru.yml b/config/locales/ru.yml index c9477ff6063..cba9d07c94f 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1040,3 +1040,5 @@ ru: field_assigned_to_role: Роль назначенного notice_not_authorized_archived_project: Запрашиваемый проект был архивирован. + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 90c9c3a1863..089cba11c1e 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -913,3 +913,5 @@ sk: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 895e012910d..a538065d76d 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -914,3 +914,5 @@ sl: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml index a17c67a3aa8..f235c9690a9 100644 --- a/config/locales/sr-YU.yml +++ b/config/locales/sr-YU.yml @@ -918,3 +918,5 @@ sr-YU: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/sr.yml b/config/locales/sr.yml index ed4be207bb3..f9777490cce 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -919,3 +919,5 @@ sr: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 0bd528608f8..1e96f9f9bd3 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -970,3 +970,5 @@ sv: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/th.yml b/config/locales/th.yml index a09d9973ac3..6e90780f98b 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -915,3 +915,5 @@ th: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 9d204178b7e..ce0d2158678 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -941,3 +941,5 @@ tr: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 61e1e737130..a48af1d035e 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -914,3 +914,5 @@ uk: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 5b734df8d82..06d83eb5480 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -973,3 +973,5 @@ vi: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index e5c86049403..7e38d0bb0d7 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1009,3 +1009,5 @@ enumeration_activities: 活動 (時間追蹤) enumeration_system_activity: 系統活動 + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 476a50f36bf..817a7bd2148 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -936,3 +936,5 @@ zh: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" From e9e7463225283c43b58ac0cad00cd6384c764e7d Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Mon, 1 Nov 2010 00:32:16 +0000 Subject: [PATCH 203/240] Locales update for the stable branch git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4347 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/de.yml | 1 + config/locales/ru.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/config/locales/de.yml b/config/locales/de.yml index a3b79f57de4..75c0ccccd8f 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -944,3 +944,4 @@ de: field_assigned_to_role: Assignee's role field_start_date: Start date + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/ru.yml b/config/locales/ru.yml index cba9d07c94f..377ff66da6c 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1042,3 +1042,4 @@ ru: label_principal_search: "Search for user or group:" label_user_search: "Search for user:" + field_start_date: Start Date From 8cc20c66c98abd3425801ae6ad11e6dd23fa4a4b Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Mon, 1 Nov 2010 00:39:29 +0000 Subject: [PATCH 204/240] Merged r4348 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4350 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- doc/CHANGELOG | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/doc/CHANGELOG b/doc/CHANGELOG index fb3d3da28db..8937d6fe2cd 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -4,6 +4,44 @@ Redmine - project management software Copyright (C) 2006-2010 Jean-Philippe Lang http://www.redmine.org/ +== 2010-10-31 v1.0.3 + +* #4065: Redmine.pm doesn't work with LDAPS and a non-standard port +* #4416: Link from version details page to edit the wiki. +* #5484: Add new issue as subtask to an existing ticket +* #5948: Update help/wiki_syntax_detailed.html with more link options +* #6494: Typo in pt_BR translation for 1.0.2 +* #6508: Japanese translation update +* #6509: Localization pt-PT (new strings) +* #6511: Rake task to test email +* #6525: Traditional Chinese language file (to r4225) +* #6536: Patch for swedish translation +* #6548: Rake tasks to add/remove i18n strings +* #6569: Updated Hebrew translation +* #6570: Japanese Translation for r4231 +* #6596: pt-BR translation updates +* #6629: Change field-name of issues start date +* #6669: Bulgarian translation +* #6731: Macedonian translation fix +* #6732: Japanese Translation for r4287 +* #6735: Add user-agent to reposman +* #6736: Traditional Chinese language file (to r4288) +* #6739: Swedish Translation for r4288 +* #6765: Traditional Chinese language file (to r4302) +* Fixed #5324: Git not working if color.ui is enabled +* Fixed #5652: Bad URL parsing in the wiki when it ends with right-angle-bracket(greater-than mark). +* Fixed #5803: Precedes/Follows Relationships Broke +* Fixed #6435: Links to wikipages bound to versions do not respect version-sharing in Settings -> Versions +* Fixed #6438: Autologin cannot be disabled again once it's enabled +* Fixed #6513: "Move" and "Copy" are not displayed when deployed in subdirectory +* Fixed #6521: Tooltip/label for user "search-refinment" field on group/project member list +* Fixed #6563: i18n-issues on calendar view +* Fixed #6598: Wrong caption for button_create_and_continue in German language file +* Fixed #6607: Unclear caption for german button_update +* Fixed #6612: SortHelper missing from CalendarsController +* Fixed #6740: Max attachment size, incorrect usage of 'KB' +* Fixed #6750: ActionView::TemplateError (undefined method `empty?' for nil:NilClass) on line #12 of app/views/context_menus/issues.html.erb: + == 2010-09-26 v1.0.2 * #2285: issue-refinement: pressing enter should result to an "apply" From 4bf0c594163903ef637a4da1422fad4d30b66643 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Mon, 1 Nov 2010 00:39:34 +0000 Subject: [PATCH 205/240] Merged r4349 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4351 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb index e7280527492..f187ba2b959 100644 --- a/lib/redmine/version.rb +++ b/lib/redmine/version.rb @@ -4,7 +4,7 @@ module Redmine module VERSION #:nodoc: MAJOR = 1 MINOR = 0 - TINY = 2 + TINY = 3 # Branch values: # * official release: nil From f1f0704ef82fe784ac9a23809c9fd3ba3a7f4283 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Mon, 1 Nov 2010 13:14:14 +0000 Subject: [PATCH 206/240] Merged r4354 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4355 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/versions_controller.rb | 4 ++++ test/functional/versions_controller_test.rb | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb index 331935d9b85..c3cf27c3d51 100644 --- a/app/controllers/versions_controller.rb +++ b/app/controllers/versions_controller.rb @@ -109,6 +109,10 @@ def update if @version.update_attributes(attributes) flash[:notice] = l(:notice_successful_update) redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project + else + respond_to do |format| + format.html { render :action => 'edit' } + end end end end diff --git a/test/functional/versions_controller_test.rb b/test/functional/versions_controller_test.rb index 1b33ba816e8..05b0af94f69 100644 --- a/test/functional/versions_controller_test.rb +++ b/test/functional/versions_controller_test.rb @@ -123,6 +123,15 @@ def test_post_update assert_equal 'New version name', version.name assert_equal Date.today, version.effective_date end + + def test_post_update_with_validation_failure + @request.session[:user_id] = 2 + put :update, :id => 2, + :version => { :name => '', + :effective_date => Date.today.strftime("%Y-%m-%d")} + assert_response :success + assert_template 'edit' + end def test_destroy @request.session[:user_id] = 2 From 9b1eda1b22fbcd664c9c38c2a6b2bfe867fa7898 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Mon, 1 Nov 2010 14:47:23 +0000 Subject: [PATCH 207/240] Fixed a test broken by r4355 (#6786). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4356 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/functional/versions_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/versions_controller_test.rb b/test/functional/versions_controller_test.rb index 05b0af94f69..59cebac8d36 100644 --- a/test/functional/versions_controller_test.rb +++ b/test/functional/versions_controller_test.rb @@ -126,7 +126,7 @@ def test_post_update def test_post_update_with_validation_failure @request.session[:user_id] = 2 - put :update, :id => 2, + post :update, :id => 2, :version => { :name => '', :effective_date => Date.today.strftime("%Y-%m-%d")} assert_response :success From d3b536e9a60cdf42d244d5bc48fae4b3a69a774f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 9 Nov 2010 19:56:29 +0000 Subject: [PATCH 208/240] Merged r4389 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4390 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/initializers/10-patches.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb index 4753dae3d51..096ea0cd168 100644 --- a/config/initializers/10-patches.rb +++ b/config/initializers/10-patches.rb @@ -84,7 +84,7 @@ module AsynchronousMailer module I18n module Backend module Base - def warn_syntax_deprecation! + def warn_syntax_deprecation!(*args) return if @skip_syntax_deprecation warn "The {{key}} interpolation syntax in I18n messages is deprecated. Please use %{key} instead.\nDowngrade your i18n gem to 0.3.7 (everything above must be deinstalled) to remove this warning, see http://www.redmine.org/issues/5608 for more information." @skip_syntax_deprecation = true From 2b9a5bf6e2d034afb2096202ee144e049ba2cceb Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 14 Nov 2010 11:15:53 +0000 Subject: [PATCH 209/240] Merged r4378 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4398 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/issues_controller.rb | 2 +- test/functional/issues_controller_test.rb | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index c11971ac27b..df5a356a29a 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -300,6 +300,7 @@ def build_new_issue_from_params render_error l(:error_no_tracker_in_project) return false end + @issue.start_date ||= Date.today if params[:issue].is_a?(Hash) @issue.safe_attributes = params[:issue] if User.current.allowed_to?(:add_issue_watchers, @project) && @issue.new_record? @@ -307,7 +308,6 @@ def build_new_issue_from_params end end @issue.author = User.current - @issue.start_date ||= Date.today @priorities = IssuePriority.all @allowed_statuses = @issue.new_statuses_allowed_to(User.current, true) end diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 9e70233b25b..0376aed28d2 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -382,6 +382,7 @@ def test_post_create :subject => 'This is the test_new issue', :description => 'This is the description', :priority_id => 5, + :start_date => '2010-11-07', :estimated_hours => '', :custom_field_values => {'2' => 'Value for field 2'}} end @@ -392,12 +393,33 @@ def test_post_create assert_equal 2, issue.author_id assert_equal 3, issue.tracker_id assert_equal 2, issue.status_id + assert_equal Date.parse('2010-11-07'), issue.start_date assert_nil issue.estimated_hours v = issue.custom_values.find(:first, :conditions => {:custom_field_id => 2}) assert_not_nil v assert_equal 'Value for field 2', v.value end + def test_post_create_without_start_date + @request.session[:user_id] = 2 + assert_difference 'Issue.count' do + post :create, :project_id => 1, + :issue => {:tracker_id => 3, + :status_id => 2, + :subject => 'This is the test_new issue', + :description => 'This is the description', + :priority_id => 5, + :start_date => '', + :estimated_hours => '', + :custom_field_values => {'2' => 'Value for field 2'}} + end + assert_redirected_to :controller => 'issues', :action => 'show', :id => Issue.last.id + + issue = Issue.find_by_subject('This is the test_new issue') + assert_not_nil issue + assert_nil issue.start_date + end + def test_post_create_and_continue @request.session[:user_id] = 2 post :create, :project_id => 1, From e174c10d6d6790c956e6404ea88c32c7cec39937 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 14 Nov 2010 11:17:20 +0000 Subject: [PATCH 210/240] Merged r4385 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4399 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/issue_categories/_form.rhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/issue_categories/_form.rhtml b/app/views/issue_categories/_form.rhtml index dc62c200055..232808800b0 100644 --- a/app/views/issue_categories/_form.rhtml +++ b/app/views/issue_categories/_form.rhtml @@ -2,5 +2,5 @@

    <%= f.text_field :name, :size => 30, :required => true %>

    -

    <%= f.select :assigned_to_id, @project.users.collect{|u| [u.name, u.id]}, :include_blank => true %>

    +

    <%= f.select :assigned_to_id, @project.users.sort.collect{|u| [u.name, u.id]}, :include_blank => true %>

    From c70ae6c7351b54aac8dafe16956b1a5aa58e90ca Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 14 Nov 2010 11:18:23 +0000 Subject: [PATCH 211/240] Merged r4380 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4400 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/my/page_layout.rhtml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/my/page_layout.rhtml b/app/views/my/page_layout.rhtml index 54e60be3603..1cf61f8faf9 100644 --- a/app/views/my/page_layout.rhtml +++ b/app/views/my/page_layout.rhtml @@ -5,9 +5,9 @@ function recreateSortables() { Sortable.destroy('list-left'); Sortable.destroy('list-right'); - Sortable.create("list-top", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('/my/order_blocks?group=top', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-top")})}, only:'mypage-box', tag:'div'}) - Sortable.create("list-left", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('/my/order_blocks?group=left', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-left")})}, only:'mypage-box', tag:'div'}) - Sortable.create("list-right", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('/my/order_blocks?group=right', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-right")})}, only:'mypage-box', tag:'div'}) + Sortable.create("list-top", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('<%= url_for(:controller => 'my', :action => 'order_blocks', :group => 'top') %>', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-top")})}, only:'mypage-box', tag:'div'}) + Sortable.create("list-left", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('<%= url_for(:controller => 'my', :action => 'order_blocks', :group => 'left') %>', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-left")})}, only:'mypage-box', tag:'div'}) + Sortable.create("list-right", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('<%= url_for(:controller => 'my', :action => 'order_blocks', :group => 'right') %>', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-right")})}, only:'mypage-box', tag:'div'}) } function updateSelect() { From 2a7a95d7465e1a348ba648cd2abb9d5fdbc694af Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 14 Nov 2010 11:30:53 +0000 Subject: [PATCH 212/240] Backported r4397 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4401 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/projects_controller.rb | 2 +- test/integration/projects_api_test.rb | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index c3efbfd9f2d..a6a5c9e5f9e 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -93,7 +93,7 @@ def create flash[:notice] = l(:notice_successful_create) redirect_to :controller => 'projects', :action => 'settings', :id => @project } - format.xml { head :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) } + format.xml { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) } end else respond_to do |format| diff --git a/test/integration/projects_api_test.rb b/test/integration/projects_api_test.rb index e254c513742..6b08d64e500 100644 --- a/test/integration/projects_api_test.rb +++ b/test/integration/projects_api_test.rb @@ -43,12 +43,15 @@ def test_create assert_difference 'Project.count' do post '/projects.xml', {:project => attributes}, :authorization => credentials('admin') end - assert_response :created - assert_equal 'application/xml', @response.content_type + project = Project.first(:order => 'id DESC') attributes.each do |attribute, value| assert_equal value, project.send(attribute) end + + assert_response :created + assert_equal 'application/xml', @response.content_type + assert_tag 'project', :child => {:tag => 'id', :content => project.id.to_s} end def test_create_failure From dbb26b08f804b1d838ba6c6060a14dcac3436db1 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 20 Nov 2010 10:23:13 +0000 Subject: [PATCH 213/240] Merged r4414 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4415 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/issue.rb | 2 +- test/functional/issues_controller_test.rb | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index 0301ee85701..97983086344 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -237,7 +237,7 @@ def safe_attributes=(attrs, user=User.current) if !user.allowed_to?(:manage_subtasks, project) attrs.delete('parent_issue_id') elsif !attrs['parent_issue_id'].blank? - attrs.delete('parent_issue_id') unless Issue.visible(user).exists?(attrs['parent_issue_id']) + attrs.delete('parent_issue_id') unless Issue.visible(user).exists?(attrs['parent_issue_id'].to_i) end end diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 0376aed28d2..6cb4f1d9c42 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -498,6 +498,20 @@ def test_post_create_subissue assert_not_nil issue assert_equal Issue.find(2), issue.parent end + + def test_post_create_subissue_with_non_numeric_parent_id + @request.session[:user_id] = 2 + + assert_difference 'Issue.count' do + post :create, :project_id => 1, + :issue => {:tracker_id => 1, + :subject => 'This is a child issue', + :parent_issue_id => 'ABC'} + end + issue = Issue.find_by_subject('This is a child issue') + assert_not_nil issue + assert_nil issue.parent + end def test_post_create_should_send_a_notification ActionMailer::Base.deliveries.clear From 6c362a5a76ba63ac0fc27e52c54d223007d84370 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 20 Nov 2010 14:06:32 +0000 Subject: [PATCH 214/240] Merged r4417 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4418 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/scm/adapters/mercurial_adapter.rb | 6 +++--- .../redmine/scm/adapters/mercurial_adapter_test.rb | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb index 9d5e9aa1164..c1be575293d 100644 --- a/lib/redmine/scm/adapters/mercurial_adapter.rb +++ b/lib/redmine/scm/adapters/mercurial_adapter.rb @@ -38,13 +38,13 @@ def hgversion # release number (eg 0.9.5 or 1.0) or as a revision # id composed of 12 hexa characters. theversion = hgversion_from_command_line - if theversion.match(/^\d+(\.\d+)+/) - theversion.split(".").collect(&:to_i) + if m = theversion.match(/\b\d+(\.\d+)+\b/) + m[0].split(".").collect(&:to_i) end end def hgversion_from_command_line - %x{#{HG_BIN} --version}.match(/\(version (.*)\)/)[1] + %x{#{HG_BIN} --version}.lines.first.to_s end def template_path diff --git a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb index 7396a395728..cefc9c74e1c 100644 --- a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb @@ -11,11 +11,12 @@ class MercurialAdapterTest < ActiveSupport::TestCase REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/mercurial_repository' def test_hgversion - to_test = { "0.9.5" => [0,9,5], - "1.0" => [1,0], - "1e4ddc9ac9f7+20080325" => nil, - "1.0.1+20080525" => [1,0,1], - "1916e629a29d" => nil} + to_test = { "Mercurial Distributed SCM (version 0.9.5)\n" => [0,9,5], + "Mercurial Distributed SCM (1.0)\n" => [1,0], + "Mercurial Distributed SCM (1e4ddc9ac9f7+20080325)\n" => nil, + "Mercurial Distributed SCM (1.0.1+20080525)\n" => [1,0,1], + "Mercurial Distributed SCM (1916e629a29d)\n" => nil, + "Mercurial SCM Distribuito (versione 0.9.5)\n" => [0,9,5]} to_test.each do |s, v| test_hgversion_for(s, v) From b5a409791c0428b9049eaa88fa8d9146c9c04c6b Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 20 Nov 2010 14:12:35 +0000 Subject: [PATCH 215/240] Merged r4419 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4420 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/scm/adapters/subversion_adapter.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/redmine/scm/adapters/subversion_adapter.rb b/lib/redmine/scm/adapters/subversion_adapter.rb index a4520a62ef0..f887df6328f 100644 --- a/lib/redmine/scm/adapters/subversion_adapter.rb +++ b/lib/redmine/scm/adapters/subversion_adapter.rb @@ -36,8 +36,8 @@ def svn_binary_version version = nil shellout(cmd) do |io| # Read svn version in first returned line - if m = io.gets.to_s.match(%r{((\d+\.)+\d+)}) - version = m[0].scan(%r{\d+}).collect(&:to_i) + if m = io.read.to_s.match(%r{\A(.*?)((\d+\.)+\d+)}) + version = m[2].scan(%r{\d+}).collect(&:to_i) end end return nil if $? && $?.exitstatus != 0 From faa461c66aed2b2b3f139751fc51c17cac9e196b Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 21 Nov 2010 14:26:01 +0000 Subject: [PATCH 216/240] Merged r4422 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4423 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/scm/adapters/mercurial_adapter.rb | 6 +++--- .../scm/adapters/mercurial_adapter_test.rb | 16 +++++++++++----- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb index c1be575293d..b4765019036 100644 --- a/lib/redmine/scm/adapters/mercurial_adapter.rb +++ b/lib/redmine/scm/adapters/mercurial_adapter.rb @@ -38,13 +38,13 @@ def hgversion # release number (eg 0.9.5 or 1.0) or as a revision # id composed of 12 hexa characters. theversion = hgversion_from_command_line - if m = theversion.match(/\b\d+(\.\d+)+\b/) - m[0].split(".").collect(&:to_i) + if m = theversion.match(%r{\A(.*?)((\d+\.)+\d+)}) + m[2].scan(%r{\d+}).collect(&:to_i) end end def hgversion_from_command_line - %x{#{HG_BIN} --version}.lines.first.to_s + shellout("#{HG_BIN} --version") { |io| io.read }.to_s end def template_path diff --git a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb index cefc9c74e1c..311262a463a 100644 --- a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb @@ -16,8 +16,10 @@ def test_hgversion "Mercurial Distributed SCM (1e4ddc9ac9f7+20080325)\n" => nil, "Mercurial Distributed SCM (1.0.1+20080525)\n" => [1,0,1], "Mercurial Distributed SCM (1916e629a29d)\n" => nil, - "Mercurial SCM Distribuito (versione 0.9.5)\n" => [0,9,5]} - + "Mercurial SCM Distribuito (versione 0.9.5)\n" => [0,9,5], + "(1.6)\n(1.7)\n(1.8)" => [1,6], + "(1.7.1)\r\n(1.8.1)\r\n(1.9.1)" => [1,7,1]} + to_test.each do |s, v| test_hgversion_for(s, v) end @@ -27,8 +29,9 @@ def test_template_path to_test = { [0,9,5] => "0.9.5", [1,0] => "1.0", [] => "1.0", - [1,0,1] => "1.0"} - + [1,0,1] => "1.0", + [1,7] => "1.0", + [1,7,1] => "1.0"} to_test.each do |v, template| test_template_path_for(v, template) end @@ -50,5 +53,8 @@ def test_template_path_for(version, template) end rescue LoadError - def test_fake; assert(false, "Requires mocha to run those tests") end + class MercurialMochaFake < ActiveSupport::TestCase + def test_fake; assert(false, "Requires mocha to run those tests") end + end end + From 92b37c0bea09702409e2b8dae9a5e25a99e01d44 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 27 Nov 2010 14:28:51 +0000 Subject: [PATCH 217/240] Merged r4426 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4433 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/settings/_general.rhtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/settings/_general.rhtml b/app/views/settings/_general.rhtml index a2f014528ed..a384693bc4f 100644 --- a/app/views/settings/_general.rhtml +++ b/app/views/settings/_general.rhtml @@ -6,7 +6,7 @@

    <%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %>

    <%= wikitoolbar_for 'settings_welcome_text' %> -

    <%= setting_text_field :attachment_max_size, :size => 6 %> KB

    +

    <%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %>

    <%= setting_text_field :per_page_options, :size => 20 %>
    <%= l(:text_comma_separated) %>

    @@ -26,7 +26,7 @@

    <%= setting_text_field :feeds_limit, :size => 6 %>

    -

    <%= setting_text_field :file_max_size_displayed, :size => 6 %> KB

    +

    <%= setting_text_field :file_max_size_displayed, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %>

    <%= setting_text_field :diff_max_lines_displayed, :size => 6 %>

    From db646753103e5dbc998674c944f612f127426b25 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 27 Nov 2010 14:30:41 +0000 Subject: [PATCH 218/240] Merged r4431 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4434 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/board.rb | 2 +- test/fixtures/attachments.yml | 12 ++++++++++++ test/unit/board_test.rb | 11 ++++++++--- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app/models/board.rb b/app/models/board.rb index e7310da65f6..de0e444b961 100644 --- a/app/models/board.rb +++ b/app/models/board.rb @@ -18,7 +18,7 @@ class Board < ActiveRecord::Base belongs_to :project has_many :topics, :class_name => 'Message', :conditions => "#{Message.table_name}.parent_id IS NULL", :order => "#{Message.table_name}.created_on DESC" - has_many :messages, :dependent => :delete_all, :order => "#{Message.table_name}.created_on DESC" + has_many :messages, :dependent => :destroy, :order => "#{Message.table_name}.created_on DESC" belongs_to :last_message, :class_name => 'Message', :foreign_key => :last_message_id acts_as_list :scope => :project_id acts_as_watchable diff --git a/test/fixtures/attachments.yml b/test/fixtures/attachments.yml index 002bb0913f2..487ce5aa9d8 100644 --- a/test/fixtures/attachments.yml +++ b/test/fixtures/attachments.yml @@ -145,3 +145,15 @@ attachments_012: filename: version_file.zip author_id: 2 content_type: application/octet-stream +attachments_013: + created_on: 2006-07-19 21:07:27 +02:00 + container_type: Message + container_id: 1 + downloads: 0 + disk_filename: 060719210727_foo.zip + digest: b91e08d0cf966d5c6ff411bd8c4cc3a2 + id: 13 + filesize: 452 + filename: foo.zip + author_id: 2 + content_type: application/octet-stream diff --git a/test/unit/board_test.rb b/test/unit/board_test.rb index 569c4620a05..d3073ec82d9 100644 --- a/test/unit/board_test.rb +++ b/test/unit/board_test.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../test_helper' class BoardTest < ActiveSupport::TestCase - fixtures :projects, :boards, :messages + fixtures :projects, :boards, :messages, :attachments, :watchers def setup @project = Project.find(1) @@ -23,8 +23,13 @@ def test_create def test_destroy board = Board.find(1) - assert board.destroy - # make sure that the associated messages are removed + assert_difference 'Message.count', -6 do + assert_difference 'Attachment.count', -1 do + assert_difference 'Watcher.count', -1 do + assert board.destroy + end + end + end assert_equal 0, Message.count(:conditions => {:board_id => 1}) end end From eb590ce1eb90aaffc8a8bc3dc2787cca110c6c21 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 27 Nov 2010 14:31:29 +0000 Subject: [PATCH 219/240] Merged r4428 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4435 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/workflows/index.rhtml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/workflows/index.rhtml b/app/views/workflows/index.rhtml index 9f06269b6e8..bed6a34dca3 100644 --- a/app/views/workflows/index.rhtml +++ b/app/views/workflows/index.rhtml @@ -5,6 +5,7 @@ <% if @workflow_counts.empty? %>

    <%= l(:label_no_data) %>

    <% else %> +
    @@ -30,4 +31,5 @@ <% end -%>
    +
    <% end %> From f5f55359a8a4c2020d98eab1f622a1b380cfad53 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 27 Nov 2010 14:40:51 +0000 Subject: [PATCH 220/240] Translations updates. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4436 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/bg.yml | 44 ++++++++++++++++++------------------ config/locales/da.yml | 48 ++++++++++++++++++++-------------------- config/locales/es.yml | 36 +++++++++++++++++------------- config/locales/ja.yml | 5 +++++ config/locales/sv.yml | 9 +++++--- config/locales/zh-TW.yml | 18 ++++++++------- 6 files changed, 89 insertions(+), 71 deletions(-) diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 816873b76d7..a1eb8aad352 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -321,7 +321,7 @@ bg: label_registered_on: Регистрация label_activity: Дейност label_new: Нов - label_logged_as: Влязъл като + label_logged_as: Здравейте, label_environment: Среда label_authentication: Оторизация label_auth_source: Начин на оторозация @@ -850,8 +850,8 @@ bg: button_duplicate: Дублиране button_copy_and_follow: Копиране и продължаване label_copy_source: Източник - setting_issue_done_ratio: Изчисление на процента на готово задачи с - setting_issue_done_ratio_issue_status: Използване на състояниетона задачите + setting_issue_done_ratio: Изчисление на процента на готови задачи с + setting_issue_done_ratio_issue_status: Използване на състоянието на задачите error_issue_done_ratios_not_updated: Процентът на завършените задачи не е обновен. error_workflow_copy_target: Моля изберете тракер(и) и роля (роли). setting_issue_done_ratio_issue_field: Използване на поле 'задача' @@ -896,28 +896,30 @@ bg: error_can_not_remove_role: Тази роля се използва и не може да бъде изтрита. error_can_not_delete_tracker: Този тракер съдържа задачи и не може да бъде изтрит. field_principal: Principal - label_my_page_block: My page block + label_my_page_block: Блокове в личната страница notice_failed_to_save_members: "Невъзможност за запис на член(ове): {{errors}}." text_zoom_out: Намаляване text_zoom_in: Увеличаване notice_unable_delete_time_entry: Невъзможност за изтриване на запис на time log. label_overall_spent_time: Общо употребено време field_time_entries: Log time - notice_not_authorized_archived_project: The project you're trying to access has been archived. - text_tip_issue_end_day: issue ending this day - field_text: Text field - label_user_mail_option_only_owner: Only for things I am the owner of - field_member_of_group: Assignee's group - project_module_gantt: Gantt - text_are_you_sure_with_children: Delete issue and all child issues? - text_tip_issue_begin_end_day: issue beginning and ending this day - setting_default_notification_option: Default notification option - project_module_calendar: Calendar - label_user_mail_option_only_my_events: Only for things I watch or I'm involved in - text_tip_issue_begin_day: issue beginning this day - label_user_mail_option_only_assigned: Only for things I am assigned to - button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + notice_not_authorized_archived_project: Проектът, който се опитвате да видите е архивиран. + text_tip_issue_end_day: задача, завършваща този ден + field_text: Текстово поле + label_user_mail_option_only_owner: Само за неща, на които аз съм собственик + field_member_of_group: Член на група + project_module_gantt: Мрежов график + text_are_you_sure_with_children: Изтриване на задачата и нейните подзадачи? + text_tip_issue_begin_end_day: задача, започваща и завършваща този ден + setting_default_notification_option: Подразбиращ се начин за известяване + project_module_calendar: Календар + label_user_mail_option_only_my_events: Само за неща, в които съм включен/а + text_tip_issue_begin_day: задача, започваща този ден + label_user_mail_option_only_assigned: Само за неща, назначени на мен + button_edit_associated_wikipage: "Редактиране на асоциираната Wiki страница: {{page_title}}" field_assigned_to_role: Assignee's role - field_start_date: Start date - label_principal_search: "Search for user or group:" - label_user_search: "Search for user:" + field_start_date: Начална дата + label_principal_search: "Търсене на потребител или група:" + label_user_search: "Търсене на потребител:" + field_visible: Видим + setting_emails_header: Emails header diff --git a/config/locales/da.yml b/config/locales/da.yml index 0bbfa0b7108..6accb75e4ef 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -370,7 +370,7 @@ da: label_reported_issues: Rapporterede sager label_assigned_to_me_issues: Sager tildelt mig label_last_login: Sidste login tidspunkt - label_registered_on: Registeret den + label_registered_on: Registreret den label_activity: Aktivitet label_new: Ny label_logged_as: Registreret som @@ -441,7 +441,7 @@ da: label_none: intet label_nobody: ingen label_next: Næste - label_previous: Forrig + label_previous: Forrige label_used_by: Brugt af label_details: Detaljer label_add_note: Tilføj note @@ -537,7 +537,7 @@ da: label_view_diff: Vis forskelle label_diff_inline: inline label_diff_side_by_side: side om side - label_options: Optioner + label_options: Formatering label_copy_workflow_from: Kopier arbejdsgang fra label_permissions_report: Godkendelsesrapport label_watched_issues: Overvågede sager @@ -547,7 +547,7 @@ da: label_relation_new: Ny relation label_relation_delete: Slet relation label_relates_to: relaterer til - label_duplicates: kopierer + label_duplicates: duplikater label_blocks: blokerer label_blocked_by: blokeret af label_precedes: kommer før @@ -870,8 +870,8 @@ da: label_version_sharing_tree: Med projekt træ label_version_sharing_none: Ikke delt error_can_not_archive_project: Dette projekt kan ikke arkiveres - button_duplicate: Kopier - button_copy_and_follow: Kopier og overvåg + button_duplicate: Duplikér + button_copy_and_follow: Kopiér og overvåg label_copy_source: Kilde setting_issue_done_ratio: Beregn sagsløsning ratio setting_issue_done_ratio_issue_status: Benyt sags status @@ -896,14 +896,14 @@ da: label_missing_feeds_access_key: Mangler en RSS nøgle button_show: Vis text_line_separated: Flere væredier tilladt (en linje for hver værdi). - setting_mail_handler_body_delimiters: Trunker emails efter en af disse linjer + setting_mail_handler_body_delimiters: Trunkér emails efter en af disse linjer permission_add_subprojects: Lav underprojekter label_subproject_new: Nyt underprojekt text_own_membership_delete_confirmation: |- Du er ved at fjerne en eller flere af dine rettigheder, og kan muligvis ikke redigere projektet bagefter. Er du sikker på du ønsker at fortsætte? label_close_versions: Luk færdige versioner - label_board_sticky: Sticky + label_board_sticky: Klistret label_board_locked: Låst permission_export_wiki_pages: Eksporter wiki sider setting_cache_formatted_text: Cache formatteret tekst @@ -914,25 +914,25 @@ da: field_parent_issue: Hoved opgave label_subtask_plural: Under opgaver label_project_copy_notifications: Send email notifikationer, mens projektet kopieres - error_can_not_delete_custom_field: 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_can_not_delete_custom_field: Kan ikke slette brugerdefineret felt + error_unable_to_connect: Kan ikke forbinde ({{value}}) + error_can_not_remove_role: Denne rolle er i brug og kan ikke slettes. + error_can_not_delete_tracker: Denne type indeholder sager og kan ikke slettes. 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: blok + notice_failed_to_save_members: "Fejl under lagring af medlem(mer): {{errors}}." + text_zoom_out: Zoom ud text_zoom_in: Zoom in - notice_unable_delete_time_entry: Unable to delete time log entry. - label_overall_spent_time: Overall spent time - field_time_entries: Log time + notice_unable_delete_time_entry: Kan ikke slette tidsregistrering. + label_overall_spent_time: Overordnet forbrug af tid + field_time_entries: Log tid project_module_gantt: Gantt - project_module_calendar: Calendar - field_member_of_group: Member of Group - field_assigned_to_role: Member of Role - button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" - text_are_you_sure_with_children: Delete issue and all child issues? - field_text: Text field + project_module_calendar: Kalender + field_member_of_group: Medlem af Gruppe + field_assigned_to_role: Medlem af Rolle + button_edit_associated_wikipage: "Redigér tilknyttet Wiki side: {{page_title}}" + text_are_you_sure_with_children: Slet sag og alle undersager? + field_text: Tekstfelt field_start_date: Start date label_principal_search: "Search for user or group:" diff --git a/config/locales/es.yml b/config/locales/es.yml index 51a7e7b9a59..f29d96f1e42 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -635,7 +635,6 @@ es: label_user_activity: "Actividad de {{value}}" label_user_mail_no_self_notified: "No quiero ser avisado de cambios hechos por mí" label_user_mail_option_all: "Para cualquier evento en todos mis proyectos" - label_user_mail_option_none: "Sólo para elementos monitorizados o relacionados conmigo" label_user_mail_option_selected: "Para cualquier evento de los proyectos seleccionados..." label_user_new: Nuevo usuario label_user_plural: Usuarios @@ -854,12 +853,12 @@ es: text_wiki_page_destroy_children: Eliminar páginas hijas y todos sus descendientes setting_password_min_length: Longitud mínima de la contraseña field_group_by: Agrupar resultados por - mail_subject_wiki_content_updated: "La página wiki '{{page}}' ha sido actualizada" + mail_subject_wiki_content_updated: "La página wiki '{{id}}' ha sido actualizada" label_wiki_content_added: Página wiki añadida - mail_subject_wiki_content_added: "Se ha añadido la página wiki '{{page}}'." - mail_body_wiki_content_added: "{{author}} ha añadido la página wiki '{{page}}'." + mail_subject_wiki_content_added: "Se ha añadido la página wiki '{{id}}'." + mail_body_wiki_content_added: "{{author}} ha añadido la página wiki '{{id}}'." label_wiki_content_updated: Página wiki actualizada - mail_body_wiki_content_updated: La página wiki '{{page}}' ha sido actualizada por {{author}}. + mail_body_wiki_content_updated: La página wiki '{{id}}' ha sido actualizada por {{author}}. permission_add_project: Crear proyecto setting_new_project_user_role_id: Permiso asignado a un usuario no-administrador para crear proyectos label_view_all_revisions: Ver todas las revisiones @@ -951,13 +950,20 @@ es: label_overall_spent_time: Tiempo total dedicado field_time_entries: Log time project_module_gantt: Gantt - project_module_calendar: Calendar - field_member_of_group: Member of Group - field_assigned_to_role: Member of Role - button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" - text_are_you_sure_with_children: Delete issue and all child issues? - field_text: Text field - - field_start_date: Start date - label_principal_search: "Search for user or group:" - label_user_search: "Search for user:" + project_module_calendar: Calendario + button_edit_associated_wikipage: "Editar paginas Wiki asociadas: {{page_title}}" + text_are_you_sure_with_children: ¿Borrar peticiones y todas sus peticiones hijas? + field_text: Campo de texto + label_user_mail_option_only_owner: Solo para objetos que soy propietario + setting_default_notification_option: Opcion de notificacion por defecto + label_user_mail_option_only_my_events: Solo para objetos que soy seguidor o estoy involucrado + label_user_mail_option_only_assigned: Solo para objetos que estoy asignado + label_user_mail_option_none: Sin eventos + field_member_of_group: Asignado al grupo + field_assigned_to_role: Asignado al perfil + notice_not_authorized_archived_project: El proyecto al que intenta acceder ha sido archivado. + field_start_date: Fecha de inicio + label_principal_search: "Buscar por usuario o grupo:" + label_user_search: "Buscar por usuario:" + field_visible: Visible + setting_emails_header: Encabezado de Correos diff --git a/config/locales/ja.yml b/config/locales/ja.yml index d2a70f7f05e..9871e3bc839 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -288,6 +288,7 @@ ja: field_attr_lastname: 苗字属性 field_attr_mail: メール属性 field_onthefly: あわせてユーザを作成 + field_start_date: 開始日 field_done_ratio: 進捗 % field_auth_source: 認証方式 field_hide_mail: メールアドレスを隠す @@ -322,6 +323,7 @@ ja: field_member_of_group: 担当者のグループ field_assigned_to_role: 担当者のロール field_text: テキスト + field_visible: 表示 setting_app_title: アプリケーションのタイトル setting_app_subtitle: アプリケーションのサブタイトル @@ -351,6 +353,7 @@ ja: setting_issue_list_default_columns: チケットの一覧で表示する項目 setting_repositories_encodings: リポジトリのエンコーディング setting_commit_logs_encoding: コミットメッセージのエンコーディング + setting_emails_header: メールのヘッダ setting_emails_footer: メールのフッタ setting_protocol: プロトコル setting_per_page_options: ページ毎の表示件数 @@ -806,6 +809,8 @@ ja: label_api_access_key_created_on: "APIアクセスキーは{{value}}前に作成されました" label_subtask_plural: 子チケット label_project_copy_notifications: コピーしたチケットのメール通知を送信する + label_principal_search: "ユーザまたはグループの検索:" + label_user_search: "ユーザの検索:" button_login: ログイン button_submit: 変更 diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 1e96f9f9bd3..de5f4b97d64 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -308,6 +308,7 @@ sv: field_attr_lastname: Efternamnsattribut field_attr_mail: Mailattribut field_onthefly: Skapa användare on-the-fly + field_start_date: Startdatum field_done_ratio: % Klart field_auth_source: Autentiseringsläge field_hide_mail: Dölj min mailadress @@ -823,6 +824,8 @@ sv: label_profile: Profil label_subtask_plural: Underaktiviteter label_project_copy_notifications: Skicka mailnotifieringar när projektet kopieras + label_principal_search: "Sök efter användare eller grupp:" + label_user_search: "Sök efter användare:" button_login: Logga in button_submit: Skicka @@ -891,9 +894,9 @@ sv: text_journal_set_to: "{{label}} satt till {{value}}" text_journal_deleted: "{{label}} borttagen ({{old}})" text_journal_added: "{{label}} {{value}} tillagd" - text_tip_issue_begin_day: arbetsuppgift som börjar denna dag - text_tip_issue_end_day: arbetsuppgift som slutar denna dag - text_tip_issue_begin_end_day: arbetsuppgift börjar och slutar denna dag + text_tip_issue_begin_day: ärende som börjar denna dag + text_tip_issue_end_day: ärende som slutar denna dag + text_tip_issue_begin_end_day: ärende som börjar och slutar denna dag text_project_identifier_info: 'Små bokstäver (a-z), siffror och streck tillåtna.
    När den är sparad kan identifieraren inte ändras.' text_caracters_maximum: "max {{count}} tecken." text_caracters_minimum: "Måste vara minst {{count}} tecken lång." diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 7e38d0bb0d7..3c4672d96d9 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -177,7 +177,7 @@ greater_than_start_date: "必須在開始日期之後" not_same_project: "不屬於同一個專案" circular_dependency: "這個關聯會導致環狀相依" - cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks" + cant_link_an_issue_with_a_descendant: "項目無法被連結至自己的子項目" # You can define own errors for models or model attributes. # The values :model, :attribute and :value are always available for interpolation. @@ -278,10 +278,10 @@ 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: "The '{{page}}' wiki 頁面已被 {{author}} 新增。" - mail_subject_wiki_content_updated: "'{{page}}' wiki 頁面已被更新" - mail_body_wiki_content_updated: "The '{{page}}' wiki 頁面已被 {{author}} 更新。" + mail_subject_wiki_content_added: "'{{id}}' wiki 頁面已被新增" + mail_body_wiki_content_added: "The '{{id}}' wiki 頁面已被 {{author}} 新增。" + mail_subject_wiki_content_updated: "'{{id}}' wiki 頁面已被更新" + mail_body_wiki_content_updated: "The '{{id}}' wiki 頁面已被 {{author}} 更新。" gui_validation_error: 1 個錯誤 gui_validation_error_plural: "{{count}} 個錯誤" @@ -383,6 +383,7 @@ field_member_of_group: "被指派者的群組" field_assigned_to_role: "被指派者的角色" field_text: 內容文字 + field_visible: 可被看見 setting_app_title: 標題 setting_app_subtitle: 副標題 @@ -411,6 +412,7 @@ setting_issue_list_default_columns: 預設顯示於項目清單的欄位 setting_repositories_encodings: 版本庫編碼 setting_commit_logs_encoding: 送交訊息編碼 + setting_emails_header: 電子郵件前頭說明 setting_emails_footer: 電子郵件附帶說明 setting_protocol: 協定 setting_per_page_options: 每頁顯示個數選項 @@ -813,7 +815,7 @@ label_search_titles_only: 僅搜尋標題 label_user_mail_option_all: "提醒與我的專案有關的全部事件" label_user_mail_option_selected: "只提醒我所選擇專案中的事件..." - label_user_mail_option_none: "只提醒我觀察中或參與中的事件" + label_user_mail_option_none: "取消提醒" label_user_mail_option_only_my_events: "只提醒我觀察中或參與中的事物" label_user_mail_option_only_assigned: "只提醒我被指派的事物" label_user_mail_option_only_owner: "只提醒我作為擁有者的事物" @@ -867,6 +869,8 @@ label_profile: 配置概況 label_subtask_plural: 子工作項目 label_project_copy_notifications: 在複製專案的過程中，傳送通知郵件 + label_principal_search: "搜尋用戶或群組：" + label_user_search: "搜尋用戶：" button_login: 登入 button_submit: 送出 @@ -1009,5 +1013,3 @@ enumeration_activities: 活動 (時間追蹤) enumeration_system_activity: 系統活動 - label_principal_search: "Search for user or group:" - label_user_search: "Search for user:" From bdb888476d06d7715e6ceeea4b1908976fad9543 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 27 Nov 2010 14:47:31 +0000 Subject: [PATCH 221/240] Merged r4437 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4438 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/group.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/group.rb b/app/models/group.rb index 80e096be8e1..1b55c256611 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -31,6 +31,7 @@ def to_s def user_added(user) members.each do |member| + next if member.project.nil? user_member = Member.find_by_project_id_and_user_id(member.project_id, user.id) || Member.new(:project_id => member.project_id, :user_id => user.id) member.member_roles.each do |member_role| user_member.member_roles << MemberRole.new(:role => member_role.role, :inherited_from => member_role.id) From 541a371b412afe3392f83fa364660c5528cd8a5c Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 27 Nov 2010 15:16:26 +0000 Subject: [PATCH 222/240] Backported r4357, r4358, r4360 and r4363 to r4367 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4439 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/issues_controller.rb | 2 +- .../{ => api_test}/disabled_rest_api_test.rb | 4 +- .../api_test/http_basic_login_test.rb | 31 ++ .../http_basic_login_with_api_token_test.rb | 27 ++ test/integration/api_test/issues_test.rb | 336 +++++++++++++++++ .../projects_test.rb} | 11 +- .../api_test/token_authentication_test.rb | 26 ++ test/integration/api_token_login_test.rb | 80 ---- test/integration/http_basic_login_test.rb | 103 ------ .../http_basic_login_with_api_token_test.rb | 84 ----- test/integration/issues_api_test.rb | 349 ------------------ test/test_helper.rb | 232 ++++++++++++ 12 files changed, 659 insertions(+), 626 deletions(-) rename test/integration/{ => api_test}/disabled_rest_api_test.rb (96%) create mode 100644 test/integration/api_test/http_basic_login_test.rb create mode 100644 test/integration/api_test/http_basic_login_with_api_token_test.rb create mode 100644 test/integration/api_test/issues_test.rb rename test/integration/{projects_api_test.rb => api_test/projects_test.rb} (94%) create mode 100644 test/integration/api_test/token_authentication_test.rb delete mode 100644 test/integration/api_token_login_test.rb delete mode 100644 test/integration/http_basic_login_test.rb delete mode 100644 test/integration/http_basic_login_with_api_token_test.rb delete mode 100644 test/integration/issues_api_test.rb diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index df5a356a29a..ec34dc4bf4e 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -26,7 +26,7 @@ class IssuesController < ApplicationController before_filter :find_optional_project, :only => [:index] before_filter :check_for_default_issue_status, :only => [:new, :create] before_filter :build_new_issue_from_params, :only => [:new, :create] - accept_key_auth :index, :show + accept_key_auth :index, :show, :create, :update, :destroy rescue_from Query::StatementInvalid, :with => :query_statement_invalid diff --git a/test/integration/disabled_rest_api_test.rb b/test/integration/api_test/disabled_rest_api_test.rb similarity index 96% rename from test/integration/disabled_rest_api_test.rb rename to test/integration/api_test/disabled_rest_api_test.rb index 5ebf91c3fdf..d94d14b6ee7 100644 --- a/test/integration/disabled_rest_api_test.rb +++ b/test/integration/api_test/disabled_rest_api_test.rb @@ -1,6 +1,6 @@ -require "#{File.dirname(__FILE__)}/../test_helper" +require "#{File.dirname(__FILE__)}/../../test_helper" -class DisabledRestApi < ActionController::IntegrationTest +class ApiTest::DisabledRestApiTest < ActionController::IntegrationTest fixtures :all def setup diff --git a/test/integration/api_test/http_basic_login_test.rb b/test/integration/api_test/http_basic_login_test.rb new file mode 100644 index 00000000000..21b584c7921 --- /dev/null +++ b/test/integration/api_test/http_basic_login_test.rb @@ -0,0 +1,31 @@ +require "#{File.dirname(__FILE__)}/../../test_helper" + +class ApiTest::HttpBasicLoginTest < ActionController::IntegrationTest + fixtures :all + + def setup + Setting.rest_api_enabled = '1' + Setting.login_required = '1' + end + + def teardown + Setting.rest_api_enabled = '0' + Setting.login_required = '0' + end + + # Using the NewsController because it's a simple API. + context "get /news" do + setup do + project = Project.find('onlinestore') + EnabledModule.create(:project => project, :name => 'news') + end + + context "in :xml format" do + should_allow_http_basic_auth_with_username_and_password(:get, "/projects/onlinestore/news.xml") + end + + context "in :json format" do + should_allow_http_basic_auth_with_username_and_password(:get, "/projects/onlinestore/news.json") + end + end +end diff --git a/test/integration/api_test/http_basic_login_with_api_token_test.rb b/test/integration/api_test/http_basic_login_with_api_token_test.rb new file mode 100644 index 00000000000..42c0be2876e --- /dev/null +++ b/test/integration/api_test/http_basic_login_with_api_token_test.rb @@ -0,0 +1,27 @@ +require "#{File.dirname(__FILE__)}/../../test_helper" + +class ApiTest::HttpBasicLoginWithApiTokenTest < ActionController::IntegrationTest + fixtures :all + + def setup + Setting.rest_api_enabled = '1' + Setting.login_required = '1' + end + + def teardown + Setting.rest_api_enabled = '0' + Setting.login_required = '0' + end + + # Using the NewsController because it's a simple API. + context "get /news" do + + context "in :xml format" do + should_allow_http_basic_auth_with_key(:get, "/news.xml") + end + + context "in :json format" do + should_allow_http_basic_auth_with_key(:get, "/news.json") + end + end +end diff --git a/test/integration/api_test/issues_test.rb b/test/integration/api_test/issues_test.rb new file mode 100644 index 00000000000..60ee66bb908 --- /dev/null +++ b/test/integration/api_test/issues_test.rb @@ -0,0 +1,336 @@ +# Redmine - project management software +# Copyright (C) 2006-2010 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +require "#{File.dirname(__FILE__)}/../../test_helper" + +class ApiTest::IssuesTest < ActionController::IntegrationTest + fixtures :projects, + :users, + :roles, + :members, + :member_roles, + :issues, + :issue_statuses, + :versions, + :trackers, + :projects_trackers, + :issue_categories, + :enabled_modules, + :enumerations, + :attachments, + :workflows, + :custom_fields, + :custom_values, + :custom_fields_projects, + :custom_fields_trackers, + :time_entries, + :journals, + :journal_details, + :queries + + def setup + Setting.rest_api_enabled = '1' + end + + # Use a private project to make sure auth is really working and not just + # only showing public issues. + context "/index.xml" do + should_allow_api_authentication(:get, "/projects/private-child/issues.xml") + end + + context "/index.json" do + should_allow_api_authentication(:get, "/projects/private-child/issues.json") + end + + context "/index.xml with filter" do + should_allow_api_authentication(:get, "/projects/private-child/issues.xml?status_id=5") + + should "show only issues with the status_id" do + get '/issues.xml?status_id=5' + assert_tag :tag => 'issues', + :children => { :count => Issue.visible.count(:conditions => {:status_id => 5}), + :only => { :tag => 'issue' } } + end + end + + context "/index.json with filter" do + should_allow_api_authentication(:get, "/projects/private-child/issues.json?status_id=5") + + should "show only issues with the status_id" do + get '/issues.json?status_id=5' + + json = ActiveSupport::JSON.decode(response.body) + status_ids_used = json.collect {|j| j['status_id'] } + assert_equal 3, status_ids_used.length + assert status_ids_used.all? {|id| id == 5 } + end + + end + + # Issue 6 is on a private project + context "/issues/6.xml" do + should_allow_api_authentication(:get, "/issues/6.xml") + end + + context "/issues/6.json" do + should_allow_api_authentication(:get, "/issues/6.json") + end + + context "POST /issues.xml" do + should_allow_api_authentication(:post, + '/issues.xml', + {:issue => {:project_id => 1, :subject => 'API test', :tracker_id => 2, :status_id => 3}}, + {:success_code => :created}) + + should "create an issue with the attributes" do + assert_difference('Issue.count') do + post '/issues.xml', {:issue => {:project_id => 1, :subject => 'API test', :tracker_id => 2, :status_id => 3}}, :authorization => credentials('jsmith') + end + + issue = Issue.first(:order => 'id DESC') + assert_equal 1, issue.project_id + assert_equal 2, issue.tracker_id + assert_equal 3, issue.status_id + assert_equal 'API test', issue.subject + end + end + + context "POST /issues.xml with failure" do + should_allow_api_authentication(:post, + '/issues.xml', + {:issue => {:project_id => 1}}, + {:success_code => :unprocessable_entity}) + + should "have an errors tag" do + assert_no_difference('Issue.count') do + post '/issues.xml', {:issue => {:project_id => 1}}, :authorization => credentials('jsmith') + end + + assert_tag :errors, :child => {:tag => 'error', :content => "Subject can't be blank"} + end + end + + context "POST /issues.json" do + should_allow_api_authentication(:post, + '/issues.json', + {:issue => {:project_id => 1, :subject => 'API test', :tracker_id => 2, :status_id => 3}}, + {:success_code => :created}) + + should "create an issue with the attributes" do + assert_difference('Issue.count') do + post '/issues.json', {:issue => {:project_id => 1, :subject => 'API test', :tracker_id => 2, :status_id => 3}}, :authorization => credentials('jsmith') + end + + issue = Issue.first(:order => 'id DESC') + assert_equal 1, issue.project_id + assert_equal 2, issue.tracker_id + assert_equal 3, issue.status_id + assert_equal 'API test', issue.subject + end + + end + + context "POST /issues.json with failure" do + should_allow_api_authentication(:post, + '/issues.json', + {:issue => {:project_id => 1}}, + {:success_code => :unprocessable_entity}) + + should "have an errors element" do + assert_no_difference('Issue.count') do + post '/issues.json', {:issue => {:project_id => 1}}, :authorization => credentials('jsmith') + end + + json = ActiveSupport::JSON.decode(response.body) + assert_equal "can't be blank", json.first['subject'] + end + end + + # Issue 6 is on a private project + context "PUT /issues/6.xml" do + setup do + @parameters = {:issue => {:subject => 'API update', :notes => 'A new note'}} + @headers = { :authorization => credentials('jsmith') } + end + + should_allow_api_authentication(:put, + '/issues/6.xml', + {:issue => {:subject => 'API update', :notes => 'A new note'}}, + {:success_code => :ok}) + + should "not create a new issue" do + assert_no_difference('Issue.count') do + put '/issues/6.xml', @parameters, @headers + end + end + + should "create a new journal" do + assert_difference('Journal.count') do + put '/issues/6.xml', @parameters, @headers + end + end + + should "add the note to the journal" do + put '/issues/6.xml', @parameters, @headers + + journal = Journal.last + assert_equal "A new note", journal.notes + end + + should "update the issue" do + put '/issues/6.xml', @parameters, @headers + + issue = Issue.find(6) + assert_equal "API update", issue.subject + end + + end + + context "PUT /issues/6.xml with failed update" do + setup do + @parameters = {:issue => {:subject => ''}} + @headers = { :authorization => credentials('jsmith') } + end + + should_allow_api_authentication(:put, + '/issues/6.xml', + {:issue => {:subject => ''}}, # Missing subject should fail + {:success_code => :unprocessable_entity}) + + should "not create a new issue" do + assert_no_difference('Issue.count') do + put '/issues/6.xml', @parameters, @headers + end + end + + should "not create a new journal" do + assert_no_difference('Journal.count') do + put '/issues/6.xml', @parameters, @headers + end + end + + should "have an errors tag" do + put '/issues/6.xml', @parameters, @headers + + assert_tag :errors, :child => {:tag => 'error', :content => "Subject can't be blank"} + end + end + + context "PUT /issues/6.json" do + setup do + @parameters = {:issue => {:subject => 'API update', :notes => 'A new note'}} + @headers = { :authorization => credentials('jsmith') } + end + + should_allow_api_authentication(:put, + '/issues/6.json', + {:issue => {:subject => 'API update', :notes => 'A new note'}}, + {:success_code => :ok}) + + should "not create a new issue" do + assert_no_difference('Issue.count') do + put '/issues/6.json', @parameters, @headers + end + end + + should "create a new journal" do + assert_difference('Journal.count') do + put '/issues/6.json', @parameters, @headers + end + end + + should "add the note to the journal" do + put '/issues/6.json', @parameters, @headers + + journal = Journal.last + assert_equal "A new note", journal.notes + end + + should "update the issue" do + put '/issues/6.json', @parameters, @headers + + issue = Issue.find(6) + assert_equal "API update", issue.subject + end + + end + + context "PUT /issues/6.json with failed update" do + setup do + @parameters = {:issue => {:subject => ''}} + @headers = { :authorization => credentials('jsmith') } + end + + should_allow_api_authentication(:put, + '/issues/6.json', + {:issue => {:subject => ''}}, # Missing subject should fail + {:success_code => :unprocessable_entity}) + + should "not create a new issue" do + assert_no_difference('Issue.count') do + put '/issues/6.json', @parameters, @headers + end + end + + should "not create a new journal" do + assert_no_difference('Journal.count') do + put '/issues/6.json', @parameters, @headers + end + end + + should "have an errors attribute" do + put '/issues/6.json', @parameters, @headers + + json = ActiveSupport::JSON.decode(response.body) + assert_equal "can't be blank", json.first['subject'] + end + end + + context "DELETE /issues/1.xml" do + should_allow_api_authentication(:delete, + '/issues/6.xml', + {}, + {:success_code => :ok}) + + should "delete the issue" do + assert_difference('Issue.count',-1) do + delete '/issues/6.xml', {}, :authorization => credentials('jsmith') + end + + assert_nil Issue.find_by_id(6) + end + end + + context "DELETE /issues/1.json" do + should_allow_api_authentication(:delete, + '/issues/6.json', + {}, + {:success_code => :ok}) + + should "delete the issue" do + assert_difference('Issue.count',-1) do + delete '/issues/6.json', {}, :authorization => credentials('jsmith') + end + + assert_nil Issue.find_by_id(6) + end + end + + def credentials(user, password=nil) + ActionController::HttpAuthentication::Basic.encode_credentials(user, password || user) + end +end diff --git a/test/integration/projects_api_test.rb b/test/integration/api_test/projects_test.rb similarity index 94% rename from test/integration/projects_api_test.rb rename to test/integration/api_test/projects_test.rb index 6b08d64e500..7c090a9251d 100644 --- a/test/integration/projects_api_test.rb +++ b/test/integration/api_test/projects_test.rb @@ -15,9 +15,9 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -require "#{File.dirname(__FILE__)}/../test_helper" +require "#{File.dirname(__FILE__)}/../../test_helper" -class ProjectsApiTest < ActionController::IntegrationTest +class ApiTest::ProjectsTest < ActionController::IntegrationTest fixtures :projects, :versions, :users, :roles, :members, :member_roles, :issues, :journals, :journal_details, :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages, :attachments, :custom_fields, :custom_values, :time_entries @@ -43,15 +43,12 @@ def test_create assert_difference 'Project.count' do post '/projects.xml', {:project => attributes}, :authorization => credentials('admin') end - + assert_response :created + assert_equal 'application/xml', @response.content_type project = Project.first(:order => 'id DESC') attributes.each do |attribute, value| assert_equal value, project.send(attribute) end - - assert_response :created - assert_equal 'application/xml', @response.content_type - assert_tag 'project', :child => {:tag => 'id', :content => project.id.to_s} end def test_create_failure diff --git a/test/integration/api_test/token_authentication_test.rb b/test/integration/api_test/token_authentication_test.rb new file mode 100644 index 00000000000..5c116c16144 --- /dev/null +++ b/test/integration/api_test/token_authentication_test.rb @@ -0,0 +1,26 @@ +require "#{File.dirname(__FILE__)}/../../test_helper" + +class ApiTest::TokenAuthenticationTest < ActionController::IntegrationTest + fixtures :all + + def setup + Setting.rest_api_enabled = '1' + Setting.login_required = '1' + end + + def teardown + Setting.rest_api_enabled = '0' + Setting.login_required = '0' + end + + # Using the NewsController because it's a simple API. + context "get /news" do + context "in :xml format" do + should_allow_key_based_auth(:get, "/news.xml") + end + + context "in :json format" do + should_allow_key_based_auth(:get, "/news.json") + end + end +end diff --git a/test/integration/api_token_login_test.rb b/test/integration/api_token_login_test.rb deleted file mode 100644 index 43f6eb01fc4..00000000000 --- a/test/integration/api_token_login_test.rb +++ /dev/null @@ -1,80 +0,0 @@ -require "#{File.dirname(__FILE__)}/../test_helper" - -class ApiTokenLoginTest < ActionController::IntegrationTest - fixtures :all - - def setup - Setting.rest_api_enabled = '1' - Setting.login_required = '1' - end - - def teardown - Setting.rest_api_enabled = '0' - Setting.login_required = '0' - end - - # Using the NewsController because it's a simple API. - context "get /news" do - - context "in :xml format" do - context "with a valid api token" do - setup do - @user = User.generate_with_protected! - @token = Token.generate!(:user => @user, :action => 'api') - get "/news.xml?key=#{@token.value}" - end - - should_respond_with :success - should_respond_with_content_type :xml - should "login as the user" do - assert_equal @user, User.current - end - end - - context "with an invalid api token" do - setup do - @user = User.generate_with_protected! - @token = Token.generate!(:user => @user, :action => 'feeds') - get "/news.xml?key=#{@token.value}" - end - - should_respond_with :unauthorized - should_respond_with_content_type :xml - should "not login as the user" do - assert_equal User.anonymous, User.current - end - end - end - - context "in :json format" do - context "with a valid api token" do - setup do - @user = User.generate_with_protected! - @token = Token.generate!(:user => @user, :action => 'api') - get "/news.json?key=#{@token.value}" - end - - should_respond_with :success - should_respond_with_content_type :json - should "login as the user" do - assert_equal @user, User.current - end - end - - context "with an invalid api token" do - setup do - @user = User.generate_with_protected! - @token = Token.generate!(:user => @user, :action => 'feeds') - get "/news.json?key=#{@token.value}" - end - - should_respond_with :unauthorized - should_respond_with_content_type :json - should "not login as the user" do - assert_equal User.anonymous, User.current - end - end - end - - end -end diff --git a/test/integration/http_basic_login_test.rb b/test/integration/http_basic_login_test.rb deleted file mode 100644 index 9ec69a8c922..00000000000 --- a/test/integration/http_basic_login_test.rb +++ /dev/null @@ -1,103 +0,0 @@ -require "#{File.dirname(__FILE__)}/../test_helper" - -class HttpBasicLoginTest < ActionController::IntegrationTest - fixtures :all - - def setup - Setting.rest_api_enabled = '1' - Setting.login_required = '1' - end - - def teardown - Setting.rest_api_enabled = '0' - Setting.login_required = '0' - end - - # Using the NewsController because it's a simple API. - context "get /news" do - - context "in :xml format" do - context "with a valid HTTP authentication" do - setup do - @user = User.generate_with_protected!(:password => 'my_password', :password_confirmation => 'my_password') - @authorization = ActionController::HttpAuthentication::Basic.encode_credentials(@user.login, 'my_password') - get "/news.xml", nil, :authorization => @authorization - end - - should_respond_with :success - should_respond_with_content_type :xml - should "login as the user" do - assert_equal @user, User.current - end - end - - context "with an invalid HTTP authentication" do - setup do - @user = User.generate_with_protected! - @authorization = ActionController::HttpAuthentication::Basic.encode_credentials(@user.login, 'wrong_password') - get "/news.xml", nil, :authorization => @authorization - end - - should_respond_with :unauthorized - should_respond_with_content_type :xml - should "not login as the user" do - assert_equal User.anonymous, User.current - end - end - - context "without credentials" do - setup do - get "/projects/onlinestore/news.xml" - end - - should_respond_with :unauthorized - should_respond_with_content_type :xml - should "include_www_authenticate_header" do - assert @controller.response.headers.has_key?('WWW-Authenticate') - end - end - end - - context "in :json format" do - context "with a valid HTTP authentication" do - setup do - @user = User.generate_with_protected!(:password => 'my_password', :password_confirmation => 'my_password') - @authorization = ActionController::HttpAuthentication::Basic.encode_credentials(@user.login, 'my_password') - get "/news.json", nil, :authorization => @authorization - end - - should_respond_with :success - should_respond_with_content_type :json - should "login as the user" do - assert_equal @user, User.current - end - end - - context "with an invalid HTTP authentication" do - setup do - @user = User.generate_with_protected! - @authorization = ActionController::HttpAuthentication::Basic.encode_credentials(@user.login, 'wrong_password') - get "/news.json", nil, :authorization => @authorization - end - - should_respond_with :unauthorized - should_respond_with_content_type :json - should "not login as the user" do - assert_equal User.anonymous, User.current - end - end - end - - context "without credentials" do - setup do - get "/projects/onlinestore/news.json" - end - - should_respond_with :unauthorized - should_respond_with_content_type :json - should "include_www_authenticate_header" do - assert @controller.response.headers.has_key?('WWW-Authenticate') - end - end - end -end diff --git a/test/integration/http_basic_login_with_api_token_test.rb b/test/integration/http_basic_login_with_api_token_test.rb deleted file mode 100644 index fe3df3130a7..00000000000 --- a/test/integration/http_basic_login_with_api_token_test.rb +++ /dev/null @@ -1,84 +0,0 @@ -require "#{File.dirname(__FILE__)}/../test_helper" - -class HttpBasicLoginWithApiTokenTest < ActionController::IntegrationTest - fixtures :all - - def setup - Setting.rest_api_enabled = '1' - Setting.login_required = '1' - end - - def teardown - Setting.rest_api_enabled = '0' - Setting.login_required = '0' - end - - # Using the NewsController because it's a simple API. - context "get /news" do - - context "in :xml format" do - context "with a valid HTTP authentication using the API token" do - setup do - @user = User.generate_with_protected! - @token = Token.generate!(:user => @user, :action => 'api') - @authorization = ActionController::HttpAuthentication::Basic.encode_credentials(@token.value, 'X') - get "/news.xml", nil, :authorization => @authorization - end - - should_respond_with :success - should_respond_with_content_type :xml - should "login as the user" do - assert_equal @user, User.current - end - end - - context "with an invalid HTTP authentication" do - setup do - @user = User.generate_with_protected! - @token = Token.generate!(:user => @user, :action => 'feeds') - @authorization = ActionController::HttpAuthentication::Basic.encode_credentials(@token.value, 'X') - get "/news.xml", nil, :authorization => @authorization - end - - should_respond_with :unauthorized - should_respond_with_content_type :xml - should "not login as the user" do - assert_equal User.anonymous, User.current - end - end - end - - context "in :json format" do - context "with a valid HTTP authentication" do - setup do - @user = User.generate_with_protected! - @token = Token.generate!(:user => @user, :action => 'api') - @authorization = ActionController::HttpAuthentication::Basic.encode_credentials(@token.value, 'DoesNotMatter') - get "/news.json", nil, :authorization => @authorization - end - - should_respond_with :success - should_respond_with_content_type :json - should "login as the user" do - assert_equal @user, User.current - end - end - - context "with an invalid HTTP authentication" do - setup do - @user = User.generate_with_protected! - @token = Token.generate!(:user => @user, :action => 'feeds') - @authorization = ActionController::HttpAuthentication::Basic.encode_credentials(@token.value, 'DoesNotMatter') - get "/news.json", nil, :authorization => @authorization - end - - should_respond_with :unauthorized - should_respond_with_content_type :json - should "not login as the user" do - assert_equal User.anonymous, User.current - end - end - end - - end -end diff --git a/test/integration/issues_api_test.rb b/test/integration/issues_api_test.rb deleted file mode 100644 index e26cf643b57..00000000000 --- a/test/integration/issues_api_test.rb +++ /dev/null @@ -1,349 +0,0 @@ -# Redmine - project management software -# Copyright (C) 2006-2010 Jean-Philippe Lang -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -require "#{File.dirname(__FILE__)}/../test_helper" - -class IssuesApiTest < ActionController::IntegrationTest - fixtures :projects, - :users, - :roles, - :members, - :member_roles, - :issues, - :issue_statuses, - :versions, - :trackers, - :projects_trackers, - :issue_categories, - :enabled_modules, - :enumerations, - :attachments, - :workflows, - :custom_fields, - :custom_values, - :custom_fields_projects, - :custom_fields_trackers, - :time_entries, - :journals, - :journal_details, - :queries - - def setup - Setting.rest_api_enabled = '1' - end - - context "/index.xml" do - setup do - get '/issues.xml' - end - - should_respond_with :success - should_respond_with_content_type 'application/xml' - end - - context "/index.json" do - setup do - get '/issues.json' - end - - should_respond_with :success - should_respond_with_content_type 'application/json' - - should 'return a valid JSON string' do - assert ActiveSupport::JSON.decode(response.body) - end - end - - context "/index.xml with filter" do - setup do - get '/issues.xml?status_id=5' - end - - should_respond_with :success - should_respond_with_content_type 'application/xml' - should "show only issues with the status_id" do - assert_tag :tag => 'issues', - :children => { :count => Issue.visible.count(:conditions => {:status_id => 5}), - :only => { :tag => 'issue' } } - end - end - - context "/index.json with filter" do - setup do - get '/issues.json?status_id=5' - end - - should_respond_with :success - should_respond_with_content_type 'application/json' - - should 'return a valid JSON string' do - assert ActiveSupport::JSON.decode(response.body) - end - - should "show only issues with the status_id" do - json = ActiveSupport::JSON.decode(response.body) - status_ids_used = json.collect {|j| j['status_id'] } - assert_equal 3, status_ids_used.length - assert status_ids_used.all? {|id| id == 5 } - end - - end - - context "/issues/1.xml" do - setup do - get '/issues/1.xml' - end - - should_respond_with :success - should_respond_with_content_type 'application/xml' - end - - context "/issues/1.json" do - setup do - get '/issues/1.json' - end - - should_respond_with :success - should_respond_with_content_type 'application/json' - - should 'return a valid JSON string' do - assert ActiveSupport::JSON.decode(response.body) - end - end - - context "POST /issues.xml" do - setup do - @issue_count = Issue.count - @attributes = {:project_id => 1, :subject => 'API test', :tracker_id => 2, :status_id => 3} - post '/issues.xml', {:issue => @attributes}, :authorization => credentials('jsmith') - end - - should_respond_with :created - should_respond_with_content_type 'application/xml' - - should "create an issue with the attributes" do - assert_equal Issue.count, @issue_count + 1 - - issue = Issue.first(:order => 'id DESC') - @attributes.each do |attribute, value| - assert_equal value, issue.send(attribute) - end - end - end - - context "POST /issues.xml with failure" do - setup do - @attributes = {:project_id => 1} - post '/issues.xml', {:issue => @attributes}, :authorization => credentials('jsmith') - end - - should_respond_with :unprocessable_entity - should_respond_with_content_type 'application/xml' - - should "have an errors tag" do - assert_tag :errors, :child => {:tag => 'error', :content => "Subject can't be blank"} - end - end - - context "POST /issues.json" do - setup do - @issue_count = Issue.count - @attributes = {:project_id => 1, :subject => 'API test', :tracker_id => 2, :status_id => 3} - post '/issues.json', {:issue => @attributes}, :authorization => credentials('jsmith') - end - - should_respond_with :created - should_respond_with_content_type 'application/json' - - should "create an issue with the attributes" do - assert_equal Issue.count, @issue_count + 1 - - issue = Issue.first(:order => 'id DESC') - @attributes.each do |attribute, value| - assert_equal value, issue.send(attribute) - end - end - end - - context "POST /issues.json with failure" do - setup do - @attributes = {:project_id => 1} - post '/issues.json', {:issue => @attributes}, :authorization => credentials('jsmith') - end - - should_respond_with :unprocessable_entity - should_respond_with_content_type 'application/json' - - should "have an errors element" do - json = ActiveSupport::JSON.decode(response.body) - assert_equal "can't be blank", json.first['subject'] - end - end - - context "PUT /issues/1.xml" do - setup do - @issue_count = Issue.count - @journal_count = Journal.count - @attributes = {:subject => 'API update', :notes => 'A new note'} - - put '/issues/1.xml', {:issue => @attributes}, :authorization => credentials('jsmith') - end - - should_respond_with :ok - should_respond_with_content_type 'application/xml' - - should "not create a new issue" do - assert_equal Issue.count, @issue_count - end - - should "create a new journal" do - assert_equal Journal.count, @journal_count + 1 - end - - should "add the note to the journal" do - journal = Journal.last - assert_equal "A new note", journal.notes - end - - should "update the issue" do - issue = Issue.find(1) - @attributes.each do |attribute, value| - assert_equal value, issue.send(attribute) unless attribute == :notes - end - end - - end - - context "PUT /issues/1.xml with failed update" do - setup do - @attributes = {:subject => ''} - @issue_count = Issue.count - @journal_count = Journal.count - - put '/issues/1.xml', {:issue => @attributes}, :authorization => credentials('jsmith') - end - - should_respond_with :unprocessable_entity - should_respond_with_content_type 'application/xml' - - should "not create a new issue" do - assert_equal Issue.count, @issue_count - end - - should "not create a new journal" do - assert_equal Journal.count, @journal_count - end - - should "have an errors tag" do - assert_tag :errors, :child => {:tag => 'error', :content => "Subject can't be blank"} - end - end - - context "PUT /issues/1.json" do - setup do - @issue_count = Issue.count - @journal_count = Journal.count - @attributes = {:subject => 'API update', :notes => 'A new note'} - - put '/issues/1.json', {:issue => @attributes}, :authorization => credentials('jsmith') - end - - should_respond_with :ok - should_respond_with_content_type 'application/json' - - should "not create a new issue" do - assert_equal Issue.count, @issue_count - end - - should "create a new journal" do - assert_equal Journal.count, @journal_count + 1 - end - - should "add the note to the journal" do - journal = Journal.last - assert_equal "A new note", journal.notes - end - - should "update the issue" do - issue = Issue.find(1) - @attributes.each do |attribute, value| - assert_equal value, issue.send(attribute) unless attribute == :notes - end - end - - end - - context "PUT /issues/1.json with failed update" do - setup do - @attributes = {:subject => ''} - @issue_count = Issue.count - @journal_count = Journal.count - - put '/issues/1.json', {:issue => @attributes}, :authorization => credentials('jsmith') - end - - should_respond_with :unprocessable_entity - should_respond_with_content_type 'application/json' - - should "not create a new issue" do - assert_equal Issue.count, @issue_count - end - - should "not create a new journal" do - assert_equal Journal.count, @journal_count - end - - should "have an errors attribute" do - json = ActiveSupport::JSON.decode(response.body) - assert_equal "can't be blank", json.first['subject'] - end - end - - context "DELETE /issues/1.xml" do - setup do - @issue_count = Issue.count - delete '/issues/1.xml', {}, :authorization => credentials('jsmith') - end - - should_respond_with :ok - should_respond_with_content_type 'application/xml' - - should "delete the issue" do - assert_equal Issue.count, @issue_count -1 - assert_nil Issue.find_by_id(1) - end - end - - context "DELETE /issues/1.json" do - setup do - @issue_count = Issue.count - delete '/issues/1.json', {}, :authorization => credentials('jsmith') - end - - should_respond_with :ok - should_respond_with_content_type 'application/json' - - should "delete the issue" do - assert_equal Issue.count, @issue_count -1 - assert_nil Issue.find_by_id(1) - end - end - - def credentials(user, password=nil) - ActionController::HttpAuthentication::Basic.encode_credentials(user, password || user) - end -end diff --git a/test/test_helper.rb b/test/test_helper.rb index 9a2761021aa..06d99ec5b82 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -181,4 +181,236 @@ def self.should_create_a_new_user(&block) assert !user.new_record? end end + + # Test that a request allows the three types of API authentication + # + # * HTTP Basic with username and password + # * HTTP Basic with an api key for the username + # * Key based with the key=X parameter + # + # @param [Symbol] http_method the HTTP method for request (:get, :post, :put, :delete) + # @param [String] url the request url + # @param [optional, Hash] parameters additional request parameters + # @param [optional, Hash] options additional options + # @option options [Symbol] :success_code Successful response code (:success) + # @option options [Symbol] :failure_code Failure response code (:unauthorized) + def self.should_allow_api_authentication(http_method, url, parameters={}, options={}) + should_allow_http_basic_auth_with_username_and_password(http_method, url, parameters, options) + should_allow_http_basic_auth_with_key(http_method, url, parameters, options) + should_allow_key_based_auth(http_method, url, parameters, options) + end + + # Test that a request allows the username and password for HTTP BASIC + # + # @param [Symbol] http_method the HTTP method for request (:get, :post, :put, :delete) + # @param [String] url the request url + # @param [optional, Hash] parameters additional request parameters + # @param [optional, Hash] options additional options + # @option options [Symbol] :success_code Successful response code (:success) + # @option options [Symbol] :failure_code Failure response code (:unauthorized) + def self.should_allow_http_basic_auth_with_username_and_password(http_method, url, parameters={}, options={}) + success_code = options[:success_code] || :success + failure_code = options[:failure_code] || :unauthorized + + context "should allow http basic auth using a username and password for #{http_method} #{url}" do + context "with a valid HTTP authentication" do + setup do + @user = User.generate_with_protected!(:password => 'my_password', :password_confirmation => 'my_password', :admin => true) # Admin so they can access the project + @authorization = ActionController::HttpAuthentication::Basic.encode_credentials(@user.login, 'my_password') + send(http_method, url, parameters, {:authorization => @authorization}) + end + + should_respond_with success_code + should_respond_with_content_type_based_on_url(url) + should "login as the user" do + assert_equal @user, User.current + end + end + + context "with an invalid HTTP authentication" do + setup do + @user = User.generate_with_protected! + @authorization = ActionController::HttpAuthentication::Basic.encode_credentials(@user.login, 'wrong_password') + send(http_method, url, parameters, {:authorization => @authorization}) + end + + should_respond_with failure_code + should_respond_with_content_type_based_on_url(url) + should "not login as the user" do + assert_equal User.anonymous, User.current + end + end + + context "without credentials" do + setup do + send(http_method, url, parameters, {:authorization => ''}) + end + + should_respond_with failure_code + should_respond_with_content_type_based_on_url(url) + should "include_www_authenticate_header" do + assert @controller.response.headers.has_key?('WWW-Authenticate') + end + end + end + + end + + # Test that a request allows the API key with HTTP BASIC + # + # @param [Symbol] http_method the HTTP method for request (:get, :post, :put, :delete) + # @param [String] url the request url + # @param [optional, Hash] parameters additional request parameters + # @param [optional, Hash] options additional options + # @option options [Symbol] :success_code Successful response code (:success) + # @option options [Symbol] :failure_code Failure response code (:unauthorized) + def self.should_allow_http_basic_auth_with_key(http_method, url, parameters={}, options={}) + success_code = options[:success_code] || :success + failure_code = options[:failure_code] || :unauthorized + + context "should allow http basic auth with a key for #{http_method} #{url}" do + context "with a valid HTTP authentication using the API token" do + setup do + @user = User.generate_with_protected!(:admin => true) + @token = Token.generate!(:user => @user, :action => 'api') + @authorization = ActionController::HttpAuthentication::Basic.encode_credentials(@token.value, 'X') + send(http_method, url, parameters, {:authorization => @authorization}) + end + + should_respond_with success_code + should_respond_with_content_type_based_on_url(url) + should_be_a_valid_response_string_based_on_url(url) + should "login as the user" do + assert_equal @user, User.current + end + end + + context "with an invalid HTTP authentication" do + setup do + @user = User.generate_with_protected! + @token = Token.generate!(:user => @user, :action => 'feeds') + @authorization = ActionController::HttpAuthentication::Basic.encode_credentials(@token.value, 'X') + send(http_method, url, parameters, {:authorization => @authorization}) + end + + should_respond_with failure_code + should_respond_with_content_type_based_on_url(url) + should "not login as the user" do + assert_equal User.anonymous, User.current + end + end + end + end + + # Test that a request allows full key authentication + # + # @param [Symbol] http_method the HTTP method for request (:get, :post, :put, :delete) + # @param [String] url the request url, without the key=ZXY parameter + # @param [optional, Hash] parameters additional request parameters + # @param [optional, Hash] options additional options + # @option options [Symbol] :success_code Successful response code (:success) + # @option options [Symbol] :failure_code Failure response code (:unauthorized) + def self.should_allow_key_based_auth(http_method, url, parameters={}, options={}) + success_code = options[:success_code] || :success + failure_code = options[:failure_code] || :unauthorized + + context "should allow key based auth using key=X for #{http_method} #{url}" do + context "with a valid api token" do + setup do + @user = User.generate_with_protected!(:admin => true) + @token = Token.generate!(:user => @user, :action => 'api') + # Simple url parse to add on ?key= or &key= + request_url = if url.match(/\?/) + url + "&key=#{@token.value}" + else + url + "?key=#{@token.value}" + end + send(http_method, request_url, parameters) + end + + should_respond_with success_code + should_respond_with_content_type_based_on_url(url) + should_be_a_valid_response_string_based_on_url(url) + should "login as the user" do + assert_equal @user, User.current + end + end + + context "with an invalid api token" do + setup do + @user = User.generate_with_protected! + @token = Token.generate!(:user => @user, :action => 'feeds') + # Simple url parse to add on ?key= or &key= + request_url = if url.match(/\?/) + url + "&key=#{@token.value}" + else + url + "?key=#{@token.value}" + end + send(http_method, request_url, parameters) + end + + should_respond_with failure_code + should_respond_with_content_type_based_on_url(url) + should "not login as the user" do + assert_equal User.anonymous, User.current + end + end + end + + end + + # Uses should_respond_with_content_type based on what's in the url: + # + # '/project/issues.xml' => should_respond_with_content_type :xml + # '/project/issues.json' => should_respond_with_content_type :json + # + # @param [String] url Request + def self.should_respond_with_content_type_based_on_url(url) + case + when url.match(/xml/i) + should_respond_with_content_type :xml + when url.match(/json/i) + should_respond_with_content_type :json + else + raise "Unknown content type for should_respond_with_content_type_based_on_url: #{url}" + end + + end + + # Uses the url to assert which format the response should be in + # + # '/project/issues.xml' => should_be_a_valid_xml_string + # '/project/issues.json' => should_be_a_valid_json_string + # + # @param [String] url Request + def self.should_be_a_valid_response_string_based_on_url(url) + case + when url.match(/xml/i) + should_be_a_valid_xml_string + when url.match(/json/i) + should_be_a_valid_json_string + else + raise "Unknown content type for should_be_a_valid_response_based_on_url: #{url}" + end + + end + + # Checks that the response is a valid JSON string + def self.should_be_a_valid_json_string + should "be a valid JSON string (or empty)" do + assert (response.body.blank? || ActiveSupport::JSON.decode(response.body)) + end + end + + # Checks that the response is a valid XML string + def self.should_be_a_valid_xml_string + should "be a valid XML string" do + assert REXML::Document.new(response.body) + end + end + +end + +# Simple module to "namespace" all of the API tests +module ApiTest end From b58382ef2e63232bc357171530a8654d4591dc60 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 27 Nov 2010 15:48:30 +0000 Subject: [PATCH 223/240] Merged r4386 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4440 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/scm/adapters/git_adapter.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index 1db57c7d652..e801f22f7b6 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -211,7 +211,7 @@ def diff(path, identifier_from, identifier_to=nil) if identifier_to cmd = "#{GIT_BIN} --git-dir #{target('')} diff --no-color #{shell_quote identifier_to} #{shell_quote identifier_from}" else - cmd = "#{GIT_BIN} --git-dir #{target('')} show #{shell_quote identifier_from}" + cmd = "#{GIT_BIN} --git-dir #{target('')} show --no-color #{shell_quote identifier_from}" end cmd << " -- #{shell_quote path}" unless path.empty? @@ -255,7 +255,7 @@ def cat(path, identifier=nil) if identifier.nil? identifier = 'HEAD' end - cmd = "#{GIT_BIN} --git-dir #{target('')} show #{shell_quote(identifier + ':' + path)}" + cmd = "#{GIT_BIN} --git-dir #{target('')} show --no-color #{shell_quote(identifier + ':' + path)}" cat = nil shellout(cmd) do |io| io.binmode From bac64c9ab423f36f0e6e192a5118ee42f029d82a Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 27 Nov 2010 16:45:07 +0000 Subject: [PATCH 224/240] Backported r4441 to r4444 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4445 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/projects_controller.rb | 2 +- test/integration/api_test/projects_test.rb | 82 ++++++++++++++-------- 2 files changed, 54 insertions(+), 30 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index a6a5c9e5f9e..f97f6c30fbc 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -24,7 +24,7 @@ class ProjectsController < ApplicationController before_filter :authorize, :except => [ :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy] before_filter :authorize_global, :only => [:new, :create] before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ] - accept_key_auth :index + accept_key_auth :index, :show, :create, :update, :destroy after_filter :only => [:create, :edit, :update, :archive, :unarchive, :destroy] do |controller| if controller.request.post? diff --git a/test/integration/api_test/projects_test.rb b/test/integration/api_test/projects_test.rb index 7c090a9251d..87c1d8311f0 100644 --- a/test/integration/api_test/projects_test.rb +++ b/test/integration/api_test/projects_test.rb @@ -31,23 +31,37 @@ def test_index assert_response :success assert_equal 'application/xml', @response.content_type end - + + context "GET /projects/2.xml" do + # TODO: A private project is needed because should_allow_api_authentication + # actually tests that authentication is *required*, not just allowed + should_allow_api_authentication(:get, "/projects/2.xml") + end + def test_show get '/projects/1.xml' assert_response :success assert_equal 'application/xml', @response.content_type end - - def test_create - attributes = {:name => 'API test', :identifier => 'api-test'} - assert_difference 'Project.count' do - post '/projects.xml', {:project => attributes}, :authorization => credentials('admin') - end - assert_response :created - assert_equal 'application/xml', @response.content_type - project = Project.first(:order => 'id DESC') - attributes.each do |attribute, value| - assert_equal value, project.send(attribute) + + context "POST /projects.xml" do + should_allow_api_authentication(:post, + '/projects.xml', + {:project => {:name => 'API test', :identifier => 'api-test'}}, + {:success_code => :created}) + + should "create a project with the attributes" do + assert_difference('Project.count') do + post '/projects.xml', {:project => {:name => 'API test', :identifier => 'api-test'}}, :authorization => credentials('admin') + end + + project = Project.first(:order => 'id DESC') + assert_equal 'API test', project.name + assert_equal 'api-test', project.identifier + + assert_response :created + assert_equal 'application/xml', @response.content_type + assert_tag 'project', :child => {:tag => 'id', :content => project.id.to_s} end end @@ -61,16 +75,20 @@ def test_create_failure assert_tag :errors, :child => {:tag => 'error', :content => "Identifier can't be blank"} end - def test_update - attributes = {:name => 'API update'} - assert_no_difference 'Project.count' do - put '/projects/1.xml', {:project => attributes}, :authorization => credentials('jsmith') - end - assert_response :ok - assert_equal 'application/xml', @response.content_type - project = Project.find(1) - attributes.each do |attribute, value| - assert_equal value, project.send(attribute) + context "PUT /projects/2.xml" do + should_allow_api_authentication(:put, + '/projects/2.xml', + {:project => {:name => 'API test'}}, + {:success_code => :ok}) + + should "update the project" do + assert_no_difference 'Project.count' do + put '/projects/2.xml', {:project => {:name => 'API update'}}, :authorization => credentials('jsmith') + end + assert_response :ok + assert_equal 'application/xml', @response.content_type + project = Project.find(2) + assert_equal 'API update', project.name end end @@ -83,14 +101,20 @@ def test_update_failure assert_equal 'application/xml', @response.content_type assert_tag :errors, :child => {:tag => 'error', :content => "Name can't be blank"} end - - def test_destroy - assert_difference 'Project.count', -1 do - delete '/projects/2.xml', {}, :authorization => credentials('admin') + + context "DELETE /projects/2.xml" do + should_allow_api_authentication(:delete, + '/projects/2.xml', + {}, + {:success_code => :ok}) + + should "delete the project" do + assert_difference('Project.count',-1) do + delete '/projects/2.xml', {}, :authorization => credentials('admin') + end + assert_response :ok + assert_nil Project.find_by_id(2) end - assert_response :ok - assert_equal 'application/xml', @response.content_type - assert_nil Project.find_by_id(2) end def credentials(user, password=nil) From ed52753a12db5fc3641c944ebfd18b2ae8a079cf Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 28 Nov 2010 12:47:36 +0000 Subject: [PATCH 225/240] Updates for 1.0.4 release. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4447 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- doc/CHANGELOG | 37 +++++++++++++++++++++++++++++++------ lib/redmine/version.rb | 2 +- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 8937d6fe2cd..d583eefb41a 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -4,6 +4,31 @@ Redmine - project management software Copyright (C) 2006-2010 Jean-Philippe Lang http://www.redmine.org/ +== 2010-11-28 v1.0.4 + +* #5324: Git not working if color.ui is enabled +* #6447: Issues API doesn't allow full key auth for all actions +* #6457: Edit User group problem +* #6575: start date being filled with current date even when blank value is submitted +* #6740: Max attachment size, incorrect usage of 'KB' +* #6760: Select box sorted by ID instead of name in Issue Category +* #6766: Changing target version name can cause an internal error +* #6784: Redmine not working with i18n gem 0.4.2 +* #6839: Hardcoded absolute links in my/page_layout +* #6841: Projects API doesn't allow full key auth for all actions +* #6860: svn: Write error: Broken pipe when browsing repository +* #6874: API should return XML description when creating a project +* #6932: submitting wrong parent task input creates a 500 error +* #6966: Records of Forums are remained, deleting project +* #6990: Layout problem in workflow overview +* #5117: mercurial_adapter should ensure the right LANG environment variable +* #6782: Traditional Chinese language file (to r4352) +* #6783: Swedish Translation for r4352 +* #6804: Bugfix: spelling fixes +* #6814: Japanese Translation for r4362 +* #6948: Bulgarian translation +* #6973: Update es.yml + == 2010-10-31 v1.0.3 * #4065: Redmine.pm doesn't work with LDAPS and a non-standard port @@ -1112,7 +1137,7 @@ http://www.redmine.org/ * Search engines now supports pagination. Results are sorted in reverse chronological order * Added "Estimated hours" attribute on issues * A category with assigned issue can now be deleted. 2 options are proposed: remove assignments or reassign issues to another category -* Forum notifications are now also sent to the authors of the thread, even if they dont watch the board +* Forum notifications are now also sent to the authors of the thread, even if they don�t watch the board * Added an application setting to specify the application protocol (http or https) used to generate urls in emails * Gantt chart: now starts at the current month by default * Gantt chart: month count and zoom factor are automatically saved as user preferences @@ -1120,7 +1145,7 @@ http://www.redmine.org/ * Added wiki index by date * Added preview on add/edit issue form * Emails footer can now be customized from the admin interface (Admin -> Email notifications) -* Default encodings for repository files can now be set in application settings (used to convert files content and diff to UTF-8 so that theyre properly displayed) +* Default encodings for repository files can now be set in application settings (used to convert files content and diff to UTF-8 so that they�re properly displayed) * Calendar: first day of week can now be set in lang files * Automatic closing of duplicate issues * Added a cross-project issue list @@ -1132,7 +1157,7 @@ http://www.redmine.org/ * Added some accesskeys * Added "Float" as a custom field format * Added basic Theme support -* Added the ability to set the done ratio of issues fixed by commit (Nikolay Solakov) +* Added the ability to set the �done ratio� of issues fixed by commit (Nikolay Solakov) * Added custom fields in issue related mail notifications * Email notifications are now sent in plain text and html * Gantt chart can now be exported to a graphic file (png). This functionality is only available if RMagick is installed. @@ -1165,7 +1190,7 @@ http://www.redmine.org/ * Added Korean translation (Choi Jong Yoon) * Fixed: the link to delete issue relations is displayed even if the user is not authorized to delete relations * Performance improvement on calendar and gantt -* Fixed: wiki preview doesnt work on long entries +* Fixed: wiki preview doesn�t work on long entries * Fixed: queries with multiple custom fields return no result * Fixed: Can not authenticate user against LDAP if its DN contains non-ascii characters * Fixed: URL with ~ broken in wiki formatting @@ -1176,7 +1201,7 @@ http://www.redmine.org/ * per project forums added * added the ability to archive projects -* added Watch functionality on issues. It allows users to receive notifications about issue changes +* added �Watch� functionality on issues. It allows users to receive notifications about issue changes * custom fields for issues can now be used as filters on issue list * added per user custom queries * commit messages are now scanned for referenced or fixed issue IDs (keywords defined in Admin -> Settings) @@ -1217,7 +1242,7 @@ http://www.redmine.org/ * added swedish translation (Thomas Habets) * italian translation update (Alessio Spadaro) * japanese translation update (Satoru Kurashiki) -* fixed: error on history atom feed when theres no notes on an issue change +* fixed: error on history atom feed when there�s no notes on an issue change * fixed: error in journalizing an issue with longtext custom fields (Postgresql) * fixed: creation of Oracle schema * fixed: last day of the month not included in project activity diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb index f187ba2b959..885fe4d4eae 100644 --- a/lib/redmine/version.rb +++ b/lib/redmine/version.rb @@ -4,7 +4,7 @@ module Redmine module VERSION #:nodoc: MAJOR = 1 MINOR = 0 - TINY = 3 + TINY = 4 # Branch values: # * official release: nil From a67f06910b658db0a190953ec73e1ad5097e6423 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Mon, 29 Nov 2010 19:34:56 +0000 Subject: [PATCH 226/240] Merged r4449 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4450 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/tasks/migrate_from_trac.rake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake index d99e4a32a6e..0510be51e69 100644 --- a/lib/tasks/migrate_from_trac.rake +++ b/lib/tasks/migrate_from_trac.rake @@ -167,7 +167,7 @@ namespace :redmine do has_many :attachments, :class_name => "TracAttachment", :finder_sql => "SELECT DISTINCT attachment.* FROM #{TracMigrate::TracAttachment.table_name}" + " WHERE #{TracMigrate::TracAttachment.table_name}.type = 'ticket'" + - ' AND #{TracMigrate::TracAttachment.table_name}.id = \'#{id}\'' + ' AND #{TracMigrate::TracAttachment.table_name}.id = \'#{TracMigrate::TracAttachment.connection.quote_string(id.to_s)}\'' has_many :customs, :class_name => "TracTicketCustom", :foreign_key => :ticket def ticket_type @@ -207,7 +207,7 @@ namespace :redmine do has_many :attachments, :class_name => "TracAttachment", :finder_sql => "SELECT DISTINCT attachment.* FROM #{TracMigrate::TracAttachment.table_name}" + " WHERE #{TracMigrate::TracAttachment.table_name}.type = 'wiki'" + - ' AND #{TracMigrate::TracAttachment.table_name}.id = \'#{id}\'' + ' AND #{TracMigrate::TracAttachment.table_name}.id = \'#{TracMigrate::TracAttachment.connection.quote_string(id.to_s)}\'' def self.columns # Hides readonly Trac field to prevent clash with AR readonly? method (Rails 2.0) From bd8e8bc71b717d94134cacdad9b48795341c4056 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 7 Dec 2010 22:05:20 +0000 Subject: [PATCH 227/240] Fixed: error when sending notification on wiki edit for bg, es, zh-TW locales (#7024). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4478 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/bg.yml | 8 ++++---- config/locales/es.yml | 8 ++++---- config/locales/zh-TW.yml | 8 ++++---- test/unit/mailer_test.rb | 20 ++++++++++++++++++++ 4 files changed, 32 insertions(+), 12 deletions(-) diff --git a/config/locales/bg.yml b/config/locales/bg.yml index a1eb8aad352..f4e3e32f2ee 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -808,12 +808,12 @@ bg: text_wiki_page_destroy_children: Изтриване на страниците деца и всички техни descendants setting_password_min_length: Минимална дължина на парола field_group_by: Групиране на резултатите по - mail_subject_wiki_content_updated: "Wiki страницата '{{id}}' не беше обновена" + mail_subject_wiki_content_updated: "Wiki страницата '{{page}}' не беше обновена" label_wiki_content_added: Wiki страница беше добавена - mail_subject_wiki_content_added: "Wiki страницата '{{id}}' беше добавена" - mail_body_wiki_content_added: Wiki страницата '{{id}}' беше добавена от {{author}}. + mail_subject_wiki_content_added: "Wiki страницата '{{page}}' беше добавена" + mail_body_wiki_content_added: Wiki страницата '{{page}}' беше добавена от {{author}}. label_wiki_content_updated: Wiki страница беше обновена - mail_body_wiki_content_updated: Wiki страницата '{{id}}' беше обновена от {{author}}. + mail_body_wiki_content_updated: Wiki страницата '{{page}}' беше обновена от {{author}}. permission_add_project: Създаване на проект setting_new_project_user_role_id: Роля, давана на потребител, създаващ проекти, който не е администратор label_view_all_revisions: Разглеждане на всички ревизии diff --git a/config/locales/es.yml b/config/locales/es.yml index f29d96f1e42..34e19b15865 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -853,12 +853,12 @@ es: text_wiki_page_destroy_children: Eliminar páginas hijas y todos sus descendientes setting_password_min_length: Longitud mínima de la contraseña field_group_by: Agrupar resultados por - mail_subject_wiki_content_updated: "La página wiki '{{id}}' ha sido actualizada" + mail_subject_wiki_content_updated: "La página wiki '{{page}}' ha sido actualizada" label_wiki_content_added: Página wiki añadida - mail_subject_wiki_content_added: "Se ha añadido la página wiki '{{id}}'." - mail_body_wiki_content_added: "{{author}} ha añadido la página wiki '{{id}}'." + mail_subject_wiki_content_added: "Se ha añadido la página wiki '{{page}}'." + mail_body_wiki_content_added: "{{author}} ha añadido la página wiki '{{page}}'." label_wiki_content_updated: Página wiki actualizada - mail_body_wiki_content_updated: La página wiki '{{id}}' ha sido actualizada por {{author}}. + mail_body_wiki_content_updated: La página wiki '{{page}}' ha sido actualizada por {{author}}. permission_add_project: Crear proyecto setting_new_project_user_role_id: Permiso asignado a un usuario no-administrador para crear proyectos label_view_all_revisions: Ver todas las revisiones diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 3c4672d96d9..a219ae120f6 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -278,10 +278,10 @@ mail_body_account_activation_request: "有位新用戶 ({{value}}) 已經完成註冊，正等候您的審核：" mail_subject_reminder: "您有 {{count}} 個項目即將到期 ({{days}})" mail_body_reminder: "{{count}} 個指派給您的項目，將於 {{days}} 天之內到期：" - mail_subject_wiki_content_added: "'{{id}}' wiki 頁面已被新增" - mail_body_wiki_content_added: "The '{{id}}' wiki 頁面已被 {{author}} 新增。" - mail_subject_wiki_content_updated: "'{{id}}' wiki 頁面已被更新" - mail_body_wiki_content_updated: "The '{{id}}' wiki 頁面已被 {{author}} 更新。" + mail_subject_wiki_content_added: "'{{page}}' wiki 頁面已被新增" + mail_body_wiki_content_added: "The '{{page}}' wiki 頁面已被 {{author}} 新增。" + mail_subject_wiki_content_updated: "'{{page}}' wiki 頁面已被更新" + mail_body_wiki_content_updated: "The '{{page}}' wiki 頁面已被 {{author}} 更新。" gui_validation_error: 1 個錯誤 gui_validation_error_plural: "{{count}} 個錯誤" diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb index 77bcb36f654..aec35a41101 100644 --- a/test/unit/mailer_test.rb +++ b/test/unit/mailer_test.rb @@ -305,6 +305,26 @@ def test_message_posted end end + def test_wiki_content_added + content = WikiContent.find(:first) + valid_languages.each do |lang| + Setting.default_language = lang.to_s + assert_difference 'ActionMailer::Base.deliveries.size' do + assert Mailer.deliver_wiki_content_added(content) + end + end + end + + def test_wiki_content_updated + content = WikiContent.find(:first) + valid_languages.each do |lang| + Setting.default_language = lang.to_s + assert_difference 'ActionMailer::Base.deliveries.size' do + assert Mailer.deliver_wiki_content_updated(content) + end + end + end + def test_account_information user = User.find(2) valid_languages.each do |lang| From 142b837271d841d91cacf29711208cff9e8e2264 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 18 Dec 2010 13:42:50 +0000 Subject: [PATCH 228/240] Backported r4530 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4531 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/issues/show.rhtml | 2 +- test/functional/issues_controller_test.rb | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml index b3493cf7c34..79feee58d92 100644 --- a/app/views/issues/show.rhtml +++ b/app/views/issues/show.rhtml @@ -47,7 +47,7 @@
    -<%= link_to_remote_if_authorized(l(:button_quote), { :url => {:action => 'reply', :id => @issue} }, :class => 'icon icon-comment') unless @issue.description.blank? %> +<%= link_to_remote_if_authorized(l(:button_quote), { :url => {:controller => 'journals', :action => 'new', :id => @issue} }, :class => 'icon icon-comment') unless @issue.description.blank? %>

    <%=l(:field_description)%>

    diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 6cb4f1d9c42..b9be0f4b0bd 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -250,6 +250,9 @@ def test_show_by_manager get :show, :id => 1 assert_response :success + assert_tag :tag => 'a', + :content => /Quote/ + assert_tag :tag => 'form', :descendant => { :tag => 'fieldset', :child => { :tag => 'legend', From fdaf58765269f448e7e0e900afec3cc369d3a00e Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 18 Dec 2010 13:53:34 +0000 Subject: [PATCH 229/240] Merged r4516 from trunk (i18n 0.4.2 gem is now required: 'gem install -v=0.4.2 i18n', see #7013). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4532 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/boot.rb | 12 ++++++++++++ config/initializers/10-patches.rb | 2 +- lib/redmine/i18n.rb | 4 ++-- test/unit/lib/redmine/i18n_test.rb | 8 ++++---- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/config/boot.rb b/config/boot.rb index dd5e3b69164..95bd6b88535 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -106,5 +106,17 @@ def read_environment_rb end end +# TODO: Workaround for #7013 to be removed for 1.2.0 +# Loads i18n 0.4.2 before Rails loads any more recent gem +# 0.5.0 is not compatible with the old interpolation syntax +# Plugins will have to migrate to the new syntax for 1.2.0 +require 'rubygems' +begin + gem 'i18n', '0.4.2' +rescue Gem::LoadError => load_error + $stderr.puts %(Missing the i18n 0.4.2 gem. Please `gem install -v=0.4.2 i18n`) + exit 1 +end + # All that for this: Rails.boot! diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb index 096ea0cd168..3d00a263818 100644 --- a/config/initializers/10-patches.rb +++ b/config/initializers/10-patches.rb @@ -86,7 +86,7 @@ module Backend module Base def warn_syntax_deprecation!(*args) return if @skip_syntax_deprecation - warn "The {{key}} interpolation syntax in I18n messages is deprecated. Please use %{key} instead.\nDowngrade your i18n gem to 0.3.7 (everything above must be deinstalled) to remove this warning, see http://www.redmine.org/issues/5608 for more information." + warn "The {{key}} interpolation syntax in I18n messages is deprecated and will be removed in Redmine 1.2. Please use %{key} instead, see http://www.redmine.org/issues/7013 for more information." @skip_syntax_deprecation = true end end diff --git a/lib/redmine/i18n.rb b/lib/redmine/i18n.rb index e7aac9f7ec4..1bfca81e441 100644 --- a/lib/redmine/i18n.rb +++ b/lib/redmine/i18n.rb @@ -37,7 +37,7 @@ def ll(lang, str, value=nil) def format_date(date) return nil unless date - Setting.date_format.blank? ? ::I18n.l(date.to_date, :count => date.strftime('%d')) : date.strftime(Setting.date_format) + Setting.date_format.blank? ? ::I18n.l(date.to_date) : date.strftime(Setting.date_format) end def format_time(time, include_date = true) @@ -45,7 +45,7 @@ def format_time(time, include_date = true) time = time.to_time if time.is_a?(String) zone = User.current.time_zone local = zone ? time.in_time_zone(zone) : (time.utc? ? time.localtime : time) - Setting.time_format.blank? ? ::I18n.l(local, :count => local.strftime('%d'), :format => (include_date ? :default : :time)) : + Setting.time_format.blank? ? ::I18n.l(local, :format => (include_date ? :default : :time)) : ((include_date ? "#{format_date(time)} " : "") + "#{local.strftime(Setting.time_format)}") end diff --git a/test/unit/lib/redmine/i18n_test.rb b/test/unit/lib/redmine/i18n_test.rb index df1942e95b5..666bd7481f2 100644 --- a/test/unit/lib/redmine/i18n_test.rb +++ b/test/unit/lib/redmine/i18n_test.rb @@ -29,7 +29,7 @@ def test_date_format_default set_language_if_valid 'en' today = Date.today Setting.date_format = '' - assert_equal I18n.l(today, :count => today.strftime('%d')), format_date(today) + assert_equal I18n.l(today), format_date(today) end def test_date_format @@ -47,7 +47,7 @@ def test_date_and_time_for_each_language format_date(Date.today) format_time(Time.now) format_time(Time.now, false) - assert_not_equal 'default', ::I18n.l(Date.today, :count => Date.today.strftime('%d'), :format => :default), "date.formats.default missing in #{lang}" + assert_not_equal 'default', ::I18n.l(Date.today, :format => :default), "date.formats.default missing in #{lang}" assert_not_equal 'time', ::I18n.l(Time.now, :format => :time), "time.formats.time missing in #{lang}" end assert l('date.day_names').is_a?(Array) @@ -63,8 +63,8 @@ def test_time_format_default now = Time.now Setting.date_format = '' Setting.time_format = '' - assert_equal I18n.l(now, :count => now.strftime('%d')), format_time(now) - assert_equal I18n.l(now, :count => now.strftime('%d'), :format => :time), format_time(now, false) + assert_equal I18n.l(now), format_time(now) + assert_equal I18n.l(now, :format => :time), format_time(now, false) end def test_time_format From f4ada319d1e877dccb262da9ae0021a21c9b1bef Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 18 Dec 2010 17:13:13 +0000 Subject: [PATCH 230/240] Merged r4535 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4536 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/journals_controller.rb | 1 + test/functional/journals_controller_test.rb | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index a3b1abde4d7..d3b56e8cb8c 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -19,6 +19,7 @@ class JournalsController < ApplicationController before_filter :find_journal, :only => [:edit] before_filter :find_issue, :only => [:new] before_filter :find_optional_project, :only => [:index] + before_filter :authorize, :only => [:new, :edit] accept_key_auth :index helper :issues diff --git a/test/functional/journals_controller_test.rb b/test/functional/journals_controller_test.rb index 83e015af6dd..b49a860eaac 100644 --- a/test/functional/journals_controller_test.rb +++ b/test/functional/journals_controller_test.rb @@ -40,14 +40,20 @@ def test_index def test_reply_to_issue @request.session[:user_id] = 2 - get :new, :id => 1 + get :new, :id => 6 assert_response :success assert_select_rjs :show, "update" end + + def test_reply_to_issue_without_permission + @request.session[:user_id] = 7 + get :new, :id => 6 + assert_response 403 + end def test_reply_to_note @request.session[:user_id] = 2 - get :new, :id => 1, :journal_id => 2 + get :new, :id => 6, :journal_id => 4 assert_response :success assert_select_rjs :show, "update" end From cb30fa49fc81a66c0a9002dc19b4fac4618e4643 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 18 Dec 2010 17:22:43 +0000 Subject: [PATCH 231/240] Merged r4468 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4538 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redcloth3.rb | 2 +- test/unit/helpers/application_helper_test.rb | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/redcloth3.rb b/lib/redcloth3.rb index ffc0e1186be..4d8e934f569 100644 --- a/lib/redcloth3.rb +++ b/lib/redcloth3.rb @@ -1078,7 +1078,7 @@ def rip_offtags( text, escape_aftertag=true ) line = "" first.match(/<#{ OFFTAGS }([^>]*)>/) tag = $1 - $2.to_s.match(/(class\=\S+)/i) + $2.to_s.match(/(class\=("[^"]+"|'[^']+'))/i) tag << " #{$1}" if $1 @pre_list << "<#{ tag }>#{ aftertag }" end diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb index 16ef6018276..dd848630427 100644 --- a/test/unit/helpers/application_helper_test.rb +++ b/test/unit/helpers/application_helper_test.rb @@ -284,6 +284,9 @@ def test_html_tags "