Merge branch 'master' into notes

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

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index eb18402359fa1ea0fee2bffd779cb7e06e7dfd1e..88516e18283446aa666a3c07b1af94f59bb37d33 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -120,13 +120,11 @@ lb:
         node: Knuet
         relation: Relatioun
         way: Wee
-    start: 
-      manually_select: En anere Beräich manuell eraussichen
     start_rjs: 
       data_frame_title: Donnéeën
       data_layer_name: Donnéeë vun de Kaarten duerchkucken
       details: Detailer
-      edited_by_user_at_timestamp: Vum [[user]] de(n) [[timestamp]] geännert
+      edited_by_user_at_timestamp: Vum %{user} de(n) %{timestamp} geännert
       load_data: Donnéeë lueden
       loading: Lueden...
       object_list: 
@@ -134,12 +132,12 @@ lb:
         heading: Lëscht mat Objeten
         history: 
           type: 
-            node: Knuet [[id]]
-            way: Wee [[id]]
+            node: Knuet %{id}
+            way: Wee %{id}
         selected: 
           type: 
-            node: Knuet [[id]]
-            way: Wee [[id]]
+            node: Knuet %{id}
+            way: Wee %{id}
         type: 
           node: Knuet
           way: Wee
@@ -244,11 +242,8 @@ lb:
         ca_postcode: Resultater vu <a href="http://geocoder.ca/">Geocoder.ca</a>
         geonames: Resultater vu <a href="http://www.geonames.org/">GeoNames</a>
         latlon: Resultater vun <a href="http://openstreetmap.org/">Internal</a>
-        osm_namefinder: Resultater vun <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
         uk_postcode: Resultater vun <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Resultater vu <a href="http://geocoder.us/">Geocoder.us</a>
-    search_osm_namefinder: 
-      suffix_place: ", %{distance} %{direction} vu(n) %{placename}"
     search_osm_nominatim: 
       prefix: 
         amenity: 
@@ -450,7 +445,6 @@ lb:
     user_diaries: Benotzer Bloggen
     view: Weisen
     view_tooltip: Kaart weisen
-    welcome_user: Wëllkomm, %{user_link}
     welcome_user_link_tooltip: Är Benotzersäit
     wiki: Wiki
   license_page: 
@@ -513,7 +507,6 @@ lb:
       footer1: Dir kënnt de Message och op %{readurl} liesen
       hi: Salut %{to_user},
     signup_confirm_html: 
-      greeting: Bonjour !
       more_videos: Et gëtt nach méi %{more_videos_link}.
       more_videos_here: méi Videoen hei
     signup_confirm_plain: