X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/95c3d640a44857b0b92ec3be6dad606e40057c5c..138a9d97644d8cba566cf840edd524fc9947ac1a:/config/locales/en.yml?ds=sidebyside

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 363f620f4..84df13c9b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -371,12 +371,16 @@ en:
         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_twain: 'Results from <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</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_twain:
+      prefix_highway: "{{type}} road"
+      prefix_other: "{{type}}"
     description:
       title:
         osm_namefinder: '{{types}} from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
@@ -456,7 +460,12 @@ en:
     shop_tooltip: Shop with branded OpenStreetMap merchandise
     shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
     sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
-    alt_donation: Make a Donation
+    license:
+      alt: CC by-sa 2.0
+      title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License
+    make_a_donation:
+      title: Support OpenStreetMap with a monetary donation
+      text: Make a Donation
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] {{user}} commented on your diary entry"
@@ -491,9 +500,7 @@ en:
         import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
       success:
         subject: "[OpenStreetMap] GPX Import success"
-        loaded_successfully: |
-          loaded successfully with {{trace_points}} out of a possible
-          {{possible_points}} points.
+        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:
@@ -581,7 +588,7 @@ en:
       my_inbox: "My {{inbox_link}}"
       inbox: "inbox"
       outbox: "outbox"
-      you_have_sent_messages: "You have {{sent_count}} sent messages"
+      you_have_sent_messages: "You have {{count}} sent messages"
       to: "To"
       subject: "Subject"
       date: "Date"
@@ -608,9 +615,9 @@ en:
       deleted: "Message deleted"
   site:
     index:
-      js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
-      js_2: "OpenStreetMap uses javascript for its slippy map."
-      js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
+      js_1: "You are either using a browser that doesn't support JavaScript, or you have disabled JavaScript."
+      js_2: "OpenStreetMap uses JavaScript for its slippy map."
+      js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable JavaScript.'
       permalink: Permalink
       shortlink: Shortlink
       license:
@@ -800,6 +807,11 @@ en:
       scheduled_for_deletion: "Track scheduled for deletion"
     make_public:
       made_public: "Track made public"
+  application:
+    require_cookies:
+      cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
+    setup_user_auth:
+      blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
   oauth:
     oauthorize:
       request_access: "The application {{app_name}} is requesting access to your account. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
@@ -884,6 +896,7 @@ en:
       heading: "Forgotten Password?"
       email address: "Email Address:"
       new password button: "Reset password"
+      help_text: "Enter the email address you used to sign up, we'll send a link to it that you can use to reset your password."
       notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
       notice email cannot find: "Couldn't find that email address, sorry."
     reset_password:
@@ -905,6 +918,7 @@ en:
       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>)'
       display name: "Display Name:"
+      display name description: "Your publicly displayed username. You can change this later in the preferences."
       password: "Password:"
       confirm password: "Confirm Password:"
       signup: Signup
@@ -919,6 +933,8 @@ en:
       my edits: my edits
       my traces: my traces
       my settings: my settings
+      blocks on me: blocks on me
+      blocks by me: blocks by me
       send message: send message
       diary: diary
       edits: edits
@@ -927,6 +943,8 @@ en:
       add as friend: add as friend
       mapper since: "Mapper since:"
       ago: "({{time_in_words_ago}} ago)"
+      email address: "Email address:"
+      created from: "Created from:"
       user image heading: User image
       delete image: Delete Image
       upload an image: Upload an image
@@ -945,11 +963,23 @@ en:
       change your settings: change your settings
       my_oauth_details: "View my OAuth details"
       role:
-        administrator: "Administrator"
-        moderator: "Moderator"
+        administrator: "This user is an administrator"
+        moderator: "This user is a moderator"
+        grant:
+          administrator: "Grant administrator access"
+          moderator: "Grant moderator access"
+        revoke:
+          administrator: "Revoke administrator access"
+          moderator: "Revoke moderator access"
       block_history: "view blocks received"
       moderator_history: "view blocks given"
       create_block: "block this user"
+      activate_user: "activate this user"
+      deactivate_user: "deactivate this user"
+      hide_user: "hide this user"
+      unhide_user: "unhide this user"
+      delete_user: "delete this user"
+      confirm: "Confirm"
     friend_map:
       your location: Your location
       nearby mapper: "Nearby mapper: [[nearby_user]]"
@@ -999,12 +1029,23 @@ en:
     remove_friend:
       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."
   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}}' isn't a valid role."
+      already_has_role: "The user already has role {{role}}."
+      doesnt_have_role: "The user does not have role {{role}}."
     grant:
+      title: Confirm role granting
+      heading: Confirm role granting
       are_you_sure: "Are you sure you want to grant the role `{{role}}' to the user `{{name}}'?"
       confirm: "Confirm"
       fail: "Couldn't grant role `{{role}}' to user `{{name}}'. Please check that the user and role are both valid."
     revoke:
+      title: Confirm role revoking
+      heading: Confirm role revoking
       are_you_sure: "Are you sure you want to revoke the role `{{role}}' from the user `{{name}}'?"
       confirm: "Confirm"
       fail: "Couldn't revoke role `{{role}}' from user `{{name}}'. Please check that the user and role are both valid."
@@ -1012,21 +1053,27 @@ en:
     model:
       non_moderator_update: "Must be a moderator to create or update a block."
       non_moderator_revoke: "Must be a moderator to revoke a block."
+    not_found:
+      sorry: "Sorry, the user block with ID {{id}} could not be found."
+      back: "Back to index"
     new:
+      title: "Creating block on {{name}}"
+      heading: "Creating block on {{name}}"
       reason: "The reason why {{name}} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms."
       period: "How long, starting now, the user will be blocked from the API for."
       submit: "Create block"
       tried_contacting: "I have contacted the user and asked them to stop."
       tried_waiting: "I have given a reasonable amount of time for the user to respond to those communications."
-      title: "Creating block on {{name}}"
-      needs_view: "Does the user need to log in before this block will be cleared?"
+      needs_view: "User needs to log in before this block will be cleared"
+      back: "View all blocks"
     edit:
+      title: "Editing block on {{name}}"
+      heading: "Editing block on {{name}}"
       reason: "The reason why {{name}} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation. Bear in mind that not all users understand the community jargon, so please try to use laymans terms."
       period: "How long, starting now, the user will be blocked from the API for."
       submit: "Update block"
-      show: "Show"
-      back: "Back"
-      title: "Editing block on {{name}}"
+      show: "View this block"
+      back: "View all blocks"
       needs_view: "Does the user need to log in before this block will be cleared?"
     filter:
       not_a_moderator: "You need to be a moderator to perform that action."
@@ -1040,8 +1087,11 @@ en:
       only_creator_can_edit: "Only the moderator who created this block can edit it."
       success: "Block updated."
     index:
-      heading: "Listing User Blocks"
+      title: "User blocks"
+      heading: "List of user blocks"
+      empty: "No blocks have been made yet."
     revoke:
+      title: "Revoking block on {{block_on}}"
       heading: "Revoking block on {{block_on}} by {{block_by}}"
       time_future: "This block will end in {{time}}."
       past: "This block ended {{time}} ago and cannot be revoked now."
@@ -1067,11 +1117,16 @@ en:
       until_login: "Active until the user logs in."
       time_past: "Ended {{time}} ago."
     blocks_on:
-      heading: "List blocks on {{name}}"
+      title: "Blocks on {{name}}"
+      heading: "List of blocks on {{name}}"
+      empty: "{{name}} has not been blocked yet."
     blocks_by:
-      heading: "List blocks by {{name}}"
+      title: "Blocks by {{name}}"
+      heading: "List of blocks by {{name}}"
+      empty: "{{name}} has not made any blocks yet."
     show:
-      heading: "Block on {{block_on}} by {{block_by}}"
+      title: "{{block_on}} blocked by {{block_by}}"
+      heading: "{{block_on}} blocked by {{block_by}}"
       time_future: "Ends in {{time}}"
       time_past: "Ended {{time}} ago"
       status: "Status"
@@ -1080,7 +1135,18 @@ en:
       revoke: "Revoke!"
       confirm: "Are you sure?"
       reason: "Reason for block:"
-      back: "Back"
+      back: "View all blocks"
       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."
-
+  javascripts:
+    map:
+      base:
+        mapnik: Mapnik
+        osmarender: Osmarender
+        cycle_map: Cycle Map
+        noname: NoName
+      overlays:
+        maplint: Maplint
+    site:
+      edit_zoom_alert: You must zoom in to edit the map
+      history_zoom_alert: You must zoom in to see the editing history