It's a magnifying glass, stupid...

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ab18c69229fcbc5708a76f14fa2fa21bf810dfba..ae8294e95ae3d4aacc41abc26bdb0cdff0436455 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -162,6 +162,7 @@ en:
         way: way
         relation: relation
         changeset: changeset
+        note: note
     timeout:
       sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve."
       type:
@@ -169,6 +170,7 @@ en:
         way: way
         relation: relation
         changeset: changeset
+        note: note
     redacted:
       redaction: "Redaction %{id}"
       message_html: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details."
@@ -248,6 +250,7 @@ en:
   diary_entry:
     new:
       title: New Diary Entry
+      publish_button: "Publish"
     list:
       title: "Users' diaries"
       title_friends: "Friends' diaries"
@@ -953,9 +956,6 @@ en:
       text: Make a Donation
     learn_more: "Learn More"
     more: More
-    donate_done_header: Thank You
-    donate_done_line_1: We hit our fundraising target!
-    donate_line_3: Hardware Funding Drive 2015
   license_page:
     foreign:
       title: About this translation
@@ -1083,7 +1083,7 @@ en:
         <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
       trademarks_title_html: <span id="trademarks"></span>Trademarks
       trademarks_1_html: |
-        OpenStreetMap and the looking glass logo are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please send your questions to the <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence Working Group</a>.
+        OpenStreetMap and the magnifying glass logo are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please send your questions to the <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence Working Group</a>.
   welcome_page:
     title: Welcome!
     introduction_html: |
@@ -1197,7 +1197,7 @@ en:
   about_page:
     next: Next
     copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
-    used_by: "%{name} powers map data on hundreds of web sites, mobile apps, and hardware devices"
+    used_by: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices"
     lede_text: |
       OpenStreetMap is built by a community of mappers that contribute and maintain data
       about roads, trails, cafés, railway stations, and much more, all over the world.
@@ -1425,13 +1425,12 @@ en:
       table:
         entry:
           motorway: "Motorway"
+          main_road: "Main road"
           trunk: "Trunk road"
           primary: "Primary road"
           secondary: "Secondary road"
           unclassified: "Unclassified road"
-          unsurfaced: "Unsurfaced road"
           track: "Track"
-          byway: "Byway"
           bridleway: "Bridleway"
           cycleway: "Cycleway"
           footway: "Footway"
@@ -1455,7 +1454,6 @@ en:
           golf: "Golf course"
           park: "Park"
           resident: "Residential area"
-          tourist: "Tourist attraction"
           common:
             - Common
             - meadow
@@ -1485,7 +1483,6 @@ en:
           tunnel: "Dashed casing = tunnel"
           bridge: "Black casing = bridge"
           private: "Private access"
-          permissive: "Permissive access"
           destination: "Destination access"
           construction: "Roads under construction"
     richtext_area:
@@ -1634,6 +1631,7 @@ en:
       allow_read_gpx:    "read your private GPS traces."
       allow_write_gpx:   "upload GPS traces."
       allow_write_notes: "modify notes."
+      grant_access: "Grant Access"
     oauthorize_success:
       title: "Authorization request allowed"
       allowed: "You have granted application %{app_name} access to your account."
@@ -1787,16 +1785,6 @@ en:
       confirm password: "Confirm Password:"
       use external auth: "Alternatively, use a third party to login"
       auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one."
-      auth association: |
-        <p>Your ID is not associated with a OpenStreetMap account yet.</p>
-        <ul>
-          <li>If you are new to OpenStreetMap, please create a new account using the form below.</li>
-          <li>
-            If you already have an account, you can login to your account
-            using your username and password and then associate the account
-            with your ID in your user settings.
-          </li>
-        </ul>
       continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"
       terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see <a href=\"%{url}\">this wiki page</a>."
@@ -2011,6 +1999,15 @@ en:
       no_authorization_code: No authorization code
       unknown_signature_algorithm: Unknown signature algorithm
       invalid_scope: Invalid scope
+    auth_association:
+      heading: Your ID is not associated with a OpenStreetMap account yet.
+      option_1: |
+        If you are new to OpenStreetMap, please create a new account
+        using the form below.
+      option_2: |
+        If you already have an account, you can login to your account
+        using your username and password and then associate the account
+        with your ID in your user settings.
   user_role:
     filter:
       not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
@@ -2235,6 +2232,9 @@ en:
         mapquest_car: "Car (MapQuest)"
         mapquest_foot: "Foot (MapQuest)"
         osrm_car: "Car (OSRM)"
+        mapzen_bicycle: "Bicycle (Mapzen)"
+        mapzen_car: "Car (Mapzen)"
+        mapzen_foot: "Foot (Mapzen)"
       directions: "Directions"
       distance: "Distance"
       errors: