Merge 16355:16480 from trunk.
[rails.git] / config / locales / en.yml
index e11cda46a670b0b7082cd1c0d82af475ecfad3d9..59e723cd18d340f878c07289a7e60d172082a72d 100644 (file)
@@ -153,6 +153,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}}"
@@ -597,7 +600,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
@@ -691,6 +694,7 @@ en:
       owner: "Owner:"
       description: "Description:"
       tags: "Tags:"
+      tags_help: "comma delimited"
       save_button: "Save Changes"
     no_such_user:
       title: "No such user"
@@ -700,6 +704,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"