Remove Potlatch 1 from edit menu

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a955440179bf4b9b9c863ae6cf603ff8513dbafe..65cc2bda33dd16e0d68c616d227d860d7de180ed 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -76,11 +76,11 @@ en:
         languages: "Languages"
         pass_crypt: "Password"
   printable_name:
         languages: "Languages"
         pass_crypt: "Password"
   printable_name:

-    with_id: "{{id}}"
-    with_version: "{{id}}, v{{version}}"
-    with_name: "{{name}} ({{id}})"
+    with_id: "%{id}"
+    with_version: "%{id}, v%{version}"
+    with_name: "%{name} (%{id})"

   editor:
   editor:

-    default: "Default (currently {{name}})"
+    default: "Default (currently %{name})"

     potlatch:
       name: "Potlatch 1"
       description: "Potlatch 1 (in-browser editor)"
     potlatch:
       name: "Potlatch 1"
       description: "Potlatch 1 (in-browser editor)"


@@ -93,25 +93,24 @@ en:
   browse:
     changeset:
       title: "Changeset"
   browse:
     changeset:
       title: "Changeset"

-      changeset: "Changeset: {{id}}"
-      download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
+      changeset: "Changeset: %{id}"

       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
       feed:
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
       feed:

-        title: "Changeset {{id}}"
-        title_comment: "Changeset {{id}} - {{comment}}"
+        title: "Changeset %{id}"
+        title_comment: "Changeset %{id} - %{comment}"

     navigation:
       paging:
         user:
     navigation:
       paging:
         user:

-          prev: "« {{id}}"
-          next: "{{id}} »"
+          prev: "« %{id}"
+          next: "%{id} »"

         all:
         all:

-          prev: "« {{id}}"
-          next: "{{id}} »"
+          prev: "« %{id}"
+          next: "%{id} »"

       user:
       user:

-        name_changeset_tooltip: "View edits by {{user}}"
-        prev_changeset_tooltip: "Previous edit by {{user}}"
-        next_changeset_tooltip: "Next edit by {{user}}"
+        name_changeset_tooltip: "View edits by %{user}"
+        prev_changeset_tooltip: "Previous edit by %{user}"
+        next_changeset_tooltip: "Next edit by %{user}"

       all:
         prev_node_tooltip: "Previous node"
         next_node_tooltip: "Next node"
       all:
         prev_node_tooltip: "Previous node"
         next_node_tooltip: "Next node"


@@ -130,14 +129,14 @@ en:
       show_area_box: "Show Area Box"
       box: "box"
       has_nodes:
       show_area_box: "Show Area Box"
       box: "box"
       has_nodes:

-        one: "Has the following {{count}} node:"
-        other: "Has the following {{count}} nodes:"
+        one: "Has the following %{count} node:"
+        other: "Has the following %{count} nodes:"

       has_ways:
       has_ways:

-        one:  "Has the following {{count}} way:"
-        other: "Has the following {{count}} ways:"
+        one:  "Has the following %{count} way:"
+        other: "Has the following %{count} ways:"

       has_relations:
       has_relations:

-        one:  "Has the following {{count}} relation:"
-        other: "Has the following {{count}} relations:"
+        one:  "Has the following %{count} relation:"
+        other: "Has the following %{count} relations:"

     common_details:
       edited_at: "Edited at:"
       edited_by: "Edited by:"
     common_details:
       edited_at: "Edited at:"
       edited_by: "Edited by:"


@@ -147,8 +146,8 @@ en:
       in_changeset: "In changeset:"
       changeset_comment: "Comment:"
     containing_relation:
       in_changeset: "In changeset:"
       changeset_comment: "Comment:"
     containing_relation:

-      entry: "Relation {{relation_name}}"
-      entry_role: "Relation {{relation_name}} (as {{relation_role}})"
+      entry: "Relation %{relation_name}"
+      entry_role: "Relation %{relation_name} (as %{relation_role})"

     map:
       loading: "Loading..."
       deleted: "Deleted"
     map:
       loading: "Loading..."
       deleted: "Deleted"


@@ -157,31 +156,34 @@ en:
         node: "View node on larger map"
         way: "View way on larger map"
         relation: "View relation on larger map"
         node: "View node on larger map"
         way: "View way on larger map"
         relation: "View relation on larger map"

+      edit:
+        area: "Edit area"
+        node: "Edit node"
+        way: "Edit way"
+        relation: "Edit relation"

     node_details:
       coordinates: "Coordinates:"
       part_of: "Part of:"
     node_history:
       node_history: "Node History"
     node_details:
       coordinates: "Coordinates:"
       part_of: "Part of:"
     node_history:
       node_history: "Node History"

-      node_history_title: "Node History: {{node_name}}"
-      download: "{{download_xml_link}} or {{view_details_link}}"
+      node_history_title: "Node History: %{node_name}"

       download_xml: "Download XML"
       download_xml: "Download XML"

-      view_details: "view details"
+      view_details: "View details"

     node:
       node: "Node"
     node:
       node: "Node"

-      node_title: "Node: {{node_name}}"
-      download: "{{download_xml_link}}, {{view_history_link}} or {{edit_link}}"
+      node_title: "Node: %{node_name}"

       download_xml: "Download XML"
       download_xml: "Download XML"

-      view_history: "view history"
-      edit: "edit"
+      view_history: "View history"
+      edit: "Edit node"

     not_found:
     not_found:

-      sorry: "Sorry, the {{type}} with the id {{id}}, could not be found."
+      sorry: "Sorry, the %{type} with the id %{id}, could not be found."

       type:
         node: node
         way: way
         relation: relation
         changeset: changeset
     timeout:
       type:
         node: node
         way: way
         relation: relation
         changeset: changeset
     timeout:

-      sorry: "Sorry, the data for the {{type}} with the id {{id}}, took too long to retrieve."
+      sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve."

       type:
         node: node
         way: way
       type:
         node: node
         way: way


@@ -190,49 +192,54 @@ en:
     paging_nav:
       showing_page: "Showing page"
       of: "of"
     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_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}}"
+      relation_history_title: "Relation History: %{relation_name}"

       download_xml: "Download XML"
       download_xml: "Download XML"

-      view_details: "view details"
+      view_details: "View details"

     relation_member:
     relation_member:

-      entry: "{{type}} {{name}}"
-      entry_role: "{{type}} {{name}} as {{role}}"
+      entry: "%{type} %{name}"
+      entry_role: "%{type} %{name} as %{role}"

       type:
         node: "Node"
         way: "Way"
         relation: "Relation"
     relation:
       relation: "Relation"
       type:
         node: "Node"
         way: "Way"
         relation: "Relation"
     relation:
       relation: "Relation"

-      relation_title: "Relation: {{relation_name}}"
-      download: "{{download_xml_link}} or {{view_history_link}}"
+      relation_title: "Relation: %{relation_name}"

       download_xml: "Download XML"
       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:
     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"
       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"
       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..."
       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"
       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"
       object_list:
         heading: "Object list"
         back: "Display object list"


@@ -244,46 +251,44 @@ en:
         details: "Details"
         selected:
           type:
         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:
             # 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:"
       wiki_link:
             # There is no 'relation' type because it is not represented in OpenLayers
     tag_details:
       tags: "Tags:"
       wiki_link:

-        key: "The wiki description page for the {{key}} tag"
-        tag: "The wiki description page for the {{key}}={{value}} tag"
-      wikipedia_link: "The {{page}} article on Wikipedia"
+        key: "The wiki description page for the %{key} tag"
+        tag: "The wiki description page for the %{key}=%{value} tag"
+      wikipedia_link: "The %{page} article on Wikipedia"

     way_details:
       nodes: "Nodes:"
       part_of: "Part of:"
       also_part_of:
     way_details:
       nodes: "Nodes:"
       part_of: "Part of:"
       also_part_of:

-        one: "also part of way {{related_ways}}"
-        other: "also part of ways {{related_ways}}"
+        one: "also part of way %{related_ways}"
+        other: "also part of ways %{related_ways}"

     way_history:
       way_history: "Way History"
     way_history:
       way_history: "Way History"

-      way_history_title: "Way History: {{way_name}}"
-      download: "{{download_xml_link}} or {{view_details_link}}"
+      way_history_title: "Way History: %{way_name}"

       download_xml: "Download XML"
       download_xml: "Download XML"

-      view_details: "view details"
+      view_details: "View details"

     way:
       way: "Way"
     way:
       way: "Way"

-      way_title: "Way: {{way_name}}"
-      download: "{{download_xml_link}}, {{view_history_link}} or {{edit_link}}"
+      way_title: "Way: %{way_name}"

       download_xml: "Download XML"
       download_xml: "Download XML"

-      view_history: "view history"
-      edit: "edit"
+      view_history: "View history"
+      edit: "Edit way"

   changeset:
     changeset_paging_nav:
   changeset:
     changeset_paging_nav:

-      showing_page: "Showing page {{page}}"
-      next: "Next »"
-      previous: "« Previous"
+      showing_page: "Showing page %{page}"
+      next: "Next »"
+      previous: "« Previous"

     changeset:
     changeset:

-      id: "#{{id}}"
+      id: "#%{id}"

       still_editing: "(still editing)"
       anonymous: "Anonymous"
       no_comment: "(none)"
       still_editing: "(still editing)"
       anonymous: "Anonymous"
       no_comment: "(none)"


@@ -299,19 +304,25 @@ en:
       area: "Area"
     list:
       title: "Changesets"
       area: "Area"
     list:
       title: "Changesets"

-      title_user: "Changesets by {{user}}"
-      title_bbox: "Changesets within {{bbox}}"
-      title_user_bbox: "Changesets by {{user}} within {{bbox}}"
-
+      title_user: "Changesets by %{user}"
+      title_bbox: "Changesets within %{bbox}"
+      title_user_bbox: "Changesets by %{user} within %{bbox}"
+      title_friend: "Changesets by your friends"
+      title_nearby: "Changesets by nearby users"

       heading: "Changesets"
       heading_user: "Changesets"
       heading_bbox: "Changesets"
       heading_user_bbox: "Changesets"
       heading: "Changesets"
       heading_user: "Changesets"
       heading_bbox: "Changesets"
       heading_user_bbox: "Changesets"

-
+      heading_friend: "Changesets"
+      heading_nearby: "Changesets"

       description: "Recent changes"
       description: "Recent changes"

-      description_user: "Changesets by {{user}}"
-      description_bbox: "Changesets within {{bbox}}"
-      description_user_bbox: "Changesets by {{user}} within {{bbox}}"
+      description_user: "Changesets by %{user}"
+      description_bbox: "Changesets within %{bbox}"
+      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:
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
   diary_entry:


@@ -319,8 +330,10 @@ en:
       title: New Diary Entry
     list:
       title: "Users' diaries"
       title: New Diary Entry
     list:
       title: "Users' diaries"

-      user_title: "{{user}}'s diary"
-      in_language_title: "Diary Entries in {{language}}"
+      title_friends: "Friends' diaries"
+      title_nearby: "Nearby Users' diaries"
+      user_title: "%{user}'s diary"
+      in_language_title: "Diary Entries in %{language}"

       new: New Diary Entry
       new_title: Compose a new entry in your user diary
       no_entries: No diary entries
       new: New Diary Entry
       new_title: Compose a new entry in your user diary
       no_entries: No diary entries


@@ -339,32 +352,28 @@ en:
       save_button: "Save"
       marker_text: Diary entry location
     view:
       save_button: "Save"
       marker_text: Diary entry location
     view:

-      title: "{{user}}'s diary | {{title}}"
-      user_title: "{{user}}'s diary"
+      title: "%{user}'s diary | %{title}"
+      user_title: "%{user}'s diary"

       leave_a_comment: "Leave a comment"
       leave_a_comment: "Leave a comment"

-      login_to_leave_a_comment: "{{login_link}} to leave a comment"
+      login_to_leave_a_comment: "%{login_link} to leave a comment"

       login: "Login"
       save_button: "Save"
     no_such_entry:
       title: "No such diary entry"
       login: "Login"
       save_button: "Save"
     no_such_entry:
       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."
+      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."

     diary_entry:
     diary_entry:

-      posted_by: "Posted by {{link_user}} on {{created}} in {{language_link}}"
+      posted_by: "Posted by %{link_user} on %{created} in %{language_link}"

       comment_link: Comment on this entry
       reply_link: Reply to this entry
       comment_count:
         one: 1 comment
       comment_link: Comment on this entry
       reply_link: Reply to this entry
       comment_count:
         one: 1 comment

-        other: "{{count}} comments"
+        other: "%{count} comments"

       edit_link: Edit this entry
       hide_link: Hide this entry
       confirm: Confirm
     diary_comment:
       edit_link: Edit this entry
       hide_link: Hide this entry
       confirm: Confirm
     diary_comment:

-      comment_from: "Comment from {{link_user}} on {{comment_created_at}}"
+      comment_from: "Comment from %{link_user} on %{comment_created_at}"

       hide_link: Hide this comment
       confirm: Confirm
     location:
       hide_link: Hide this comment
       confirm: Confirm
     location:


@@ -373,25 +382,32 @@ en:
       edit: "Edit"
     feed:
       user:
       edit: "Edit"
     feed:
       user:

-        title: "OpenStreetMap diary entries for {{user}}"
-        description: "Recent OpenStreetMap diary entries from {{user}}"
+        title: "OpenStreetMap diary entries for %{user}"
+        description: "Recent OpenStreetMap diary entries from %{user}"

       language:
       language:

-        title: "OpenStreetMap diary entries in {{language_name}}"
-        description: "Recent diary entries from users of OpenStreetMap in {{language_name}}"
+        title: "OpenStreetMap diary entries in %{language_name}"
+        description: "Recent diary entries from users of OpenStreetMap in %{language_name}"

       all:
         title: "OpenStreetMap diary entries"
         description: "Recent diary entries from users of OpenStreetMap"
       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"
   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"
       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."
       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."


@@ -422,27 +438,32 @@ en:
         us_postcode: 'Results from <a href="http://geocoder.us/">Geocoder.us</a>'
         uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
         ca_postcode: 'Results from <a href="http://geocoder.ca/">Geocoder.CA</a>'
         us_postcode: 'Results from <a href="http://geocoder.us/">Geocoder.us</a>'
         uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
         ca_postcode: 'Results from <a href="http://geocoder.ca/">Geocoder.CA</a>'

-        osm_namefinder: 'Results from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'

         osm_nominatim: 'Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
         geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
         osm_nominatim: 'Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
         geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'

-    search_osm_namefinder:
-      prefix: "{{type}}"
-      suffix_place: ", {{distance}} {{direction}} of {{placename}}"
-      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
-      suffix_suburb: "{{suffix}}, {{parentname}}"

     search_osm_nominatim:
     search_osm_nominatim:

-      prefix_format: "{{name}}"
+      prefix_format: "%{name}"

       prefix:
       prefix:

+        aeroway:
+          aerodrome: "Aerodrome"
+          apron: "Apron"
+          gate: "Gate"
+          helipad: "Helipad"
+          runway: "Runway"
+          taxiway: "Taxiway"
+          terminal: "Terminal"

         amenity:
           airport: "Airport"
           arts_centre: "Arts Centre"
         amenity:
           airport: "Airport"
           arts_centre: "Arts Centre"

+          artwork: "Artwork"

           atm: "ATM"
           auditorium: "Auditorium"
           bank: "Bank"
           bar: "Bar"
           atm: "ATM"
           auditorium: "Auditorium"
           bank: "Bank"
           bar: "Bar"

+          bbq: "BBQ"

           bench: "Bench"
           bicycle_parking: "Cycle Parking"
           bicycle_rental: "Cycle Rental"
           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"
           brothel: "Brothel"
           bureau_de_change: "Bureau de Change"
           bus_station: "Bus Station"


@@ -451,6 +472,7 @@ en:
           car_sharing: "Car Sharing"
           car_wash: "Car Wash"
           casino: "Casino"
           car_sharing: "Car Sharing"
           car_wash: "Car Wash"
           casino: "Casino"

+          charging_station: "Charging Station"

           cinema: "Cinema"
           clinic: "Clinic"
           club: "Club"
           cinema: "Cinema"
           clinic: "Clinic"
           club: "Club"


@@ -469,6 +491,7 @@ en:
           ferry_terminal: "Ferry Terminal"
           fire_hydrant: "Fire Hydrant"
           fire_station: "Fire Station"
           ferry_terminal: "Ferry Terminal"
           fire_hydrant: "Fire Hydrant"
           fire_station: "Fire Station"

+          food_court: "Food Court"

           fountain: "Fountain"
           fuel: "Fuel"
           grave_yard: "Grave Yard"
           fountain: "Fountain"
           fuel: "Fuel"
           grave_yard: "Grave Yard"


@@ -509,9 +532,12 @@ en:
           shelter: "Shelter"
           shop: "Shop"
           shopping: "Shopping"
           shelter: "Shelter"
           shop: "Shop"
           shopping: "Shopping"

+          shower: "Shower"
+          social_centre: "Social Centre"

           social_club: "Social Club"
           studio: "Studio"
           supermarket: "Supermarket"
           social_club: "Social Club"
           studio: "Studio"
           supermarket: "Supermarket"

+          swimming_pool: "Swimming Pool"

           taxi: "Taxi"
           telephone: "Public Telephone"
           theatre: "Theatre"
           taxi: "Taxi"
           telephone: "Public Telephone"
           theatre: "Theatre"


@@ -523,41 +549,21 @@ en:
           village_hall: "Village Hall"
           waste_basket: "Waste Basket"
           wifi: "WiFi Access"
           village_hall: "Village Hall"
           waste_basket: "Waste Basket"
           wifi: "WiFi Access"

+          WLAN: "WiFi Access"

           youth_centre: "Youth Centre"
         boundary:
           administrative: "Administrative Boundary"
           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:
         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"
         highway:
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"


@@ -565,12 +571,11 @@ en:
           byway: "Byway"
           construction: "Highway under Construction"
           cycleway: "Cycle Path"
           byway: "Byway"
           construction: "Highway under Construction"
           cycleway: "Cycle Path"

-          distance_marker: "Distance Marker"

           emergency_access_point: "Emergency Access Point"
           footway: "Footpath"
           ford: "Ford"
           emergency_access_point: "Emergency Access Point"
           footway: "Footpath"
           ford: "Ford"

-          gate: "Gate"

           living_street: "Living Street"
           living_street: "Living Street"

+          milestone: "Milestone"

           minor: "Minor Road"
           motorway: "Motorway"
           motorway_junction: "Motorway Junction"
           minor: "Minor Road"
           motorway: "Motorway"
           motorway_junction: "Motorway Junction"


@@ -582,14 +587,17 @@ en:
           primary_link: "Primary Road"
           raceway: "Raceway"
           residential: "Residential"
           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"
           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"
           steps: "Steps"
           stile: "Stile"
           tertiary: "Tertiary Road"

+          tertiary_link: "Tertiary Road"

           track: "Track"
           trail: "Trail"
           trunk: "Trunk Road"
           track: "Track"
           trail: "Trail"
           trunk: "Trunk Road"


@@ -603,6 +611,7 @@ en:
           building: "Building"
           castle: "Castle"
           church: "Church"
           building: "Building"
           castle: "Castle"
           church: "Church"

+          fort: "Fort"

           house: "House"
           icon: "Icon"
           manor: "Manor"
           house: "House"
           icon: "Icon"
           manor: "Manor"


@@ -627,6 +636,7 @@ en:
           farmland: "Farmland"
           farmyard: "Farmyard"
           forest: "Forest"
           farmland: "Farmland"
           farmyard: "Farmyard"
           forest: "Forest"

+          garages: "Garages"

           grass: "Grass"
           greenfield: "Greenfield Land"
           industrial: "Industrial Area"
           grass: "Grass"
           greenfield: "Greenfield Land"
           industrial: "Industrial Area"


@@ -634,25 +644,28 @@ en:
           meadow: "Meadow"
           military: "Military Area"
           mine: "Mine"
           meadow: "Meadow"
           military: "Military Area"
           mine: "Mine"

-          mountain: "Mountain"
+          orchard: "Orchard"

           nature_reserve: "Nature Reserve"
           park: "Park"
           piste: "Piste"
           nature_reserve: "Nature Reserve"
           park: "Park"
           piste: "Piste"

-          plaza: "Plaza"

           quarry: "Quarry"
           railway: "Railway"
           recreation_ground: "Recreation Ground"
           reservoir: "Reservoir"
           quarry: "Quarry"
           railway: "Railway"
           recreation_ground: "Recreation Ground"
           reservoir: "Reservoir"

+          reservoir_watershed: "Reservoir Watershed"

           residential: "Residential Area"
           retail: "Retail"
           residential: "Residential Area"
           retail: "Retail"

+          road: "Road Area"

           village_green: "Village Green"
           vineyard: "Vineyard"
           wetland: "Wetland"
           wood: "Wood"
         leisure:
           beach_resort: "Beach Resort"
           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"
           common: "Common Land"
           fishing: "Fishing Area"

+          fitness_station: "Fitness Station"

           garden: "Garden"
           golf_course: "Golf Course"
           ice_rink: "Ice Rink"
           garden: "Garden"
           golf_course: "Golf Course"
           ice_rink: "Ice Rink"


@@ -663,12 +676,17 @@ en:
           pitch: "Sports Pitch"
           playground: "Playground"
           recreation_ground: "Recreation Ground"
           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"
           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"
         natural:
           bay: "Bay"
           beach: "Beach"


@@ -676,11 +694,12 @@ en:
           cave_entrance: "Cave Entrance"
           channel: "Channel"
           cliff: "Cliff"
           cave_entrance: "Cave Entrance"
           channel: "Channel"
           cliff: "Cliff"

-          coastline: "Coastline"

           crater: "Crater"
           crater: "Crater"

+          dune: "Dune"

           feature: "Feature"
           fell: "Fell"
           fjord: "Fjord"
           feature: "Feature"
           fell: "Fell"
           fjord: "Fjord"

+          forest: "Forest"

           geyser: "Geyser"
           glacier: "Glacier"
           heath: "Heath"
           geyser: "Geyser"
           glacier: "Glacier"
           heath: "Heath"


@@ -700,6 +719,7 @@ en:
           scrub: "Scrub"
           shoal: "Shoal"
           spring: "Spring"
           scrub: "Scrub"
           shoal: "Shoal"
           spring: "Spring"

+          stone: "Stone"

           strait: "Strait"
           tree: "Tree"
           valley: "Valley"
           strait: "Strait"
           tree: "Tree"
           valley: "Valley"


@@ -708,6 +728,19 @@ en:
           wetland: "Wetland"
           wetlands: "Wetlands"
           wood: "Wood"
           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"
         place:
           airport: "Airport"
           city: "City"


@@ -719,6 +752,7 @@ en:
           houses: "Houses"
           island: "Island"
           islet: "Islet"
           houses: "Houses"
           island: "Island"
           islet: "Islet"

+          isolated_dwelling: "Isolated Dwelling"

           locality: "Locality"
           moor: "Moor"
           municipality: "Municipality"
           locality: "Locality"
           moor: "Moor"
           municipality: "Municipality"


@@ -742,6 +776,7 @@ en:
           junction: "Railway Junction"
           level_crossing: "Level Crossing"
           light_rail: "Light Rail"
           junction: "Railway Junction"
           level_crossing: "Level Crossing"
           light_rail: "Light Rail"

+          miniature: "Miniature Rail"

           monorail: "Monorail"
           narrow_gauge: "Narrow Gauge Railway"
           platform: "Railway Platform"
           monorail: "Monorail"
           narrow_gauge: "Narrow Gauge Railway"
           platform: "Railway Platform"


@@ -756,7 +791,7 @@ en:
           yard: "Railway Yard"
         shop:
           alcohol: "Off License"
           yard: "Railway Yard"
         shop:
           alcohol: "Off License"

-          apparel: "Apparel Shop"
+          antiques: "Antiques"

           art: "Art Shop"
           bakery: "Bakery"
           beauty: "Beauty Shop"
           art: "Art Shop"
           bakery: "Bakery"
           beauty: "Beauty Shop"


@@ -765,7 +800,6 @@ en:
           books: "Book Shop"
           butcher: "Butcher"
           car: "Car Shop"
           books: "Book Shop"
           butcher: "Butcher"
           car: "Car Shop"

-          car_dealer: "Car Dealer"

           car_parts: "Car Parts"
           carpet: "Carpet Shop"
           car_repair: "Car Repair"
           car_parts: "Car Parts"
           carpet: "Carpet Shop"
           car_repair: "Car Repair"


@@ -780,7 +814,6 @@ en:
           department_store: "Department Store"
           discount: "Discount Items Shop"
           doityourself: "Do-It-Yourself"
           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"
           dry_cleaning: "Dry Cleaning"
           electronics: "Electronics Shop"
           estate_agent: "Estate Agent"


@@ -846,7 +879,10 @@ en:
           valley: "Valley"
           viewpoint: "Viewpoint"
           zoo: "Zoo"
           valley: "Valley"
           viewpoint: "Viewpoint"
           zoo: "Zoo"

+        tunnel:
+          "yes": "Tunnel"

         waterway:
         waterway:

+          artificial: "Artificial Waterway"

           boatyard: "Boatyard"
           canal: "Canal"
           connector: "Waterway Connector"
           boatyard: "Boatyard"
           canal: "Canal"
           connector: "Waterway Connector"


@@ -869,22 +905,19 @@ en:
           weir: "Weir"
     description:
       title:
           weir: "Weir"
     description:
       title:

-        osm_namefinder: '{{types}} from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'

         osm_nominatim: 'Location from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
         geonames: 'Location from <a href="http://www.geonames.org/">GeoNames</a>'
       types:
         cities: Cities
         towns: Towns
         places: Places
         osm_nominatim: 'Location from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
         geonames: 'Location from <a href="http://www.geonames.org/">GeoNames</a>'
       types:
         cities: Cities
         towns: Towns
         places: Places

-    description_osm_namefinder:
-      prefix: "{{distance}} {{direction}} of {{type}}"

     results:
       no_results: "No results found"
       more_results: "More results"
     distance:
       zero: "less than 1km"
       one: "about 1km"
     results:
       no_results: "No results found"
       more_results: "More results"
     distance:
       zero: "less than 1km"
       one: "about 1km"

-      other: "about {{count}}km"
+      other: "about %{count}km"

     direction:
       south_west: "south-west"
       south: "south"
     direction:
       south_west: "south-west"
       south: "south"


@@ -902,15 +935,15 @@ en:
       h1: OpenStreetMap
     logo:
       alt_text: OpenStreetMap logo
       h1: OpenStreetMap
     logo:
       alt_text: OpenStreetMap logo

-    welcome_user: "Welcome, {{user_link}}"
+    welcome_user: "Welcome, %{user_link}"

     welcome_user_link_tooltip: Your user page
     home: home
     home_tooltip: Go to home location
     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
     inbox_tooltip:
       zero: Your inbox contains no unread messages
       one: Your inbox contains 1 unread message

-      other: Your inbox contains {{count}} unread messages
+      other: Your inbox contains %{count} unread messages

     logout: logout
     logout_tooltip: "Log out"
     log_in: log in
     logout: logout
     logout_tooltip: "Log out"
     log_in: log in


@@ -927,18 +960,24 @@ en:
     gps_traces_tooltip: Manage GPS traces
     user_diaries: User Diaries
     user_diaries_tooltip: View user diaries
     gps_traces_tooltip: Manage GPS traces
     user_diaries: User Diaries
     user_diaries_tooltip: View user diaries

-    edit_with: Edit with {{editor}}
+    edit_with: Edit with %{editor}

     tag_line: The Free Wiki World Map
     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 the {{ucl}} and {{bytemark}}. Other supporters of the project are listed in the {{partners}}."
-    intro_3_ucl: "UCL VR Centre"
-    intro_3_bytemark: "bytemark"
-    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."
     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."
+    donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."

     donate_link_text: donating
     help: Help
     help_centre: Help Centre
     donate_link_text: donating
     help: Help
     help_centre: Help Centre


@@ -949,15 +988,13 @@ en:
     wiki_title: Wiki site for the project
     documentation: Documentation
     documentation_title: Documentation for the project
     wiki_title: Wiki site for the project
     documentation: Documentation
     documentation_title: Documentation for the project

-    copyright: "Copyright &amp; License"
+    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
     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
+    sotm2012: 'Come to the 2012 United States OpenStreetMap Conference, The State of the Map US, October 13-14th in Portland, Oregon!'

     make_a_donation:
       title: Support OpenStreetMap with a monetary donation
       text: Make a Donation
     make_a_donation:
       title: Support OpenStreetMap with a monetary donation
       text: Make a Donation


@@ -965,136 +1002,127 @@ en:
   license_page:
     foreign:
       title: About this translation
   license_page:
     foreign:
       title: About this translation

-      text: In the event of a conflict between this translated page and {{english_original_link}}, the English page shall take precedence
+      text: In the event of a conflict between this translated page and %{english_original_link}, the English page shall take precedence

       english_link: the English original
     native:
       title: About this page
       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 page 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
       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
         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.
         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>.
         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.
         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>.
         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>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.
         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: Copyright infringement
+      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:
   notifier:
     diary_comment_notification:

-      subject: "[OpenStreetMap] {{user}} commented on your diary entry"
-      hi: "Hi {{to_user}},"
-      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}}"
+      subject: "[OpenStreetMap] %{user} commented on your diary entry"
+      hi: "Hi %{to_user},"
+      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:
     message_notification:

-      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}}"
-      footer2: "and you can reply at {{replyurl}}"
+      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}"
+      footer2: "and you can reply at %{replyurl}"

     friend_notification:
     friend_notification:

-      subject: "[OpenStreetMap] {{user}} added you as a friend"
-      had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
-      see_their_profile: "You can see their profile at {{userurl}}."
-      befriend_them: "You can also add them as a friend at {{befriendurl}}."
+      subject: "[OpenStreetMap] %{user} added you as a friend"
+      had_added_you: "%{user} has added you as a friend on OpenStreetMap."
+      see_their_profile: "You can see their profile at %{userurl}."
+      befriend_them: "You can also add them as a friend at %{befriendurl}."

     gpx_notification:
       greeting: "Hi,"
       your_gpx_file: "It looks like your GPX file"
     gpx_notification:
       greeting: "Hi,"
       your_gpx_file: "It looks like your GPX file"


@@ -1109,7 +1137,7 @@ en:
         import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
       success:
         subject: "[OpenStreetMap] GPX Import success"
         import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
       success:
         subject: "[OpenStreetMap] GPX Import success"

-        loaded_successfully: loaded successfully with {{trace_points}} out of a possible {{possible_points}} points.
+        loaded_successfully: loaded successfully with %{trace_points} out of a possible %{possible_points} points.

     signup_confirm:
       subject: "[OpenStreetMap] Confirm your email address"
     signup_confirm_plain:
     signup_confirm:
       subject: "[OpenStreetMap] Confirm your email address"
     signup_confirm_plain:


@@ -1136,9 +1164,9 @@ en:
       greeting: "Hi there!"
       hopefully_you: "Someone (hopefully you) would like to create an account over at"
       click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap"
       greeting: "Hi there!"
       hopefully_you: "Someone (hopefully you) would like to create an account over at"
       click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap"

-      introductory_video: "You can watch an {{introductory_video_link}}."
+      introductory_video: "You can watch an %{introductory_video_link}."

       video_to_openstreetmap: "introductory video to OpenStreetMap"
       video_to_openstreetmap: "introductory video to OpenStreetMap"

-      more_videos: "There are {{more_videos_link}}."
+      more_videos: "There are %{more_videos_link}."

       more_videos_here: "more videos here"
       get_reading: Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a>, catch up with the latest news via the <a href="http://blog.openstreetmap.org/">OpenStreetMap blog</a> or <a href="http://twitter.com/openstreetmap">Twitter</a>, or browse through OpenStreetMap founder Steve Coast's <a href="http://www.opengeodata.org/">OpenGeoData blog</a> for the potted history of the project, which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!
       ask_questions: You can ask any questions you may have about OpenStreetMap at our <a href="http://help.openstreetmap.org/">question and answer site</a>.
       more_videos_here: "more videos here"
       get_reading: Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a>, catch up with the latest news via the <a href="http://blog.openstreetmap.org/">OpenStreetMap blog</a> or <a href="http://twitter.com/openstreetmap">Twitter</a>, or browse through OpenStreetMap founder Steve Coast's <a href="http://www.opengeodata.org/">OpenGeoData blog</a> for the potted history of the project, which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!
       ask_questions: You can ask any questions you may have about OpenStreetMap at our <a href="http://help.openstreetmap.org/">question and answer site</a>.


@@ -1150,11 +1178,11 @@ en:
     email_confirm_plain:
       greeting: "Hi,"
       hopefully_you_1: "Someone (hopefully you) would like to change their email address over at"
     email_confirm_plain:
       greeting: "Hi,"
       hopefully_you_1: "Someone (hopefully you) would like to change their email address over at"

-      hopefully_you_2: "{{server_url}} to {{new_address}}."
+      hopefully_you_2: "%{server_url} to %{new_address}."

       click_the_link: "If this is you, please click the link below to confirm the change."
     email_confirm_html:
       greeting: "Hi,"
       click_the_link: "If this is you, please click the link below to confirm the change."
     email_confirm_html:
       greeting: "Hi,"

-      hopefully_you: "Someone (hopefully you) would like to change their email address over at {{server_url}} to {{new_address}}."
+      hopefully_you: "Someone (hopefully you) would like to change their email address over at %{server_url} to %{new_address}."

       click_the_link: "If this is you, please click the link below to confirm the change."
     lost_password:
       subject: "[OpenStreetMap] Password reset request"
       click_the_link: "If this is you, please click the link below to confirm the change."
     lost_password:
       subject: "[OpenStreetMap] Password reset request"


@@ -1172,11 +1200,17 @@ en:
       title: "Inbox"
       my_inbox: "My inbox"
       outbox: "outbox"
       title: "Inbox"
       my_inbox: "My inbox"
       outbox: "outbox"

-      you_have: "You have {{new_count}} new messages and {{old_count}} old messages"
+      messages: "You have %{new_messages} and %{old_messages}"
+      new_messages:
+        one: "%{count} new message"
+        other: "%{count} new messages"
+      old_messages:
+        one: "%{count} old message"
+        other: "%{count} old messages"

       from: "From"
       subject: "Subject"
       date: "Date"
       from: "From"
       subject: "Subject"
       date: "Date"

-      no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
+      no_messages_yet: "You have no messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"

       people_mapping_nearby: "people mapping nearby"
     message_summary:
       unread_button: "Mark as unread"
       people_mapping_nearby: "people mapping nearby"
     message_summary:
       unread_button: "Mark as unread"


@@ -1185,34 +1219,32 @@ en:
       delete_button: "Delete"
     new:
       title: "Send message"
       delete_button: "Delete"
     new:
       title: "Send message"

-      send_message_to: "Send a new message to {{name}}"
+      send_message_to: "Send a new message to %{name}"

       subject: "Subject"
       body: "Body"
       send_button: "Send"
       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."
       subject: "Subject"
       body: "Body"
       send_button: "Send"
       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"
       body: "Sorry there is no message with that id."
     outbox:
       title: "Outbox"
     no_such_message:
       title: "No such message"
       heading: "No such message"
       body: "Sorry there is no message with that id."
     outbox:
       title: "Outbox"

-      my_inbox: "My {{inbox_link}}"
+      my_inbox: "My %{inbox_link}"

       inbox: "inbox"
       outbox: "outbox"
       inbox: "inbox"
       outbox: "outbox"

-      you_have_sent_messages: "You have {{count}} sent messages"
+      messages:
+        one: "You have %{count} sent message"
+        other: "You have %{count} sent messages"

       to: "To"
       subject: "Subject"
       date: "Date"
       to: "To"
       subject: "Subject"
       date: "Date"

-      no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
+      no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"

       people_mapping_nearby: "people mapping nearby"
     reply:
       people_mapping_nearby: "people mapping nearby"
     reply:

-      wrong_user: "You are logged in as `{{user}}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."
+      wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."

     read:
       title: "Read message"
       reading_your_messages: "Reading your messages"
     read:
       title: "Read message"
       reading_your_messages: "Reading your messages"


@@ -1225,7 +1257,7 @@ en:
       reading_your_sent_messages: "Reading your sent messages"
       to: "To"
       back_to_outbox: "Back to outbox"
       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:
     sent_message_summary:
       delete_button: "Delete"
     mark:


@@ -1237,21 +1269,18 @@ 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."
     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:
       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/"
-        project_name: "OpenStreetMap project"
+        copyright: "Copyright OpenStreetMap and contributors, under an open license"
+        license_url: "http://openstreetmap.org/copyright"

         project_url: "http://openstreetmap.org"
       remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
     edit:
       not_public: "You have not set your edits to be public."
         project_url: "http://openstreetmap.org"
       remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
     edit:
       not_public: "You have not set your edits to be public."

-      not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
+      not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your %{user_page}."

       user_page_link: user page
       user_page_link: user page

-      anon_edits: "({{link}})"
+      anon_edits: "(%{link})"

       anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
       anon_edits_link_text: "Find out why this is the case."
       flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
       anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
       anon_edits_link_text: "Find out why this is the case."
       flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'


@@ -1337,6 +1366,23 @@ en:
           permissive: "Permissive access"
           destination: "Destination access"
           construction: "Roads under construction"
           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)"
   trace:
     visibility:
       private: "Private (only shared as anonymous, unordered points)"


@@ -1347,8 +1393,8 @@ en:
       upload_trace: "Upload GPS Trace"
       trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
     edit:
       upload_trace: "Upload GPS Trace"
       trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
     edit:

-      title: "Editing trace {{name}}"
-      heading: "Editing trace {{name}}"
+      title: "Editing trace %{name}"
+      heading: "Editing trace %{name}"

       filename: "Filename:"
       download: "download"
       uploaded_at: "Uploaded:"
       filename: "Filename:"
       download: "download"
       uploaded_at: "Uploaded:"


@@ -1364,16 +1410,12 @@ en:
       visibility: "Visibility:"
       visibility_help: "what does this mean?"
       visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
       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:
     trace_form:

-      upload_gpx: "Upload GPX File"
-      description: "Description"
-      tags: "Tags"
+      upload_gpx: "Upload GPX File:"
+      description: "Description:"
+      tags: "Tags:"

       tags_help: "comma delimited"
       tags_help: "comma delimited"

-      visibility: "Visibility"
+      visibility: "Visibility:"

       visibility_help: "what does this mean?"
       visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
       upload_button: "Upload"
       visibility_help: "what does this mean?"
       visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
       upload_button: "Upload"


@@ -1383,12 +1425,12 @@ en:
       upload_trace: "Upload a trace"
       see_all_traces: "See all traces"
       see_your_traces: "See your traces"
       upload_trace: "Upload a trace"
       see_all_traces: "See all traces"
       see_your_traces: "See your traces"

-      traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
+      traces_waiting: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."

     trace_optionals:
       tags: "Tags"
     view:
     trace_optionals:
       tags: "Tags"
     view:

-      title: "Viewing trace {{name}}"
-      heading: "Viewing trace {{name}}"
+      title: "Viewing trace %{name}"
+      heading: "Viewing trace %{name}"

       pending: "PENDING"
       filename: "Filename:"
       download: "download"
       pending: "PENDING"
       filename: "Filename:"
       download: "download"


@@ -1406,13 +1448,13 @@ en:
       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
     trace_paging_nav:
       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
     trace_paging_nav:

-      showing_page: "Showing page {{page}}"
-      next: "Next &raquo;"
-      previous: "&laquo; Previous"
+      showing_page: "Showing page %{page}"
+      older: "Older Traces"
+      newer: "Newer Traces"

     trace:
       pending: "PENDING"
     trace:
       pending: "PENDING"

-      count_points: "{{count}} points"
-      ago: "{{time_in_words_ago}} ago"
+      count_points: "%{count} points"
+      ago: "%{time_in_words_ago} ago"

       more: "more"
       trace_details: "View Trace Details"
       view_map: "View Map"
       more: "more"
       trace_details: "View Trace Details"
       view_map: "View Map"


@@ -1428,8 +1470,9 @@ en:
     list:
       public_traces: "Public GPS traces"
       your_traces: "Your GPS traces"
     list:
       public_traces: "Public GPS traces"
       your_traces: "Your GPS traces"

-      public_traces_from: "Public GPS traces from {{user}}"
-      tagged_with: " tagged with {{tags}}"
+      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:
     delete:
       scheduled_for_deletion: "Trace scheduled for deletion"
     make_public:


@@ -1442,12 +1485,14 @@ en:
   application:
     require_cookies:
       cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
   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."
   oauth:
     oauthorize:
     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."
   oauth:
     oauthorize:

-      request_access: "The application {{app_name}} is requesting access to your account. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
+      request_access: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."

       allow_to: "Allow the client application to:"
       allow_read_prefs:  "read your user preferences."
       allow_write_prefs: "modify your user preferences."
       allow_to: "Allow the client application to:"
       allow_read_prefs:  "read your user preferences."
       allow_write_prefs: "modify your user preferences."


@@ -1456,7 +1501,7 @@ en:
       allow_read_gpx:    "read your private GPS traces."
       allow_write_gpx:   "upload GPS traces."
     revoke:
       allow_read_gpx:    "read your private GPS traces."
       allow_write_gpx:   "upload GPS traces."
     revoke:

-      flash: "You've revoked the token for {{application}}"
+      flash: "You've revoked the token for %{application}"

   oauth_clients:
     new:
       title: "Register a new application"
   oauth_clients:
     new:
       title: "Register a new application"


@@ -1465,14 +1510,16 @@ en:
       title: "Edit your application"
       submit: "Edit"
     show:
       title: "Edit your application"
       submit: "Edit"
     show:

-      title: "OAuth details for {{app_name}}"
+      title: "OAuth details for %{app_name}"

       key: "Consumer Key:"
       secret: "Consumer Secret:"
       url: "Request Token URL:"
       access_url: "Access Token URL:"
       authorize_url: "Authorise URL:"
       key: "Consumer Key:"
       secret: "Consumer Secret:"
       url: "Request Token URL:"
       access_url: "Access Token URL:"
       authorize_url: "Authorise URL:"

-      support_notice: "We support HMAC-SHA1 (recommended) as well as plain text in ssl mode."
+      support_notice: "We support HMAC-SHA1 (recommended) as well as plain text in SSL mode."

       edit: "Edit Details"
       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."
       requests: "Requesting the following permissions from the user:"
       allow_read_prefs:  "read their user preferences."
       allow_write_prefs: "modify their user preferences."


@@ -1488,7 +1535,7 @@ en:
       issued_at: "Issued At"
       revoke: "Revoke!"
       my_apps: "My Client Applications"
       issued_at: "Issued At"
       revoke: "Revoke!"
       my_apps: "My Client Applications"

-      no_apps: "Do you have an application you would like to register for use with us using the {{oauth}} standard? You must register your web application before it can make OAuth requests to this service."
+      no_apps: "Do you have an application you would like to register for use with us using the %{oauth} standard? You must register your web application before it can make OAuth requests to this service."

       registered_apps: "You have the following client applications registered:"
       register_new: "Register your application"
     form:
       registered_apps: "You have the following client applications registered:"
       register_new: "Register your application"
     form:


@@ -1505,7 +1552,7 @@ en:
       allow_read_gpx:    "read their private GPS traces."
       allow_write_gpx:   "upload GPS traces."
     not_found:
       allow_read_gpx:    "read their private GPS traces."
       allow_write_gpx:   "upload GPS traces."
     not_found:

-      sorry: "Sorry, that {{type}} could not be found."
+      sorry: "Sorry, that %{type} could not be found."

     create:
       flash: "Registered the information successfully"
     update:
     create:
       flash: "Registered the information successfully"
     update:


@@ -1518,8 +1565,8 @@ en:
       heading: "Login"
       email or username: "Email Address or Username:"
       password: "Password:"
       heading: "Login"
       email or username: "Email Address or Username:"
       password: "Password:"

-      openid: "{{logo}} OpenID:"
-      remember: "Remember me:"
+      openid: "%{logo} OpenID:"
+      remember: "Remember me"

       lost password link: "Lost your password?"
       login_button: "Login"
       register now: Register now
       lost password link: "Lost your password?"
       login_button: "Login"
       register now: Register now


@@ -1528,33 +1575,32 @@ 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.
       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.

-      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 suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the {{webmaster}} if you wish to discuss this.
-      webmaster: webmaster
+      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."
       auth failure: "Sorry, could not log in with those details."

-      notice: "<a href=\"http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License\">Find out more about OpenStreetMap's upcoming license change</a> (<a href=\"http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License\">translations</a>) (<a href=\"http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming\">discussion</a>)"

       openid missing provider: "Sorry, could not contact your OpenID provider"
       openid invalid: "Sorry, your OpenID seems to be malformed"
       openid_logo_alt: "Log in with an OpenID"
       openid_providers:
         openid:
       openid missing provider: "Sorry, could not contact your OpenID provider"
       openid invalid: "Sorry, your OpenID seems to be malformed"
       openid_logo_alt: "Log in with an OpenID"
       openid_providers:
         openid:

-          title: Login with an OpenID URL
+          title: Login with OpenID

           alt: Login with an OpenID URL
           alt: Login with an OpenID URL

-        yahoo:
-          title: Login with a Yahoo! OpenID
-          alt: Login with a Yahoo! OpenID

         google:
         google:

-          title: Login with a Google OpenID
+          title: Login with Google

           alt: Login with a Google OpenID
           alt: Login with a Google OpenID

+        yahoo:
+          title: Login with Yahoo
+          alt: Login with a Yahoo OpenID

         myopenid:
         myopenid:

-          title: Login with a myOpenID OpenID
+          title: Login with myOpenID

           alt: Login with a myOpenID OpenID
         wordpress:
           alt: Login with a myOpenID OpenID
         wordpress:

-          title: Login with a Wordpress.com OpenID
-          alt: Login with a Wordpress.com OpenID
-        myspace:
-          title: Login with a MySpace OpenID
-          alt: Login with a MySpace OpenID
+          title: Login with Wordpress
+          alt: Login with a Wordpress OpenID
+        aol:
+          title: Login with AOL
+          alt: Login with an AOL OpenID

     logout:
       title: "Logout"
       heading: "Logout from OpenStreetMap"
     logout:
       title: "Logout"
       heading: "Logout from OpenStreetMap"


@@ -1569,7 +1615,7 @@ en:
       notice email cannot find: "Could not find that email address, sorry."
     reset_password:
       title: "Reset password"
       notice email cannot find: "Could not find that email address, sorry."
     reset_password:
       title: "Reset password"

-      heading: "Reset Password for {{user}}"
+      heading: "Reset Password for %{user}"

       password: "Password:"
       confirm password: "Confirm Password:"
       reset: "Reset Password"
       password: "Password:"
       confirm password: "Confirm Password:"
       reset: "Reset Password"


@@ -1587,10 +1633,10 @@ en:
       not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
       display name: "Display Name:"
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
       display name: "Display Name:"
       display name description: "Your publicly displayed username. You can change this later in the preferences."

-      openid: "{{logo}} OpenID:"
+      openid: "%{logo} OpenID:"

       password: "Password:"
       confirm password: "Confirm Password:"
       password: "Password:"
       confirm password: "Confirm Password:"

-      use openid: "Alternatively, use {{logo}} OpenID to login"
+      use openid: "Alternatively, use %{logo} OpenID to login"

       openid no password: "With OpenID a password is not required, but some extra tools or server may still need one."
       openid association: |
         <p>Your OpenID is not associated with a OpenStreetMap account yet.</p>
       openid no password: "With OpenID a password is not required, but some extra tools or server may still need one."
       openid association: |
         <p>Your OpenID is not associated with a OpenStreetMap account yet.</p>


@@ -1601,11 +1647,11 @@ en:
             using your username and password and then associate the account
             with your OpenID in your user settings.
           </li>
             using your username and password and then associate the account
             with your OpenID in your user settings.
           </li>

-        </ul> 
+        </ul>

       continue: Continue
       continue: Continue

-      flash create success message: "Thanks for signing up. We've sent a confirmation note to {{email}} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
+      flash create success message: "Thanks for signing up. We've sent a confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."

       terms accepted: "Thanks for accepting the new contributor terms!"
       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>."
+      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>."

       terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     terms:
       title: "Contributor terms"
       terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     terms:
       title: "Contributor terms"


@@ -1614,7 +1660,7 @@ en:
       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://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_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://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain

-      guidance: 'Information to help understand these terms: a <a href="{{summary}}">human readable summary</a> and some <a href="{{translations}}">informal translations</a>'
+      guidance: 'Information to help understand these terms: a <a href="%{summary}">human readable summary</a> and some <a href="%{translations}">informal translations</a>'

       agree: Agree
       declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
       decline: "Decline"
       agree: Agree
       declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
       decline: "Decline"


@@ -1626,14 +1672,15 @@ en:
         rest_of_world: "Rest of the world"
     no_such_user:
       title: "No such user"
         rest_of_world: "Rest of the world"
     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."
+      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."

     view:
       my diary: my diary
       new diary entry: new diary entry
       my edits: my edits
       my traces: my traces
       my settings: my settings
     view:
       my diary: my diary
       new diary entry: new diary entry
       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
       oauth settings: oauth settings
       blocks on me: blocks on me
       blocks by me: blocks by me


@@ -1644,20 +1691,24 @@ en:
       remove as friend: remove as friend
       add as friend: add as friend
       mapper since: "Mapper since:"
       remove as friend: remove as friend
       add as friend: add as friend
       mapper since: "Mapper since:"

-      ago: "({{time_in_words_ago}} ago)"
-      latest edit: "Latest edit {{ago}}:"
+      ago: "(%{time_in_words_ago} ago)"
+      ct status: "Contributor terms:"
+      ct undecided: Undecided
+      ct declined: Declined
+      ct accepted: Accepted %{ago} ago
+      latest edit: "Latest edit %{ago}:"

       email address: "Email address:"
       created from: "Created from:"
       status: "Status:"
       spam score: "Spam Score:"
       description: Description
       user location: User location
       email address: "Email address:"
       created from: "Created from:"
       status: "Status:"
       spam score: "Spam Score:"
       description: Description
       user location: User location

-      if set location: "If you set your location, a pretty map and stuff will appear here. You can set your home location on your {{settings_link}} page."
+      if set location: "If you set your location, a pretty map and stuff will appear here. You can set your home location on your %{settings_link} page."

       settings_link_text: settings
       your friends: Your friends
       no friends: You have not added any friends yet.
       settings_link_text: settings
       your friends: Your friends
       no friends: You have not added any friends yet.

-      km away: "{{count}}km away"
-      m away: "{{count}}m away"
+      km away: "%{count}km away"
+      m away: "%{count}m away"

       nearby users: "Other nearby users"
       no nearby users: "There are no other users who admit to mapping nearby yet."
       role:
       nearby users: "Other nearby users"
       no nearby users: "There are no other users who admit to mapping nearby yet."
       role:


@@ -1669,8 +1720,9 @@ en:
         revoke:
           administrator: "Revoke administrator access"
           moderator: "Revoke moderator access"
         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"
       create_block: "block this user"
       activate_user: "activate this user"
       deactivate_user: "deactivate this user"


@@ -1679,6 +1731,10 @@ en:
       unhide_user: "unhide this user"
       delete_user: "delete this user"
       confirm: "Confirm"
       unhide_user: "unhide this user"
       delete_user: "delete this user"
       confirm: "Confirm"

+      friends_changesets: "Browse all changesets by friends"
+      friends_diaries: "Browse all diary entries by friends"
+      nearby_changesets: "Browse all changesets by nearby users"
+      nearby_diaries: "Browse all diary entries by nearby users"

     popup:
       your location: "Your location"
       nearby mapper: "Nearby mapper"
     popup:
       your location: "Your location"
       nearby mapper: "Nearby mapper"


@@ -1738,10 +1794,10 @@ en:
       before you start: "We know you're probably in a hurry to start mapping, but before you do you might like to fill in some more information about yourself in the form below."
       already active: "This account has already been confirmed."
       unknown token: "That token doesn't seem to exist."
       before you start: "We know you're probably in a hurry to start mapping, but before you do you might like to fill in some more information about yourself in the form below."
       already active: "This account has already been confirmed."
       unknown token: "That token doesn't seem to exist."

-      reconfirm: "If it's been a while since you signed up you might need to <a href=\"{{reconfirm}}\">send yourself a new confirmation email</a>."
+      reconfirm: "If it's been a while since you signed up you might need to <a href=\"%{reconfirm}\">send yourself a new confirmation email</a>."

     confirm_resend:
     confirm_resend:

-      success: "We've sent a new confirmation note to {{email}} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
-      failure: "User {{name}} not found."
+      success: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
+      failure: "User %{name} not found."

     confirm_email:
       heading: Confirm a change of email address
       press confirm button: "Press the confirm button below to confirm your new email address."
     confirm_email:
       heading: Confirm a change of email address
       press confirm button: "Press the confirm button below to confirm your new email address."


@@ -1753,22 +1809,26 @@ en:
     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."
     make_friend:
     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."
     make_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}}."
+      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:
     remove_friend:

-      success: "{{name}} was removed from your friends."
-      not_a_friend: "{{name}} is not one of your friends."
+      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:
       not_an_administrator: "You need to be an administrator to perform that action."
     list:
       title: Users
       heading: Users
       showing:
     filter:
       not_an_administrator: "You need to be an administrator to perform that action."
     list:
       title: Users
       heading: Users
       showing:

-        one: Showing page {{page}} ({{first_item}} of {{items}})
-        other: Showing page {{page}} ({{first_item}}-{{last_item}} of {{items}})
-      summary: "{{name}} created from {{ip_address}} on {{date}}"
-      summary_no_ip: "{{name}} created on {{date}}"
+        one: Showing page %{page} (%{first_item} of %{items})
+        other: Showing page %{page} (%{first_item}-%{last_item} of %{items})
+      summary: "%{name} created from %{ip_address} on %{date}"
+      summary_no_ip: "%{name} created on %{date}"

       confirm: Confirm Selected Users
       hide: Hide Selected Users
       empty: No matching users found
       confirm: Confirm Selected Users
       hide: Hide Selected Users
       empty: No matching users found


@@ -1783,37 +1843,37 @@ en:
         </p>
         <p>
           This decision will be reviewed by an administrator shortly, or
         </p>
         <p>
           This decision will be reviewed by an administrator shortly, or

-          you may contact the {{webmaster}} if you wish to discuss this.
+          you may contact the %{webmaster} if you wish to discuss this.

         </p>
   user_role:
     filter:
       not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
         </p>
   user_role:
     filter:
       not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."

-      not_a_role: "The string `{{role}}' is not a valid role."
-      already_has_role: "The user already has role {{role}}."
-      doesnt_have_role: "The user does not have role {{role}}."
+      not_a_role: "The string `%{role}' is not a valid role."
+      already_has_role: "The user already has role %{role}."
+      doesnt_have_role: "The user does not have role %{role}."

     grant:
       title: Confirm role granting
       heading: Confirm role granting
     grant:
       title: Confirm role granting
       heading: Confirm role granting

-      are_you_sure: "Are you sure you want to grant the role `{{role}}' to the user `{{name}}'?"
+      are_you_sure: "Are you sure you want to grant the role `%{role}' to the user `%{name}'?"

       confirm: "Confirm"
       confirm: "Confirm"

-      fail: "Could not grant role `{{role}}' to user `{{name}}'. Please check that the user and role are both valid."
+      fail: "Could not grant role `%{role}' to user `%{name}'. Please check that the user and role are both valid."

     revoke:
       title: Confirm role revoking
       heading: Confirm role revoking
     revoke:
       title: Confirm role revoking
       heading: Confirm role revoking

-      are_you_sure: "Are you sure you want to revoke the role `{{role}}' from the user `{{name}}'?"
+      are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?"

       confirm: "Confirm"
       confirm: "Confirm"

-      fail: "Could not revoke role `{{role}}' from user `{{name}}'. Please check that the user and role are both valid."
+      fail: "Could not revoke role `%{role}' from user `%{name}'. Please check that the user and role are both valid."

   user_block:
     model:
       non_moderator_update: "Must be a moderator to create or update a block."
       non_moderator_revoke: "Must be a moderator to revoke a block."
     not_found:
   user_block:
     model:
       non_moderator_update: "Must be a moderator to create or update a block."
       non_moderator_revoke: "Must be a moderator to revoke a block."
     not_found:

-      sorry: "Sorry, the user block with ID {{id}} could not be found."
+      sorry: "Sorry, the user block with ID %{id} could not be found."

       back: "Back to index"
     new:
       back: "Back to index"
     new:

-      title: "Creating block on {{name}}"
-      heading: "Creating block on {{name}}"
-      reason: "The reason why {{name}} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms."
+      title: "Creating block on %{name}"
+      heading: "Creating block on %{name}"
+      reason: "The reason why %{name} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms."

       period: "How long, starting now, the user will be blocked from the API for."
       submit: "Create block"
       tried_contacting: "I have contacted the user and asked them to stop."
       period: "How long, starting now, the user will be blocked from the API for."
       submit: "Create block"
       tried_contacting: "I have contacted the user and asked them to stop."


@@ -1821,22 +1881,21 @@ en:
       needs_view: "User needs to log in before this block will be cleared"
       back: "View all blocks"
     edit:
       needs_view: "User needs to log in before this block will be cleared"
       back: "View all blocks"
     edit:

-      title: "Editing block on {{name}}"
-      heading: "Editing block on {{name}}"
-      reason: "The reason why {{name}} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation. Bear in mind that not all users understand the community jargon, so please try to use laymans terms."
+      title: "Editing block on %{name}"
+      heading: "Editing block on %{name}"
+      reason: "The reason why %{name} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation. Bear in mind that not all users understand the community jargon, so please try to use laymans terms."

       period: "How long, starting now, the user will be blocked from the API for."
       submit: "Update block"
       show: "View this block"
       back: "View all blocks"
       needs_view: "Does the user need to log in before this block will be cleared?"
     filter:
       period: "How long, starting now, the user will be blocked from the API for."
       submit: "Update block"
       show: "View this block"
       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:
       try_contacting: "Please try contacting the user before blocking them and giving them a reasonable time to respond."
       try_waiting: "Please try giving the user a reasonable time to respond before blocking them."
       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:
       try_contacting: "Please try contacting the user before blocking them and giving them a reasonable time to respond."
       try_waiting: "Please try giving the user a reasonable time to respond before blocking them."

-      flash: "Created a block on user {{name}}."
+      flash: "Created a block on user %{name}."

     update:
       only_creator_can_edit: "Only the moderator who created this block can edit it."
       success: "Block updated."
     update:
       only_creator_can_edit: "Only the moderator who created this block can edit it."
       success: "Block updated."


@@ -1845,16 +1904,16 @@ en:
       heading: "List of user blocks"
       empty: "No blocks have been made yet."
     revoke:
       heading: "List of user blocks"
       empty: "No blocks have been made yet."
     revoke:

-      title: "Revoking block on {{block_on}}"
-      heading: "Revoking block on {{block_on}} by {{block_by}}"
-      time_future: "This block will end in {{time}}."
-      past: "This block ended {{time}} ago and cannot be revoked now."
+      title: "Revoking block on %{block_on}"
+      heading: "Revoking block on %{block_on} by %{block_by}"
+      time_future: "This block will end in %{time}."
+      past: "This block ended %{time} ago and cannot be revoked now."

       confirm: "Are you sure you wish to revoke this block?"
       revoke: "Revoke!"
       flash: "This block has been revoked."
     period:
       one: "1 hour"
       confirm: "Are you sure you wish to revoke this block?"
       revoke: "Revoke!"
       flash: "This block has been revoked."
     period:
       one: "1 hour"

-      other: "{{count}} hours"
+      other: "%{count} hours"

     partial:
       show: "Show"
       edit: "Edit"
     partial:
       show: "Show"
       edit: "Edit"


@@ -1866,23 +1925,26 @@ en:
       status: "Status"
       revoker_name: "Revoked by"
       not_revoked: "(not revoked)"
       status: "Status"
       revoker_name: "Revoked by"
       not_revoked: "(not revoked)"

+      showing_page: "Showing page %{page}"
+      next: "Next »"
+      previous: "« Previous"

     helper:
     helper:

-      time_future: "Ends in {{time}}."
+      time_future: "Ends in %{time}."

       until_login: "Active until the user logs in."
       until_login: "Active until the user logs in."

-      time_past: "Ended {{time}} ago."
+      time_past: "Ended %{time} ago."

     blocks_on:
     blocks_on:

-      title: "Blocks on {{name}}"
-      heading: "List of blocks on {{name}}"
-      empty: "{{name}} has not been blocked yet."
+      title: "Blocks on %{name}"
+      heading: "List of blocks on %{name}"
+      empty: "%{name} has not been blocked yet."

     blocks_by:
     blocks_by:

-      title: "Blocks by {{name}}"
-      heading: "List of blocks by {{name}}"
-      empty: "{{name}} has not made any blocks yet."
+      title: "Blocks by %{name}"
+      heading: "List of blocks by %{name}"
+      empty: "%{name} has not made any blocks yet."

     show:
     show:

-      title: "{{block_on}} blocked by {{block_by}}"
-      heading: "{{block_on}} blocked by {{block_by}}"
-      time_future: "Ends in {{time}}"
-      time_past: "Ended {{time}} ago"
+      title: "%{block_on} blocked by %{block_by}"
+      heading: "%{block_on} blocked by %{block_by}"
+      time_future: "Ends in %{time}"
+      time_past: "Ended %{time} ago"

       status: "Status"
       show: "Show"
       edit: "Edit"
       status: "Status"
       show: "Show"
       edit: "Edit"


@@ -1895,10 +1957,10 @@ en:
   javascripts:
     map:
       base:
   javascripts:
     map:
       base:

-        mapnik: Mapnik
-        osmarender: Osmarender
+        standard: Standard

         cycle_map: Cycle Map
         cycle_map: Cycle Map

-        noname: NoName
+        transport_map: Transport Map
+        mapquest: MapQuest Open

       overlays:
         maplint: Maplint
     site:
       overlays:
         maplint: Maplint
     site:


@@ -1908,3 +1970,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
       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."