X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/edaddbedaec78a252e988e2271962407e64483fd..69a3cd04a70222f80140b398dd06a801d503bd96:/vendor/plugins/rails-i18n/locale/de.yml

diff --git a/vendor/plugins/rails-i18n/locale/de.yml b/vendor/plugins/rails-i18n/locale/de.yml
index b087b0765..a05189528 100644
--- a/vendor/plugins/rails-i18n/locale/de.yml
+++ b/vendor/plugins/rails-i18n/locale/de.yml
@@ -2,15 +2,6 @@
 # by Clemens Kofler (clemens@railway.at)
 
 de:
-  # Support for word connectors, added for OpenStreetMap, needs upstream merge
-  support:
-    array:
-      sentence_connector: "und"
-      skip_last_comma: true
-      words_connector: ", "
-      two_words_connector: " und "
-      last_word_connector: " und "
-
   date:
     formats:
       default: "%d.%m.%Y"
@@ -26,9 +17,9 @@ de:
   
   time:
     formats:
-      default: "%A, %e. %B %Y, %H:%M Uhr"
-      short: "%e. %B, %H:%M Uhr"
-      long: "%A, %e. %B %Y, %H:%M Uhr"
+      default: "%A, %d. %B %Y, %H:%M Uhr"
+      short: "%d. %B, %H:%M Uhr"
+      long: "%A, %d. %B %Y, %H:%M Uhr"
       time: "%H:%M"
 
     am: "vormittags"
@@ -69,7 +60,14 @@ de:
       over_x_years:
         one: 'mehr als 1 Jahr'
         other: 'mehr als {{count}} Jahre'
-      
+    prompts:
+      second: "Sekunden"
+      minute: "Minuten"
+      hour: "Stunden"
+      day: "Tag"
+      month: "Monat"
+      year: "Jahr"
+
   number:
     format:
       precision: 2
@@ -92,12 +90,25 @@ de:
       format:
         delimiter: ""
         precision: 1
+      storage_units:
+        # Storage units output formatting.
+        # %u is the storage unit, %n is the number (default: 2 MB)
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
 
   support:
     array:
-      sentence_connector: "und"
-      skip_last_comma: true
-        
+      words_connector: ", "
+      two_words_connector: " und "
+      last_word_connector: " und "
+
   activerecord:
     errors:
       template:
@@ -126,4 +137,5 @@ de:
         less_than_or_equal_to: "muss kleiner oder gleich {{count}} sein"
         odd: "muss ungerade sein"
         even: "muss gerade sein"
+        record_invalid: "Gültigkeitsprüfung ist fehlgeschlagen: {{errors}}"
       models: