]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/en.yml
Merge remote-tracking branch 'upstream/pull/2192'
[rails.git] / config / locales / en.yml
index 5b0807dba314923ac4e5e2f90f78309b79297c58..569992599994aa4d0e0141c87dae25f68d92b517 100644 (file)
@@ -6,6 +6,10 @@ en:
       friendly: "%e %B %Y at %H:%M"
       blog: "%e %B %Y"
   activerecord:
+    errors:
+      messages:
+        invalid_email_address: does not appear to be a valid e-mail address
+        email_address_not_routable: is not routable
     # Translates all the model names, which is used in error handling on the web site
     models:
       acl: "Access Control List"
@@ -94,6 +98,28 @@ en:
     remote:
       name: "Remote Control"
       description: "Remote Control (JOSM or Merkaartor)"
+  api:
+    notes:
+      comment:
+        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})]"
+        description_item: "An rss feed for note %{id}"
+        opened: "new note (near %{place})"
+        commented: "new comment (near %{place})"
+        closed: "closed note (near %{place})"
+        reopened: "reactivated note (near %{place})"
+      entry:
+        comment: Comment
+        full: Full note
   browse:
     created: "Created"
     closed: "Closed"
@@ -213,7 +239,7 @@ en:
       introduction: "Click on the map to find nearby features."
       nearby: "Nearby features"
       enclosing: "Enclosing features"
-  changeset:
+  changesets:
     changeset_paging_nav:
       showing_page: "Page %{page}"
       next: "Next »"
@@ -228,7 +254,7 @@ en:
       user: "User"
       comment: "Comment"
       area: "Area"
-    list:
+    index:
       title: "Changesets"
       title_user: "Changesets by %{user}"
       title_friend: "Changesets by my friends"
@@ -242,18 +268,22 @@ en:
       load_more: "Load more"
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
-    rss:
-      title_all: OpenStreetMap changeset discussion
-      title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
+  changeset_comments:
+    comment:
       comment: "New comment on changeset #%{changeset_id} by %{author}"
-      commented_at_html: "Updated %{when} ago"
       commented_at_by_html: "Updated %{when} ago by %{user}"
-      full: Full discussion
-  diary_entry:
+    comments:
+      comment: "New comment on changeset #%{changeset_id} by %{author}"
+    index:
+      title_all: OpenStreetMap changeset discussion
+      title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
+    timeout:
+      sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
+  diary_entries:
     new:
       title: New Diary Entry
       publish_button: "Publish"
-    list:
+    index:
       title: "Users' diaries"
       title_friends: "Friends' diaries"
       title_nearby: "Nearby Users' diaries"
@@ -276,7 +306,7 @@ en:
       use_map_link: "use map"
       save_button: "Save"
       marker_text: Diary entry location
-    view:
+    show:
       title: "%{user}'s diary | %{title}"
       user_title: "%{user}'s diary"
       leave_a_comment: "Leave a comment"
@@ -860,7 +890,7 @@ en:
           "yes": "Shop"
         tourism:
           alpine_hut: "Alpine Hut"
-          apartment: "Apartment"
+          apartment: "Holiday Apartment"
           artwork: "Artwork"
           attraction: "Attraction"
           bed_and_breakfast: "Bed and Breakfast"
@@ -985,7 +1015,7 @@ en:
     helper:
       reportable_title:
         diary_comment: "%{entry_title}, comment #%{comment_id}"
-        note: "Note #{note_id}"
+        note: "Note #%{note_id}"
   issue_comments:
     create:
       comment_created: Your comment was successfully created
@@ -1002,29 +1032,29 @@ en:
         resolve_with_user: You have already tried to resolve the problem with the user concerned
       categories:
         diary_entry:
-          spam: This diary entry is/contains spam
-          offensive: This diary entry is obscene/offensive
-          threat: This diary entry contains a threat
-          other: Other
+          spam_label: This diary entry is/contains spam
+          offensive_label: This diary entry is obscene/offensive
+          threat_label: This diary entry contains a threat
+          other_label: Other
         diary_comment:
-          spam: This diary comment is/contains spam
-          offensive: This diary comment is obscene/offensive
-          threat: This diary comment contains a threat
-          other: Other
+          spam_label: This diary comment is/contains spam
+          offensive_label: This diary comment is obscene/offensive
+          threat_label: This diary comment contains a threat
+          other_label: Other
         user:
-          spam: This user profile is/contains spam
-          offensive: This user profile is obscene/offensive
-          threat: This user profile contains a threat
-          vandal: This user is a vandal
-          other: Other
+          spam_label: This user profile is/contains spam
+          offensive_label: This user profile is obscene/offensive
+          threat_label: This user profile contains a threat
+          vandal_label: This user is a vandal
+          other_label: Other
         note:
-          spam: This note is spam
-          personal: This note contains personal data
-          abusive: This note is abusive
-          other: Other
+          spam_label: This note is spam
+          personal_label: This note contains personal data
+          abusive_label: This note is abusive
+          other_label: Other
     create:
       successful_report: Your report has been registered sucessfully
-      provide_details: Please provide the required details      
+      provide_details: Please provide the required details
   layouts:
     project_name:
       # in <title>
@@ -1055,9 +1085,8 @@ en:
     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
     intro_2_create_account: "Create a user account"
-    partners_html: "Hosting is supported by %{ucl}, %{bytemark}, %{ic}, and other %{partners}."
+    hosting_partners_html: "Hosting is supported by %{ucl}, %{bytemark}, and other %{partners}."
     partners_ucl: "UCL"
-    partners_ic: "Imperial College London"
     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
@@ -1194,6 +1223,7 @@ en:
       body: "Body"
       send_button: "Send"
       back_to_inbox: "Back to inbox"
+    create:
       message_sent: "Message sent"
       limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more."
     no_such_message:
@@ -1347,6 +1377,11 @@ en:
           <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
           <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
           Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
+        contributors_au_html: |
+          <strong>Australia</strong>: Contains data sourced from
+          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia Limited</a>
+          licensed by the Commonwealth of Australia under
+          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
         contributors_ca_html: |
           <strong>Canada</strong>: Contains data from
           GeoBase&reg;, GeoGratis (&copy; Department of Natural
@@ -1374,6 +1409,11 @@ en:
           <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and
           <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
           (public information of Slovenia).
+        contributors_es_html: |
+          <strong>Spain</strong>: Contains data sourced from the
+          Spanish National Geographic Institute (<a href="http://www.ign.es/">IGN</a>) and
+          National Cartographic System (<a href="http://www.scne.es/">SCNE</a>)
+          licensed for reuse under <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
         contributors_za_html: |
           <strong>South Africa</strong>: Contains data sourced from
           <a href="http://www.ngi.gov.za/">Chief Directorate:
@@ -1381,7 +1421,7 @@ en:
         contributors_gb_html: |
           <strong>United Kingdom</strong>: Contains Ordnance
           Survey data &copy; Crown copyright and database right
-          2010-12.
+          2010-19.
         contributors_footer_1_html: |
           For further details of these, and other sources that have been used
           to help improve OpenStreetMap, please see the <a
@@ -1522,6 +1562,10 @@ en:
         url: https://switch2osm.org/
         title: switch2osm
         description: Help for companies and organisations switching to OpenStreetMap based maps and other services.
+      welcomemat:
+        url: https://welcome.openstreetmap.org/
+        title: For Organizations
+        description: With an organization making plans for OpenStreetMap? Find what you need to know in the Welcome Mat.
       wiki:
         url: https://wiki.openstreetmap.org/
         title: wiki.openstreetmap.org
@@ -1613,7 +1657,7 @@ en:
       edit: Edit
       preview: Preview
     markdown_help:
-      title_html: Parsed with <a href="https://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: Parsed with <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
       headings: Headings
       heading: Heading
       subheading: Subheading
@@ -1668,7 +1712,7 @@ en:
         paragraph_1_html: |
           OpenStreetMap has several resources for learning about the project, asking and answering
           questions, and collaboratively discussing and documenting mapping topics.
-          <a href='%{help_url}'>Get help here</a>.
+          <a href='%{help_url}'>Get help here</a>. With an organization making plans for OpenStreetMap? <a href='https://welcome.openstreetmap.org/'>Check out the Welcome Mat</a>.
       start_mapping: Start Mapping
       add_a_note:
         title: No Time To Edit? Add a Note!
@@ -1700,6 +1744,7 @@ en:
     create:
       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."
+      upload_failed: "Sorry, the GPX upload failed. An administrator has been alerted to the error. Please try again"
       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."
@@ -1721,9 +1766,11 @@ en:
       visibility: "Visibility:"
       visibility_help: "what does this mean?"
       visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
+    update:
+      updated: Trace updated
     trace_optionals:
       tags: "Tags"
-    view:
+    show:
       title: "Viewing trace %{name}"
       heading: "Viewing trace %{name}"
       pending: "PENDING"
@@ -1738,8 +1785,8 @@ en:
       description: "Description:"
       tags: "Tags:"
       none: "None"
-      edit_track: "Edit this trace"
-      delete_track: "Delete this trace"
+      edit_trace: "Edit this trace"
+      delete_trace: "Delete this trace"
       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
       confirm_delete: "Delete this trace?"
@@ -1763,7 +1810,7 @@ en:
       by: "by"
       in: "in"
       map: "map"
-    list:
+    index:
       public_traces: "Public GPS traces"
       my_traces: "My GPS traces"
       public_traces_from: "Public GPS traces from %{user}"
@@ -1790,14 +1837,11 @@ en:
         other: "GPX file with %{count} points from %{user}"
       description_without_count: "GPX file from %{user}"
   application:
+    permission_denied: You do not have permission to access that action
     require_cookies:
       cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
     require_admin:
       not_an_admin: You need to be an admin to perform that action.
-    require_moderator:
-      not_a_moderator: "You need to be a moderator to perform that action."
-    require_moderator_or_admin:
-      not_a_moderator_or_admin: You need to be a moderator or an admin to perform that action
     setup_user_auth:
       blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits."
       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
@@ -1886,7 +1930,7 @@ en:
       flash: "Updated the client information successfully"
     destroy:
       flash: "Destroyed the client application registration"
-  user:
+  users:
     login:
       title: "Login"
       heading: "Login"
@@ -2002,7 +2046,7 @@ en:
       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."
       deleted: "deleted"
-    view:
+    show:
       my diary: My Diary
       new diary entry: new diary entry
       my edits: My Edits
@@ -2162,9 +2206,7 @@ en:
       button: "Unfriend"
       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:
+    index:
       title: Users
       heading: Users
       showing:
@@ -2205,7 +2247,6 @@ en:
         with your ID in your user settings.
   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}."
@@ -2317,30 +2358,10 @@ en:
       next: "Next »"
       previous: "« Previous"
   notes:
-    comment:
-      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})]"
-      description_item: "An rss feed for note %{id}"
-      opened: "new note (near %{place})"
-      commented: "new comment (near %{place})"
-      closed: "closed note (near %{place})"
-      reopened: "reactivated note (near %{place})"
-    entry:
-      comment: Comment
-      full: Full note
     mine:
       title: "Notes submitted or commented on by %{user}"
       heading: "%{user}'s notes"
-      subheading: "Notes submitted or commented on by %{user}"
+      subheading_html: "Notes submitted or commented on by %{user}"
       id: "Id"
       creator: "Creator"
       description: "Description"
@@ -2428,13 +2449,12 @@ en:
     directions:
       ascend: "Ascend"
       engines:
+        fossgis_osrm_bike: "Bicycle (OSRM)"
+        fossgis_osrm_car: "Car (OSRM)"
+        fossgis_osrm_foot: "Foot (OSRM)"
         graphhopper_bicycle: "Bicycle (GraphHopper)"
         graphhopper_car: "Car (GraphHopper)"
         graphhopper_foot: "Foot (GraphHopper)"
-        mapquest_bicycle: "Bicycle (MapQuest)"
-        mapquest_car: "Car (MapQuest)"
-        mapquest_foot: "Foot (MapQuest)"
-        osrm_car: "Car (OSRM)"
       descend: "Descend"
       directions: "Directions"
       distance: "Distance"
@@ -2553,3 +2573,8 @@ en:
       not_empty: "Redaction is not empty. Please un-redact all versions belonging to this redaction before destroying it."
       flash: "Redaction destroyed."
       error: "There was an error destroying this redaction."
+  validations:
+    leading_whitespace: "has leading whitespace"
+    trailing_whitespace: "has trailing whitespace"
+    invalid_characters: "contains invalid characters"
+    url_characters: "contains special URL characters (%{characters})"