Include an [OpenStreetMap] prefix on the subject of message notifications

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9bdfe0e3c329339181f0f1fb4f43e2ca7477e443..e3d8803ed28a3d23b88d33b15d3f44f6f6e414cd 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -297,6 +297,8 @@ en:
       description_user: "Changesets by {{user}}"
       description_bbox: "Changesets within {{bbox}}"
       description_user_bbox: "Changesets by {{user}} within {{bbox}}"
+    timeout:
+      sorry: "Sorry, the list of changesets you requested took too long to retrieve."
   diary_entry:
     new:
       title: New Diary Entry
@@ -414,6 +416,7 @@ en:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
       suffix_suburb: "{{suffix}}, {{parentname}}"
     search_osm_nominatim:
+      prefix_format: "{{name}}"
       prefix:
         amenity:
           airport: "Airport"
@@ -930,7 +933,7 @@ en:
     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!'
+    sotm2010: 'Come to the 2010 OpenStreetMap Conference, The State of the Map, July 9-11 in Girona!'
     license:
       alt: CC by-sa 2.0
       title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License
@@ -945,7 +948,7 @@ en:
       english_link: the English original
     native:
       title: About this page
-      text: You are viewing the English version of the copyright page. You can go back to the {{native_link}} of this pag or you can stop reading about copyright and {{mapping_link}}.
+      text: You are viewing the English version of the copyright page. You can go back to the {{native_link}} of this page or you can stop reading about copyright and {{mapping_link}}.
       native_link: THIS_LANGUAGE_NAME_HERE version
       mapping_link: start mapping
     legal_babble: |
@@ -1039,6 +1042,9 @@ en:
           Statistics Canada).</li>
           <li><strong>New Zealand</strong>: Contains data sourced from
           Land Information New Zealand. Crown Copyright reserved.</li>
+          <li><strong>Poland</strong>: Contains data from <a
+          href="http://ump.waw.pl/">UMP-pcPL maps</a>. Copyright
+          UMP-pcPL contributors.</li>
           <li><strong>United Kingdom</strong>: Contains Ordnance
           Survey data &copy; Crown copyright and database right
           2010.</li>
@@ -1056,7 +1062,7 @@ en:
       header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
       footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
     message_notification:
-      subject: "[OpenStreetMap] {{user}} sent you a new message"
+      subject_header: "[OpenStreetMap] {{subject}}"
       hi: "Hi {{to_user}},"
       header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:"
       footer1: "You can also read the message at {{readurl}}"
@@ -1531,7 +1537,7 @@ en:
     terms:
       heading: "Contributor terms"
       press accept button: "Please read the agreement below and press the agree button to create your account."
-      consider_pd: "I consider my contributions to be in the Public Domain"
+      consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain"
       consider_pd_why: "what's this?"
       consider_pd_why_url: http://wiki.openstreetmap.org/wiki/Why_would_I_want_my_contributions_to_be_public_domain
       agree: Agree