From 16383ed38619e322b4782e909ef09e579cae2f9b Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Wed, 8 Aug 2012 01:39:09 +0000 Subject: [PATCH] Merged r10169 from trunk to 1.4-stable (#11600) fix plural form of the abbreviation for hours in Brazilian Portuguese. Contributed by Mauricio Piacentini. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10173 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/pt-BR.yml | 8 ++++---- doc/CHANGELOG | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index b3aaef3e5..41b539d57 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -18,10 +18,10 @@ pt-BR: time: formats: - default: "%A, %d de %B de %Y, %H:%M hs" - time: "%H:%M hs" - short: "%d/%m, %H:%M hs" - long: "%A, %d de %B de %Y, %H:%M hs" + default: "%A, %d de %B de %Y, %H:%M h" + time: "%H:%M h" + short: "%d/%m, %H:%M h" + long: "%A, %d de %B de %Y, %H:%M h" only_second: "%S" datetime: formats: diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 85fdab901..78e174277 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -13,6 +13,7 @@ http://www.redmine.org/ * Feature #11338: Exclude emails with auto-submitted => auto-generated * Patch #11328: Fix Japanese mistranslation for 'label_language_based' * Patch #11448: Russian translation for 1.4-stable and 2.0-stable +* Patch #11600: Fix plural form of the abbreviation for hours in Brazilian Portuguese == 2012-06-18 v1.4.4