]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/en.yml
Localisation updates from http://translatewiki.net.
[rails.git] / config / locales / en.yml
index 5d3e6bbaeef5b980e7100b4745bdcaaba708084d..79784049c8a613235e7561582cb6fa5f191cbf5c 100644 (file)
@@ -4,6 +4,7 @@ en:
   time:
     formats:
       friendly: "%e %B %Y at %H:%M"
+      blog: "%e %B %Y"
   activerecord:
     # Translates all the model names, which is used in error handling on the web site
     models:
@@ -84,6 +85,9 @@ en:
     potlatch:
       name: "Potlatch 1"
       description: "Potlatch 1 (in-browser editor)"
+    id:
+      name: "iD"
+      description: "iD (in-browser editor)"
     potlatch2:
       name: "Potlatch 2"
       description: "Potlatch 2 (in-browser editor)"
@@ -285,8 +289,8 @@ en:
       view_history: "View history"
       edit: "Edit way"
     note:
-      open_title: "Unresolved issue: %{note_name}"
-      closed_title: "Resolved issue: %{note_name}"
+      open_title: "Unresolved note: %{note_name}"
+      closed_title: "Resolved note: %{note_name}"
       opened: "Opened:"
       last_modified: "Last modified:"
       closed: "Closed:"
@@ -1188,8 +1192,7 @@ en:
       subject: "[OpenStreetMap] Confirm your email address"
     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: "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."
     email_confirm_html:
       greeting: "Hi,"
@@ -1199,8 +1202,7 @@ en:
       subject: "[OpenStreetMap] Password reset request"
     lost_password_plain:
       greeting: "Hi,"
-      hopefully_you_1: "Someone (possibly you) has asked for the password to be reset on this"
-      hopefully_you_2: "email addresses openstreetmap.org account."
+      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."
     lost_password_html:
       greeting: "Hi,"
@@ -1208,11 +1210,17 @@ en:
       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}."
+      commented:
+        subject_own: "[OpenStreetMap] %{commenter} has commented on one of your notes"
+        subject_other: "[OpenStreetMap] %{commenter} has commented on a note you are interested in"
+        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}."
+      closed:
+        subject_own: "[OpenStreetMap] %{commenter} has resolved one of your notes"
+        subject_other: "[OpenStreetMap] %{commenter} has resolved a note you are interested in"
+        your_note: "%{commenter} has resolved one of your map notes near %{place}."
+        commented_note: "%{commenter} has resolved 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:
@@ -1305,6 +1313,7 @@ en:
       potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"
       potlatch2_not_configured: "Potlatch 2 has not been configured - please see http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information"
       potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)"
+      id_not_configured: "iD has not been configured"
       no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
     sidebar:
       search_results: Search Results
@@ -1443,7 +1452,9 @@ en:
       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:
+        one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
+        other: "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:
@@ -1519,6 +1530,7 @@ en:
       allow_write_api:   "modify the map."
       allow_read_gpx:    "read your private GPS traces."
       allow_write_gpx:   "upload GPS traces."
+      allow_write_notes: "modify notes."
     revoke:
       flash: "You've revoked the token for %{application}"
   oauth_clients:
@@ -1546,6 +1558,7 @@ en:
       allow_write_api:   "modify the map."
       allow_read_gpx:    "read their private GPS traces."
       allow_write_gpx:   "upload GPS traces."
+      allow_write_notes: "modify notes."
     index:
       title: "My OAuth Details"
       my_tokens: "My Authorised Applications"
@@ -1570,6 +1583,7 @@ en:
       allow_write_api:   "modify the map."
       allow_read_gpx:    "read their private GPS traces."
       allow_write_gpx:   "upload GPS traces."
+      allow_write_notes: "modify notes."
     not_found:
       sorry: "Sorry, that %{type} could not be found."
     create:
@@ -1982,14 +1996,14 @@ en:
       needs_view: "The user needs to log in before this block will be cleared."
   note:
     description:
-      opened_at: "Created %{when} ago"
-      opened_at_by: "Created %{when} ago by %{user}"
-      commented_at: "Updated %{when} ago"
-      commented_at_by: "Updated %{when} ago by %{user}"
-      closed_at: "Resolved %{when} ago"
-      closed_at_by: "Resolved %{when} ago by %{user}"
-      reopened_at: "Reactivated %{when} ago"
-      reopened_at_by: "Reactivated %{when} ago by %{user}"
+      opened_at_html: "Created %{when} ago"
+      opened_at_by_html: "Created %{when} ago by %{user}"
+      commented_at_html: "Updated %{when} ago"
+      commented_at_by_html: "Updated %{when} ago by %{user}"
+      closed_at_html: "Resolved %{when} ago"
+      closed_at_by_html: "Resolved %{when} ago by %{user}"
+      reopened_at_html: "Reactivated %{when} ago"
+      reopened_at_by_html: "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})]"
@@ -1997,6 +2011,9 @@ en:
       closed: "closed note (near %{place})"
       new: "new note (near %{place})"
       comment: "new comment (near %{place})"
+    entry:
+      comment: Comment
+      full: Full note
     mine:
       title: "Notes submitted or commented on by %{user}"
       heading: "%{user}'s notes"
@@ -2031,7 +2048,7 @@ en:
         intro: "In order to improve the map the information you enter is shown to other mappers, so please be as descriptive and precise as possible when moving the marker to the correct position and entering your note below."
         add: Add Note
       show:
-        title: Note %{id}
+        permalink: Permalink
         anonymous_warning: This note includes comments from anonymous users which should be independently verified.
         opened_by: "created by <a href='%{user_url}'>%{user}</a> at %{time}"
         opened_by_anonymous: "created by anonymous at %{time}"
@@ -2041,6 +2058,7 @@ en:
         closed_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}"
+        hide: Hide
         resolve: Resolve
         comment_and_resolve: Comment & Resolve
         comment: Comment