Improve comment descriptions in note popups

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c77dbf5c9b431cbe24f841f15543a2fd0ea12279..b40a639d8ce2af76dca139b5898a3a1f7f90bf70 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -120,6 +120,8 @@ en:
         next_relation_tooltip: "Next relation"
         prev_changeset_tooltip: "Previous changeset"
         next_changeset_tooltip: "Next changeset"
         next_relation_tooltip: "Next relation"
         prev_changeset_tooltip: "Previous changeset"
         next_changeset_tooltip: "Next changeset"

+        prev_note_tooltip: "Previous note"
+        next_note_tooltip: "Next note"

     changeset_details:
       created_at: "Created at:"
       closed_at: "Closed at:"
     changeset_details:
       created_at: "Created at:"
       closed_at: "Closed at:"


@@ -190,7 +192,7 @@ en:
         relation: relation
         changeset: changeset
     paging_nav:
         relation: relation
         changeset: changeset
     paging_nav:

-      showing_page: "Showing page"
+      showing_page: "page"

       of: "of"
     redacted:
       redaction: "Redaction %{id}"
       of: "of"
     redacted:
       redaction: "Redaction %{id}"


@@ -219,14 +221,12 @@ en:
       relation_title: "Relation: %{relation_name}"
       download_xml: "Download XML"
       view_history: "View history"
       relation_title: "Relation: %{relation_name}"
       download_xml: "Download XML"
       view_history: "View history"

-    start:
-      view_data: "View data for current map view"
-      manually_select: "Manually select a different area"

     start_rjs:
     start_rjs:

+      notes_layer_name: "Browse Notes"

       data_layer_name: "Browse Map Data"
       data_frame_title: "Data"
       zoom_or_select: "Zoom in or select an area of the map to view"
       data_layer_name: "Browse Map Data"
       data_frame_title: "Data"
       zoom_or_select: "Zoom in or select an area of the map to view"

-      drag_a_box: "Drag a box on the map to select an area"
+      view_data: "View data for current map view"

       manually_select: "Manually select a different area"
       hide_areas: "Hide areas"
       show_areas: "Show areas"
       manually_select: "Manually select a different area"
       hide_areas: "Hide areas"
       show_areas: "Show areas"


@@ -242,7 +242,7 @@ en:
       edited_by_user_at_timestamp: "Edited by %{user} at %{timestamp}"
       object_list:
         heading: "Object list"
       edited_by_user_at_timestamp: "Edited by %{user} at %{timestamp}"
       object_list:
         heading: "Object list"

-        back: "Display object list"
+        back: "Back to object list"

         type:
           node: "Node"
           way: "Way"
         type:
           node: "Node"
           way: "Way"


@@ -269,8 +269,8 @@ en:
       nodes: "Nodes:"
       part_of: "Part of:"
       also_part_of:
       nodes: "Nodes:"
       part_of: "Part of:"
       also_part_of:

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

     way_history:
       way_history: "Way History"
       way_history_title: "Way History: %{way_name}"
     way_history:
       way_history: "Way History"
       way_history_title: "Way History: %{way_name}"


@@ -282,13 +282,21 @@ en:
       download_xml: "Download XML"
       view_history: "View history"
       edit: "Edit way"
       download_xml: "Download XML"
       view_history: "View history"
       edit: "Edit way"

+    note:
+      open_title: "Unresolved issue: %{note_name}"
+      closed_title: "Resolved issue: %{note_name}"
+      opened: "Opened:"
+      last_modified: "Last modified:"
+      closed: "Closed:"
+      at_by_html: "%{when} ago by %{user}"
+      description: "Description:"
+      comments: "Comments:"

   changeset:
     changeset_paging_nav:
   changeset:
     changeset_paging_nav:

-      showing_page: "Showing page %{page}"
+      showing_page: "Page %{page}"

       next: "Next »"
       previous: "« Previous"
     changeset:
       next: "Next »"
       previous: "« Previous"
     changeset:

-      id: "#%{id}"

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


@@ -315,14 +323,14 @@ en:
       heading_user_bbox: "Changesets"
       heading_friend: "Changesets"
       heading_nearby: "Changesets"
       heading_user_bbox: "Changesets"
       heading_friend: "Changesets"
       heading_nearby: "Changesets"

-      description: "Recent changes"
+      description: "Browse recent contributions to the map"

       description_user: "Changesets by %{user}"
       description_bbox: "Changesets within %{bbox}"
       description_user_bbox: "Changesets by %{user} within %{bbox}"
       description_friend: "Changesets by your friends"
       description_nearby: "Changesets by nearby users"
       empty_user_html: "It looks you haven't made any edits yet. To get started, check out the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Beginners Guide</a>."
       description_user: "Changesets by %{user}"
       description_bbox: "Changesets within %{bbox}"
       description_user_bbox: "Changesets by %{user} within %{bbox}"
       description_friend: "Changesets by your friends"
       description_nearby: "Changesets by nearby users"
       empty_user_html: "It looks you haven't made any edits yet. To get started, check out the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Beginners Guide</a>."

-      empty_anon_html: "No edits made yet"
+      empty_anon_html: "No edits made yet."

     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
   diary_entry:
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
   diary_entry:


@@ -337,7 +345,7 @@ en:
       new: New Diary Entry
       new_title: Compose a new entry in your user diary
       no_entries: No diary entries
       new: New Diary Entry
       new_title: Compose a new entry in your user diary
       no_entries: No diary entries

-      recent_entries: "Recent diary entries:"
+      recent_entries: "Recent diary entries"

       older_entries: Older Entries
       newer_entries: Newer Entries
     edit:
       older_entries: Older Entries
       newer_entries: Newer Entries
     edit:


@@ -367,7 +375,8 @@ en:
       comment_link: Comment on this entry
       reply_link: Reply to this entry
       comment_count:
       comment_link: Comment on this entry
       reply_link: Reply to this entry
       comment_count:

-        one: 1 comment
+        zero: No comments
+        one: "%{count} comment"

         other: "%{count} comments"
       edit_link: Edit this entry
       hide_link: Hide this entry
         other: "%{count} comments"
       edit_link: Edit this entry
       hide_link: Hide this entry


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

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

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

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

     search_osm_nominatim:
       prefix_format: "%{name}"
       prefix:
     search_osm_nominatim:
       prefix_format: "%{name}"
       prefix:


@@ -911,15 +914,12 @@ en:
           weir: "Weir"
     description:
       title:
           weir: "Weir"
     description:
       title:

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

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

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

     results:
       no_results: "No results found"
       more_results: "More results"
     results:
       no_results: "No results found"
       more_results: "More results"


@@ -944,7 +944,6 @@ en:
       h1: OpenStreetMap
     logo:
       alt_text: OpenStreetMap logo
       h1: OpenStreetMap
     logo:
       alt_text: OpenStreetMap logo

-    welcome_user: "Welcome, %{user_link}"

     welcome_user_link_tooltip: Your user page
     home: home
     home_tooltip: Go to home location
     welcome_user_link_tooltip: Your user page
     home: home
     home_tooltip: Go to home location


@@ -1032,23 +1031,29 @@ en:
         code</a> explains your rights and responsibilities.
       intro_3_html: |
         The cartography in our map tiles, and our documentation, are
         code</a> explains your rights and responsibilities.
       intro_3_html: |
         The cartography in our map tiles, and our documentation, are

-        licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative 
+        licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative

         Commons Attribution-ShareAlike 2.0</a> license (CC-BY-SA).
       credit_title_html: How to credit OpenStreetMap
       credit_1_html: |
         Commons Attribution-ShareAlike 2.0</a> license (CC-BY-SA).
       credit_title_html: How to credit OpenStreetMap
       credit_1_html: |

-        We require that you use the credit &ldquo;&copy; OpenStreetMap 
+        We require that you use the credit &ldquo;&copy; OpenStreetMap

         contributors&rdquo;.
       credit_2_html: |
         contributors&rdquo;.
       credit_2_html: |

-        You must also make it clear that the data is available under the Open 
-        Database License, and if using our map tiles, that the cartography is 
-        licensed as CC-BY-SA. You may do this by linking to 
-        <a href="http://www.openstreetmap.org/copyright">this copyright page</a>. 
-        Alternatively, and as a requirement if you are distributing OSM in a 
-        data form, you can name and link directly to the license(s). In media 
-        where links are not possible (e.g. printed works), we suggest you 
-        direct your readers to openstreetmap.org (perhaps by expanding 
-        'OpenStreetMap' to this full address), to opendatacommons.org, and 
+        You must also make it clear that the data is available under the Open
+        Database License, and if using our map tiles, that the cartography is
+        licensed as CC-BY-SA. You may do this by linking to
+        <a href="http://www.openstreetmap.org/copyright">this copyright page</a>.
+        Alternatively, and as a requirement if you are distributing OSM in a
+        data form, you can name and link directly to the license(s). In media
+        where links are not possible (e.g. printed works), we suggest you
+        direct your readers to openstreetmap.org (perhaps by expanding
+        'OpenStreetMap' to this full address), to opendatacommons.org, and

         if relevant, to creativecommons.org.
         if relevant, to creativecommons.org.

+      credit_3_html: |
+        For a browsable electronic map, the credit should appear in the corner of the map.
+        For example:
+      attribution_example:
+        alt: Example of how to attribute OpenStreetMap on a webpage
+        title: Attribution example

       more_title_html: Finding out more
       more_1_html: |
         Read more about using our data, and how to credit us, at the <a
       more_title_html: Finding out more
       more_1_html: |
         Read more about using our data, and how to credit us, at the <a


@@ -1109,10 +1114,10 @@ en:
         copyrighted sources (e.g. Google Maps or printed maps) without
         explicit permission from the copyright holders.
       infringement_2_html: |
         copyrighted sources (e.g. Google Maps or printed maps) without
         explicit permission from the copyright holders.
       infringement_2_html: |

-        If you believe that copyrighted material has been inappropriately 
-        added to the OpenStreetMap database or this site, please refer 
-        to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown 
-        procedure</a> or file directly at our 
+        If you believe that copyrighted material has been inappropriately
+        added to the OpenStreetMap database or this site, please refer
+        to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
+        procedure</a> or file directly at our

         <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
   notifier:
     diary_comment_notification:
         <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
   notifier:
     diary_comment_notification:


@@ -1147,13 +1152,12 @@ en:
         subject: "[OpenStreetMap] GPX Import success"
         loaded_successfully: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
     signup_confirm:
         subject: "[OpenStreetMap] GPX Import success"
         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:
+      subject: "[OpenStreetMap] Welcome to OpenStreetMap"

       greeting: "Hi there!"
       greeting: "Hi there!"

-      hopefully_you: "Someone (hopefully you) would like to create an account over at"
-      # next two translations run-on : please word wrap appropriately
-      click_the_link_1: "If this is you, welcome! Please click the link below to confirm your"
-      click_the_link_2: "account and read on for more information about OpenStreetMap."
+      created: "Someone (hopefully you) just created an account at %{site_url}."
+      confirm: "Before we do anything else, we need to confirm that this request came from you, so if it did then please click the link below to confirm your account:"
+      welcome: "We would like to welcome you and provide you with some additional information to get you started."
+    signup_confirm_plain:

       introductory_video: "You can watch an introductory video to OpenStreetMap here:"
       more_videos: "There are more videos here:"
       the_wiki: "Get reading about OpenStreetMap on the wiki:"
       introductory_video: "You can watch an introductory video to OpenStreetMap here:"
       more_videos: "There are more videos here:"
       the_wiki: "Get reading about OpenStreetMap on the wiki:"


@@ -1163,15 +1167,9 @@ en:
       ask_questions: "You can ask any questions you may have about OpenStreetMap at our question and answer site:"
       wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
       wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
       ask_questions: "You can ask any questions you may have about OpenStreetMap at our question and answer site:"
       wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
       wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"

-      # next four translations are in pairs : please word wrap appropriately
-      user_wiki_1: "It is recommended that you create a user wiki page, which includes"
-      user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."
-      current_user_1: "A list of current users in categories, based on where in the world"
-      current_user_2: "they are, is available from:"
+      user_wiki_page: "It is recommended that you create a user wiki page, which includes category tags noting where you are, such as [[Category:Users_in_London]]."
+      current_user: "A list of current users in categories, based on where in the world they are, is available from:"

     signup_confirm_html:
     signup_confirm_html:

-      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}."
       video_to_openstreetmap: "introductory video to OpenStreetMap"
       more_videos: "There are %{more_videos_link}."
       introductory_video: "You can watch an %{introductory_video_link}."
       video_to_openstreetmap: "introductory video to OpenStreetMap"
       more_videos: "There are %{more_videos_link}."


@@ -1203,6 +1201,14 @@ en:
       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."
       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."

+    note_comment_notification:
+      anonymous: An anonymous user
+      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"
   message:
     inbox:
       title: "Inbox"


@@ -1279,11 +1285,10 @@ en:
       js_2: "OpenStreetMap uses JavaScript for its slippy map."
       permalink: Permalink
       shortlink: Shortlink
       js_2: "OpenStreetMap uses JavaScript for its slippy map."
       permalink: Permalink
       shortlink: Shortlink

+      createnote: Add a note

       license:
       license:

-        notice: "Data copyright %{project_name} and its contributors."
-        license_name: "Open Data Commons Open Database License (ODbL)"
+        copyright: "Copyright OpenStreetMap and contributors, under an open license"

         license_url: "http://openstreetmap.org/copyright"
         license_url: "http://openstreetmap.org/copyright"

-        project_name: "OpenStreetMap project"

         project_url: "http://openstreetmap.org"
       remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
     edit:
         project_url: "http://openstreetmap.org"
       remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
     edit:


@@ -1458,7 +1463,7 @@ en:
       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
     trace_paging_nav:
       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
     trace_paging_nav:

-      showing_page: "Showing page %{page}"
+      showing_page: "Page %{page}"

       older: "Older Traces"
       newer: "Newer Traces"
     trace:
       older: "Older Traces"
       newer: "Newer Traces"
     trace:


@@ -1481,6 +1486,7 @@ en:
       public_traces: "Public GPS traces"
       your_traces: "Your GPS traces"
       public_traces_from: "Public GPS traces from %{user}"
       public_traces: "Public GPS traces"
       your_traces: "Your GPS traces"
       public_traces_from: "Public GPS traces from %{user}"

+      description: "Browse recent GPS track uploads"

       tagged_with: " tagged with %{tags}"
       empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
     delete:
       tagged_with: " tagged with %{tags}"
       empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
     delete:


@@ -1589,8 +1595,6 @@ en:
       account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>."
       account is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the <a href="%{webmaster}">webmaster</a> if you wish to discuss this.
       auth failure: "Sorry, could not log in with those details."
       account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>."
       account is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the <a href="%{webmaster}">webmaster</a> if you wish to discuss this.
       auth failure: "Sorry, could not log in with those details."

-      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>)"
-      notice_terms: "OpenStreetMap is moving to a new licence on 1st April 2012. It's just as open as our current one, but the legal bits are much better suited to our map database. We'd love to keep your contributions in OpenStreetMap, but we can only do so if you agree to let us distribute them under the new licence. Otherwise, we'll have to remove them from the database.<br /><br />Please log in, then take a few seconds to review and accept the new terms. Thank you!"

       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 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"


@@ -1661,6 +1665,7 @@ en:
           </li>
         </ul>
       continue: Continue
           </li>
         </ul>
       continue: Continue

+      flash welcome: "Thanks for signing up. We've sent a welcome message to %{email} with some hints on getting started."

       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>."
       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>."


@@ -1691,6 +1696,7 @@ en:
       new diary entry: new diary entry
       my edits: my edits
       my traces: my traces
       new diary entry: new diary entry
       my edits: my edits
       my traces: my traces

+      my notes: my map notes

       my settings: my settings
       my comments: my comments
       oauth settings: oauth settings
       my settings: my settings
       my comments: my comments
       oauth settings: oauth settings


@@ -1700,8 +1706,9 @@ en:
       diary: diary
       edits: edits
       traces: traces
       diary: diary
       edits: edits
       traces: traces

-      remove as friend: remove as friend
-      add as friend: add as friend
+      notes: map notes
+      remove as friend: unfriend
+      add as friend: add friend

       mapper since: "Mapper since:"
       ago: "(%{time_in_words_ago} ago)"
       ct status: "Contributor terms:"
       mapper since: "Mapper since:"
       ago: "(%{time_in_words_ago} ago)"
       ct status: "Contributor terms:"


@@ -1715,7 +1722,7 @@ en:
       spam score: "Spam Score:"
       description: Description
       user location: User location
       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: "Set your home location on the %{settings_link} page to see nearby users."

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


@@ -1743,10 +1750,10 @@ en:
       unhide_user: "unhide this user"
       delete_user: "delete this user"
       confirm: "Confirm"
       unhide_user: "unhide this user"
       delete_user: "delete this user"
       confirm: "Confirm"

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

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


@@ -1783,6 +1790,10 @@ en:
       preferred languages: "Preferred Languages:"
       preferred editor: "Preferred Editor:"
       image: "Image:"
       preferred languages: "Preferred Languages:"
       preferred editor: "Preferred Editor:"
       image: "Image:"

+      gravatar:
+        gravatar: "Use Gravatar"
+        link: "http://wiki.openstreetmap.org/wiki/Gravatar"
+        link text: "what is this?"

       new image: "Add an image"
       keep image: "Keep the current image"
       delete image: "Remove the current image"
       new image: "Add an image"
       keep image: "Keep the current image"
       delete image: "Remove the current image"


@@ -1823,12 +1834,12 @@ en:
     make_friend:
       heading: "Add %{user} as a friend?"
       button: "Add as friend"
     make_friend:
       heading: "Add %{user} as a friend?"
       button: "Add as friend"

-      success: "%{name} is now your friend."
+      success: "%{name} is now your friend!"

       failed: "Sorry, failed to add %{name} as a friend."
       already_a_friend: "You are already friends with %{name}."
     remove_friend:
       failed: "Sorry, failed to add %{name} as a friend."
       already_a_friend: "You are already friends with %{name}."
     remove_friend:

-      heading: "Remove %{user} as a friend?"
-      button: "Remove as friend"
+      heading: "Unfriend %{user}?"
+      button: "Unfriend"

       success: "%{name} was removed from your friends."
       not_a_friend: "%{name} is not one of your friends."
     filter:
       success: "%{name} was removed from your friends."
       not_a_friend: "%{name} is not one of your friends."
     filter:


@@ -1837,8 +1848,8 @@ en:
       title: Users
       heading: Users
       showing:
       title: Users
       heading: Users
       showing:

-        one: Showing page %{page} (%{first_item} of %{items})
-        other: Showing page %{page} (%{first_item}-%{last_item} of %{items})
+        one: Page %{page} (%{first_item} of %{items})
+        other: 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
       summary: "%{name} created from %{ip_address} on %{date}"
       summary_no_ip: "%{name} created on %{date}"
       confirm: Confirm Selected Users


@@ -1937,7 +1948,7 @@ en:
       status: "Status"
       revoker_name: "Revoked by"
       not_revoked: "(not revoked)"
       status: "Status"
       revoker_name: "Revoked by"
       not_revoked: "(not revoked)"

-      showing_page: "Showing page %{page}"
+      showing_page: "Page %{page}"

       next: "Next »"
       previous: "« Previous"
     helper:
       next: "Next »"
       previous: "« Previous"
     helper:


@@ -1966,6 +1977,25 @@ en:
       back: "View all blocks"
       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."
       back: "View all blocks"
       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."

+  note:
+    description:
+      opened_at_by: "Created %{when} ago by %{user}"
+      commented_at_by: "Updated %{when} ago by %{user}"
+      closed_at_by: "Resolved %{when} ago by %{user}"
+      reopened_at_by: "Reactivated %{when} ago by %{user}"
+    rss:
+      title: "OpenStreetMap Notes"
+      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:
   javascripts:
     map:
       base:


@@ -1982,6 +2012,26 @@ en:
       history_tooltip: View edits for this area
       history_disabled_tooltip: Zoom in to view edits for this area
       history_zoom_alert: You must zoom in to view edits for this area
       history_tooltip: View edits for this area
       history_disabled_tooltip: Zoom in to view edits for this area
       history_zoom_alert: You must zoom in to view edits for this area

+      createnote_tooltip: Add a note to the map
+      createnote_disabled_tooltip: Zoom in to add a note to the map
+      createnote_zoom_alert: You must zoom in to add a note to the map
+    notes:
+      new:
+        intro: "Move the marker to the correct position and add your comment in the box below:"
+        add: Add Note
+      show:
+        title: Note %{id}
+        opened_by: "created by <a href='%{user_url}'>%{user}</a> at %{time}"
+        opened_by_anonymous: "created by anonymous at %{time}"
+        commented_by: "comment from <a href='%{user_url}'>%{user}</a> at %{time}"
+        commented_by_anonymous: "comment from anonymous at %{time}"
+        closed_by: "resolved by <a href='%{user_url}'>%{user}</a> at %{time}"
+        closeded_by_anonymous: "resolved by anonymous at %{time}"
+        reopened_by: "reactivated by <a href='%{user_url}'>%{user}</a> at %{time}"
+        reopened_by_anonymous: "reactivated by anonymous at %{time}"
+        close: Close
+        comment_and_close: Comment & Close
+        comment: Comment

   redaction:
     edit:
       description: "Description"
   redaction:
     edit:
       description: "Description"