Merge branch 'master' into openstreetbugs

diff --cc config/locales/de.yml
Simple merge

diff --cc config/locales/en.yml
index 3c743aac686e7a207e73a71930bb07ca6cc995be,313f7ec7946a61257ca1827dcaccb18b935c1655..c619d449d9050550b369a016bf7fce040d0b6da1
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -277,20 -277,9 +277,20 @@@ en
        download_xml: "Download XML"
        view_history: "view history"
        edit: "edit"
-       open_title: "Unresolved issue: {{note_name}}"
-       closed_title: "Resolved issue: {{note_name}}"
 +    note:
++      open_title: "Unresolved issue: %{note_name}"
++      closed_title: "Resolved issue: %{note_name}"
 +      created_at: "Created at:"
 +      edited_at: "Edited at:"
 +      closed_at: "Closed at:"
 +      opened_by: "Opened by:"
 +      description: "Description:"
 +      comment_by: "Comment by: "
 +      comment: "Comment:"
 +      date: "Date:"
    changeset:
      changeset_paging_nav:
-       showing_page: "Showing page {{page}}"
+       showing_page: "Showing page %{page}"
        next: "Next »"
        previous: "« Previous"
      changeset:
@@@ -1178,13 -1167,6 +1178,13 @@@
        greeting: "Hi,"
        hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
        click_the_link: "If this is you, please click the link below to reset your password."
-       subject_own: "[OpenStreetMap] {{commenter}} has commented on one of your notes"
-       subject_other: "[OpenStreetMap] {{commenter}} has commented on a note you are interested in"
 +    note_plain:
-       your_note: "{{commenter}} has left a comment on one of your map notes near {{place}}."
-       commented_note: "{{commenter}} has left a comment on a map note you have commented on. The note is near {{place}}."
-       details: "More details about the note can be found at {{URL}}."
++      subject_own: "[OpenStreetMap] %{commenter} has commented on one of your notes"
++      subject_other: "[OpenStreetMap] %{commenter} has commented on a note you are interested in"
 +      greeting: "Hi,"
++      your_note: "%{commenter} has left a comment on one of your map notes near %{place}."
++      commented_note: "%{commenter} has left a comment on a map note you have commented on. The note is near %{place}."
++      details: "More details about the note can be found at %{URL}."
    message:
      inbox:
        title: "Inbox"
@@@ -1873,21 -1853,6 +1873,21 @@@
        back: "View all blocks"
        revoker: "Revoker:"
        needs_view: "The user needs to log in before this block will be cleared."
-       description_area: "A list of notes, reported, commented on or closed in your area [({{min_lat}}|{{min_lon}}) -- ({{max_lat}}|{{max_lon}})]"
-       description_item: "An rss feed for note {{id}}"
-       closed: "closed note (near {{place}})"
-       new: "new note (near {{place}})"
-       comment: "new comment (near {{place}})"
 +  note:
 +    rss:
 +      title: "OpenStreetMap Notes"
-       title: "Notes submitted or commented on by {{user}}"
-       heading: "{{user}}'s notes"
-       description: "Notes submitted or commented on by {{user}}"
++      description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"
++      description_item: "An rss feed for note %{id}"
++      closed: "closed note (near %{place})"
++      new: "new note (near %{place})"
++      comment: "new comment (near %{place})"
 +    mine:
++      title: "Notes submitted or commented on by %{user}"
++      heading: "%{user}'s notes"
++      description: "Notes submitted or commented on by %{user}"
 +      id: "Id"
 +      last_changed: "Last changed"
 +
    javascripts:
      map:
        base: