]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/en.yml
Roll back contentious and faulty changes and change "Pre-school" to "Kindergarten".
[rails.git] / config / locales / en.yml
index f909f1e5cc338e4f3a243a1ed2c1496001533d16..3841eeb94dee311bf9e99f5cf8f9959d5e325a67 100644 (file)
@@ -197,7 +197,7 @@ en:
       of: "of"
     redacted:
       redaction: "Redaction %{id}"
-      message: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details."
+      message_html: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details."
       type:
         node: "node"
         way: "way"
@@ -235,7 +235,7 @@ en:
       manually_select: "Manually select a different area"
       hide_areas: "Hide areas"
       show_areas: "Show areas"
-      loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
+      loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than [[max_features]] features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
       load_data: "Load Data"
       unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than %{max_bbox_size})"
       loading: "Loading..."
@@ -400,7 +400,7 @@ en:
       post: Post
       when: When
       comment: Comment
-      ago: %{ago} ago
+      ago: "%{ago} ago"
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"
   export:
@@ -456,12 +456,12 @@ en:
       prefix:
         aeroway:
           aerodrome: "Aerodrome"
-          apron: "Apron"
-          gate: "Gate"
+          apron: "Airport Apron"
+          gate: "Airport Gate"
           helipad: "Helipad"
           runway: "Runway"
           taxiway: "Taxiway"
-          terminal: "Terminal"
+          terminal: "Airport Terminal"
         amenity:
           airport: "Airport"
           arts_centre: "Arts Centre"
@@ -498,13 +498,13 @@ en:
           driving_school: "Driving School"
           embassy: "Embassy"
           emergency_phone: "Emergency Phone"
-          fast_food: "Fast Food"
+          fast_food: "Fast Food Restaurant"
           ferry_terminal: "Ferry Terminal"
           fire_hydrant: "Fire Hydrant"
           fire_station: "Fire Station"
           food_court: "Food Court"
           fountain: "Fountain"
-          fuel: "Fuel"
+          fuel: "Filling Station"
           grave_yard: "Grave Yard"
           gym: "Fitness Centre / Gym"
           hall: "Hall"
@@ -529,7 +529,7 @@ en:
           police: "Police"
           post_box: "Post Box"
           post_office: "Post Office"
-          preschool: "Pre-School"
+          preschool: "Kindergarten"
           prison: "Prison"
           pub: "Pub"
           public_building: "Public Building"
@@ -580,7 +580,7 @@ en:
           bus_guideway: "Guided Bus Lane"
           bus_stop: "Bus Stop"
           byway: "Byway"
-          construction: "Highway under Construction"
+          construction: "Road under Construction"
           cycleway: "Cycle Path"
           emergency_access_point: "Emergency Access Point"
           footway: "Footpath"
@@ -597,7 +597,7 @@ en:
           primary: "Primary Road"
           primary_link: "Primary Road"
           raceway: "Raceway"
-          residential: "Residential"
+          residential: "Residential Road"
           rest_area: "Rest Area"
           road: "Road"
           secondary: "Secondary Road"
@@ -641,9 +641,9 @@ en:
           brownfield: "Brownfield Land"
           cemetery: "Cemetery"
           commercial: "Commercial Area"
-          conservation: "Conservation"
-          construction: "Construction"
-          farm: "Farm"
+          conservation: "Conservation Area"
+          construction: "Construction Area"
+          farm: "Farmland"
           farmland: "Farmland"
           farmyard: "Farmyard"
           forest: "Forest"
@@ -665,7 +665,7 @@ en:
           reservoir: "Reservoir"
           reservoir_watershed: "Reservoir Watershed"
           residential: "Residential Area"
-          retail: "Retail"
+          retail: "Retail Area"
           road: "Road Area"
           village_green: "Village Green"
           vineyard: "Vineyard"
@@ -824,8 +824,8 @@ en:
           cosmetics: "Cosmetics Shop"
           department_store: "Department Store"
           discount: "Discount Items Shop"
-          doityourself: "Do-It-Yourself"
-          dry_cleaning: "Dry Cleaning"
+          doityourself: "Do-It-Yourself Shop"
+          dry_cleaning: "Dry Cleaner"
           electronics: "Electronics Shop"
           estate_agent: "Estate Agent"
           farm: "Farm Shop"
@@ -843,7 +843,7 @@ en:
           grocery: "Grocery Shop"
           hairdresser: "Hairdresser"
           hardware: "Hardware Store"
-          hifi: "Hi-Fi"
+          hifi: "Hi-Fi Shop"
           insurance: "Insurance"
           jewelry: "Jewelry Shop"
           kiosk: "Kiosk Shop"
@@ -874,7 +874,7 @@ en:
           artwork: "Artwork"
           attraction: "Attraction"
           bed_and_breakfast: "Bed and Breakfast"
-          cabin: "Cabin"
+          cabin: "Tourist Cabin"
           camp_site: "Camp Site"
           caravan_site: "Caravan Site"
           chalet: "Chalet"
@@ -1112,8 +1112,9 @@ en:
           on Australian Bureau of Statistics data.</li>
           <li><strong>Austria</strong>: Contains data from
           <a href="http://data.wien.gv.at/">Stadt Wien</a> (under
-          <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>)
-          and <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg.</a></li>
+          <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
+          <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
+          Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT with amendments</a>).</li>
           <li><strong>Canada</strong>: Contains data from
           GeoBase&reg;, GeoGratis (&copy; Department of Natural
           Resources Canada), CanVec (&copy; Department of Natural
@@ -1121,7 +1122,7 @@ en:
           Statistics Canada).</li>
           <li><strong>France</strong>: Contains data sourced from
           Direction Générale des Impôts.</li>
-          <li><strong>Netherlands</strong>: Contains &copy; AND data, 2007 
+          <li><strong>Netherlands</strong>: Contains &copy; AND data, 2007
           (<a href="http://www.and.com">www.and.com</a>)</li>
           <li><strong>New Zealand</strong>: Contains data sourced from
           Land Information New Zealand. Crown Copyright reserved.</li>
@@ -1138,6 +1139,12 @@ en:
           2010.</li>
       </ul>
 
+      <p>
+        For further details of these, and other sources that have been used
+        to help improve OpenStreetMap, please see the <a
+        href="http://wiki.openstreetmap.org/wiki/Contributors">Contributors
+        page</a> on the OpenStreetMap Wiki.
+      </p>
       <p>
         Inclusion of data in OpenStreetMap does not imply that the original
         data provider endorses OpenStreetMap, provides any warranty, or
@@ -1421,7 +1428,7 @@ en:
       text: Text
       image: Image
       alt: Alt text
-      url: url
+      url: URL
   trace:
     visibility:
       private: "Private (only shared as anonymous, unordered points)"
@@ -1524,7 +1531,7 @@ en:
     require_cookies:
       cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
     require_moderator:
-      not_a_moderator: "You need to be a moderator to perform that action."      
+      not_a_moderator: "You need to be a moderator to perform that action."
     setup_user_auth:
       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
@@ -1556,6 +1563,8 @@ en:
       authorize_url: "Authorise URL:"
       support_notice: "We support HMAC-SHA1 (recommended) as well as plain text in SSL mode."
       edit: "Edit Details"
+      delete: "Delete Client"
+      confirm: "Are you sure?"
       requests: "Requesting the following permissions from the user:"
       allow_read_prefs:  "read their user preferences."
       allow_write_prefs: "modify their user preferences."
@@ -2017,11 +2026,11 @@ en:
       submit: "Create redaction"
       title: "Creating new redaction"
     show:
-      description: "Description"
+      description: "Description:"
       heading: "Showing redaction \"%{title}\""
       title: "Showing redaction"
       user: "Creator:"
-      edit: "Edit this redaction."
+      edit: "Edit this redaction"
       destroy: "Remove this redaction"
       confirm: "Are you sure?"
     create: