Merge branch 'master' into notes

[rails.git] / config / locales / nds.yml

diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index c4c890deb8a18deab1c1a548b160da2b3f36e987..d31c5a3a1197dc4e5f013bf3b70ad7acc3082ffd 100644 (file)
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -100,19 +100,19 @@ nds:
       data_layer_name: Daten
       details: Details
       hide_areas: Rebeden versteken
-      history_for_feature: Geschicht för [[feature]]
+      history_for_feature: Geschicht för %{feature}
       loading: An’t Laden...
       object_list: 
         details: Details
         heading: Objektlist
         history: 
           type: 
-            node: Knütt [[id]]
-            way: Weg [[id]]
+            node: Knütt %{id}
+            way: Weg %{id}
         selected: 
           type: 
-            node: Knütt [[id]]
-            way: Weg [[id]]
+            node: Knütt %{id}
+            way: Weg %{id}
         type: 
           node: Knütt
           way: Weg
@@ -209,14 +209,11 @@ nds:
     description: 
       title: 
         geonames: Steed von <a href="http://www.geonames.org/">GeoNames</a>
-        osm_namefinder: "%{types} von <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
         osm_nominatim: Steed von <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
       types: 
         cities: Städer
         places: Öörd
         towns: lüttje Städer
-    description_osm_namefinder: 
-      prefix: "%{distance} %{direction} von %{type}"
     direction: 
       east: oosten
       north: noorden
@@ -233,9 +230,6 @@ nds:
     results: 
       more_results: Mehr
       no_results: nix funnen
-    search_osm_namefinder: 
-      suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} von %{parentname})"
-      suffix_place: ", %{distance} %{direction} von %{placename}"
     search_osm_nominatim: 
       prefix: 
         amenity: 
@@ -523,7 +517,6 @@ nds:
     user_diaries_tooltip: Bruker-Dagböker wiesen
     view: ankieken
     view_tooltip: Koort wiesen
-    welcome_user: Willkamen, %{user_link}
     welcome_user_link_tooltip: Dien Brukersied
     wiki: Wiki
   license_page: 
@@ -580,10 +573,6 @@ nds:
       greeting: Moin,
     message_notification: 
       hi: Moin %{to_user},
-    signup_confirm_html: 
-      greeting: Moin!
-    signup_confirm_plain: 
-      greeting: Moin!
   oauth_clients: 
     edit: 
       submit: Ännern
@@ -597,8 +586,6 @@ nds:
     edit: 
       user_page_link: Brukersied
     index: 
-      license: 
-        project_name: OpenStreetMap-Projekt
       permalink: Permalink
       shortlink: Kortlink
     key: