Merged r5950 to r5960 from trunk.

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

48 files changed, 183 insertions, 31 deletions

diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index a5f10586c..4c7a7c44e 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -33,7 +33,9 @@ module SettingsHelper
       choices = [[blank_text.is_a?(Symbol) ? l(blank_text) : blank_text, '']] + choices
     end
     setting_label(setting, options) +
-      select_tag("settings[#{setting}]", options_for_select(choices, Setting.send(setting).to_s), options)
+      select_tag("settings[#{setting}]",
+                 options_for_select(choices, Setting.send(setting).to_s),
+                 options)
   end
 
   def setting_multiselect(setting, choices, options={})
@@ -44,10 +46,15 @@ module SettingsHelper
       hidden_field_tag("settings[#{setting}][]", '') +
       choices.collect do |choice|
         text, value = (choice.is_a?(Array) ? choice : [choice, choice])
-        content_tag('label',
-          check_box_tag("settings[#{setting}][]", value, Setting.send(setting).include?(value)) + text.to_s,
+        content_tag(
+          'label',
+          check_box_tag(
+             "settings[#{setting}][]",
+             value,
+             Setting.send(setting).include?(value)
+           ) + text.to_s,
           :class => 'block'
-        )
+         )
       end.join
   end
 
@@ -64,7 +71,7 @@ module SettingsHelper
   def setting_check_box(setting, options={})
     setting_label(setting, options) +
       hidden_field_tag("settings[#{setting}]", 0) +
-      check_box_tag("settings[#{setting}]", 1, Setting.send("#{setting}?"), options)
+        check_box_tag("settings[#{setting}]", 1, Setting.send("#{setting}?"), options)
   end
 
   def setting_label(setting, options={})
diff --git a/app/views/projects/settings/_repository.rhtml b/app/views/projects/settings/_repository.rhtml
index 57406a8ba..3bd3b4338 100644
--- a/app/views/projects/settings/_repository.rhtml
+++ b/app/views/projects/settings/_repository.rhtml
@@ -8,12 +8,9 @@
 <div class="box tabular">
 <p>
 <%= label_tag('repository_scm', l(:label_scm)) %><%= scm_select_tag(@repository) %>
-<% if @repository %>
-<br />
-<%= image_tag((@repository.class.scm_available ? 'true.png' : 'exclamation.png'))%>
-<%=  l(:text_scm_command) -%>: <%= @repository.class.scm_command %>
-|
-<%=  l(:text_scm_command_version) -%>: <%= @repository.class.scm_version_string %>
+<% if @repository && ! @repository.class.scm_available %>
+	<br />
+	<em><%= content_tag 'span', l(:text_scm_command_not_available), :class => 'error' %></em>
 <% end %>
 </p>
 <% button_disabled = true %>
diff --git a/app/views/settings/_repositories.rhtml b/app/views/settings/_repositories.rhtml
index f5fdc154e..b3c252f16 100644
--- a/app/views/settings/_repositories.rhtml
+++ b/app/views/settings/_repositories.rhtml
@@ -1,41 +1,95 @@
 <% form_tag({:action => 'edit', :tab => 'repositories'}) do %>
 
+<fieldset class="box tabular settings enabled_scm">
+<legend><%= l(:setting_enabled_scm) %></legend>
+<table>
+  <tr>
+    <th></th>
+    <th><%= l(:text_scm_command)         %></th>
+    <th><%= l(:text_scm_command_version) %></th>
+  </tr>
+  <% Redmine::Scm::Base.all.collect do |choice| %>
+    <% scm_class = "Repository::#{choice}".constantize %>
+    <% text, value = (choice.is_a?(Array) ? choice : [choice, choice]) %>
+    <% setting = :enabled_scm %>
+    <tr>
+      <td class="scm_name">
+        <%= 
+          check_box_tag(
+              "settings[#{setting}][]",
+               value,
+               Setting.send(setting).include?(value))
+         %>
+        <%= text.to_s %>
+      </td>
+      <td>
+         <%=
+           image_tag(
+              (scm_class.scm_available ? 'true.png' : 'exclamation.png'),
+              :style => "vertical-align:bottom;"
+           )
+           %>
+          <%= scm_class.scm_command %>
+       </td>
+       <td>
+          <%= scm_class.scm_version_string %>
+       </td>
+     </tr>
+  <% end %>
+</table>
+<p class="scm_config">
+<%= l(:text_scm_config) %>
+</p>
+</fieldset>
+
 <div class="box tabular settings">
 <p><%= setting_check_box :autofetch_changesets %></p>
 
 <p><%= setting_check_box :sys_api_enabled,
-         :onclick => "if (this.checked) { Form.Element.enable('settings_sys_api_key'); } else { Form.Element.disable('settings_sys_api_key'); }" %></p>
+                         :onclick =>
+                             "if (this.checked) { Form.Element.enable('settings_sys_api_key'); } else { Form.Element.disable('settings_sys_api_key'); }" %></p>
 
-<p><%= setting_text_field :sys_api_key, :size     => 30,
-                                        :id       => 'settings_sys_api_key',
-                                        :disabled => !Setting.sys_api_enabled?,
-                                        :label    => :setting_mail_handler_api_key %>
-  <%= link_to_function l(:label_generate_key), "if ($('settings_sys_api_key').disabled == false) { $('settings_sys_api_key').value = randomKey(20) }" %>
+<p><%= setting_text_field :sys_api_key,
+                          :size     => 30,
+                          :id       => 'settings_sys_api_key',
+                          :disabled => !Setting.sys_api_enabled?,
+                          :label    => :setting_mail_handler_api_key %>
+  <%= link_to_function l(:label_generate_key),
+                       "if ($('settings_sys_api_key').disabled == false) { $('settings_sys_api_key').value = randomKey(20) }" %>
 </p>
 
-<p><%= setting_multiselect(:enabled_scm, Redmine::Scm::Base.all) %></p>
-
 <p><%= setting_text_field :repositories_encodings, :size => 60 %><br />
 <em><%= l(:text_comma_separated) %></em></p>
 
 <p><%= setting_text_field :repository_log_display_limit, :size => 6 %></p>
 </div>
 
-<fieldset class="box tabular settings"><legend><%= l(:text_issues_ref_in_commit_messages) %></legend>
+<fieldset class="box tabular settings">
+<legend><%= l(:text_issues_ref_in_commit_messages) %></legend>
 <p><%= setting_text_field :commit_ref_keywords, :size => 30 %><br />
 <em><%= l(:text_comma_separated) %></em></p>
 
 <p><%= setting_text_field :commit_fix_keywords, :size => 30 %>
-&nbsp;<%= l(:label_applied_status) %>: <%= setting_select :commit_fix_status_id, [["", 0]] + IssueStatus.find(:all).collect{|status| [status.name, status.id.to_s]}, :label => false %>
-&nbsp;<%= l(:field_done_ratio) %>: <%= setting_select :commit_fix_done_ratio, (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] }, :blank => :label_no_change_option, :label => false %>
+&nbsp;<%= l(:label_applied_status) %>: <%= setting_select :commit_fix_status_id,
+                                                          [["", 0]] +
+                                                              IssueStatus.find(:all).collect{
+                                                                 |status| [status.name, status.id.to_s]
+                                                              },
+                                                          :label => false %>
+&nbsp;<%= l(:field_done_ratio) %>: <%= setting_select :commit_fix_done_ratio,
+                                                       (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] },
+                                                       :blank => :label_no_change_option,
+                                                       :label => false %>
 <br /><em><%= l(:text_comma_separated) %></em></p>
 
 <p><%= setting_check_box :commit_logtime_enabled,
-         :onclick => "if (this.checked) { Form.Element.enable('settings_commit_logtime_activity_id'); } else { Form.Element.disable('settings_commit_logtime_activity_id'); }"%></p>
+                         :onclick =>
+                            "if (this.checked) { Form.Element.enable('settings_commit_logtime_activity_id'); } else { Form.Element.disable('settings_commit_logtime_activity_id'); }"%></p>
 
 <p><%= setting_select :commit_logtime_activity_id,
-         [[l(:label_default), 0]] + TimeEntryActivity.shared.all.collect{|activity| [activity.name, activity.id.to_s]},
-         :disabled => !Setting.commit_logtime_enabled?%></p>
+                      [[l(:label_default), 0]] +
+                          TimeEntryActivity.shared.all.collect{|activity| [activity.name, activity.id.to_s]},
+                      :disabled => !Setting.commit_logtime_enabled?%></p>
 </fieldset>
 
 <%= submit_tag l(:button_save) %>
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 4cdae8f51..fa5c9308c 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -973,3 +973,5 @@ bg:
   enumeration_doc_categories: Категории документи
   enumeration_activities: Дейности (time tracking)
   enumeration_system_activity: Системна активност
+  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/bs.yml b/config/locales/bs.yml
index b14f25866..4dbd8817e 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -988,3 +988,5 @@ 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.
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index e980e7594..b7ee8a053 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -977,3 +977,5 @@ 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.
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index a990881d4..baa608f59 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -978,3 +978,5 @@ cs:
   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.
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 6d9d5cfbb..bd939c683 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -991,3 +991,5 @@ 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.
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 2c361bde0..5ce8fddac 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -991,3 +991,5 @@ de:
   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.
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 8fbb54e90..a7cfe2216 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -974,3 +974,5 @@ 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.
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 8a39e7839..8af3e684d 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -977,3 +977,5 @@ 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.
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 40d66093e..401d608c8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -867,17 +867,17 @@ en:
   button_quote: Quote
   button_duplicate: Duplicate
   button_show: Show
-  
+
   status_active: active
   status_registered: registered
   status_locked: locked
-  
+
   version_status_open: open
   version_status_locked: locked
   version_status_closed: closed
 
   field_active: Active
-  
+
   text_select_mail_notifications: Select actions for which email notifications should be sent.
   text_regexp_info: eg. ^[A-Z0-9]+$
   text_min_max_length_info: 0 means no restriction
@@ -946,6 +946,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.
 
   default_role_manager: Manager
   default_role_developer: Developer
diff --git a/config/locales/es.yml b/config/locales/es.yml
index ca4da6811..71a9c1ecc 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1011,3 +1011,5 @@ es:
   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.
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 29cc10c3c..296553389 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -978,3 +978,5 @@ 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.
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 880575600..6bba8ab71 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -977,3 +977,5 @@ 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.
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index fc87be145..85c2afff6 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -995,3 +995,5 @@ 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.
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index e9c2cd292..f0fa145ec 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -989,3 +989,5 @@ fr:
   text_scm_command: Commande
   text_scm_command_version: Version
   label_git_report_last_commit: Afficher le dernier commit des fichiers et répertoires
+  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/gl.yml b/config/locales/gl.yml
index 9e9c52bb4..87dacd7e0 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -986,3 +986,5 @@ 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.
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 6d78f736d..cb396537d 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -979,3 +979,5 @@ 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.
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 9eb8f6e2a..67be91a97 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -981,3 +981,5 @@ 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.
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index e9dc9cb51..fd79d85c8 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -993,3 +993,5 @@
   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.
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 580fdce02..b867c2e13 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -982,3 +982,5 @@ 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.
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 52b28c664..48dfd1790 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -975,3 +975,5 @@ it:
   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.
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index e6f75d021..11683d544 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -392,7 +392,7 @@ ja:
   setting_commit_logtime_enabled: コミット時に作業時間を記録する
   setting_commit_logtime_activity_id: 作業時間の作業分類
   setting_gantt_items_limit: ガントチャート最大表示項目数
-  
+
   permission_add_project: プロジェクトの追加
   permission_add_subprojects: サブプロジェクトの追加
   permission_edit_project: プロジェクトの編集
@@ -448,7 +448,7 @@ ja:
   permission_delete_messages: メッセージの削除
   permission_delete_own_messages: 自身が記入したメッセージの削除
   permission_manage_subtasks: 子チケットの管理
-  
+
   project_module_issue_tracking: チケットトラッキング
   project_module_time_tracking: 時間トラッキング
   project_module_news: ニュース
@@ -459,7 +459,7 @@ ja:
   project_module_boards: フォーラム
   project_module_gantt: ガントチャート
   project_module_calendar: カレンダー
-  
+
   label_user: ユーザ
   label_user_plural: ユーザ
   label_user_new: 新しいユーザ
@@ -950,6 +950,8 @@ ja:
   text_mercurial_repository_note: "ローカルリポジトリ (例: /hgrepo, c:\hgrepo)"
   text_scm_command: コマンド
   text_scm_command_version: バージョン
+  text_scm_config: バージョン管理システムのコマンドをconfig/configuration.ymlで設定できます。設定後、Redmineを再起動してください。
+  text_scm_command_not_available: バージョン管理システムのコマンドが利用できません。管理画面にて設定を確認してください。
 
   default_role_manager: 管理者
   default_role_developer: 開発者
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 7fbe82a26..e536900f4 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1026,3 +1026,5 @@ ko:
   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.
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 7004b19a1..9052ae114 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1034,3 +1034,5 @@ lt:
   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.
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index e24763e58..c9920d67b 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -969,3 +969,5 @@ 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.
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 4822a8530..a1ff390eb 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -974,3 +974,5 @@ 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.
diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index 6503b3247..29c79eae2 100644
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -975,3 +975,5 @@ 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.
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index edea22751..ab33895f0 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -956,3 +956,5 @@ nl:
   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.
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 0b6c9e6f4..2bbb77e69 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -961,3 +961,5 @@
   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.
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index dcf42cd8b..c36723c46 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -991,3 +991,5 @@ 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.
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 1a64238f1..e320f30da 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -994,3 +994,5 @@ pt-BR:
   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.
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 7e690d5a1..dbae58c3c 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -979,3 +979,5 @@ pt:
   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.
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index eca40d519..492743f72 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -967,3 +967,5 @@ 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.
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index db26b48fc..1cdbcd589 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1087,3 +1087,5 @@ ru:
   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.
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index a48dc6495..7968c470a 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -969,3 +969,5 @@ 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.
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 0b5eef0b9..c59e75969 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -970,3 +970,5 @@ sl:
   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.
diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
index b434a2d86..e47562cb7 100644
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -974,3 +974,5 @@ 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.
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 8b5befcf0..cb3d39777 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -975,3 +975,5 @@ 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.
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 596f7ce59..b8629b359 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1015,3 +1015,5 @@ sv:
   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.
diff --git a/config/locales/th.yml b/config/locales/th.yml
index b3fbfb7db..1cb3b6c81 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -971,3 +971,5 @@ 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.
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 38b0148dd..c6e017bbb 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -993,3 +993,5 @@ tr:
   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.
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 6db0524f1..b20806a6f 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -970,3 +970,5 @@ 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.
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index a98679571..cbac74fb0 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1025,3 +1025,5 @@ vi:
   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.
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index aa2feb788..474f1fb02 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1055,3 +1055,5 @@
   enumeration_doc_categories: 文件分類
   enumeration_activities: 活動 (時間追蹤)
   enumeration_system_activity: 系統活動
+  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/zh.yml b/config/locales/zh.yml
index 4fde52e73..47b4cb14f 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -977,3 +977,5 @@ zh:
   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.
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 47eb839c8..d74cba136 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -434,6 +434,10 @@ input#time_entry_comments { width: 90%;}
 .tabular.settings label{ margin-left: -300px; width: 295px; }
 .tabular.settings textarea { width: 99%; }
 
+.tabular.settings.enabled_scm table {width:100%}
+.tabular.settings.enabled_scm td.scm_name{ font-weight: bold; }
+.tabular.settings.enabled_scm p.scm_config{ padding-left: 8px; font-style:italic;}
+
 fieldset.settings label { display: block; }
 fieldset#notified_events .parent { padding-left: 20px; }
 
@@ -505,6 +509,8 @@ div.flash.warning {
 	color: #A6750C;
 }
 
+span.error {padding-left:20px; background:url(../images/exclamation.png) no-repeat 0 50%;}
+
 #errorExplanation ul { font-size: 0.9em;}
 #errorExplanation h2, #errorExplanation p { display: none; }