]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/en.yml
Remove some unused i18n resources
[rails.git] / config / locales / en.yml
index 1ab8ef90d8232adf8bc2a6ec6e9fe9c4d12ce4de..631917a37591e8d48749e2d7920841cda6f6c44c 100644 (file)
@@ -94,7 +94,6 @@ en:
     changeset:
       title: "Changeset"
       changeset: "Changeset: %{id}"
-      download: "Download %{changeset_xml_link} or %{osmchange_xml_link}"
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
       feed:
@@ -168,16 +167,14 @@ en:
     node_history:
       node_history: "Node History"
       node_history_title: "Node History: %{node_name}"
-      download: "%{download_xml_link} or %{view_details_link}"
       download_xml: "Download XML"
-      view_details: "view details"
+      view_details: "View details"
     node:
       node: "Node"
       node_title: "Node: %{node_name}"
-      download: "%{download_xml_link}, %{view_history_link} or %{edit_link}"
       download_xml: "Download XML"
-      view_history: "view history"
-      edit: "edit"
+      view_history: "View history"
+      edit: "Edit node"
     not_found:
       sorry: "Sorry, the %{type} with the id %{id}, could not be found."
       type:
@@ -195,15 +192,21 @@ en:
     paging_nav:
       showing_page: "Showing page"
       of: "of"
+    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."
+      type:
+        node: "node"
+        way: "way"
+        relation: "relation"
     relation_details:
       members: "Members:"
       part_of: "Part of:"
     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"
+      view_details: "View details"
     relation_member:
       entry: "%{type} %{name}"
       entry_role: "%{type} %{name} as %{role}"
@@ -214,30 +217,29 @@ en:
     relation:
       relation: "Relation"
       relation_title: "Relation: %{relation_name}"
-      download: "%{download_xml_link} or %{view_history_link}"
       download_xml: "Download XML"
-      view_history: "view history"
+      view_history: "View history"
     start:
       view_data: "View data for current map view"
       manually_select: "Manually select a different area"
     start_rjs:
-      data_layer_name: "Data"
+      data_layer_name: "Browse Map Data"
       data_frame_title: "Data"
       zoom_or_select: "Zoom in or select an area of the map to view"
       drag_a_box: "Drag a box on the map to select an area"
       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})"
+      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..."
       show_history: "Show History"
       wait: "Wait..."
-      history_for_feature: "History for [[feature]]"
+      history_for_feature: "History for %{feature}"
       details: "Details"
       private_user: "private user"
-      edited_by_user_at_timestamp: "Edited by [[user]] at [[timestamp]]"
+      edited_by_user_at_timestamp: "Edited by %{user} at %{timestamp}"
       object_list:
         heading: "Object list"
         back: "Display object list"
@@ -249,13 +251,13 @@ en:
         details: "Details"
         selected:
           type:
-            node: "Node [[id]]"
-            way: "Way [[id]]"
+            node: "Node %{id}"
+            way: "Way %{id}"
             # There is no 'relation' type because it is not represented in OpenLayers
         history:
           type:
-            node: "Node [[id]]"
-            way: "Way [[id]]"
+            node: "Node %{id}"
+            way: "Way %{id}"
             # There is no 'relation' type because it is not represented in OpenLayers
     tag_details:
       tags: "Tags:"
@@ -272,16 +274,14 @@ en:
     way_history:
       way_history: "Way History"
       way_history_title: "Way History: %{way_name}"
-      download: "%{download_xml_link} or %{view_details_link}"
       download_xml: "Download XML"
-      view_details: "view details"
+      view_details: "View details"
     way:
       way: "Way"
       way_title: "Way: %{way_name}"
-      download: "%{download_xml_link}, %{view_history_link} or %{edit_link}"
       download_xml: "Download XML"
-      view_history: "view history"
-      edit: "edit"
+      view_history: "View history"
+      edit: "Edit way"
   changeset:
     changeset_paging_nav:
       showing_page: "Showing page %{page}"
@@ -321,6 +321,8 @@ en:
       description_user_bbox: "Changesets by %{user} within %{bbox}"
       description_friend: "Changesets by your friends"
       description_nearby: "Changesets by nearby users"
+      empty_user_html: "It looks you haven't made any edits yet. To get started, check out the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Beginners Guide</a>."
+      empty_anon_html: "No edits made yet"
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
   diary_entry:
@@ -360,10 +362,6 @@ en:
       title: "No such diary entry"
       heading: "No entry with the id: %{id}"
       body: "Sorry, there is no diary entry or comment with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong."
-    no_such_user:
-      title: "No such user"
-      heading: "The user %{user} does not exist"
-      body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
     diary_entry:
       posted_by: "Posted by %{link_user} on %{created} in %{language_link}"
       comment_link: Comment on this entry
@@ -392,17 +390,24 @@ en:
       all:
         title: "OpenStreetMap diary entries"
         description: "Recent diary entries from users of OpenStreetMap"
+    comments:
+      has_commented_on: "%{display_name} has commented on the following diary entries"
+      post: Post
+      when: When
+      comment: Comment
+      ago: "%{ago} ago"
+      newer_comments: "Newer Comments"
+      older_comments: "Older Comments"
   export:
     start:
       area_to_export: "Area to Export"
       manually_select: "Manually select a different area"
       format_to_export: "Format to Export"
       osm_xml_data: "OpenStreetMap XML Data"
-      mapnik_image: "Mapnik Image"
-      osmarender_image: "Osmarender Image"
+      map_image: "Map Image (shows standard layer)"
       embeddable_html: "Embeddable HTML"
       licence: "Licence"
-      export_details: 'OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.'
+      export_details: 'OpenStreetMap data is licensed under the <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).'
       too_large:
         heading: "Area Too Large"
         body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area."
@@ -444,16 +449,27 @@ en:
     search_osm_nominatim:
       prefix_format: "%{name}"
       prefix:
+        aeroway:
+          aerodrome: "Aerodrome"
+          apron: "Apron"
+          gate: "Gate"
+          helipad: "Helipad"
+          runway: "Runway"
+          taxiway: "Taxiway"
+          terminal: "Terminal"
         amenity:
           airport: "Airport"
           arts_centre: "Arts Centre"
+          artwork: "Artwork"
           atm: "ATM"
           auditorium: "Auditorium"
           bank: "Bank"
           bar: "Bar"
+          bbq: "BBQ"
           bench: "Bench"
           bicycle_parking: "Cycle Parking"
           bicycle_rental: "Cycle Rental"
+          biergarten: "Beer Garden"
           brothel: "Brothel"
           bureau_de_change: "Bureau de Change"
           bus_station: "Bus Station"
@@ -462,6 +478,7 @@ en:
           car_sharing: "Car Sharing"
           car_wash: "Car Wash"
           casino: "Casino"
+          charging_station: "Charging Station"
           cinema: "Cinema"
           clinic: "Clinic"
           club: "Club"
@@ -480,6 +497,7 @@ en:
           ferry_terminal: "Ferry Terminal"
           fire_hydrant: "Fire Hydrant"
           fire_station: "Fire Station"
+          food_court: "Food Court"
           fountain: "Fountain"
           fuel: "Fuel"
           grave_yard: "Grave Yard"
@@ -520,9 +538,12 @@ en:
           shelter: "Shelter"
           shop: "Shop"
           shopping: "Shopping"
+          shower: "Shower"
+          social_centre: "Social Centre"
           social_club: "Social Club"
           studio: "Studio"
           supermarket: "Supermarket"
+          swimming_pool: "Swimming Pool"
           taxi: "Taxi"
           telephone: "Public Telephone"
           theatre: "Theatre"
@@ -534,41 +555,21 @@ en:
           village_hall: "Village Hall"
           waste_basket: "Waste Basket"
           wifi: "WiFi Access"
+          WLAN: "WiFi Access"
           youth_centre: "Youth Centre"
         boundary:
           administrative: "Administrative Boundary"
+          census: "Census Boundary"
+          national_park: "National Park"
+          protected_area : "Protected Area"
+        bridge:
+          aqueduct: "Aqueduct"
+          suspension: "Suspension Bridge"
+          swing: "Swing Bridge"
+          viaduct: "Viaduct"
+          "yes": "Bridge"
         building:
-          apartments: "Apartment Block"
-          block: "Building Block"
-          bunker: "Bunker"
-          chapel: "Chapel"
-          church: "Church"
-          city_hall: "City Hall"
-          commercial: "Commercial Building"
-          dormitory: "Dormitory"
-          entrance: "Building Entrance"
-          faculty: "Faculty Building"
-          farm: "Farm Building"
-          flats: "Flats"
-          garage: "Garage"
-          hall: "Hall"
-          hospital: "Hospital Building"
-          hotel: "Hotel"
-          house: "House"
-          industrial: "Industrial Building"
-          office: "Office Building"
-          public: "Public Building"
-          residential: "Residential Building"
-          retail: "Retail Building"
-          school: "School Building"
-          shop: "Shop"
-          stadium: "Stadium"
-          store: "Store"
-          terrace: "Terrace"
-          tower: "Tower"
-          train_station: "Railway Station"
-          university: "University Building"
-          yes: "Building"
+          "yes": "Building"
         highway:
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"
@@ -576,12 +577,11 @@ en:
           byway: "Byway"
           construction: "Highway under Construction"
           cycleway: "Cycle Path"
-          distance_marker: "Distance Marker"
           emergency_access_point: "Emergency Access Point"
           footway: "Footpath"
           ford: "Ford"
-          gate: "Gate"
           living_street: "Living Street"
+          milestone: "Milestone"
           minor: "Minor Road"
           motorway: "Motorway"
           motorway_junction: "Motorway Junction"
@@ -593,14 +593,17 @@ en:
           primary_link: "Primary Road"
           raceway: "Raceway"
           residential: "Residential"
+          rest_area: "Rest Area"
           road: "Road"
           secondary: "Secondary Road"
           secondary_link: "Secondary Road"
           service: "Service Road"
           services: "Motorway Services"
+          speed_camera: "Speed Camera"
           steps: "Steps"
           stile: "Stile"
           tertiary: "Tertiary Road"
+          tertiary_link: "Tertiary Road"
           track: "Track"
           trail: "Trail"
           trunk: "Trunk Road"
@@ -614,6 +617,7 @@ en:
           building: "Building"
           castle: "Castle"
           church: "Church"
+          fort: "Fort"
           house: "House"
           icon: "Icon"
           manor: "Manor"
@@ -638,6 +642,7 @@ en:
           farmland: "Farmland"
           farmyard: "Farmyard"
           forest: "Forest"
+          garages: "Garages"
           grass: "Grass"
           greenfield: "Greenfield Land"
           industrial: "Industrial Area"
@@ -645,25 +650,28 @@ en:
           meadow: "Meadow"
           military: "Military Area"
           mine: "Mine"
-          mountain: "Mountain"
+          orchard: "Orchard"
           nature_reserve: "Nature Reserve"
           park: "Park"
           piste: "Piste"
-          plaza: "Plaza"
           quarry: "Quarry"
           railway: "Railway"
           recreation_ground: "Recreation Ground"
           reservoir: "Reservoir"
+          reservoir_watershed: "Reservoir Watershed"
           residential: "Residential Area"
           retail: "Retail"
+          road: "Road Area"
           village_green: "Village Green"
           vineyard: "Vineyard"
           wetland: "Wetland"
           wood: "Wood"
         leisure:
           beach_resort: "Beach Resort"
+          bird_hide: "Bird Hide"
           common: "Common Land"
           fishing: "Fishing Area"
+          fitness_station: "Fitness Station"
           garden: "Garden"
           golf_course: "Golf Course"
           ice_rink: "Ice Rink"
@@ -674,12 +682,17 @@ en:
           pitch: "Sports Pitch"
           playground: "Playground"
           recreation_ground: "Recreation Ground"
+          sauna: "Sauna"
           slipway: "Slipway"
           sports_centre: "Sports Centre"
           stadium: "Stadium"
           swimming_pool: "Swimming Pool"
           track: "Running Track"
           water_park: "Water Park"
+        military:
+          airfield: "Military Airfield"
+          barracks: "Barracks"
+          bunker: "Bunker"
         natural:
           bay: "Bay"
           beach: "Beach"
@@ -687,11 +700,12 @@ en:
           cave_entrance: "Cave Entrance"
           channel: "Channel"
           cliff: "Cliff"
-          coastline: "Coastline"
           crater: "Crater"
+          dune: "Dune"
           feature: "Feature"
           fell: "Fell"
           fjord: "Fjord"
+          forest: "Forest"
           geyser: "Geyser"
           glacier: "Glacier"
           heath: "Heath"
@@ -711,6 +725,7 @@ en:
           scrub: "Scrub"
           shoal: "Shoal"
           spring: "Spring"
+          stone: "Stone"
           strait: "Strait"
           tree: "Tree"
           valley: "Valley"
@@ -719,6 +734,19 @@ en:
           wetland: "Wetland"
           wetlands: "Wetlands"
           wood: "Wood"
+        office:
+          accountant: "Accountant"
+          architect: "Architect"
+          company: "Company"
+          employment_agency: "Employment Agency"
+          estate_agent: "Estate Agent"
+          government: "Governmental Office"
+          insurance: "Insurance Office"
+          lawyer: "Lawyer"
+          ngo: "NGO Office"
+          telecommunication: "Telecommunication Office"
+          travel_agent: "Travel Agency"
+          "yes": "Office"
         place:
           airport: "Airport"
           city: "City"
@@ -730,6 +758,7 @@ en:
           houses: "Houses"
           island: "Island"
           islet: "Islet"
+          isolated_dwelling: "Isolated Dwelling"
           locality: "Locality"
           moor: "Moor"
           municipality: "Municipality"
@@ -753,6 +782,7 @@ en:
           junction: "Railway Junction"
           level_crossing: "Level Crossing"
           light_rail: "Light Rail"
+          miniature: "Miniature Rail"
           monorail: "Monorail"
           narrow_gauge: "Narrow Gauge Railway"
           platform: "Railway Platform"
@@ -767,7 +797,7 @@ en:
           yard: "Railway Yard"
         shop:
           alcohol: "Off License"
-          apparel: "Apparel Shop"
+          antiques: "Antiques"
           art: "Art Shop"
           bakery: "Bakery"
           beauty: "Beauty Shop"
@@ -776,7 +806,6 @@ en:
           books: "Book Shop"
           butcher: "Butcher"
           car: "Car Shop"
-          car_dealer: "Car Dealer"
           car_parts: "Car Parts"
           carpet: "Carpet Shop"
           car_repair: "Car Repair"
@@ -791,7 +820,6 @@ en:
           department_store: "Department Store"
           discount: "Discount Items Shop"
           doityourself: "Do-It-Yourself"
-          drugstore: "Drugstore"
           dry_cleaning: "Dry Cleaning"
           electronics: "Electronics Shop"
           estate_agent: "Estate Agent"
@@ -857,7 +885,10 @@ en:
           valley: "Valley"
           viewpoint: "Viewpoint"
           zoo: "Zoo"
+        tunnel:
+          "yes": "Tunnel"
         waterway:
+          artificial: "Artificial Waterway"
           boatyard: "Boatyard"
           canal: "Canal"
           connector: "Waterway Connector"
@@ -917,7 +948,7 @@ en:
     welcome_user_link_tooltip: Your user page
     home: home
     home_tooltip: Go to home location
-    inbox: "inbox (%{count})"
+    inbox_html: "inbox %{count}"
     inbox_tooltip:
       zero: Your inbox contains no unread messages
       one: Your inbox contains 1 unread message
@@ -940,14 +971,19 @@ en:
     user_diaries_tooltip: View user diaries
     edit_with: Edit with %{editor}
     tag_line: The Free Wiki World Map
-    intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you."
-    intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth."
-    intro_3: "OpenStreetMap's hosting is kindly supported by %{ucl}, %{ic} and %{bytemark}. Other supporters of the project are listed in the %{partners}."
-    intro_3_ucl: "the UCL VR Centre"
-    intro_3_ic: "Imperial College London"
-    intro_3_bytemark: "Bytemark Hosting"
-    intro_3_partners: "wiki"
-    intro_3_partners_url: "http://wiki.openstreetmap.org/wiki/Partners"
+    intro_1: "OpenStreetMap is a free worldwide map, created by people like you."
+    intro_2_html: "The data is free to %{download} and %{use} under its %{license}. %{create_account} to improve the map."
+    intro_2_create_account: "Create a user account"
+    intro_2_license: "open license"
+    intro_2_use: "use"
+    intro_2_download: "download"
+    intro_2_use_url: "http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap"
+    partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
+    partners_ucl: "the UCL VR Centre"
+    partners_ic: "Imperial College London"
+    partners_bytemark: "Bytemark Hosting"
+    partners_partners: "partners"
+    partners_url: "http://wiki.openstreetmap.org/wiki/Partners"
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
@@ -962,14 +998,11 @@ en:
     documentation: Documentation
     documentation_title: Documentation for the project
     copyright: "Copyright & License"
+    community: Community
     community_blogs: "Community Blogs"
     community_blogs_title: "Blogs from members of the OpenStreetMap community"
     foundation: Foundation
     foundation_title: The OpenStreetMap Foundation
-    sotm2011: 'Come to the 2011 OpenStreetMap Conference, The State of the Map, September 9-11th in Denver!'
-    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
@@ -984,115 +1017,103 @@ en:
       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: |
-      <h2>Copyright and License</h2>
-      <p>
-         OpenStreetMap is <i>open data</i>, licensed under the <a
-         href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
-         Commons Attribution-ShareAlike 2.0</a> licence (CC-BY-SA).
-      </p>
-      <p>
-        You are free to copy, distribute, transmit and adapt our maps
-        and data, as long as you credit OpenStreetMap and its
-        contributors. If you alter or build upon our maps or data, you
+    legal_babble:
+      title_html: Copyright and License
+      intro_1_html: |
+        OpenStreetMap is <i>open data</i>, licensed under the <a
+        href="http://opendatacommons.org/licenses/odbl/">Open Data
+        Commons Open Database License</a> (ODbL).
+      intro_2_html: |
+        You are free to copy, distribute, transmit and adapt our data,
+        as long as you credit OpenStreetMap and its
+        contributors. If you alter or build upon our data, you
         may distribute the result only under the same licence. The
-        full <a
-        href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">legal
+        full <a href="http://opendatacommons.org/licenses/odbl/1.0/">legal
         code</a> explains your rights and responsibilities.
-      </p>
-
-      <h3>How to credit OpenStreetMap</h3>
-      <p>
-        If you are using OpenStreetMap map images, we request that
-        your credit reads at least &ldquo;&copy; OpenStreetMap
-        contributors, CC-BY-SA&rdquo;. If you are using map data only,
-        we request &ldquo;Map data &copy; OpenStreetMap contributors,
-        CC-BY-SA&rdquo;.
-      </p>
-      <p>
-        Where possible, OpenStreetMap should be hyperlinked to <a
-        href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>
-        and CC-BY-SA to <a
-        href="http://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/</a>. If
-        you are using a medium where links are not possible (e.g. a
-        printed work), we suggest you direct your readers to
-        www.openstreetmap.org (perhaps by expanding
-        &lsquo;OpenStreetMap&rsquo; to this full address) and to
-        www.creativecommons.org.
-      </p>
-
-      <h3>Finding out more</h3>
-      <p>
-        Read more about using our data at the <a
+      intro_3_html: |
+        The cartography in our map tiles, and our documentation, are
+        licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative 
+        Commons Attribution-ShareAlike 2.0</a> license (CC-BY-SA).
+      credit_title_html: How to credit OpenStreetMap
+      credit_1_html: |
+        We require that you use the credit &ldquo;&copy; OpenStreetMap 
+        contributors&rdquo;.
+      credit_2_html: |
+        You must also make it clear that the data is available under the Open 
+        Database License, and if using our map tiles, that the cartography is 
+        licensed as CC-BY-SA. You may do this by linking to 
+        <a href="http://www.openstreetmap.org/copyright">this copyright page</a>. 
+        Alternatively, and as a requirement if you are distributing OSM in a 
+        data form, you can name and link directly to the license(s). In media 
+        where links are not possible (e.g. printed works), we suggest you 
+        direct your readers to openstreetmap.org (perhaps by expanding 
+        'OpenStreetMap' to this full address), to opendatacommons.org, and 
+        if relevant, to creativecommons.org.
+      more_title_html: Finding out more
+      more_1_html: |
+        Read more about using our data, and how to credit us, at the <a
         href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
         FAQ</a>.
-      </p>
-      <p>
-        OSM contributors are reminded never to add data from any
-        copyrighted sources (e.g. Google Maps or printed maps) without
-        explicit permission from the copyright holders.
-      </p>
-      <p>
+      more_2_html: |
         Although OpenStreetMap is open data, we cannot provide a
         free-of-charge map API for third-party developers.
-
         See our <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API Usage Policy</a>,
         <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile Usage Policy</a>
         and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim Usage Policy</a>.
-      </p>
-
-      <h3>Our contributors</h3>
-      <p>
-        Our CC-BY-SA licence requires you to &ldquo;give the Original
-        Author credit reasonable to the medium or means You are
-        utilising&rdquo;. Individual OSM mappers do not request a
-        credit over and above that to &ldquo;OpenStreetMap
-        contributors&rdquo;, but where data from a national mapping
-        agency or other major source has been included in
-        OpenStreetMap, it may be reasonable to credit them by directly
-        reproducing their credit or by linking to it on this page.
-      </p>
-
-      <!--
-      Information for page editors
-
-      The following lists only those organisations who require attribution
-      as a condition of their data being used in OpenStreetMap. It is not a
-      general catalogue of imports, and must not be used except when
-      attribution is required to comply with the licence of the imported
-      data.
-
-      Any additions here must be discussed with OSM sysadmins first.
-      -->
-
-      <ul id="contributors">
-          <li><strong>Australia</strong>: Contains suburb data based
-          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>.</li>
-          <li><strong>Canada</strong>: Contains data from
-          GeoBase&reg;, GeoGratis (&copy; Department of Natural
-          Resources Canada), CanVec (&copy; Department of Natural
-          Resources Canada), and StatCan (Geography Division,
-          Statistics Canada).</li>
-          <li><strong>France</strong>: Contains data sourced from
-          Direction Générale des Impôts.</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>
-      </ul>
-
-      <p>
+      contributors_title_html: Our contributors
+      contributors_intro_html: |
+        Our contributors are thousands of individuals. We also include
+        openly-licensed data from national mapping agencies
+        and other sources, among them:
+      contributors_at_html: |
+        <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>),
+        <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>).
+      contributors_ca_html: |
+        <strong>Canada</strong>: Contains data from
+        GeoBase&reg;, GeoGratis (&copy; Department of Natural
+        Resources Canada), CanVec (&copy; Department of Natural
+        Resources Canada), and StatCan (Geography Division,
+        Statistics Canada).
+      contributors_fr_html: |
+        <strong>France</strong>: Contains data sourced from
+        Direction Générale des Impôts.
+      contributors_nl_html: |
+        <strong>Netherlands</strong>: Contains &copy; AND data, 2007
+        (<a href="http://www.and.com">www.and.com</a>)
+      contributors_nz_html: |
+        <strong>New Zealand</strong>: Contains data sourced from
+        Land Information New Zealand. Crown Copyright reserved.
+      contributors_za_html: |
+        <strong>South Africa</strong>: Contains data sourced from
+        <a href="http://www.ngi.gov.za/">Chief Directorate:
+        National Geo-Spatial Information</a>, State copyright reserved.
+      contributors_gb_html: |
+        <strong>United Kingdom</strong>: Contains Ordnance
+        Survey data &copy; Crown copyright and database right
+        2010-12.
+      contributors_footer_1_html: |
+        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.
+      contributors_footer_2_html: |
         Inclusion of data in OpenStreetMap does not imply that the original
         data provider endorses OpenStreetMap, provides any warranty, or
         accepts any liability.
-      </p>
+      infringement_title_html: Finding out more
+      infringement_1_html: |
+        OSM contributors are reminded never to add data from any
+        copyrighted sources (e.g. Google Maps or printed maps) without
+        explicit permission from the copyright holders.
+      infringement_2_html: |
+        If you believe that copyrighted material has been inappropriately 
+        added to the OpenStreetMap database or this site, please refer 
+        to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown 
+        procedure</a> or file directly at our 
+        <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] %{user} commented on your diary entry"
@@ -1213,10 +1234,6 @@ en:
       back_to_inbox: "Back to inbox"
       message_sent: "Message sent"
       limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more."
-    no_such_user:
-      title: "No such user"
-      heading: "No such user"
-      body: "Sorry there is no user with that name."
     no_such_message:
       title: "No such message"
       heading: "No such message"
@@ -1248,7 +1265,7 @@ en:
       reading_your_sent_messages: "Reading your sent messages"
       to: "To"
       back_to_outbox: "Back to outbox"
-      wrong_user: "You are logged in as `%{user}' but the message you have asked to read to was not sent by or to that user. Please login as the correct user in order to read it."
+      wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
     sent_message_summary:
       delete_button: "Delete"
     mark:
@@ -1260,13 +1277,12 @@ en:
     index:
       js_1: "You are either using a browser that does not 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:
         notice: "Licensed under the %{license_name} license by the %{project_name} and its contributors."
-        license_name: "Creative Commons Attribution-Share Alike 2.0"
-        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
+        license_name: "Open Data Commons Open Database License (ODbL)"
+        license_url: "http://opendatacommons.org/licenses/odbl/1.0/"
         project_name: "OpenStreetMap project"
         project_url: "http://openstreetmap.org"
       remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
@@ -1360,6 +1376,23 @@ en:
           permissive: "Permissive access"
           destination: "Destination access"
           construction: "Roads under construction"
+    richtext_area:
+      edit: Edit
+      preview: Preview
+    markdown_help:
+      title_html: Parsed with <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      headings: Headings
+      heading: Heading
+      subheading: Subheading
+      unordered: Unordered list
+      ordered: Ordered list
+      first: First item
+      second: Second item
+      link: Link
+      text: Text
+      image: Image
+      alt: Alt text
+      url: URL
   trace:
     visibility:
       private: "Private (only shared as anonymous, unordered points)"
@@ -1387,10 +1420,6 @@ en:
       visibility: "Visibility:"
       visibility_help: "what does this mean?"
       visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-    no_such_user:
-      title: "No such user"
-      heading: "The user %{user} does not exist"
-      body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
     trace_form:
       upload_gpx: "Upload GPX File:"
       description: "Description:"
@@ -1430,8 +1459,8 @@ en:
       visibility: "Visibility:"
     trace_paging_nav:
       showing_page: "Showing page %{page}"
-      next: "Next »"
-      previous: "« Previous"
+      older: "Older Traces"
+      newer: "Newer Traces"
     trace:
       pending: "PENDING"
       count_points: "%{count} points"
@@ -1453,6 +1482,7 @@ en:
       your_traces: "Your GPS traces"
       public_traces_from: "Public GPS traces from %{user}"
       tagged_with: " tagged with %{tags}"
+      empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
     delete:
       scheduled_for_deletion: "Trace scheduled for deletion"
     make_public:
@@ -1465,6 +1495,8 @@ en:
   application:
     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."
     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."
@@ -1496,6 +1528,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."
@@ -1542,7 +1576,7 @@ en:
       email or username: "Email Address or Username:"
       password: "Password:"
       openid: "%{logo} OpenID:"
-      remember: "Remember me:"
+      remember: "Remember me"
       lost password link: "Lost your password?"
       login_button: "Login"
       register now: Register now
@@ -1551,6 +1585,7 @@ en:
       new to osm: New to OpenStreetMap?
       to make changes: To make changes to the OpenStreetMap data, you must have an account.
       create account minute: Create an account. It only takes a minute.
+      no account: Don't have an account?
       account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>."
       account is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the <a href="%{webmaster}">webmaster</a> if you wish to discuss this.
       auth failure: "Sorry, could not log in with those details."
@@ -1657,6 +1692,7 @@ en:
       my edits: my edits
       my traces: my traces
       my settings: my settings
+      my comments: my comments
       oauth settings: oauth settings
       blocks on me: blocks on me
       blocks by me: blocks by me
@@ -1696,8 +1732,9 @@ en:
         revoke:
           administrator: "Revoke administrator access"
           moderator: "Revoke moderator access"
-      block_history: "view blocks received"
-      moderator_history: "view blocks given"
+      block_history: "blocks received"
+      moderator_history: "blocks given"
+      comments: "comments"
       create_block: "block this user"
       activate_user: "activate this user"
       deactivate_user: "deactivate this user"
@@ -1784,10 +1821,14 @@ en:
     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."
     make_friend:
+      heading: "Add %{user} as a friend?"
+      button: "Add as friend"
       success: "%{name} is now your friend."
       failed: "Sorry, failed to add %{name} as a friend."
       already_a_friend: "You are already friends with %{name}."
     remove_friend:
+      heading: "Remove %{user} as a friend?"
+      button: "Remove as friend"
       success: "%{name} was removed from your friends."
       not_a_friend: "%{name} is not one of your friends."
     filter:
@@ -1861,7 +1902,6 @@ en:
       back: "View all blocks"
       needs_view: "Does the user need to log in before this block will be cleared?"
     filter:
-      not_a_moderator: "You need to be a moderator to perform that action."
       block_expired: "The block has already expired and cannot be edited."
       block_period: "The blocking period must be one of the values selectable in the drop-down list."
     create:
@@ -1897,6 +1937,9 @@ en:
       status: "Status"
       revoker_name: "Revoked by"
       not_revoked: "(not revoked)"
+      showing_page: "Showing page %{page}"
+      next: "Next »"
+      previous: "« Previous"
     helper:
       time_future: "Ends in %{time}."
       until_login: "Active until the user logs in."
@@ -1926,8 +1969,7 @@ en:
   javascripts:
     map:
       base:
-        mapnik: Mapnik
-        osmarender: Osmarender
+        standard: Standard
         cycle_map: Cycle Map
         transport_map: Transport Map
         mapquest: MapQuest Open
@@ -1940,3 +1982,34 @@ en:
       history_tooltip: View edits for this area
       history_disabled_tooltip: Zoom in to view edits for this area
       history_zoom_alert: You must zoom in to view edits for this area
+  redaction:
+    edit:
+      description: "Description"
+      heading: "Edit redaction"
+      submit: "Save redaction"
+      title: "Edit redaction"
+    index:
+      empty: "No redactions to show."
+      heading: "List of redactions"
+      title: "List of redactions"
+    new:
+      description: "Description"
+      heading: "Enter information for new redaction"
+      submit: "Create redaction"
+      title: "Creating new redaction"
+    show:
+      description: "Description:"
+      heading: "Showing redaction \"%{title}\""
+      title: "Showing redaction"
+      user: "Creator:"
+      edit: "Edit this redaction"
+      destroy: "Remove this redaction"
+      confirm: "Are you sure?"
+    create:
+      flash: "Redaction created."
+    update:
+      flash: "Changes saved."
+    destroy:
+      not_empty: "Redaction is not empty. Please un-redact all versions belonging to this redaction before destroying it."
+      flash: "Redaction destroyed."
+      error: "There was an error destroying this redaction."