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

@@ -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:

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