X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7a9b2de42b8e969c162917e3e69877815a6eab75..e13187fc88c2b54a9b36577cdc0ff46962ae1e52:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5218bd714..e41f5e68c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -91,9 +91,9 @@ en:
       no_bounding_box: "No bounding box has been stored for this changeset."
       show_area_box: "Show Area Box"
       box: "box"
-      has_nodes: "Has the following {{node_count}} nodes:"
-      has_ways: "Has the following {{way_count}} ways:"
-      has_relations: "Has the following {{relation_count}} relations:"
+      has_nodes: "Has the following {{count}} nodes:"
+      has_ways: "Has the following {{count}} ways:"
+      has_relations: "Has the following {{count}} relations:"
     common_details: 
       edited_at: "Edited at:"
       edited_by: "Edited by:"
@@ -147,6 +147,7 @@ en:
       view_data: "View data for current map view"
       manually_select: "Manually select a different area"
     start_rjs:
+      data_layer_name: "Data"
       data_frame_title: "Data"
       zoom_or_select: "Zoom in or select an area of the map to view"
       drag_a_box: "Drag a box on the map to select an area"
@@ -246,6 +247,7 @@ en:
     list:
       title: "Users' diaries"
       user_title: "{{user}}'s diary"
+      in_language_title: "Diary Entries in {{language}}"
       new: New Diary Entry
       new_title: Compose a new entry in your user diary
       no_entries: No diary entries
@@ -335,10 +337,11 @@ en:
     welcome_user_link_tooltip: Your user page
     home: home
     home_tooltip: Go to home location
-    inbox: "inbox ({{size}})"
-    inbox_tooltip_0: Your inbox contains no unread messages
-    inbox_tooltip_1: Your inbox contians 1 unread message
-    inbox_tooltip_n: Your inbox contains {{size}} unread messages
+    inbox: "inbox ({{count}})"
+    inbox_tooltip:
+      zero: Your inbox contains no unread messages
+      one: Your inbox contians 1 unread message
+      other: Your inbox contains {{count}} unread messages
     logout: logout
     logout_tooltip: "Log out"
     log_in: log in
@@ -368,9 +371,12 @@ en:
     donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
     donate_link_text: donating
     help_wiki: "Help & Wiki"
+    help_wiki_tooltip: "Help & Wiki site for the project"
     help_wiki_url: "http://wiki.openstreetmap.org"
     news_blog: "News blog"
+    news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
     shop: Shop
+    shop_tooltip: Shop with branded OpenStreetMap 
     shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
     sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
     alt_donation: Make a Donation
@@ -558,6 +564,7 @@ en:
       search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
     key:
       map_key: "Map key"
+      map_key_tooltip: "Map key for the mapnik rendering at this zoom level"
   trace:
     create:
       upload_trace: "Upload GPS Trace"
@@ -702,7 +709,7 @@ en:
       settings_link_text: settings
       your friends: Your friends
       no friends: You have not added any friends yet.
-      km away: "{{distance}}km away"
+      km away: "{{count}}km away"
       nearby users: "Nearby users: "
       no nearby users: "There are no users who admit to mapping nearby yet."
       change your settings: change your settings