X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8a80162db10f33a7c1d0b6ef2a2da16b2104cc1b..2ac919d4f15300c5866daddb1dd56ddb7cc93fcc:/config/locales/en.yml?ds=inline

diff --git a/config/locales/en.yml b/config/locales/en.yml
index cb1fb50a7..114c06ac0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -145,6 +145,9 @@ en:
     relation_history:
       relation_history: "Relation History"
       relation_history_title: "Relation History: {{relation_name}}"
+      download: "{{download_xml_link}} or {{view_details_link}}"
+      download_xml: "Download XML"
+      view_details: "view details"
     relation_member:
       entry: "{{type}} {{name}}"
       entry_role: "{{type}} {{name}} as {{role}}"
@@ -355,11 +358,12 @@ en:
       title:
         osm_namefinder: '{{types}} from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
         geonames: 'Location from <a href="http://www.geonames.org/">GeoNames</a>'
-      osm_namefinder_prefix: "{{distance}} {{direction}} of {{type}} "
       types:
         cities: Cities
         towns: Towns
         places: Places
+    description_osm_namefinder:
+      prefix: "{{distance}} {{direction}} of {{type}} "
     results:
       no_results: "No results found"
     distance:
@@ -603,7 +607,7 @@ en:
       anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
       anon_edits_link_text: "Find out why this is the case."
       flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
-      potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)"
+      potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"
     sidebar:
       search_results: Search Results
       close: Close
@@ -697,6 +701,7 @@ en:
       owner: "Owner:"
       description: "Description:"
       tags: "Tags:"
+      tags_help: "comma delimited"
       save_button: "Save Changes"
     no_such_user:
       title: "No such user"
@@ -706,6 +711,7 @@ en:
       upload_gpx: "Upload GPX File"
       description: "Description"
       tags: "Tags"
+      tags_help: "use commas"
       public: "Public?"
       public_help: "what does this mean?"
       public_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
@@ -832,6 +838,7 @@ en:
       your friends: Your friends
       no friends: You have not added any friends yet.
       km away: "{{count}}km away"
+      m away: "{{count}}m away"
       nearby users: "Nearby users: "
       no nearby users: "There are no users who admit to mapping nearby yet."
       change your settings: change your settings