Merge 15722:15806 from head and adjust new views to rails 2 style names.

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index b3a678cd3b2b414724868768c5480c68d555ca0d..fe5f0f9261fecef85796db0fa51d94ed9d501cd0 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,4 +1,6 @@
 en:
 en:

+  html:
+    dir: ltr

   activerecord:
     # Translates all the model names, which is used in error handling on the web site
     models:
   activerecord:
     # Translates all the model names, which is used in error handling on the web site
     models:


@@ -89,9 +91,9 @@ en:
       no_bounding_box: "No bounding box has been stored for this changeset."
       show_area_box: "Show Area Box"
       box: "box"
       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:"
     common_details: 
       edited_at: "Edited at:"
       edited_by: "Edited by:"


@@ -145,6 +147,7 @@ en:
       view_data: "View data for current map view"
       manually_select: "Manually select a different area"
     start_rjs:
       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"
       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"


@@ -217,27 +220,12 @@ en:
       user: "User"
       comment: "Comment"
       area: "Area"
       user: "User"
       comment: "Comment"
       area: "Area"

-    list_bbox:
-      history: "History"
-      changesets_within_the_area: "Changesets within the area:"
-      show_area_box: "show area box"
-      no_changesets: "No changesets"
-      all_changes_everywhere: "For all changes everywhere see {{recent_changes_link}}"
-      recent_changes: "Recent Changes"
-      no_area_specified: "No area specified"
-      first_use_view: "First use the {{view_tab_link}} to pan and zoom to an area of interest, then click the history tab."
-      view_the_map: "view the map"
-      view_tab: "view tab"
-      alternatively_view: "Alternatively, view all {{recent_changes_link}}"

     list:
     list:

-      recent_changes: "Recent Changes"
-      recently_edited_changesets: "Recently edited changesets:"
-      for_more_changesets: "For more changesets, select a user and view their edits, or see the editing 'history' of a specific area."
-    list_user:
-      edits_by_username: "Edits by {{username_link}}"
-      no_visible_edits_by: "No visible edits by {{name}}."
-      for_all_changes: "For changes by all users see {{recent_changes_link}}"
-      recent_changes: "Recent Changes"
+      title: "Changesets"
+      description: "Recent edits"
+      description_user: "Recent edits by {{user}}"
+      description_bbox: "Recent edits within {{bbox}}"
+      description_user_bbox: "Recent edits by {{user}} within {{bbox}}"

   diary_entry:
     new:
       title: New Diary Entry
   diary_entry:
     new:
       title: New Diary Entry


@@ -322,11 +310,28 @@ en:
       type_from_source: "{{type}} from {{source_link}}"
       no_results: "No results found"
   layouts:
       type_from_source: "{{type}} from {{source_link}}"
       no_results: "No results found"
   layouts:

+    project_name:
+      # in <title>
+      title: OpenStreetMap
+      # in <h1>
+      h1: OpenStreetMap
+    logo:
+      alt_text: OpenStreetMap logo

     welcome_user: "Welcome, {{user_link}}"
     welcome_user: "Welcome, {{user_link}}"

-    inbox: "inbox ({{size}})"
+    welcome_user_link_tooltip: Your user page
+    home: home
+    home_tooltip: Go to home location
+    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: logout

+    logout_tooltip: "Log out"

     log_in: log in
     log_in: log in

+    log_in_tooltip: Log in with an existing account

     sign_up: sign up
     sign_up: sign up

+    sign_up_tooltip: Create an account for editing

     view: View
     view_tooltip: View maps
     edit: Edit
     view: View
     view_tooltip: View maps
     edit: Edit


@@ -350,9 +355,12 @@ en:
     donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
     donate_link_text: donating
     help_wiki: "Help &amp; Wiki"
     donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
     donate_link_text: donating
     help_wiki: "Help &amp; Wiki"

+    help_wiki_tooltip: "Help &amp; Wiki site for the project"

     help_wiki_url: "http://wiki.openstreetmap.org"
     news_blog: "News blog"
     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: 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
     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


@@ -510,7 +518,6 @@ en:
       as_unread: "Message marked as unread"
   site:
     index:
       as_unread: "Message marked as unread"
   site:
     index:

-      home: "home"

       js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
       js_2: "OpenStreetMap uses javascript for its slippy map."
       js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
       js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
       js_2: "OpenStreetMap uses javascript for its slippy map."
       js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'


@@ -541,6 +548,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"
       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"
   trace:
     create:
       upload_trace: "Upload GPS Trace"


@@ -685,7 +693,7 @@ en:
       settings_link_text: settings
       your friends: Your friends
       no friends: You have not added any friends yet.
       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
       nearby users: "Nearby users: "
       no nearby users: "There are no users who admit to mapping nearby yet."
       change your settings: change your settings