Merge 16110:16487 from trunk.

[rails.git] / 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 a76e113a627c361bcf88db8007c773ae3a1ae4d2..b087b076534c0db86694190db574f8f73759f97f 100644 (file)
--- a/vendor/plugins/rails-i18n/locale/de.yml
+++ b/vendor/plugins/rails-i18n/locale/de.yml
@@ -2,6 +2,15 @@
 # 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"