Merge branch 'master' into openid

Conflicts:
	config/locales/en.yml

diff --combined config/locales/en.yml
index 153dca1fe5e212dfb8d82b2336968693bb3cf87e,313f7ec7946a61257ca1827dcaccb18b935c1655..30901e50a705f47362c40af7286ef35d41fd2731
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -76,11 -76,11 +76,11 @@@ en
          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:
-     default: "Default (currently {{name}})"
+     default: "Default (currently %{name})"
      potlatch:
        name: "Potlatch 1"
        description: "Potlatch 1 (in-browser editor)"
@@@ -93,25 -93,25 +93,25 @@@
    browse:
      changeset:
        title: "Changeset"
-       changeset: "Changeset: {{id}}"
-       download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
+       changeset: "Changeset: %{id}"
+       download: "Download %{changeset_xml_link} or %{osmchange_xml_link}"
        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:
-           prev: "« {{id}}"
-           next: "{{id}} »"
+           prev: "« %{id}"
+           next: "%{id} »"
          all:
-           prev: "« {{id}}"
-           next: "{{id}} »"
+           prev: "« %{id}"
+           next: "%{id} »"
        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"
@@@ -130,14 -130,14 +130,14 @@@
        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:
-         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:
-         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:"
@@@ -147,8 -147,8 +147,8 @@@
        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"
@@@ -162,26 -162,26 +162,26 @@@
        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: "%{download_xml_link} or %{view_details_link}"
        download_xml: "Download XML"
        view_details: "view details"
      node:
        node: "Node"
-       node_title: "Node: {{node_name}}"
-       download: "{{download_xml_link}}, {{view_history_link}} or {{edit_link}}"
+       node_title: "Node: %{node_name}"
+       download: "%{download_xml_link}, %{view_history_link} or %{edit_link}"
        download_xml: "Download XML"
        view_history: "view history"
        edit: "edit"
      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:
-       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
@@@ -195,21 -195,21 +195,21 @@@
        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: "%{download_xml_link} or %{view_details_link}"
        download_xml: "Download XML"
        view_details: "view details"
      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"
-       relation_title: "Relation: {{relation_name}}"
-       download: "{{download_xml_link}} or {{view_history_link}}"
+       relation_title: "Relation: %{relation_name}"
+       download: "%{download_xml_link} or %{view_history_link}"
        download_xml: "Download XML"
        view_history: "view history"
      start:
@@@ -225,7 -225,7 +225,7 @@@
        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."
        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..."
@@@ -255,35 -255,35 +255,35 @@@
      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:
-         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_title: "Way History: {{way_name}}"
-       download: "{{download_xml_link}} or {{view_details_link}}"
+       way_history_title: "Way History: %{way_name}"
+       download: "%{download_xml_link} or %{view_details_link}"
        download_xml: "Download XML"
        view_details: "view details"
      way:
        way: "Way"
-       way_title: "Way: {{way_name}}"
-       download: "{{download_xml_link}}, {{view_history_link}} or {{edit_link}}"
+       way_title: "Way: %{way_name}"
+       download: "%{download_xml_link}, %{view_history_link} or %{edit_link}"
        download_xml: "Download XML"
        view_history: "view history"
        edit: "edit"
    changeset:
      changeset_paging_nav:
-       showing_page: "Showing page {{page}}"
+       showing_page: "Showing page %{page}"
        next: "Next »"
        previous: "« Previous"
      changeset:
-       id: "#{{id}}"
+       id: "#%{id}"
        still_editing: "(still editing)"
        anonymous: "Anonymous"
        no_comment: "(none)"
@@@ -299,9 -299,9 +299,9 @@@
        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}"
  
        heading: "Changesets"
        heading_user: "Changesets"
@@@ -309,9 -309,9 +309,9 @@@
        heading_user_bbox: "Changesets"
  
        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}"
      timeout:
        sorry: "Sorry, the list of changesets you requested took too long to retrieve."
    diary_entry:
@@@ -319,8 -319,8 +319,8 @@@
        title: New Diary Entry
      list:
        title: "Users' diaries"
-       user_title: "{{user}}'s diary"
-       in_language_title: "Diary Entries in {{language}}"
+       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
@@@ -339,32 -339,32 +339,32 @@@
        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"
-       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"
-       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."
+       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: "The user %{user} does not exist"
+       body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
      diary_entry:
-       posted_by: "Posted by {{link_user}} on {{created}} in {{language_link}}"
+       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
-         other: "{{count}} comments"
+         other: "%{count} comments"
        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:
@@@ -373,11 -373,11 +373,11 @@@
        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:
-         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"
@@@ -426,12 -426,12 +426,12 @@@
          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}}"
+       prefix: "%{type}"
+       suffix_place: ", %{distance} %{direction} of %{placename}"
+       suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} of %{parentname})"
+       suffix_suburb: "%{suffix}, %{parentname}"
      search_osm_nominatim:
-       prefix_format: "{{name}}"
+       prefix_format: "%{name}"
        prefix:
          amenity:
            airport: "Airport"
@@@ -869,7 -869,7 +869,7 @@@
            weir: "Weir"
      description:
        title:
-         osm_namefinder: '{{types}} from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
+         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:
@@@ -877,14 -877,14 +877,14 @@@
          towns: Towns
          places: Places
      description_osm_namefinder:
-       prefix: "{{distance}} {{direction}} of {{type}}"
+       prefix: "%{distance} %{direction} of %{type}"
      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"
@@@ -902,15 -902,15 +902,15 @@@
        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
-     inbox: "inbox ({{count}})"
+     inbox: "inbox (%{count})"
      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
@@@ -927,18 -927,18 +927,18 @@@
      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
      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: "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"
      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
@@@ -965,11 -965,11 +965,11 @@@
    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
-       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
      legal_babble: |
@@@ -1080,21 -1080,21 +1080,21 @@@
        </p>
    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:
-       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:
-       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"
@@@ -1109,7 -1109,7 +1109,7 @@@
          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:
@@@ -1136,9 -1136,9 +1136,9 @@@
        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"
-       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>.
@@@ -1150,11 -1150,11 +1150,11 @@@
      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,"
-       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"
@@@ -1172,11 -1172,11 +1172,11 @@@
        title: "Inbox"
        my_inbox: "My inbox"
        outbox: "outbox"
-       you_have: "You have {{new_count}} new messages and {{old_count}} old messages"
+       you_have: "You have %{new_count} new messages and %{old_count} old messages"
        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"
@@@ -1185,7 -1185,7 +1185,7 @@@
        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"
@@@ -1202,17 -1202,17 +1202,17 @@@
        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"
-       you_have_sent_messages: "You have {{count}} sent messages"
+       you_have_sent_messages: "You have %{count} sent messages"
        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:
-       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"
@@@ -1225,7 -1225,7 +1225,7 @@@
        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 to 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:
@@@ -1241,7 -1241,7 +1241,7 @@@
        permalink: Permalink
        shortlink: Shortlink
        license:
-         notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
+         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"
@@@ -1249,9 -1249,9 +1249,9 @@@
        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
-       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.'
@@@ -1347,8 -1347,8 +1347,8 @@@
        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:"
@@@ -1366,8 -1366,8 +1366,8 @@@
        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."
+       heading: "The user %{user} does not exist"
+       body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
      trace_form:
        upload_gpx: "Upload GPX File"
        description: "Description"
@@@ -1383,12 -1383,12 +1383,12 @@@
        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:
-       title: "Viewing trace {{name}}"
-       heading: "Viewing trace {{name}}"
+       title: "Viewing trace %{name}"
+       heading: "Viewing trace %{name}"
        pending: "PENDING"
        filename: "Filename:"
        download: "download"
@@@ -1406,13 -1406,13 +1406,13 @@@
        trace_not_found: "Trace not found!"
        visibility: "Visibility:"
      trace_paging_nav:
-       showing_page: "Showing page {{page}}"
+       showing_page: "Showing page %{page}"
        next: "Next &raquo;"
        previous: "&laquo; Previous"
      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"
@@@ -1428,8 -1428,8 +1428,8 @@@
      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}"
      delete:
        scheduled_for_deletion: "Trace scheduled for deletion"
      make_public:
@@@ -1447,7 -1447,7 +1447,7 @@@
        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. 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."
@@@ -1456,7 -1456,7 +1456,7 @@@
        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"
@@@ -1465,7 -1465,7 +1465,7 @@@
        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:"
@@@ -1488,7 -1488,7 +1488,7 @@@
        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:
@@@ -1505,7 -1505,7 +1505,7 @@@
        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:
@@@ -1516,45 -1516,23 +1516,45 @@@
      login:
        title: "Login"
        heading: "Login"
 -      please login: "Please login or %{create_user_link}."
 -      create_account: "create an account"
        email or username: "Email Address or Username:"
        password: "Password:"
-       openid: "{{logo}} OpenID:"
++      openid: "%{logo} OpenID:"
        remember: "Remember me:"
        lost password link: "Lost your password?"
        login_button: "Login"
        register now: Register now
 -      already have: Already have an OpenStreetMap account? Please login.
 +      with username: "Already have an OpenStreetMap account? Please login with your username and password:"
 +      with openid: "Alternatively please use your OpenID to login:"
        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.
+       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
        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:
 +          title: Login with OpenID
 +          alt: Login with an OpenID URL
 +        google:
 +          title: Login with Google
 +          alt: Login with a Google OpenID
 +        yahoo:
 +          title: Login with Yahoo
 +          alt: Login with a Yahoo OpenID
 +        myopenid:
 +          title: Login with myOpenID
 +          alt: Login with a myOpenID OpenID
 +        wordpress:
 +          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"
@@@ -1569,7 -1547,7 +1569,7 @@@
        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"
@@@ -1587,25 -1565,12 +1587,25 @@@
        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:"
-       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>
 +        <ul>
 +          <li>If you are new to OpenStreetMap, please create a new account using the form below.</li>
 +          <li>
 +            If you already have an account, you can login to your account
 +            using your username and password and then associate the account
 +            with your OpenID in your user settings.
 +          </li>
 +        </ul> 
        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 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"
@@@ -1614,7 -1579,7 +1614,7 @@@
        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"
@@@ -1626,8 -1591,8 +1626,8 @@@
          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
@@@ -1644,20 -1609,20 +1644,20 @@@
        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)"
+       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
-       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.
-       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:
@@@ -1689,10 -1654,6 +1689,10 @@@
        current email address: "Current Email Address:"
        new email address: "New Email Address:"
        email never displayed publicly: "(never displayed publicly)"
 +      openid:
 +        openid: "OpenID:"
 +        link: "http://wiki.openstreetmap.org/wiki/OpenID"
 +        link text: "what is this?"
        public editing:
          heading: "Public editing:"
          enabled: "Enabled. Not anonymous and can edit data."
@@@ -1738,10 -1699,10 +1738,10 @@@
        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:
-       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."
@@@ -1753,22 -1714,22 +1753,22 @@@
      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}}."
+       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:
-       success: "{{name}} was removed from your friends."
-       not_a_friend: "{{name}} is not one of your friends."
+       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:
-         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
@@@ -1783,37 -1744,37 +1783,37 @@@
          </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."
-       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
-       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"
-       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
-       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"
-       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:
-       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:
-       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."
@@@ -1821,9 -1782,9 +1821,9 @@@
        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"
@@@ -1836,7 -1797,7 +1836,7 @@@
      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."
@@@ -1845,16 -1806,16 +1845,16 @@@
        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"
-       other: "{{count}} hours"
+       other: "%{count} hours"
      partial:
        show: "Show"
        edit: "Edit"
@@@ -1867,22 -1828,22 +1867,22 @@@
        revoker_name: "Revoked by"
        not_revoked: "(not revoked)"
      helper:
-       time_future: "Ends in {{time}}."
+       time_future: "Ends in %{time}."
        until_login: "Active until the user logs in."
-       time_past: "Ended {{time}} ago."
+       time_past: "Ended %{time} ago."
      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:
-       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:
-       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"

diff --combined config/locales/is.yml
index 505973def8dadbd0d019f52c8962e8bc4b324e10,66a78861dde60cb20dbf03d9d8269fe820e35fe6..dfdacf9e9c95e182d588f905f2b4334ecc185bcc
--- 1/config/locales/is.yml
--- 2/config/locales/is.yml
+++ b/config/locales/is.yml
@@@ -78,12 -78,12 +78,12 @@@ is
        blocked: Aðgangur þinn að forritunarviðmótinu hefur verið bannaður. Skráðu þig inn í vefviðmótið fyrir frekari upplýsingar.
    browse: 
      changeset: 
-       changeset: "Breytingarsett: {{id}}"
+       changeset: "Breytingarsett: %{id}"
        changesetxml: Breytingarsetts XML sniði
-       download: Sækja breytinguna á {{changeset_xml_link}} eða á {{osmchange_xml_link}}
+       download: Sækja breytinguna á %{changeset_xml_link} eða á %{osmchange_xml_link}
        feed: 
-         title: Breytingarsett {{id}}
-         title_comment: Breytingarsett {{id}} - {{comment}}
+         title: Breytingarsett %{id}
+         title_comment: Breytingarsett %{id} - %{comment}
        osmchangexml: osmChange XML sniði
        title: Breytingarsett
      changeset_details: 
@@@ -93,14 -93,14 +93,14 @@@
        closed_at: "Lokað:"
        created_at: "Búið til:"
        has_nodes: 
-         one: "Inniheldur {{count}} hnút:"
-         other: "Inniheldur {{count}} hnúta:"
+         one: "Inniheldur %{count} hnút:"
+         other: "Inniheldur %{count} hnúta:"
        has_relations: 
-         one: "Inniheldur {{count}} vensl:"
-         other: "Inniheldur {{count}} vensl:"
+         one: "Inniheldur %{count} vensl:"
+         other: "Inniheldur %{count} vensl:"
        has_ways: 
-         one: "Inniheldur {{count}} veg:"
-         other: "Inniheldur {{count}} vegi:"
+         one: "Inniheldur %{count} veg:"
+         other: "Inniheldur %{count} vegi:"
        no_bounding_box: Engin svæðismörk voru vistuð ásamt þessu breytingarsetti.
        show_area_box: Sýna svæðismörk á aðalkorti
      common_details: 
@@@ -110,8 -110,8 +110,8 @@@
        in_changeset: "Í breytingarsetti:"
        version: "Útgáfa:"
      containing_relation: 
-       entry: Venslunum {{relation_name}}
-       entry_role: Venslunum {{relation_name}} (sem „{{relation_role}}“)
+       entry: Venslunum %{relation_name}
+       entry_role: Venslunum %{relation_name} (sem „%{relation_role}“)
      map: 
        deleted: Eytt
        larger: 
@@@ -131,27 -131,27 +131,27 @@@
          prev_relation_tooltip: Fyrri vensl
          prev_way_tooltip: Fyrri vegur
        user: 
-         name_changeset_tooltip: Skoða breytingarsett eftir {{user}}
-         next_changeset_tooltip: Næsta breytingarsett eftir {{user}}
-         prev_changeset_tooltip: Fyrri breytingarsett eftir {{user}}
+         name_changeset_tooltip: Skoða breytingarsett eftir %{user}
+         next_changeset_tooltip: Næsta breytingarsett eftir %{user}
+         prev_changeset_tooltip: Fyrri breytingarsett eftir %{user}
      node: 
-       download: "{{download_xml_link}} eða {{view_history_link}} eða {{edit_link}}"
+       download: "%{download_xml_link} eða %{view_history_link} eða %{edit_link}"
        download_xml: Sækja hnútinn á XML sniði
        edit: breyta
        node: Hnútur
-       node_title: "Hnútur: {{node_name}}"
+       node_title: "Hnútur: %{node_name}"
        view_history: sýna breytingarsögu
      node_details: 
        coordinates: "Hnit:"
        part_of: "Hluti af:"
      node_history: 
-       download: "{{download_xml_link}} eða {{view_details_link}}"
+       download: "%{download_xml_link} eða %{view_details_link}"
        download_xml: Sækja hnútinn ásamt breytingaskrá á XML sniði
        node_history: Breytingarskrá hnúts
-       node_history_title: "Breytingarskrá hnúts: {{node_name}}"
+       node_history_title: "Breytingarskrá hnúts: %{node_name}"
        view_details: sýna breytingarsögu
      not_found: 
-       sorry: Því miður {{type}} með kennitöluna {{id}}.
+       sorry: Því miður %{type} með kennitöluna %{id}.
        type: 
          changeset: fannst ekki breytingarsett
          node: fannst ekki hnútur
@@@ -161,22 -161,22 +161,22 @@@
        of: af
        showing_page: Sýni síðu
      relation: 
-       download: "{{download_xml_link}} eða {{view_history_link}}"
+       download: "%{download_xml_link} eða %{view_history_link}"
        download_xml: Sækja á XML sniði
        relation: Vensl
-       relation_title: "Vensl: {{relation_name}}"
+       relation_title: "Vensl: %{relation_name}"
        view_history: sýna breytingarsögu
      relation_details: 
        members: "Stök:"
        part_of: "Hluti af:"
      relation_history: 
-       download: "{{download_xml_link}} eða {{view_details_link}}"
+       download: "%{download_xml_link} eða %{view_details_link}"
        download_xml: Sækja venslin ásamt breytingaskrá á XML sniði
        relation_history: Breytingarskrá vensla
-       relation_history_title: "Breytingarskrá vensla: {{relation_name}}"
+       relation_history_title: "Breytingarskrá vensla: %{relation_name}"
        view_details: sýna breytingarsögu
      relation_member: 
-       entry_role: "{{type}} {{name}} sem „{{role}}“"
+       entry_role: "%{type} %{name} sem „%{role}“"
        type: 
          node: Hnúturinn
          relation: Venslin
@@@ -213,41 -213,41 +213,41 @@@
            way: Vegurinn
        private_user: ónafngreindum
        show_history: Sýna breytingarsögu
-       unable_to_load_size: "Gat ekki hlaðið gögnum: Svæði af stærðinni [[bbox_size]] er of stórt, svæðið verður að vera minna en {{max_bbox_size}}"
+       unable_to_load_size: "Gat ekki hlaðið gögnum: Svæði af stærðinni [[bbox_size]] er of stórt, svæðið verður að vera minna en %{max_bbox_size}"
        wait: Augnablik...
        zoom_or_select: Þú verður að þysja að eða velja svæði á kortinu
      tag_details: 
        tags: "Eigindi:"
        wiki_link: 
-         key: Wiki-síðan fyrir {{key}} lykilinn
-         tag: Wiki-síðan fyrir {{key}}={{value}} eigindin
-       wikipedia_link: „{{page}}“ greinin á Wikipedia
+         key: Wiki-síðan fyrir %{key} lykilinn
+         tag: Wiki-síðan fyrir %{key}=%{value} eigindin
+       wikipedia_link: „%{page}“ greinin á Wikipedia
      timeout: 
-       sorry: Ekki var hægt að ná í gögn fyrir {{type}} með kennitöluna {{id}}, það tók of langann tíma að ná í gögnin.
+       sorry: Ekki var hægt að ná í gögn fyrir %{type} með kennitöluna %{id}, það tók of langann tíma að ná í gögnin.
        type: 
          changeset: breytingarsettið
          node: hnútinn
          relation: venslin
          way: veginn
      way: 
-       download: "{{download_xml_link}} eða {{view_history_link}} eða {{edit_link}}"
+       download: "%{download_xml_link} eða %{view_history_link} eða %{edit_link}"
        download_xml: Sækja veginn á XML sniði
        edit: breyta
        view_history: sýna breytingarsögu
        way: Vegur
-       way_title: "Vegur: {{way_name}}"
+       way_title: "Vegur: %{way_name}"
      way_details: 
        also_part_of: 
-         one: einnig hluti af {{related_ways}}
-         other: einnig hluti af {{related_ways}}
+         one: einnig hluti af %{related_ways}
+         other: einnig hluti af %{related_ways}
        nodes: "Hnútar:"
        part_of: "Hluti af:"
      way_history: 
-       download: "{{download_xml_link}} eða {{view_details_link}}"
+       download: "%{download_xml_link} eða %{view_details_link}"
        download_xml: Sækja veginn ásamt breytingaskrá á XML sniði
        view_details: sýna breytingarsögu
        way_history: Breytingarskrá vegs
-       way_history_title: "Breytingarskrá vegs: {{way_name}}"
+       way_history_title: "Breytingarskrá vegs: %{way_name}"
    changeset: 
      changeset: 
        anonymous: Ónafngreindur
@@@ -260,7 -260,7 +260,7 @@@
      changeset_paging_nav: 
        next: Næsta »
        previous: "« Fyrri"
-       showing_page: Sýni síðu {{page}}
+       showing_page: Sýni síðu %{page}
      changesets: 
        area: Svæði
        comment: Athugasemd
@@@ -269,31 -269,31 +269,31 @@@
        user: Notandi
      list: 
        description: Nýlegar breytingar
-       description_bbox: Breytingar innan {{bbox}}
-       description_user: Breytingar eftir {{user}}
-       description_user_bbox: Breytingar eftir {{user}} innan {{bbox}}
+       description_bbox: Breytingar innan %{bbox}
+       description_user: Breytingar eftir %{user}
+       description_user_bbox: Breytingar eftir %{user} innan %{bbox}
        heading: Breytingarsett
        heading_bbox: Breytingarsett
        heading_user: Breytingarsett
        heading_user_bbox: Breytingarsett
        title: Breytingarsett
-       title_bbox: Breytingar innan {{bbox}}
-       title_user: Breytingar eftir {{user}}
-       title_user_bbox: Breytingar eftir {{user}} innan {{bbox}}
+       title_bbox: Breytingar innan %{bbox}
+       title_user: Breytingar eftir %{user}
+       title_user_bbox: Breytingar eftir %{user} innan %{bbox}
    diary_entry: 
      diary_comment: 
-       comment_from: Athugasemd eftir {{link_user}} sett inn {{comment_created_at}}
+       comment_from: Athugasemd eftir %{link_user} sett inn %{comment_created_at}
        confirm: Staðfestu
        hide_link: Fela þessa athugasemd
      diary_entry: 
        comment_count: 
          one: 1 athugasemd
-         other: "{{count}} athugasemdir"
+         other: "%{count} athugasemdir"
        comment_link: Bæta við athugasemd
        confirm: Staðfestu
        edit_link: Breyta þessari færslu
        hide_link: Fela þessa færslu
-       posted_by: Sett inn af {{link_user}} {{created}} á {{language_link}}
+       posted_by: Sett inn af %{link_user} %{created} á %{language_link}
        reply_link: Senda höfund skilaboð
      edit: 
        body: "Texti:"
@@@ -311,13 -311,13 +311,13 @@@
          description: Nýjustu dagbókarfærslur frá OpenStreetMap
          title: OpenStreetMap dagbókarfærslur
        language: 
-         description: Nýjustu dagbókarfærslur frá OpenStreetMap á {{language_name}}
-         title: OpenStreetMap dagbókarfærslur á {{language_name}}
+         description: Nýjustu dagbókarfærslur frá OpenStreetMap á %{language_name}
+         title: OpenStreetMap dagbókarfærslur á %{language_name}
        user: 
-         description: Nýjustu dagbókarfærslur eftir {{user}}
-         title: OpenStreetMap dagbókarfærslur eftir {{user}}
+         description: Nýjustu dagbókarfærslur eftir %{user}
+         title: OpenStreetMap dagbókarfærslur eftir %{user}
      list: 
-       in_language_title: Bloggfærslur á {{language}}
+       in_language_title: Bloggfærslur á %{language}
        new: Ný bloggfærsla
        new_title: Semja nýja færslu á bloggið þitt
        newer_entries: Nýrri færslur
@@@ -325,7 -325,7 +325,7 @@@
        older_entries: Eldri færslur
        recent_entries: "Nýlegar færslur:"
        title: Blogg notenda
-       user_title: Blogg {{user}}
+       user_title: Blogg %{user}
      location: 
        edit: breyta
        location: "Staðsetning:"
@@@ -333,20 -333,20 +333,20 @@@
      new: 
        title: Ný bloggfærsla
      no_such_entry: 
-       body: Bloggfærsla númer er ekki til {{id}}. Kannski slóstu slóðina vitlaust inn eða fylgdir ógildum tengli.
-       heading: Bloggfærsla númer {{id}} er ekki til
+       body: Bloggfærsla númer er ekki til %{id}. Kannski slóstu slóðina vitlaust inn eða fylgdir ógildum tengli.
+       heading: Bloggfærsla númer %{id} er ekki til
        title: Þessi bloggfærsla er ekki til
      no_such_user: 
-       body: Það er ekki til notandi með nafninu {{user}}. Kannski slóstu nafnið rangt inn eða fylgdir ógildum tengli.
-       heading: Notandinn {{user}} er ekki til
+       body: Það er ekki til notandi með nafninu %{user}. Kannski slóstu nafnið rangt inn eða fylgdir ógildum tengli.
+       heading: Notandinn %{user} er ekki til
        title: Notandi ekki til
      view: 
        leave_a_comment: Bæta við athugasemd
        login: Innskráðu þig
-       login_to_leave_a_comment: "{{login_link}} til að bæta við athugasemd"
+       login_to_leave_a_comment: "%{login_link} til að bæta við athugasemd"
        save_button: Vista
-       title: Blogg | {{user}}
-       user_title: Blogg {{user}}
+       title: Blogg | %{user}
+       user_title: Blogg %{user}
    export: 
      start: 
        add_marker: Bæta punkti á kortið
@@@ -382,14 -382,14 +382,14 @@@
      description: 
        title: 
          geonames: Staðsetning frá <a href="http://www.geonames.org/">GeoNames</a>
-         osm_namefinder: "{{types}} frá <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
+         osm_namefinder: "%{types} frá <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
          osm_nominatim: Staðsetning frá <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
        types: 
          cities: Borgir
          places: Staðir
          towns: Bæir
      description_osm_namefinder: 
-       prefix: "{{distance}} {{direction}} af{{type}}"
+       prefix: "%{distance} %{direction} af%{type}"
      direction: 
        east: austur
        north: norður
@@@ -401,7 -401,7 +401,7 @@@
        west: vestur
      distance: 
        one: u.þ.b. 1 km
-       other: u.þ.b. {{count}} km
+       other: u.þ.b. %{count} km
        zero: minna en 1 km
      results: 
        more_results: Fleiri niðurstöður
@@@ -416,8 -416,8 +416,8 @@@
          uk_postcode: Niðurstöður frá <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
          us_postcode: Niðurstöður frá <a href="http://geocoder.us/">Geocoder.us</a>
      search_osm_namefinder: 
-       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} af {{parentname}})"
-       suffix_place: ", {{distance}} {{direction}} af {{placename}}"
+       suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} af %{parentname})"
+       suffix_place: ", %{distance} %{direction} af %{placename}"
      search_osm_nominatim: 
        prefix: 
          amenity: 
@@@ -558,7 -558,7 +558,7 @@@
            river: Áin
            stream: Lækurinn
            waterfall: Fossinn
-       prefix_format: "{{name}}:"
+       prefix_format: "%{name}:"
    javascripts: 
      map: 
        base: 
@@@ -572,7 -572,7 +572,7 @@@
        history_zoom_alert: Þú verður að þysja inn á smærra svæði til að sjá breytingarskránna
    layouts: 
      copyright: Höfundaréttur &amp; leyfi
-     donate: Hjálpaðu OpenStreetMap verkefninu með {{link}} í vélbúnaðarsjóðinn.
+     donate: Hjálpaðu OpenStreetMap verkefninu með %{link} í vélbúnaðarsjóðinn.
      donate_link_text: fjárframlagi
      edit: Breyta
      export: Niðurhala
@@@ -582,14 -582,14 +582,14 @@@
      history: Breytingarskrá
      home: heim
      home_tooltip: Færa kortasýnina á þína staðsetningu
-     inbox: innhólf ({{count}})
+     inbox: innhólf (%{count})
      inbox_tooltip: 
        one: Það eru ein skilaboð í innhólfinu þínu
-       other: Það eru {{count}} skilaboð í innhólfinu þínu
+       other: Það eru %{count} skilaboð í innhólfinu þínu
        zero: Það eru engin skilaboð í innhólfinu þínu
      intro_1: OpenStreetMap er frjálst heimskort sem hver sem er getur breytt. Líka þú!
      intro_2: OpenStreetMap gerir þér kleift að skoða, breyta og nota kortagögn í samvinnu við aðra.
-     intro_3: Hýsíng verkefnisins er studd af {{ucl}} og {{bytemark}}.
+     intro_3: Hýsíng verkefnisins er studd af %{ucl} og %{bytemark}.
      license: 
        title: OpenStreetMap gögnin eru gefin út undir Creative Commons Attribution-Share Alike 2.0 leyfinu
      log_in: innskrá
@@@ -610,18 -610,18 +610,18 @@@
      user_diaries_tooltip: Sjá blogg notenda
      view: Kort
      view_tooltip: Kortasýn
-     welcome_user: Hæ {{user_link}}
+     welcome_user: Hæ %{user_link}
      welcome_user_link_tooltip: Notandasíðan þín
    license_page: 
      foreign: 
        english_link: ensku útgáfuna
-       text: "Stangist þessi þýðing á við {{english_original_link}} gildir\nhin síðari fram yfir íslenskuna."
+       text: "Stangist þessi þýðing á við %{english_original_link} gildir\nhin síðari fram yfir íslenskuna."
        title: Um þessa þýðingu
      legal_babble: "<h2>Höfundaréttur og leyfi</h2>\n\n<p>\n   OpenStreetMap er <i>frjáls kortagrunnur</i> undir <a\n   href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n   Commons Attribution-ShareAlike 2.0</a> leyfinu. (CC-BY-SA).\n</p>\n\n<h2>Frekari upplýsingar</h2>\n\n<p>\n  Frekari upplýsingar má nálgast <a href=\"/copyright/en\">í ensku\n  útgáfu</a> þessa skjals.\n</p>"
      native: 
        mapping_link: farið að kortleggja
        native_link: íslensku útgáfuna
-       text: "Þú ert að skoða höfundaréttarsíðuna á frummálinu. Þú getur\nlesið þessa útgáfu, farið aftur á {{native_link}}, eða hætt\nþessu lagabulli og {{mapping_link}}."
+       text: "Þú ert að skoða höfundaréttarsíðuna á frummálinu. Þú getur\nlesið þessa útgáfu, farið aftur á %{native_link}, eða hætt\nþessu lagabulli og %{mapping_link}."
        title: Um þessa síðu
    message: 
      delete: 
@@@ -630,12 -630,12 +630,12 @@@
        date: Dagsetning
        from: Frá
        my_inbox: Mitt innhólf
-       no_messages_yet: Þú hefur ekki fengið nein skilboð. Hví ekki að hafa samband við einhverja {{people_mapping_nearby_link}}?
+       no_messages_yet: Þú hefur ekki fengið nein skilboð. Hví ekki að hafa samband við einhverja %{people_mapping_nearby_link}?
        outbox: úthólf
        people_mapping_nearby: nálæga notendur
        subject: Titill
        title: Innhólf
-       you_have: Þú hefur {{new_count}} ólesin skilaboð og {{old_count}} lesin skilaboð
+       you_have: Þú hefur %{new_count} ólesin skilaboð og %{old_count} lesin skilaboð
      mark: 
        as_read: Skilaboðin voru merkt sem lesin
        as_unread: Skilaboðin voru merkt sem ólesin
@@@ -650,7 -650,7 +650,7 @@@
        limit_exceeded: Þú hefur sent mikið af skilaboðun nýverið. Hinkraðu svoldið áður en þú reynir að senda fleiri.
        message_sent: Skilaboðin hafa verið send
        send_button: Senda
-       send_message_to: Senda skilaboð til {{name}}
+       send_message_to: Senda skilaboð til %{name}
        subject: Titill
        title: Senda skilaboð
      no_such_user: 
@@@ -660,14 -660,14 +660,14 @@@
      outbox: 
        date: Dags
        inbox: innhólf
-       my_inbox: Mitt {{inbox_link}}
-       no_sent_messages: Þú hefur ekki seint nein skeyti, hví ekki að hafa samband við einhverja {{people_mapping_nearby_link}}?
+       my_inbox: Mitt %{inbox_link}
+       no_sent_messages: Þú hefur ekki seint nein skeyti, hví ekki að hafa samband við einhverja %{people_mapping_nearby_link}?
        outbox: úthólf
        people_mapping_nearby: nálæga notendur
        subject: Titill
        title: Úthólf
        to: Til
-       you_have_sent_messages: Þú hefur sent {{count}} skeyti
+       you_have_sent_messages: Þú hefur sent %{count} skeyti
      read: 
        back_to_inbox: Aftur í innhólf
        back_to_outbox: Aftur í úthólf
@@@ -684,25 -684,25 +684,25 @@@
        delete_button: Eyða
    notifier: 
      diary_comment_notification: 
-       footer: Þú getur einnig lesið athugasemdina á {{readurl}} og skrifað athugasemd á {{commenturl}} eða svarað á {{replyurl}}
-       header: "{{from_user}} hefur bætt við athugasemd á OpenStreetMap bloggið þitt með titlinum „{{subject}}“:"
-       hi: Hæ {{to_user}},
-       subject: "[OpenStreetMap] {{user}} bætti við athugasemd á bloggfærslu þína"
+       footer: Þú getur einnig lesið athugasemdina á %{readurl} og skrifað athugasemd á %{commenturl} eða svarað á %{replyurl}
+       header: "%{from_user} hefur bætt við athugasemd á OpenStreetMap bloggið þitt með titlinum „%{subject}“:"
+       hi: Hæ %{to_user},
+       subject: "[OpenStreetMap] %{user} bætti við athugasemd á bloggfærslu þína"
      email_confirm: 
        subject: "[OpenStreetMap] Staðfestu netfangið þitt"
      email_confirm_html: 
        click_the_link: Ef þú óskaðir eftir þessari breytingu fylgdu tenglinum hér fyrir neðan til að staðfesta breytinguna.
        greeting: Hæ,
-       hopefully_you: Einhver (vonandi þú) vill breyta netfanginu sínu á {{server_url}} í {{new_address}}.
+       hopefully_you: Einhver (vonandi þú) vill breyta netfanginu sínu á %{server_url} í %{new_address}.
      email_confirm_plain: 
        click_the_link: Ef þú óskaðir eftir þessari breytingu fylgdu tenglinum hér fyrir neðan til að staðfesta breytinguna.
        greeting: Hæ,
        hopefully_you_1: Einhver (vonandi þú) vill breyta netfanginu sínu á
-       hopefully_you_2: "{{server_url}} í {{new_address}}."
+       hopefully_you_2: "%{server_url} í %{new_address}."
      friend_notification: 
-       had_added_you: Notandinn {{user}} hefur bætt þér við sem vini á OpenStreetMap.
-       see_their_profile: Þú getur séð notandasíðu notandans á {{userurl}} og jafnvel bætt honum við sem vini líka.
-       subject: "[OpenStreetMap] {{user}} bætti þér við sem vin"
+       had_added_you: Notandinn %{user} hefur bætt þér við sem vini á OpenStreetMap.
+       see_their_profile: Þú getur séð notandasíðu notandans á %{userurl} og jafnvel bætt honum við sem vini líka.
+       subject: "[OpenStreetMap] %{user} bætti þér við sem vin"
      gpx_notification: 
        and_no_tags: og engin tögg.
        and_the_tags: "og eftirfarandi tögg:"
@@@ -714,7 -714,7 +714,7 @@@
          subject: "[OpenStreetMap] Villa við að flytja inn GPX skrá"
        greeting: Hæ,
        success: 
-         loaded_successfully: var innflutt með {{trace_points}} punkta af {{possible_points}} mögulegum.
+         loaded_successfully: var innflutt með %{trace_points} punkta af %{possible_points} mögulegum.
          subject: "[OpenStreetMap] GPX skrá innflutt"
        with_description: "með lýsinguna:"
        your_gpx_file: GPX skráin þín
@@@ -730,10 -730,10 +730,10 @@@
        hopefully_you_1: Einhver (vonandi þú) hefur beðið um að endurstilla lykilorðið á reikningnum
        hopefully_you_2: með þetta netfang á openstreetmap.org
      message_notification: 
-       footer1: Þú getur einnig lesið skilaboðin á {{readurl}}
-       footer2: og svarað á {{replyurl}}
-       header: "{{from_user}} hefur send þér skilaboð á OpenStreetMap með titlinum „{{subject}}“:"
-       hi: Hæ {{to_user}},
+       footer1: Þú getur einnig lesið skilaboðin á %{readurl}
+       footer2: og svarað á %{replyurl}
+       header: "%{from_user} hefur send þér skilaboð á OpenStreetMap með titlinum „%{subject}“:"
+       hi: Hæ %{to_user},
      signup_confirm: 
        subject: "[OpenStreetMap] Staðfestu netfangið þitt"
      signup_confirm_html: 
@@@ -742,8 -742,8 +742,8 @@@
        get_reading: "Þú getur lesið um OpenStreetMap verkefnið á <a href=\"http://wiki.openstreetmap.org/index.php?uselang=is&title=Beginners%27_Guide\">wiki-síðunni okkar</a> eða <a href=\"http://www.opengeodata.org/\">OpenGeoData blogginu</a> þar sem einnig er að finna <a href=\"http://www.opengeodata.org/?cat=13\">hljóðvarp</a>.\n\nEinnig er hægt að fylgjast með <a href=\"http://twitter.com/openstreetmap\">OpenStreetMap á Twitter</a> eða skoða <a href=\"http://blogs.openstreetmap.org/\">almennan bloggstraum</a> fyrir verkefnið."
        greeting: Hæ!
        hopefully_you: "Einhver (vonandi þú) vill búa til notanda á þessari vefsíðu:"
-       introductory_video: Þú getur horft á {{introductory_video_link}}.
-       more_videos: Fleiri myndbönd er {{more_videos_link}}.
+       introductory_video: Þú getur horft á %{introductory_video_link}.
+       more_videos: Fleiri myndbönd er %{more_videos_link}.
        more_videos_here: hægt að finna hér
        user_wiki_page: Það er mælt með því að þú búir ttil notandasíðu á wiki-inu þar sem tengt er í flokk sem gefur til kynna hvar þú ert, t.d. <a href="http://wiki.openstreetmap.org/index.php?uselang=is&title=Category:Users_in_Iceland">[[Category:Users_in_Iceland]]</a>.
        video_to_openstreetmap: kynningarmyndband um OpenStreetMap
@@@ -773,7 -773,7 +773,7 @@@
        allow_write_diary: Búa til bloggfærslur, setja inn athugasemdir og bæta við vinum.
        allow_write_gpx: Senda inn GPS ferla.
        allow_write_prefs: Breyta notandastillingunum þínum.
-       request_access: Forritið {{app_name}} hefur óskað eftir að fá aðgang að OpenStreetMap í gegnum notandann þinn. Hakaðu við hvað eiginleika þú vilt gefa forritinu leyfi fyrir. Hægt er að haka við hvaða eiginleika sem er.
+       request_access: Forritið %{app_name} hefur óskað eftir að fá aðgang að OpenStreetMap í gegnum notandann þinn. Hakaðu við hvað eiginleika þú vilt gefa forritinu leyfi fyrir. Hægt er að haka við hvaða eiginleika sem er.
    oauth_clients: 
      create: 
        flash: Nýtt OAuth forrit hefur verið skráð
@@@ -805,15 -805,15 +805,15 @@@
        allow_write_prefs: Breyta notandastillingum þeirra.
        edit: Breyta þessari skráningu
        requests: "Óska eftir eftirfarandi leyfum frá notendum:"
-       title: OAuth stillingar fyrir {{app_name}}
+       title: OAuth stillingar fyrir %{app_name}
    printable_name: 
-     with_version: "{{id}}, útgáfa {{version}}"
+     with_version: "%{id}, útgáfa %{version}"
    site: 
      edit: 
        anon_edits_link_text: Finndu út afhverju.
        flash_player_required: Þú þarft Flash spilara til að nota Potlatch ritilinn. Þú getur <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">sótt niður Flash spilara frá Adobe.com</a> eða notað <a href="http://wiki.openstreetmap.org/index.php?uselang=is&title=Editing">aðra OpenStreetMap ritla</a> sem ekki krefjast Flash.
        not_public: Þú hefur ekki merkt breytingar þínar sem opinberar.
-       not_public_description: Þú getur ekki lengur gert breytingar nema þær séu merktar opinberar, þú getur breytt þeim stillingum á {{user_page}}.
+       not_public_description: Þú getur ekki lengur gert breytingar nema þær séu merktar opinberar, þú getur breytt þeim stillingum á %{user_page}.
        potlatch_unsaved_changes: Þú ert með óvistaðar breytingar. Til að vista í Potlatch þarf að af-velja núverandi val ef þú ert í „Live“-ham, eða ýta á „Save“ hnappinn til að vista ef sá hnappur er sjáanlegur.
        user_page_link: notandasíðunni þinni
      index: 
@@@ -822,7 -822,7 +822,7 @@@
        js_3: Þú getur einnig notað <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home kortasýnina</a> sem krefst ekki JavaScript stuðnings.
        license: 
          license_name: Creative Commons Attribution-Share Alike 2.0
-         notice: Gefið út undir {{license_name}} leyfinu af þáttakendum í {{project_name}}.
+         notice: Gefið út undir %{license_name} leyfinu af þáttakendum í %{project_name}.
          project_name: OpenStreetMap verkefninu
        permalink: Varanlegur tengill
        shortlink: Varanlegur smátengill
@@@ -918,7 -918,7 +918,7 @@@
        download: sækja
        edit: breyta
        filename: "Skráanafn:"
-       heading: Breyti ferlinum {{name}}
+       heading: Breyti ferlinum %{name}
        map: kort
        owner: "Eigandi:"
        points: "Punktar:"
@@@ -926,20 -926,20 +926,20 @@@
        start_coord: "Byrjunarhnit:"
        tags: "Tögg:"
        tags_help: aðskilin með kommum
-       title: Breyti ferlinum {{name}}
+       title: Breyti ferlinum %{name}
        uploaded_at: "Hlaðið upp:"
        visibility: "Sýnileiki:"
        visibility_help: hvað þýðir þetta?
      list: 
        public_traces: Allir ferlar
-       public_traces_from: Ferlar eftir {{user}}
-       tagged_with: " með taggið {{tags}}"
+       public_traces_from: Ferlar eftir %{user}
+       tagged_with: " með taggið %{tags}"
        your_traces: Þínir ferlar
      make_public: 
        made_public: Ferilinn var gerður sjáanlegur
      no_such_user: 
-       body: Það er ekki til notandi með nafninu {{user}}. Kannski slóstu nafnið rangt inn eða fylgdir ógildum tengli.
-       heading: Notandinn {{user}} er ekki til
+       body: Það er ekki til notandi með nafninu %{user}. Kannski slóstu nafnið rangt inn eða fylgdir ógildum tengli.
+       heading: Notandinn %{user} er ekki til
        title: Notandi ekki til
      offline: 
        heading: Ekki hægt að hlaða upp GPX
@@@ -947,9 -947,9 +947,9 @@@
      offline_warning: 
        message: Ekki er hægt að hlaða upp GPX ferlum í augnablikinu
      trace: 
-       ago: "{{time_in_words_ago}} síðan"
+       ago: "%{time_in_words_ago} síðan"
        by: eftir
-       count_points: "{{count}} punktar"
+       count_points: "%{count} punktar"
        edit: breyta
        edit_map: Breyta kortinu með ferilin til hliðsjónar
        identifiable: AUÐKENNANLEGUR
@@@ -975,13 -975,13 +975,13 @@@
      trace_header: 
        see_all_traces: Sjá alla ferla
        see_your_traces: Sjá aðeins þína ferla
-       traces_waiting: Þú ert með {{count}} ferla í bið. Íhugaðu að bíða með að senda inn fleiri ferla til að aðrir notendur komist að.
+       traces_waiting: Þú ert með %{count} ferla í bið. Íhugaðu að bíða með að senda inn fleiri ferla til að aðrir notendur komist að.
      trace_optionals: 
        tags: Tögg
      trace_paging_nav: 
        next: Næsta &raquo;
        previous: "&laquo; Fyrri"
-       showing_page: Sýni síðu {{page}}
+       showing_page: Sýni síðu %{page}
      view: 
        delete_track: Eyða
        description: "Lýsing:"
@@@ -989,7 -989,7 +989,7 @@@
        edit: breyta
        edit_track: Breyta
        filename: "Skráarnafn:"
-       heading: Skoða ferilinn {{name}}
+       heading: Skoða ferilinn %{name}
        map: kort
        none: engin
        owner: "Eigandi:"
@@@ -997,7 -997,7 +997,7 @@@
        points: "Punktar:"
        start_coordinates: "Byrjunarhnit:"
        tags: Tögg
-       title: Skoða ferilinn {{name}}
+       title: Skoða ferilinn %{name}
        trace_not_found: Þessi ferill fannst ekki!
        uploaded: "Hlaðið upp:"
        visibility: "Sýnileiki:"
@@@ -1011,8 -1011,6 +1011,8 @@@
        current email address: "Núverandi netfang:"
        delete image: Eyða þessari mynd
        email never displayed publicly: (aldrei sýnt opinberlega)
 +      openid:
 +        link text: "hvað er openID?"
        flash update success: Stillingarnar þínar voru uppfærðar.
        flash update success confirm needed: Stillingarnar þínar voru uppfærðar. Póstur var sendur á netfangið þitt sem þú þarft að bregðast við til að netfangið þitt verði staðfest.
        home location: "Staðsetning:"
@@@ -1060,7 -1058,7 +1060,7 @@@
        flash success: Allar breytingar þínar eru nú opinberar, og þú getur breytt gögnum.
      login: 
        account not active: Þessi reikningur er ekki virkur.<br />Vinsamlegast smelltu á tengilinn í staðfestingarpóstinum sem þú fékkst til að virkja reikninginn.
-       account suspended: Reikningnum þínum hefur verið lokað vegna grunsamlegrar hegðunar.<br />Hafðu samband við {{webmaster}} ef þú vilt fá hann opnaðan aftur.
+       account suspended: Reikningnum þínum hefur verið lokað vegna grunsamlegrar hegðunar.<br />Hafðu samband við %{webmaster} ef þú vilt fá hann opnaðan aftur.
        auth failure: Þetta notandanafn eða lykilorð er rangt.
        create_account: stofnaðu aðgang
        email or username: "Netfang eða notandanafn:"
@@@ -1068,32 -1066,10 +1068,32 @@@
        login_button: Innskrá
        lost password link: Gleymt lykilorð?
        password: "Lykilorð:"
-       please login: Vinsamlegast innskráðu þig eða {{create_user_link}}.
+       please login: Vinsamlegast innskráðu þig eða %{create_user_link}.
        remember: "Muna innskráninguna:"
        title: Innskrá
        webmaster: vefstjóra
 +      openid_heading: "Innskráning með OpenID:"
 +      username_heading: "Innskráning með OpenStreetMap aðgang:"
 +      openid_logo_alt: "Innskrá með OpenID"
 +      openid_providers:
 +        openid:
 +          title: Innskrá með OpenID slóð
 +          alt: Innskrá með OpenID slóð
 +        yahoo:
 +          title: Innsrká með Yahoo! OpenID
 +          alt: Innsrká með Yahoo! OpenID
 +        google:
 +          title: Innsrká með Google OpenID
 +          alt: Innsrká með Google OpenID
 +        myopenid:
 +          title: Innsrká með myOpenID OpenID
 +          alt: Innsrká með myOpenID OpenID
 +        wordpress:
 +          title: Innsrká með Wordpress.com OpenID
 +          alt: Innsrká með Wordpress.com OpenID
 +        myspace:
 +          title: Innsrká með MySpace OpenID
 +          alt: Innsrká með MySpace OpenID
      logout: 
        heading: Útskrá
        logout_button: Útskrá
@@@ -1107,9 -1083,9 +1107,9 @@@
        notice email on way: Nýtt lykilorð er á leiðinni í innhólfið þitt.
        title: Gleymt lykilorð
      make_friend: 
-       already_a_friend: "{{name}} er þegar vinur þinn."
-       failed: Gat ekki bætt {{name}} á vinalistann þinn.
-       success: "{{name}} er núna vinur þinn."
+       already_a_friend: "%{name} er þegar vinur þinn."
+       failed: Gat ekki bætt %{name} á vinalistann þinn.
+       success: "%{name} er núna vinur þinn."
      new: 
        confirm email address: "Staðfestu netfang:"
        confirm password: "Staðfestu lykilorðið:"
@@@ -1125,38 -1101,23 +1125,38 @@@
        no_auto_account_create: Því miður getum við eki búið til reikning fyrir þig sjálfkrafa.
        not displayed publicly: Ekki sýnt opinberlega (sjá <a href="http://wiki.openstreetmap.org/index.php?uselang=is&title=Privacy_Policy" title="Meðferð persónuupplýsinga, þ.á.m. netfanga">meðferð persónuupplýsinga</a>)
        password: "Lykilorð:"
 +      openID associate: "Tengja OpenID við þennan aðgang"
 +      openID: "OpenID:"
 +      openID description: '(Valfrjálst) Ef þú ert með <a href="http://wiki.openstreetmap.org/wiki/openID">OpenID</a> getur þú tengt það við nýja aðganginn þinn.'
 +      openID nopassword: "Með OpenID þarft þú ekki að gefa upp lykilorð við innskráningu. Í stað þess notar þú OpenID."
 +      openID association: |
 +        Þetta OpenID er ekki tengt við neinn OpenStreetMap aðgang.
 +        <ul>
 +          <li>Ef þú ert ekki með OpenStreetMap aðgang getur þú búið til nýjan aðgang hér fyrir neðan.</li>
 +          <li>
 +            Ef þú ert þegar með aðgang skaltu innskrá þig með
 +            honum. Svo getur þú tengt OpenID við aðganginn þinn á
 +            stillingarsíðunni.
 +          </li>
 +        </ul> 
 +      signup: Nýskrá
        title: Nýskrá
      no_such_user: 
-       body: Það er ekki til notandi með nafninu {{user}}. Kannski slóstu nafnið rangt inn eða fylgdir ógildum tengli.
-       heading: Notandinn {{user}} er ekki til
+       body: Það er ekki til notandi með nafninu %{user}. Kannski slóstu nafnið rangt inn eða fylgdir ógildum tengli.
+       heading: Notandinn %{user} er ekki til
        title: Notandi ekki til
      popup: 
        friend: Vinur
        nearby mapper: Nálægur notandi
        your location: Þín staðsetning
      remove_friend: 
-       not_a_friend: "{{name}} er ekki vinur þinn."
-       success: "{{name}} er ekki lengur vinur þinn."
+       not_a_friend: "%{name} er ekki vinur þinn."
+       success: "%{name} er ekki lengur vinur þinn."
      reset_password: 
        confirm password: "Staðfestu lykilorð:"
        flash changed: Lykilorðinu þínu hefur verið breytt
        flash token bad: Þessi leynistrengur fannst ekki, kannski er slóðin röng?
-       heading: Endurstillti lykilorð fyrir notandann {{user}}
+       heading: Endurstillti lykilorð fyrir notandann %{user}
        password: "Lykilorð:"
        reset: Endurstilla lykilorð
        title: Lykilorð endurstillt
@@@ -1176,7 -1137,7 +1176,7 @@@
      view: 
        activate_user: virkja þennan notanda
        add as friend: bæta við sem vin
-       ago: ({{time_in_words_ago}} síðan)
+       ago: (%{time_in_words_ago} síðan)
        block_history: bönn gegn þessum notanda
        blocks by me: bönn eftir mig
        blocks on me: bönn gegn mér
@@@ -1191,9 -1152,9 +1191,9 @@@
        edits: breytingar
        email address: "Netfang:"
        hide_user: fela þennan notanda
-       if set location: Ef þú vistar staðsetningu þína mun kortasjá birtast hér fyrir neðan með þér og nálægum notendum. Þú getur stillt staðsetninguna á {{settings_link}}.
-       km away: í {{count}} km fjarlægð
-       m away: í {{count}} m fjarlægð
+       if set location: Ef þú vistar staðsetningu þína mun kortasjá birtast hér fyrir neðan með þér og nálægum notendum. Þú getur stillt staðsetninguna á %{settings_link}.
+       km away: í %{count} km fjarlægð
+       m away: í %{count} m fjarlægð
        mapper since: "Notandi síðan:"
        moderator_history: bönn eftir notandann
        my diary: bloggið mitt
@@@ -1225,30 -1186,30 +1225,30 @@@
        your friends: Vinir þínir
    user_block: 
      blocks_by: 
-       empty: "{{name}} hefur ekki ennþá bannað einhvern."
-       heading: Bönn eftir {{name}}
-       title: Bönn eftir {{name}}
+       empty: "%{name} hefur ekki ennþá bannað einhvern."
+       heading: Bönn eftir %{name}
+       title: Bönn eftir %{name}
      blocks_on: 
-       empty: "{{name}} hefur ekki verið bannaður."
-       heading: Bönn gegn {{name}}
-       title: Bönn gegn {{name}}
+       empty: "%{name} hefur ekki verið bannaður."
+       heading: Bönn gegn %{name}
+       title: Bönn gegn %{name}
      create: 
-       flash: Bjó til bann gegn {{name}}.
+       flash: Bjó til bann gegn %{name}.
      edit: 
        back: Listi yfir öll bönn
-       heading: Breyti banni gegn {{name}}
+       heading: Breyti banni gegn %{name}
        needs_view: Notandinn þarf að innskrá sig áður en bannið fellur úr gildi.
        period: Hversu lengi á að banna notandann frá því að nota forritunarviðmótið?
-       reason: "Ástæðan fyrir því að það er bann gegn {{name}}:"
+       reason: "Ástæðan fyrir því að það er bann gegn %{name}:"
        show: Sýna þetta bann
        submit: Uppfæra bannið
-       title: Breyti banni gegn {{name}}
+       title: Breyti banni gegn %{name}
      filter: 
        block_period: Banntíminn verður að vera í forstillingunum.
        not_a_moderator: Þú þarft að vera stjórnandi til að framkvæma þessa aðgerð.
      helper: 
-       time_future: Endar eftir {{time}}
-       time_past: Endaði fyrir {{time}} síðan
+       time_future: Endar eftir %{time}
+       time_past: Endaði fyrir %{time} síðan
        until_login: Virkt þangað til notandinn innskráir sig.
      index: 
        empty: Enginn hefur verið bannaður enn.
@@@ -1259,15 -1220,15 +1259,15 @@@
        non_moderator_update: Þú verður að vera stjórnandi til að búa til eða breyta banni.
      new: 
        back: Listi yfir öll bönn
-       heading: Banna {{name}}
+       heading: Banna %{name}
        needs_view: Notandinn þarf að innskrá sig áður en bannið fellur úr gildi.
        period: Hversu lengi á að banna notandann frá því að nota forritunarviðmótið?
-       reason: "Gefðu ástæðu fyrir því að þú viljir banna {{name}}:"
+       reason: "Gefðu ástæðu fyrir því að þú viljir banna %{name}:"
        submit: Banna notandann
-       title: Banna {{name}}
+       title: Banna %{name}
      not_found: 
        back: Listi yfir öll bönn
-       sorry: "Bann #{{id}} fannst ekki."
+       sorry: "Bann #%{id} fannst ekki."
      partial: 
        confirm: Ert þú viss?
        creator_name: Búið til af
@@@ -1281,47 -1242,47 +1281,47 @@@
        status: Staða
      period: 
        one: 1 stund
-       other: "{{count}} stundir"
+       other: "%{count} stundir"
      revoke: 
        confirm: Staðfestu að þú viljir eyða þessu banni.
        flash: Banninu var eytt.
-       heading: Eyði banni á {{block_on}} eftir {{block_by}}
-       past: Bannið endaði fyrir {{time}} síðan, ekki er hægt að eyða því núna.
+       heading: Eyði banni á %{block_on} eftir %{block_by}
+       past: Bannið endaði fyrir %{time} síðan, ekki er hægt að eyða því núna.
        revoke: Eyða banninu
-       time_future: Bannið endar eftir {{time}}.
-       title: Eyði banni á {{block_on}}
+       time_future: Bannið endar eftir %{time}.
+       title: Eyði banni á %{block_on}
      show: 
        back: Listi yfir öll bönn
        confirm: Ertu viss?
        edit: Breyta banninu
-       heading: Notandinn „{{block_on}}“ var bannaður af „{{block_by}}“
+       heading: Notandinn „%{block_on}“ var bannaður af „%{block_by}“
        needs_view: Notandinn þarf að innskrá sig áður en bannið fellur úr gildi.
        reason: "Ástæða banns:"
        revoke: Eyða banninu
        revoker: "Eytt af:"
        show: Sýna
        status: Staða
-       time_future: Endar eftir {{time}}
-       time_past: Endaði fyrir {{time}} síðan
-       title: Bann á {{block_on}} eftir {{block_by}}
+       time_future: Endar eftir %{time}
+       time_past: Endaði fyrir %{time} síðan
+       title: Bann á %{block_on} eftir %{block_by}
      update: 
        only_creator_can_edit: Aðeins stjórnandinn sem bjó til bannið getur breytt því.
        success: Banninu var breytt.
    user_role: 
      filter: 
-       already_has_role: Notandinn hefur þegar „{{role}}“ leyfi
-       doesnt_have_role: Notandinn er ekki með „{{role}}“ leyfi.
-       not_a_role: „{{role}}“ er ekki gilt leyfi.
+       already_has_role: Notandinn hefur þegar „%{role}“ leyfi
+       doesnt_have_role: Notandinn er ekki með „%{role}“ leyfi.
+       not_a_role: „%{role}“ er ekki gilt leyfi.
        not_an_administrator: Aðeins möppudýr geta sýslað með leyfi, og þú ert ekki möppudýr.
      grant: 
-       are_you_sure: Staðfestu að þú viljir veita notandanum „{{name}}“ leyfið „{{role}}“
+       are_you_sure: Staðfestu að þú viljir veita notandanum „%{name}“ leyfið „%{role}“
        confirm: Staðfesta
-       fail: Gat ekki veitt „{{name}}“ leyfið „{{role}}“. Staðfestu að notandinn og leyfið séu bæði gild.
+       fail: Gat ekki veitt „%{name}“ leyfið „%{role}“. Staðfestu að notandinn og leyfið séu bæði gild.
        heading: Staðfestu leyfisveitingu
        title: Staðfestu leyfisveitingu
      revoke: 
-       are_you_sure: Staðfestu að þú viljir svifta notandann „{{name}}“ leyfinu „{{role}}“
+       are_you_sure: Staðfestu að þú viljir svifta notandann „%{name}“ leyfinu „%{role}“
        confirm: Staðfesta
-       fail: Gat ekki svift „{{name}}“ leyfinu „{{role}}“. Staðfestu að notandinn og leyfið séu bæði gild.
+       fail: Gat ekki svift „%{name}“ leyfinu „%{role}“. Staðfestu að notandinn og leyfið séu bæði gild.
        heading: Staðfestu leyfissviftingu
        title: Staðfestu leyfissviftingu