X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6480d7ec02176fa372b19cc9635c55f6db2907bb..b0e15608750417351c2ac3d9ffa6d13fcf6c8ccb:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e3c539ce9..7e096def5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -373,7 +373,7 @@ en:
         osm_namefinder: 'Results from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
         geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
     search_osm_namefinder:
-      prefix: "{{type}} "
+      prefix: "{{type}}"
       suffix_place: ", {{distance}} {{direction}} of {{placename}}"
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
       suffix_suburb: "{{suffix}}, {{parentname}}"
@@ -386,7 +386,7 @@ en:
         towns: Towns
         places: Places
     description_osm_namefinder:
-      prefix: "{{distance}} {{direction}} of {{type}} "
+      prefix: "{{distance}} {{direction}} of {{type}}"
     results:
       no_results: "No results found"
     distance:
@@ -429,8 +429,10 @@ en:
     view_tooltip: View maps
     edit: Edit
     edit_tooltip: Edit maps
+    edit_zoom_alert: You must zoom in to edit the map
     history: History
     history_tooltip: Changeset history
+    history_zoom_alert: You must zoom in to see the editing history
     export: Export
     export_tooltip: Export map data
     gps_traces: GPS Traces
@@ -456,7 +458,12 @@ en:
     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
+    license:
+      alt: CC by-sa 2.0
+      title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License
+    make_a_donation:
+      title: Support OpenStreetMap with a monetary donation
+      text: Make a Donation
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] {{user}} commented on your diary entry"
@@ -581,7 +588,7 @@ en:
       my_inbox: "My {{inbox_link}}"
       inbox: "inbox"
       outbox: "outbox"
-      you_have_sent_messages: "You have {{sent_count}} sent messages"
+      you_have_sent_messages: "You have {{count}} sent messages"
       to: "To"
       subject: "Subject"
       date: "Date"
@@ -608,9 +615,9 @@ en:
       deleted: "Message deleted"
   site:
     index:
-      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.'
       permalink: Permalink
       shortlink: Shortlink
       license: