Merged r11599, r11600, r11601 from trunk to 2.3-stable (#13438)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11602 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/config/configuration.yml.example b/config/configuration.yml.example
index 4c14fa8f196be824d360f88098b68a5585543277..27eb86f68a3f28b1ef8815264100dc93e7c8a9de 100644 (file)
--- a/config/configuration.yml.example
+++ b/config/configuration.yml.example
@@ -133,7 +133,7 @@ default:
   scm_bazaar_command:
   scm_darcs_command:
 
-  # Absolute path to the scm commands errors (stderr) log file.
+  # Absolute path to the SCM commands errors (stderr) log file.
   # The default is to log in the 'log' directory of your Redmine instance.
   # Example:
   # scm_stderr_log_file: /var/log/redmine_scm_stderr.log

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index f70f45a8ce57dfd408897e9effe200d9a3995997..d7f95128e5873bc10688b22fbe2b20908c1753c2 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -360,7 +360,6 @@ bg:
   setting_cross_project_subtasks: Подзадачи от други проекти
   setting_issue_list_default_columns: Показвани колони по подразбиране
   setting_repositories_encodings: Кодова таблица на прикачените файлове и хранилищата
-  setting_emails_header: Emails header
   setting_emails_footer: Подтекст за e-mail
   setting_protocol: Протокол
   setting_per_page_options: Опции за страниране
@@ -1084,3 +1083,4 @@ bg:
   description_date_to: Въведете крайна дата
   text_repository_identifier_info: 'Позволени са малки букви (a-z), цифри, тирета и _.<br />Промяна след създаването му не е възможна.'
   label_total_time: Общо
+  setting_emails_header: Email header

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index cec979ee43528042abec52687b3597c391589eb1..50f230014581c8af0233ac8bf4bcff85a600fa8f 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -938,7 +938,6 @@ bs:
   label_principal_search: "Search for user or group:"
   label_user_search: "Search for user:"
   field_visible: Visible
-  setting_emails_header: Emails header
   setting_commit_logtime_activity_id: Activity for logged time
   text_time_logged_by_changeset: Applied in changeset %{value}.
   setting_commit_logtime_enabled: Enable time logging
@@ -979,8 +978,6 @@ bs:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1100,3 +1097,6 @@ bs:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Ukupno
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
+  setting_emails_header: Email header

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index e01b7dcbf65c48f99c20c602e24d8f7091770d01..f9e6a40fc7eb29d62ca709ce2f103a9fb055ba27 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -927,7 +927,6 @@ ca:
   label_principal_search: "Search for user or group:"
   label_user_search: "Search for user:"
   field_visible: Visible
-  setting_emails_header: Emails header
   setting_commit_logtime_activity_id: Activity for logged time
   text_time_logged_by_changeset: Applied in changeset %{value}.
   setting_commit_logtime_enabled: Enable time logging
@@ -968,8 +967,6 @@ ca:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1089,3 +1086,6 @@ ca:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Total
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
+  setting_emails_header: Email header

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 1cdc4d4cde5572985f912eb58689669056b3e463..48a94fec75eb6a2b24c1afb895b7a016fbc9e45f 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -941,7 +941,6 @@ da:
   label_principal_search: "Søg efter bruger eller gruppe:"
   label_user_search: "Søg efter bruger:"
   field_visible: Synlig
-  setting_emails_header: Emails header
   setting_commit_logtime_activity_id: Aktivitet for registreret tid
   text_time_logged_by_changeset: Anvendt i changeset %{value}.
   setting_commit_logtime_enabled: Aktiver tidsregistrering
@@ -983,8 +982,6 @@ da:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1104,3 +1101,6 @@ da:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Total
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
+  setting_emails_header: Email header

diff --git a/config/locales/el.yml b/config/locales/el.yml
index f122dd0586e9a1bf5715ce9b6046189d1e4900a0..ba00cae28393f593f3a45b47750146ae014939df 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -925,7 +925,6 @@ el:
   label_principal_search: "Search for user or group:"
   label_user_search: "Search for user:"
   field_visible: Visible
-  setting_emails_header: Emails header
   setting_commit_logtime_activity_id: Activity for logged time
   text_time_logged_by_changeset: Applied in changeset %{value}.
   setting_commit_logtime_enabled: Enable time logging
@@ -966,8 +965,6 @@ el:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1087,3 +1084,6 @@ el:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Σύνολο
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
+  setting_emails_header: Email header

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index d1dafe679d86721b820b94b5250aa2509a876c4f..ceaba1ed52a55988d231b5f7c79bacafa2ebe670 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -338,8 +338,8 @@ en-GB:
   setting_time_format: Time format
   setting_cross_project_issue_relations: Allow cross-project issue relations
   setting_issue_list_default_columns: Default columns displayed on the issue list
-  setting_emails_header: Emails header
-  setting_emails_footer: Emails footer
+  setting_emails_header: Email header
+  setting_emails_footer: Email footer
   setting_protocol: Protocol
   setting_per_page_options: Objects per page options
   setting_user_format: Users display format
@@ -972,8 +972,8 @@ en-GB:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   label_diff: diff

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ba16af6ed8da10e1e580780f26d98eda58f40675..135d078d385f089d42c7a0cb06868b2cd56b1198 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -359,8 +359,8 @@ en:
   setting_cross_project_subtasks: Allow cross-project subtasks
   setting_issue_list_default_columns: Default columns displayed on the issue list
   setting_repositories_encodings: Attachments and repositories encodings
-  setting_emails_header: Emails header
-  setting_emails_footer: Emails footer
+  setting_emails_header: Email header
+  setting_emails_footer: Email footer
   setting_protocol: Protocol
   setting_per_page_options: Objects per page options
   setting_user_format: Users display format
@@ -1027,8 +1027,8 @@ en:
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
   text_scm_command_version: Version
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
   text_issue_conflict_resolution_overwrite: "Apply my changes anyway (previous notes will be kept but some changes may be overwritten)"
   text_issue_conflict_resolution_add_notes: "Add my notes and discard my other changes"
   text_issue_conflict_resolution_cancel: "Discard all my changes and redisplay %{link}"

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 5518d4be5ee8b98a701493ecdeb05124e5229929..e0aa83153ad61e84e4febc1888db8a6bb3e8c06a 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -967,8 +967,6 @@ eu:
   text_scm_command: Komandoa
   text_scm_command_version: Bertsioa
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1088,3 +1086,5 @@ eu:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Guztira
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index a70578876568b5753d2bf28b223e4426546925af..d31c1f707b6472dbfb798c0d547a7ea69efcd204 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -968,8 +968,6 @@ fa:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1089,3 +1087,5 @@ fa:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: جمله
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index e05aa6ef2a779667cb60ea51f31eb499870f89fe..97564e793120a7bec7ec5519071c8ec00f79deee 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -946,7 +946,6 @@ fi:
   label_principal_search: "Search for user or group:"
   label_user_search: "Search for user:"
   field_visible: Visible
-  setting_emails_header: Emails header
   setting_commit_logtime_activity_id: Activity for logged time
   text_time_logged_by_changeset: Applied in changeset %{value}.
   setting_commit_logtime_enabled: Enable time logging
@@ -987,8 +986,6 @@ fi:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1108,3 +1105,6 @@ fi:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Yhteensä
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
+  setting_emails_header: Email header

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index bf0d742a4e8251b0bef9e369ba70a13c5e112850..ca14126f8cc0c345ad2386d5bfe915f6f2fb4981 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -936,7 +936,6 @@ gl:
   label_principal_search: "Search for user or group:"
   label_user_search: "Search for user:"
   field_visible: Visible
-  setting_emails_header: Emails header
   setting_commit_logtime_activity_id: Activity for logged time
   text_time_logged_by_changeset: Applied in changeset %{value}.
   setting_commit_logtime_enabled: Enable time logging
@@ -977,8 +976,6 @@ gl:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1098,3 +1095,6 @@ gl:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Total
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
+  setting_emails_header: Email header

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 83e1ec9533159ecc96d0c750f69b249b57b003c0..c7ace5a9ec57c5753fc387428e55db7c84822471 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -930,7 +930,6 @@ he:
   label_principal_search: "Search for user or group:"
   label_user_search: "Search for user:"
   field_visible: Visible
-  setting_emails_header: Emails header
   setting_commit_logtime_activity_id: Activity for logged time
   text_time_logged_by_changeset: Applied in changeset %{value}.
   setting_commit_logtime_enabled: Enable time logging
@@ -971,8 +970,6 @@ he:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1092,3 +1089,6 @@ he:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: סה"כ
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
+  setting_emails_header: Email header

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 007c9fa093a575294b873e465d0b5271685e15f4..26274f7751ac159f4a0478fd365c57ebb9c9c0c2 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -926,7 +926,6 @@ hr:
   label_principal_search: "Search for user or group:"
   label_user_search: "Search for user:"
   field_visible: Visible
-  setting_emails_header: Emails header
   setting_commit_logtime_activity_id: Activity for logged time
   text_time_logged_by_changeset: Applied in changeset %{value}.
   setting_commit_logtime_enabled: Enable time logging
@@ -967,8 +966,6 @@ hr:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1088,3 +1085,6 @@ hr:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Ukupno
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
+  setting_emails_header: Email header

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 2544bd77df54d0bbe619395f37f621d16c96fedf..4ffe7516cedc7b11822e9e1622fd9a24240e4a66 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -985,8 +985,6 @@
   text_scm_command: Parancs
   text_scm_command_version: Verzió
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1106,3 +1104,5 @@
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Összesen
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.

diff --git a/config/locales/id.yml b/config/locales/id.yml
index 248e687bc31b6865b2a2d5299fc53c09b23618a4..5dc5afeb59025da29247af109a707a1590ad0c65 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -929,7 +929,6 @@ id:
   label_principal_search: "Search for user or group:"
   label_user_search: "Search for user:"
   field_visible: Visible
-  setting_emails_header: Emails header
   setting_commit_logtime_activity_id: Activity for logged time
   text_time_logged_by_changeset: Applied in changeset %{value}.
   setting_commit_logtime_enabled: Enable time logging
@@ -970,8 +969,6 @@ id:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1091,3 +1088,6 @@ id:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Total
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
+  setting_emails_header: Email header

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 1159854f719d2d5bd35c9e7bae384f825665fea5..9fa64089a9d72595e5e3387c214328d3142f5a48 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1008,8 +1008,6 @@ lt:
   text_mercurial_repository_note: Vietinė saugykla (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Komanda
   text_scm_command_version: Versija
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
 
   default_role_manager: Vadovas
   default_role_developer: Projektuotojas
@@ -1146,3 +1144,5 @@ lt:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Iš viso
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 4dddbf0b4faf565f8295fd2770a3bed44092bae8..9c3de74165b3939910ad428e37b3a1c33239d54d 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -919,7 +919,6 @@ lv:
   label_principal_search: "Search for user or group:"
   label_user_search: "Search for user:"
   field_visible: Visible
-  setting_emails_header: Emails header
   setting_commit_logtime_activity_id: Activity for logged time
   text_time_logged_by_changeset: Applied in changeset %{value}.
   setting_commit_logtime_enabled: Enable time logging
@@ -960,8 +959,6 @@ lv:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1081,3 +1078,6 @@ lv:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Kopā
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
+  setting_emails_header: Email header

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index f8afade89a530595e1851e29d40ac331c9e7baae..61b219c312fcafbcc8c9b61281000063d78e5e0c 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -327,7 +327,6 @@ mk:
   setting_time_format: Формат на време
   setting_cross_project_issue_relations: Дозволи релации на задачи меѓу проекти
   setting_issue_list_default_columns: Default columns displayed on the issue list
-  setting_emails_footer: Emails footer
   setting_protocol: Протокол
   setting_per_page_options: Objects per page options
   setting_user_format: Приказ на корисниците
@@ -925,7 +924,6 @@ mk:
   label_principal_search: "Search for user or group:"
   label_user_search: "Search for user:"
   field_visible: Visible
-  setting_emails_header: Emails header
   setting_commit_logtime_activity_id: Activity for logged time
   text_time_logged_by_changeset: Applied in changeset %{value}.
   setting_commit_logtime_enabled: Enable time logging
@@ -966,8 +964,6 @@ mk:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1087,3 +1083,7 @@ mk:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Вкупно
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
+  setting_emails_footer: Email footer
+  setting_emails_header: Email header

diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index d3eb70ec92b03f8cf642371b5635ae4e37f025d3..3598693738ba1b3f5c75edfd67670e83c466e355 100644 (file)
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -926,7 +926,6 @@ mn:
   label_principal_search: "Search for user or group:"
   label_user_search: "Search for user:"
   field_visible: Visible
-  setting_emails_header: Emails header
   setting_commit_logtime_activity_id: Activity for logged time
   text_time_logged_by_changeset: Applied in changeset %{value}.
   setting_commit_logtime_enabled: Enable time logging
@@ -967,8 +966,6 @@ mn:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1088,3 +1085,6 @@ mn:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Нийт
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
+  setting_emails_header: Email header

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index cbaea2e20ac31c36a887a379fd27b68c8e31375d..806dc55683745868148c876a8c4b14b3d67c8c78 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -908,7 +908,6 @@ nl:
   label_principal_search: "Zoek naar gebruiker of groep:"
   label_user_search: "Zoek naar gebruiker:"
   field_visible: Zichtbaar
-  setting_emails_header: Emails header
   setting_commit_logtime_activity_id: Standaard activiteit voor tijdregistratie
   text_time_logged_by_changeset: Toegepast in changeset %{value}.
   setting_commit_logtime_enabled: Activeer tijdregistratie
@@ -1069,3 +1068,4 @@ nl:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Totaal
+  setting_emails_header: Email header

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index ff6eff31a1954b8bfef0492a9c95260ba8c46c6a..c9ff4dd58c42f884e41c0d1ece3793a8ec3a1115 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -946,7 +946,6 @@ pl:
   label_principal_search: "Szukaj użytkownika lub grupy:"
   label_user_search: "Szukaj użytkownika:"
   field_visible: Visible
-  setting_emails_header: Emails header
   setting_commit_logtime_activity_id: Activity for logged time
   text_time_logged_by_changeset: Applied in changeset %{value}.
   setting_commit_logtime_enabled: Enable time logging
@@ -987,8 +986,6 @@ pl:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1108,3 +1105,6 @@ pl:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Ogółem
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
+  setting_emails_header: Email header

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index ef7f0854f4ed4d1f013a9d4b3039dfd325234651..6f72e7b8b1d0c548d464fb4a5992a022882628cd 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -920,7 +920,6 @@ ro:
   label_principal_search: "Search for user or group:"
   label_user_search: "Search for user:"
   field_visible: Visible
-  setting_emails_header: Emails header
   setting_commit_logtime_activity_id: Activity for logged time
   text_time_logged_by_changeset: Applied in changeset %{value}.
   setting_commit_logtime_enabled: Enable time logging
@@ -961,8 +960,6 @@ ro:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1082,3 +1079,6 @@ ro:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Total
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
+  setting_emails_header: Email header

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index b9b4d6a0cfabe3d2581d6add3822764e050229e6..f8924c894c2cf8b34f165ead9aafad72826354e4 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -922,7 +922,6 @@ sk:
   label_principal_search: "Search for user or group:"
   label_user_search: "Search for user:"
   field_visible: Visible
-  setting_emails_header: Emails header
   setting_commit_logtime_activity_id: Activity for logged time
   text_time_logged_by_changeset: Applied in changeset %{value}.
   setting_commit_logtime_enabled: Enable time logging
@@ -963,8 +962,6 @@ sk:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1084,3 +1081,6 @@ sk:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Celkovo
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
+  setting_emails_header: Email header

diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 3336181c5746c45a2707839902a8b365635c4dc8..05e5a6f792f6fddf554012f491075bad48ccb666 100644 (file)
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -351,8 +351,6 @@ sq:
   setting_cross_project_issue_relations: Allow cross-project issue relations
   setting_issue_list_default_columns: Default columns displayed on the issue list
   setting_repositories_encodings: Attachments and repositories encodings
-  setting_emails_header: Emails header
-  setting_emails_footer: Emails footer
   setting_protocol: Protocol
   setting_per_page_options: Objects per page options
   setting_user_format: Users display format
@@ -971,8 +969,6 @@ sq:
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
   text_scm_command_version: Version
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   text_issue_conflict_resolution_overwrite: "Apply my changes anyway (previous notes will be kept but some changes may be overwritten)"
   text_issue_conflict_resolution_add_notes: "Add my notes and discard my other changes"
   text_issue_conflict_resolution_cancel: "Discard all my changes and redisplay %{link}"
@@ -1083,3 +1079,7 @@ sq:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Total
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
+  setting_emails_footer: Email footer
+  setting_emails_header: Email header

diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
index 86590627afa5bed38adf075b8d534aa4355423d7..3b53e6ee536f4fd19751f63207d0f0698a16431c 100644 (file)
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -968,8 +968,6 @@ sr-YU:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1089,3 +1087,5 @@ sr-YU:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Ukupno
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index c06be94d4f0fac15d0d3c35b7ab5e7cbaace45bf..f5573c96ca565b2c6f7016cab1cf54f5a5380882 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -926,7 +926,6 @@ sr:
   label_principal_search: "Search for user or group:"
   label_user_search: "Search for user:"
   field_visible: Visible
-  setting_emails_header: Emails header
   setting_commit_logtime_activity_id: Activity for logged time
   text_time_logged_by_changeset: Applied in changeset %{value}.
   setting_commit_logtime_enabled: Enable time logging
@@ -967,8 +966,6 @@ sr:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1088,3 +1085,6 @@ sr:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Укупно
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
+  setting_emails_header: Email header

diff --git a/config/locales/th.yml b/config/locales/th.yml
index 326a261a65c5b56dd6e663623749171c42c53049..a7e1255ea5d1de7d0348c777910d678c5d4f67fb 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -922,7 +922,6 @@ th:
   label_principal_search: "Search for user or group:"
   label_user_search: "Search for user:"
   field_visible: Visible
-  setting_emails_header: Emails header
   setting_commit_logtime_activity_id: Activity for logged time
   text_time_logged_by_changeset: Applied in changeset %{value}.
   setting_commit_logtime_enabled: Enable time logging
@@ -963,8 +962,6 @@ th:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1084,3 +1081,6 @@ th:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: จำนวนรวม
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
+  setting_emails_header: Email header

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 383b0b889b5a7056994717d98c9e53c48a6207fc..757af1a911ceca0d1e91e33100c044c0a3a4a141 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -985,8 +985,6 @@ tr:
   text_scm_command: Komut
   text_scm_command_version: Sürüm
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1106,3 +1104,5 @@ tr:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Toplam
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 821ec254b997716cab32438b69fc9525f6a22410..ddfd3ffa3ab5b7dac964461fb50c2e4c22d2d049 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -922,7 +922,6 @@ uk:
   label_principal_search: "Search for user or group:"
   label_user_search: "Search for user:"
   field_visible: Visible
-  setting_emails_header: Emails header
   setting_commit_logtime_activity_id: Activity for logged time
   text_time_logged_by_changeset: Applied in changeset %{value}.
   setting_commit_logtime_enabled: Enable time logging
@@ -963,8 +962,6 @@ uk:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
   notice_issue_successful_create: Issue %{id} created.
   label_between: between
   setting_issue_group_assignment: Allow issue assignment to groups
@@ -1082,3 +1079,6 @@ uk:
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Всього
+  text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
+  setting_emails_header: Email header