Merge branch 'master' into moderation

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1d6aacba23692e6a6221d622d6ae52f27352c1be..558e960b4e12f9b923e30d78c2c59f72c75ba5dc 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -786,7 +786,6 @@ en:
           car_parts: "Car Parts"
           car_repair: "Car Repair"
           carpet: "Carpet Shop"
           car_parts: "Car Parts"
           car_repair: "Car Repair"
           carpet: "Carpet Shop"

-          car_repair: "Car Repair"

           charity: "Charity Shop"
           chemist: "Chemist"
           clothes: "Clothes Shop"
           charity: "Charity Shop"
           chemist: "Chemist"
           clothes: "Clothes Shop"


@@ -917,7 +916,7 @@ en:
     index:
       search:
         user_not_found: User does not exist
     index:
       search:
         user_not_found: User does not exist

-        issues_not_found: No such issues found    
+        issues_not_found: No such issues found

     create:
       successful_report: Your report has been registered sucessfully
       provide_details: Please provide the required details
     create:
       successful_report: Your report has been registered sucessfully
       provide_details: Please provide the required details


@@ -928,94 +927,99 @@ en:
     new:
       details: Please provide some more details into the problem. (This field cannot be left blank!)
       select: Select a reason for your report
     new:
       details: Please provide some more details into the problem. (This field cannot be left blank!)
       select: Select a reason for your report

-    show: 
+      disclaimer:
+        intro: Before sending in a report for official action, be sure that
+        not_just_mistake: You are sure that the problem is not just a mistake
+        unable_to_fix: You are unable to fix the problem yourself
+        resolve_with_user: You have tried to resolve the problem with the user
+    show:

       comments:
         reassign: The Issue was reassigned
         reassign_param: Reassign Issue?
     comment:
       comments:
         reassign: The Issue was reassigned
         reassign_param: Reassign Issue?
     comment:

-      provide_details: Please provide the required details        
-      comment_created: Your comment was successfully created        
+      provide_details: Please provide the required details
+      comment_created: Your comment was successfully created

     resolved: Issue status has been set to 'Resolved'
     ignored: Issue status has been set to 'Ignored'
     reopened: Issue status has been set to 'Open'
     report_strings:
       DiaryEntry:
     resolved: Issue status has been set to 'Resolved'
     ignored: Issue status has been set to 'Ignored'
     reopened: Issue status has been set to 'Open'
     report_strings:
       DiaryEntry:

-        spam: 
+        spam:

           type: "[SPAM]"
           details: This Diary Entry is/contains spam
           type: "[SPAM]"
           details: This Diary Entry is/contains spam

-        offensive: 
+        offensive:

           type: "[OFFENSIVE]"
           details: This Diary Entry is obscene/offensive
           type: "[OFFENSIVE]"
           details: This Diary Entry is obscene/offensive

-        threat: 
+        threat:

           type: "[THREAT]"
           details: This Diary Entry contains a threat
           type: "[THREAT]"
           details: This Diary Entry contains a threat

-        other: 
+        other:

           type: "[OTHER]"
           details: Other
       DiaryComment:
           type: "[OTHER]"
           details: Other
       DiaryComment:

-        spam: 
+        spam:

           type: "[SPAM]"
           details: This Diary Comment is/contains spam
           type: "[SPAM]"
           details: This Diary Comment is/contains spam

-        offensive: 
+        offensive:

           type: "[OFFENSIVE]"
           details: This Diary Comment is obscene/offensive
           type: "[OFFENSIVE]"
           details: This Diary Comment is obscene/offensive

-        threat: 
+        threat:

           type: "[THREAT]"
           details: This Diary Comment contains a threat
           type: "[THREAT]"
           details: This Diary Comment contains a threat

-        other: 
+        other:

           type: "[OTHER]"
           details: Other
       User:
           type: "[OTHER]"
           details: Other
       User:

-        spam: 
+        spam:

           type: "[SPAM]"
           details: This User profile is/contains spam
           type: "[SPAM]"
           details: This User profile is/contains spam

-        offensive: 
+        offensive:

           type: "[OFFENSIVE]"
           details: This User profile is obscene/offensive
           type: "[OFFENSIVE]"
           details: This User profile is obscene/offensive

-        threat: 
+        threat:

           type: "[THREAT]"
           details: This User profile contains a threat
         vandal:
           type: "[VANDAL]"
           details: This User is a vandal
           type: "[THREAT]"
           details: This User profile contains a threat
         vandal:
           type: "[VANDAL]"
           details: This User is a vandal

-        other: 
+        other:

           type: "[OTHER]"
           type: "[OTHER]"

-          details: Other      
+          details: Other

       Changeset:
         undiscussed_import:
           type: "[UNDISCUSSED-IMPORT]"
       Changeset:
         undiscussed_import:
           type: "[UNDISCUSSED-IMPORT]"

-          details: This changeset is an undiscussed import    
+          details: This changeset is an undiscussed import

         mechanical_edit:
           type: "[MECH-EDIT]"
         mechanical_edit:
           type: "[MECH-EDIT]"

-          details: This changeset is a mechanical edit    
+          details: This changeset is a mechanical edit

         edit_error:
           type: "[EDIT-ERROR]"
         edit_error:
           type: "[EDIT-ERROR]"

-          details: This changeset contains a newbie or an editor error    
+          details: This changeset contains a newbie or an editor error

         spam:
           type: "[SPAM]"
         spam:
           type: "[SPAM]"

-          details: This changeset is/contains spam  
+          details: This changeset is/contains spam

         vandalism:
           type: "[VANDALISM]"
         vandalism:
           type: "[VANDALISM]"

-          details: This changeset is/contains vandalism  
-        other: 
+          details: This changeset is/contains vandalism
+        other:

           type: "[OTHER]"
           details: Other
       Note:
         spam:
           type: "[SPAM]"
           type: "[OTHER]"
           details: Other
       Note:
         spam:
           type: "[SPAM]"

-          details: This note is spam            
+          details: This note is spam

         vandalism:
           type: "[VANDALISM]"
         vandalism:
           type: "[VANDALISM]"

-          details: This note is vandalism            
+          details: This note is vandalism

         personal:
           type: "[PERSONAL]"
         personal:
           type: "[PERSONAL]"

-          details: This note contains personal data            
+          details: This note contains personal data

         abusive:
           type: "[ABUSIVE]"
           details: This note is abusive
         other:
           type: "[OTHER]"
         abusive:
           type: "[ABUSIVE]"
           details: This note is abusive
         other:
           type: "[OTHER]"

-          details: Other            
+          details: Other

   layouts:
     project_name:
       # in <title>
   layouts:
     project_name:
       # in <title>


@@ -1046,12 +1050,11 @@ 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"
     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}, %{ic} and %{bytemark}, and other %{partners}."
-    partners_ucl: "the UCL VR Centre"
+    partners_html: "Hosting is supported by %{ucl}, %{bytemark} and %{ic}, and other %{partners}."
+    partners_ucl: "UCL"

     partners_ic: "Imperial College London"
     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"
     partners_ic: "Imperial College London"
     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"

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


@@ -1125,10 +1128,10 @@ en:
         FAQ</a>.
       more_2_html: |
         Although OpenStreetMap is open data, we cannot provide a
         FAQ</a>.
       more_2_html: |
         Although OpenStreetMap is open data, we cannot provide a

-        free-of-charge map API for third-party developers.
-        See our <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API Usage Policy</a>,
-        <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile Usage Policy</a>
-        and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim Usage Policy</a>.
+        free-of-charge map API for third-parties.
+        See our <a href="https://operations.osmfoundation.org/policies/api/">API Usage Policy</a>,
+        <a href="https://operations.osmfoundation.org/policies/tiles/">Tile Usage Policy</a>
+        and <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim Usage Policy</a>.

       contributors_title_html: Our contributors
       contributors_intro_html: |
         Our contributors are thousands of individuals. We also include
       contributors_title_html: Our contributors
       contributors_intro_html: |
         Our contributors are thousands of individuals. We also include


@@ -1230,8 +1233,8 @@ en:
       paragraph_1_html: |
         OpenStreetMap has few formal rules but we expect all participants to collaborate
         with, and communicate with, the community. If you are considering
       paragraph_1_html: |
         OpenStreetMap has few formal rules but we expect all participants to collaborate
         with, and communicate with, the community. If you are considering

-        any activities other than editing by hand, please read and follow the guidelines on 
-        <a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and 
+        any activities other than editing by hand, please read and follow the guidelines on
+        <a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and

         <a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automated Edits</a>.
     questions:
       title: Any questions?
         <a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automated Edits</a>.
     questions:
       title: Any questions?


@@ -1257,7 +1260,7 @@ en:
         title: Join the community
         explanation_html: |
           If you have noticed a problem with our map data, for example a road is missing or your address, the best way to
         title: Join the community
         explanation_html: |
           If you have noticed a problem with our map data, for example a road is missing or your address, the best way to

-          proceed is to join the OpenStreetMap community and add or repair the data yourself. 
+          proceed is to join the OpenStreetMap community and add or repair the data yourself.

       add_a_note:
         instructions_html: |
           Just click <a class='icon note'></a> or the same icon on the map display.
       add_a_note:
         instructions_html: |
           Just click <a class='icon note'></a> or the same icon on the map display.


@@ -1267,8 +1270,8 @@ en:
       title: Other concerns
       explanation_html: |
         If you have concerns about how our data is being used or about the contents please consult our
       title: Other concerns
       explanation_html: |
         If you have concerns about how our data is being used or about the contents please consult our

-        <a href='/copyright'>copyright page</a> for more legal information, or contact the appropriate 
-        <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.  
+        <a href='/copyright'>copyright page</a> for more legal information, or contact the appropriate
+        <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.

   help_page:
     title: Getting Help
     introduction: |
   help_page:
     title: Getting Help
     introduction: |


@@ -1336,18 +1339,20 @@ en:
       License page</a> for details.
     legal_title: Legal
     legal_html: |
       License page</a> for details.
     legal_title: Legal
     legal_html: |

-      This site and many other related services are formally operated by the  
-      <a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF) 
-      on behalf of the community.
-      <br> 
-      Please <a href='http://osmfoundation.org/Contact'>contact the OSMF</a> 
+      This site and many other related services are formally operated by the
+      <a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
+      on behalf of the community. Use of all OSMF operated services is subject
+      to our <a href="http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
+      Acceptable Use Policies</a> and our <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>
+      <br>
+      Please <a href='http://osmfoundation.org/Contact'>contact the OSMF</a>

       if you have licensing, copyright or other legal questions and issues.
     partners_title: Partners
   notifier:
     diary_comment_notification:
       if you have licensing, copyright or other legal questions and issues.
     partners_title: Partners
   notifier:
     diary_comment_notification:

-      subject: "[OpenStreetMap] %{user} commented on your diary entry"
+      subject: "[OpenStreetMap] %{user} commented on a diary entry"

       hi: "Hi %{to_user},"
       hi: "Hi %{to_user},"

-      header: "%{from_user} has commented on your recent OpenStreetMap diary entry with the subject %{subject}:"
+      header: "%{from_user} has commented on the 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}"
       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}"


@@ -1355,6 +1360,7 @@ en:
       header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
       footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
     friend_notification:
       header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
       footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
     friend_notification:

+      hi: "Hi %{to_user},"

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


@@ -1420,6 +1426,7 @@ en:
         commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
       details: "More details about the note can be found at %{url}."
     changeset_comment_notification:
         commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
       details: "More details about the note can be found at %{url}."
     changeset_comment_notification:

+      hi: "Hi %{to_user},"

       greeting: "Hi,"
       commented:
         subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
       greeting: "Hi,"
       commented:
         subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"


@@ -1429,10 +1436,12 @@ en:
         partial_changeset_with_comment: "with comment '%{changeset_comment}'"
         partial_changeset_without_comment: "without comment"
       details: "More details about the changeset can be found at %{url}."
         partial_changeset_with_comment: "with comment '%{changeset_comment}'"
         partial_changeset_without_comment: "without comment"
       details: "More details about the changeset can be found at %{url}."

+      unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'

     new_issue_notification:
       subject: "[OpenStreetMap] New Issue"
       greeting: "Hi,"
       new_issue: "A new issue has been created"
     new_issue_notification:
       subject: "[OpenStreetMap] New Issue"
       greeting: "Hi,"
       new_issue: "A new issue has been created"

+      url: You can view the issue here

   message:
     inbox:
       title: "Inbox"
   message:
     inbox:
       title: "Inbox"


@@ -1490,6 +1499,7 @@ en:
       date: "Date"
       reply_button: "Reply"
       unread_button: "Mark as unread"
       date: "Date"
       reply_button: "Reply"
       unread_button: "Mark as unread"

+      delete_button: "Delete"

       back: "Back"
       to: "To"
       wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
       back: "Back"
       to: "To"
       wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."


@@ -1741,6 +1751,7 @@ en:
     require_moderator:
       not_a_moderator: "You need to be a moderator to perform that action."
     setup_user_auth:
     require_moderator:
       not_a_moderator: "You need to be a moderator 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."
       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:
       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
       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:


@@ -1766,6 +1777,8 @@ en:
       invalid: "The authorization token is not valid."
     revoke:
       flash: "You've revoked the token for %{application}"
       invalid: "The authorization token is not valid."
     revoke:
       flash: "You've revoked the token for %{application}"

+    permissions:
+      missing: "You have not permitted the application access to this facility"

   oauth_clients:
     new:
       title: "Register a new application"
   oauth_clients:
     new:
       title: "Register a new application"


@@ -1862,6 +1875,9 @@ en:
         github:
           title: Login with GitHub
           alt: Login with a GitHub Account
         github:
           title: Login with GitHub
           alt: Login with a GitHub Account

+        wikipedia:
+          title: Login with Wikipedia
+          alt: Login with a Wikipedia Account

         yahoo:
           title: Login with Yahoo
           alt: Login with a Yahoo OpenID
         yahoo:
           title: Login with Yahoo
           alt: Login with a Yahoo OpenID


@@ -1904,7 +1920,7 @@ en:
       license_agreement: 'When you confirm your account you will need to agree to the <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'
       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"
       license_agreement: 'When you confirm your account you will need to agree to the <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'
       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"

-      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>)'
+      not displayed publicly: 'Your address is not displayed publicly, see our <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information'

       display name: "Display Name:"
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       external auth: "Third Party Authentication:"
       display name: "Display Name:"
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       external auth: "Third Party Authentication:"


@@ -2225,6 +2241,7 @@ en:
     helper:
       time_future: "Ends in %{time}."
       until_login: "Active until the user logs in."
     helper:
       time_future: "Ends in %{time}."
       until_login: "Active until the user logs in."

+      time_future_and_until_login: "Ends in %{time} and after the user has logged in."

       time_past: "Ended %{time} ago."
     blocks_on:
       title: "Blocks on %{name}"
       time_past: "Ended %{time} ago."
     blocks_on:
       title: "Blocks on %{name}"


@@ -2308,7 +2325,7 @@ en:
     key:
       title: "Map Key"
       tooltip: "Map Key"
     key:
       title: "Map Key"
       tooltip: "Map Key"

-      tooltip_disabled: "Map Key available only for Standard layer"
+      tooltip_disabled: "Map Key not available for this layer"

     map:
       zoom:
         in: Zoom In
     map:
       zoom:
         in: Zoom In


@@ -2325,6 +2342,7 @@ en:
         header: Map Layers
         notes: Map Notes
         data: Map Data
         header: Map Layers
         notes: Map Notes
         data: Map Data

+        gps: Public GPS Traces

         overlays: Enable overlays for troubleshooting the map
         title: "Layers"
       copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
         overlays: Enable overlays for troubleshooting the map
         title: "Layers"
       copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"


@@ -2358,8 +2376,10 @@ en:
         comment: Comment
     edit_help: Move the map and zoom in on a location you want to edit, then click here.
     directions:
         comment: Comment
     edit_help: Move the map and zoom in on a location you want to edit, then click here.
     directions:

+      ascend: "Ascend"

       engines:
         graphhopper_bicycle: "Bicycle (GraphHopper)"
       engines:
         graphhopper_bicycle: "Bicycle (GraphHopper)"

+        graphhopper_car: "Car (GraphHopper)"

         graphhopper_foot: "Foot (GraphHopper)"
         mapquest_bicycle: "Bicycle (MapQuest)"
         mapquest_car: "Car (MapQuest)"
         graphhopper_foot: "Foot (GraphHopper)"
         mapquest_bicycle: "Bicycle (MapQuest)"
         mapquest_car: "Car (MapQuest)"


@@ -2368,6 +2388,7 @@ en:
         mapzen_bicycle: "Bicycle (Mapzen)"
         mapzen_car: "Car (Mapzen)"
         mapzen_foot: "Foot (Mapzen)"
         mapzen_bicycle: "Bicycle (Mapzen)"
         mapzen_car: "Car (Mapzen)"
         mapzen_foot: "Foot (Mapzen)"

+      descend: "Descend"

       directions: "Directions"
       distance: "Distance"
       errors:
       directions: "Directions"
       distance: "Distance"
       errors:


@@ -2402,6 +2423,11 @@ en:
         against_oneway_without_exit: Go against one-way on %{name}
         end_oneway_without_exit: End of one-way on %{name}
         roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
         against_oneway_without_exit: Go against one-way on %{name}
         end_oneway_without_exit: End of one-way on %{name}
         roundabout_with_exit: At roundabout take exit %{exit} onto %{name}

+        turn_left_with_exit: At roundabout turn left onto %{name}
+        slight_left_with_exit: At roundabout slight left onto %{name}
+        turn_right_with_exit: At roundabout turn right onto %{name}
+        slight_right_with_exit: At roundabout slight right onto %{name}
+        continue_with_exit: At roundabout continue straight onto %{name}

         unnamed: "unnamed road"
         courtesy: "Directions courtesy of %{link}"
       time: "Time"
         unnamed: "unnamed road"
         courtesy: "Directions courtesy of %{link}"
       time: "Time"


@@ -2412,6 +2438,13 @@ en:
       nothing_found: No features found
       error: "Error contacting %{server}: %{error}"
       timeout: "Timeout contacting %{server}"
       nothing_found: No features found
       error: "Error contacting %{server}: %{error}"
       timeout: "Timeout contacting %{server}"

+    context:
+      directions_from: Directions from here
+      directions_to: Directions to here
+      add_note: Add a note here
+      show_address: Show address
+      query_features: Query features
+      centre_map: Centre map here

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