summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-09-12 14:53:28 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-09-12 14:53:28 +0000
commitd5bb0e85931bfdddcef4eada5e7e1c133c84a7e3 (patch)
treeed6221403e95ace57ddaee8f9f5618393a529a3e /config
parent637ec7e883647baa3cffdd8ea27d56246e522f85 (diff)
downloadredmine-d5bb0e85931bfdddcef4eada5e7e1c133c84a7e3.tar.gz
redmine-d5bb0e85931bfdddcef4eada5e7e1c133c84a7e3.zip
Merged r14554 (#20688).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14558 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
-rw-r--r--config/locales/en.yml1
-rw-r--r--config/locales/fr.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 039df462f..b5aa9f2cf 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -342,6 +342,7 @@ en:
field_default_status: Default status
field_users_visibility: Users visibility
field_time_entries_visibility: Time logs visibility
+ field_total_estimated_hours: Total estimated time
setting_app_title: Application title
setting_app_subtitle: Application subtitle
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 3432514be..e97427533 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -362,6 +362,7 @@ fr:
field_default_status: Statut par défaut
field_users_visibility: Visibilité des utilisateurs
field_time_entries_visibility: Visibilité du temps passé
+ field_total_estimated_hours: Temps estimé total
setting_app_title: Titre de l'application
setting_app_subtitle: Sous-titre de l'application