X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/011237c2c5c82a638e3bbd5b78196baea576a5a9..ff03138a978406b431da71aba64941d87b509098:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 306036b52..9581d83b7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,4 +1,6 @@
 en:
+  html:
+    dir: ltr
   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"
-      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:"
@@ -115,9 +117,10 @@ en:
     node:
       node: "Node"
       node_title: "Node: {{node_name}}"
-      download: "{{download_xml_link}} or {{view_history_link}}"
+      download: "{{download_xml_link}}, {{view_history_link}} or {{edit_link}}"
       download_xml: "Download XML"
       view_history: "view history"
+      edit: "edit"
     not_found:
       sorry: "Sorry, the {{type}} with the id {{id}}, could not be found."
       type:
@@ -145,20 +148,21 @@ 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"
       manually_select: "Manually select a different area"
-      loaded_an_area_with_num_features: "You have loaded an area which contains {{num_features}} features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
+      loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
       load_data: "Load Data"
-      unable_to_load_size: "Unable to load: Bounding box size of {{bbox_size}} is too large (must be smaller than {{max_bbox_size}})"
+      unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than {{max_bbox_size}})"
       loading: "Loading..."
       show_history: "Show History"
       wait: "Wait..."
-      history_for_feature: "History for {{feature}}"
+      history_for_feature: "History for [[feature]]"
       details: "Details"
       private_user: "private user"
-      edited_by_user_at_timestamp: "Edited by {{user}} at {{timestamp}}"
+      edited_by_user_at_timestamp: "Edited by [[user]] at [[timestamp]]"
       object_list:
         heading: "Object list"
         back: "Display object list"
@@ -170,13 +174,13 @@ en:
         details: "Details"
         selected:
           type:
-            node: "Node {{id}}"
-            way: "Way {{id}}"
+            node: "Node [[id]]"
+            way: "Way [[id]]"
             # There's no 'relation' type because it isn't represented in OpenLayers
         history:
           type:
-            node: "Node {{id}}"
-            way: "Way {{id}}"
+            node: "Node [[id]]"
+            way: "Way [[id]]"
             # There's no 'relation' type because it isn't represented in OpenLayers
     tag_details:
       tags: "Tags:"
@@ -195,9 +199,10 @@ en:
     way:
       way: "Way"
       way_title: "Way: {{way_name}}"
-      download: "{{download_xml_link}} or {{view_history_link}}"
+      download: "{{download_xml_link}}, {{view_history_link}} or {{edit_link}}"
       download_xml: "Download XML"
       view_history: "view history"
+      edit: "edit"
   changeset:
     changeset_paging_nav: 
       showing_page: "Showing page"
@@ -217,36 +222,19 @@ en:
       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:
-      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"
-    list_user_rss:
-      title: "Edits by {{user}}"
-      description: "Recent changesets by {{user}}"
+      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
     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
@@ -279,7 +267,7 @@ en:
       heading: "The user {{user}} does not exist"
       body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
     diary_entry:
-      posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
+      posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
       comment_link: Comment on this entry
       reply_link: Reply to this entry
       comment_count:
@@ -325,11 +313,28 @@ en:
       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}}"
-    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_tooltip: "Log out"
     log_in: log in
+    log_in_tooltip: Log in with an existing account
     sign_up: sign up
+    sign_up_tooltip: Create an account for editing
     view: View
     view_tooltip: View maps
     edit: Edit
@@ -346,14 +351,19 @@ en:
     intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you."
     intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth."
     intro_3: "OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}."
+    intro_3_ucl: "UCL VR Centre"
+    intro_3_bytemark: "bytemark"
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     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"
+    news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
     shop: Shop
+    shop_tooltip: Shop with branded OpenStreetMap merchandise
     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
@@ -377,6 +387,23 @@ en:
       subject: "[OpenStreetMap] {{user}} added you as a friend"
       had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
       see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
+    gpx_notification:
+      greeting: "Hi,"
+      your_gpx_file: "It looks like your GPX file"
+      with_description: "with the description"
+      and_the_tags: "and the following tags:"
+      and_no_tags: "and no tags."
+      failure:
+        subject: "[OpenStreetMap] GPX Import failure"
+        failed_to_import: "failed to import. Here's the error:"
+        more_info_1: "More information about GPX import failures and how to avoid"
+        more_info_2: "them can be found at:"
+        import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
+      success:
+        subject: "[OpenStreetMap] GPX Import success"
+        loaded_successfully: |
+          loaded successfully with {{trace_points}} out of a possible
+          {{possible_points}} points.
     signup_confirm:
       subject: "[OpenStreetMap] Confirm your email address"
     signup_confirm_plain:
@@ -494,12 +521,16 @@ en:
       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.'
       permalink: Permalink
-      license: "Licensed under the Creative Commons Attribution-Share Alike 2.0 license by the OpenStreetMap project and its contributors."
+      license:
+        notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
+        project_name: "OpenStreetMap project"
+        project_url: "http://openstreetmap.org"
     edit:
       not_public: "You haven't set your edits to be public."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
@@ -520,6 +551,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"
@@ -626,7 +658,7 @@ en:
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
       contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible. '
       fill_form: "Fill in the form and we'll send you a quick email to activate your account."
-      license_agreement: 'By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools which connect to openstreetmap.org is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
+      license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
       email address: "Email Address: "
       confirm email address: "Confirm Email Address: "
       not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
@@ -664,7 +696,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