Merge branch 'master' into copyright

[rails.git] / vendor / plugins / rails-i18n / locale / fr.yml

diff --git a/vendor/plugins/rails-i18n/locale/fr.yml b/vendor/plugins/rails-i18n/locale/fr.yml
index 962cb61bcd644ad01d697fbb0cd47a8cdefd9ba0..95598140550adb342f0a82ea10e36eb3ebeff86e 100755 (executable)
--- a/vendor/plugins/rails-i18n/locale/fr.yml
+++ b/vendor/plugins/rails-i18n/locale/fr.yml
@@ -83,14 +83,29 @@ fr:
         format: '%n %u'
     human:
       format:
+        # These three are to override number.format and are optional
+        # separator: 
+        delimiter: "" 
         precision: 2
-      storage_units: [ Octet, ko, Mo, Go, To ]
-  
+      # Rails <= v2.2.2
+      # storage_units: [octet, kb, Mb, Gb, Tb]
+      # Rails >= v2.3
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "octet"
+            other: "octets"
+          kb: "ko"
+          mb: "Mo"
+          gb: "Go"
+          tb: "To"
+
   support:
     array:
       sentence_connector: 'et'
       skip_last_comma: true
-      word_connector: ", "
+      words_connector: ", "
       two_words_connector: " et "
       last_word_connector: " et "
   
@@ -121,3 +136,5 @@ fr:
         less_than_or_equal_to: "doit être inférieur ou égal à {{count}}"
         odd: "doit être impair"
         even: "doit être pair"
+        record_invalid: "La validation a échoué : {{errors}}"
+