diff --git a/app/views/projects/settings/_repository.rhtml b/app/views/projects/settings/_repository.rhtml
index 113930b8b..d48622147 100644
--- a/app/views/projects/settings/_repository.rhtml
+++ b/app/views/projects/settings/_repository.rhtml
@@ -12,7 +12,7 @@
 <br />
 <%= image_tag((@repository.class.scm_available ? 'true.png' : 'exclamation.png'))%>
 <%=  l(:text_scm_command) -%>: <%= @repository.class.scm_command -%>,
-<%=  l(:text_scm_version) -%>: <%= @repository.class.scm_version_string %>
+<%=  l(:text_scm_command_version) -%>: <%= @repository.class.scm_version_string %>
 <% end %>
 </p>
 <% button_disabled = true %>
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 8678779dc..901a6d50b 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -971,4 +971,4 @@ bg:
   enumeration_activities: Дейности (time tracking)
   enumeration_system_activity: Системна активност
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 90ed71e1f..ef3e8aaad 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -986,4 +986,4 @@ bs:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index eae6531c5..35b0c963a 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -975,4 +975,4 @@ ca:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index a4311763f..b54078f89 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -976,4 +976,4 @@ cs:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/da.yml b/config/locales/da.yml
index cff789cea..dc6d06efb 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -989,4 +989,4 @@ da:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 356bd0add..4c1828fea 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -989,4 +989,4 @@ de:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/el.yml b/config/locales/el.yml
index a2fb10e0b..7ff45350f 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -972,4 +972,4 @@ el:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 07ff3f648..96f01a81c 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -975,4 +975,4 @@ en-GB:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 57036f6ad..4f23aca9a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -944,7 +944,7 @@ en:
   text_git_repository_note: "Bare and local repository (e.g. /gitrepo, c:\gitrepo)"
   text_mercurial_repository_note: "Local repository (e.g. /hgrepo, c:\hgrepo)"
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
 
   default_role_manager: Manager
   default_role_developer: Developer
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 45dae96a8..7908dd9e7 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1009,4 +1009,4 @@ es:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 7303dcce1..3786a634d 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -976,4 +976,4 @@ eu:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 8bd98d103..e4f0635b9 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -975,4 +975,4 @@ fa:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 662ff897c..e8c42ce02 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -993,4 +993,4 @@ fi:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index ca1784c77..34d9cd091 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -987,4 +987,4 @@ fr:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index b930abaf6..3d4c45f12 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -984,4 +984,4 @@ gl:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 0b26052ea..fe164883f 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -977,4 +977,4 @@ he:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index ea5a78fce..f51758307 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -979,4 +979,4 @@ hr:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index c9201e9e2..663b072e3 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -991,4 +991,4 @@
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 010019e5f..ed8f2a13a 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -980,4 +980,4 @@ id:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/it.yml b/config/locales/it.yml
index d62f58886..52c2a1302 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -973,4 +973,4 @@ it:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index f5ba8070a..a963024a5 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -949,7 +949,7 @@ ja:
   text_git_repository_note: "Bare、かつ、ローカルリポジトリ (例: /gitrepo, c:\gitrepo)"
   text_mercurial_repository_note: "ローカルリポジトリ (例: /hgrepo, c:\hgrepo)"
   text_scm_command: コマンド
-  text_scm_version: バージョン
+  text_scm_command_version: バージョン
 
   default_role_manager: 管理者
   default_role_developer: 開発者
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 2d2fd7021..85c0bbc85 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1024,4 +1024,4 @@ ko:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 58eabe147..f2eb38145 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1032,4 +1032,4 @@ lt:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 4db676cb7..1d51a3559 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -967,4 +967,4 @@ lv:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index e5fd9c990..188631430 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -972,4 +972,4 @@ mk:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index a8a40c0c3..ae767a337 100644
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -973,4 +973,4 @@ mn:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 596100346..77d1e0548 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -954,4 +954,4 @@ nl:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 62fccaf2f..d8fd53eb6 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -959,4 +959,4 @@
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index c313ed86c..849e31231 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -989,4 +989,4 @@ pl:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index cc0c91194..8c8c28d79 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -992,4 +992,4 @@ pt-BR:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 9a21c70c1..f43586a0d 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -977,4 +977,4 @@ pt:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 5b6d057ec..24b6eaf77 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -965,4 +965,4 @@ ro:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 780862c6e..25f71c1ae 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1085,4 +1085,4 @@ ru:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Локальный репозиторий (например, /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index b1cb457d2..7b737fd18 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -967,4 +967,4 @@ sk:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 13ccc4c07..4ec90c285 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -968,4 +968,4 @@ sl:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
index 987ed42d3..45e830dc5 100644
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -972,4 +972,4 @@ sr-YU:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 1093828aa..a3bdda372 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -973,4 +973,4 @@ sr:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 351220f68..f39ac552b 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1013,4 +1013,4 @@ sv:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/th.yml b/config/locales/th.yml
index bfc9df604..914f73e16 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -969,4 +969,4 @@ th:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index f902fdd7d..998ce2036 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -991,4 +991,4 @@ tr:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 27f7a2b08..837777858 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -968,4 +968,4 @@ uk:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 01a42db37..d33fdcfea 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1023,4 +1023,4 @@ vi:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index baf25ee08..53f4fad6d 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1026,8 +1026,8 @@
   text_git_repository_note: "純(Bare)儲存機制與本機儲存機制 (e.g. /gitrepo, c:\gitrepo)"
   text_mercurial_repository_note: "本機儲存機制 (e.g. /hgrepo, c:\hgrepo)"
   text_scm_command: 命令
-  text_scm_version: 版本
-  
+  text_scm_command_version: 版本
+
   default_role_manager: 管理人員
   default_role_developer: 開發人員
   default_role_reporter: 報告人員
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 9187f1634..78b75324a 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -975,4 +975,4 @@ zh:
   text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
   text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
   text_scm_command: Command
-  text_scm_version: Version
+  text_scm_command_version: Version