X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ebcc988376b0dad8a0969803d52b1073420c77b7..a53c7bf623f7a08706eaf73de44380fbf11b14ad:/config/locales/en.yml?ds=sidebyside

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2d4a634ad..7e6592165 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3,7 +3,7 @@ en:
     dir: ltr
   time:
     formats:
-      friendly: "%e %B %Y at %H:%M"    
+      friendly: "%e %B %Y at %H:%M"
   activerecord:
     # Translates all the model names, which is used in error handling on the web site
     models:
@@ -127,7 +127,7 @@ en:
       has_relations:
         one:  "Has the following {{count}} relation:"
         other: "Has the following {{count}} relations:"
-    common_details: 
+    common_details:
       edited_at: "Edited at:"
       edited_by: "Edited by:"
       version: "Version:"
@@ -263,7 +263,7 @@ en:
       view_history: "view history"
       edit: "edit"
   changeset:
-    changeset_paging_nav: 
+    changeset_paging_nav:
       showing_page: "Showing page {{page}}"
       next: "Next »"
       previous: "« Previous"
@@ -941,30 +941,20 @@ en:
   license_page:
     foreign:
       title: About this translation
-      text: |
-        In the event of a conflict between this translated page and
-        {{english_original_link}}, the English page shall take
-        precedence
+      text: In the event of a conflict between this translated page and {{english_original_link}}, the English page shall take precedence
       english_link: the English original
     native:
       title: About this page
-      text: |
-
-        You are viewing the English version of the copyright page. You
-        can go back to the {{native_link}} of this page; Or you can
-        stop reading about copyright and {{mapping_link}}.
-
+      text: You are viewing the English version of the copyright page. You can go back to the {{native_link}} of this pag or you can stop reading about copyright and {{mapping_link}}.
       native_link: THIS_LANGUAGE_NAME_HERE version
       mapping_link: start mapping
     legal_babble: |
       <h2>Copyright and License</h2>
-      
       <p>
          OpenStreetMap is <i>open data</i>, licensed under the <a
          href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
          Commons Attribution-ShareAlike 2.0</a> licence (CC-BY-SA).
       </p>
-      
       <p>
         You are free to copy, distribute, transmit and adapt our maps
         and data, as long as you credit OpenStreetMap and its
@@ -974,9 +964,8 @@ en:
         href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">legal
         code</a> explains your rights and responsibilities.
       </p>
-      
+
       <h3>How to credit OpenStreetMap</h3>
-      
       <p>
         If you are using OpenStreetMap map images, we request that
         your credit reads at least &ldquo;&copy; OpenStreetMap
@@ -984,7 +973,6 @@ en:
         we request &ldquo;Map data &copy; OpenStreetMap contributors,
         CC-BY-SA&rdquo;.
       </p>
-      
       <p>
         Where possible, OpenStreetMap should be hyperlinked to <a
         href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>
@@ -996,32 +984,28 @@ en:
         &lsquo;OpenStreetMap&rsquo; to this full address) and to
         www.creativecommons.org.
       </p>
-      
+
       <h3>Finding out more</h3>
-      
       <p>
         Read more about using our data at the <a
         href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
         FAQ</a>.
       </p>
-      	
       <p>
         OSM contributors are reminded never to add data from any
         copyrighted sources (e.g. Google Maps or printed maps) without
         explicit permission from the copyright holders.
       </p>
-      
       <p>
         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>.
       </p>
-      
+
       <h3>Our contributors</h3>
-      
       <p>
         Our CC-BY-SA licence requires you to &ldquo;give the Original
         Author credit reasonable to the medium or means You are
@@ -1032,41 +1016,34 @@ en:
         OpenStreetMap, it may be reasonable to credit them by directly
         reproducing their credit or by linking to it on this page.
       </p>
-      
+
       <!--
-      
       Information for page editors
-      
+
       The following lists only those organisations who require attribution
       as a condition of their data being used in OpenStreetMap. It is not a
       general catalogue of imports, and must not be used except when
       attribution is required to comply with the licence of the imported
       data.
-      
+
       Any additions here must be discussed with OSM sysadmins first.
-      
       -->
-      
+
       <ul id="contributors">
-      
           <li><strong>Australia</strong>: Contains suburb data based
           on Australian Bureau of Statistics data.</li>
-      
           <li><strong>Canada</strong>: Contains data from
           GeoBase&reg;, GeoGratis (&copy; Department of Natural
           Resources Canada), CanVec (&copy; Department of Natural
           Resources Canada), and StatCan (Geography Division,
           Statistics Canada).</li>
-      
           <li><strong>New Zealand</strong>: Contains data sourced from
           Land Information New Zealand. Crown Copyright reserved.</li>
-      
           <li><strong>United Kingdom</strong>: Contains Ordnance
           Survey data &copy; Crown copyright and database right
           2010.</li>
-
       </ul>
-      
+
       <p>
         Inclusion of data in OpenStreetMap does not imply that the original
         data provider endorses OpenStreetMap, provides any warranty, or
@@ -1169,7 +1146,7 @@ en:
       subject: "Subject"
       date: "Date"
       no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "people mapping nearby" 
+      people_mapping_nearby: "people mapping nearby"
     message_summary:
       unread_button: "Mark as unread"
       read_button: "Mark as read"
@@ -1192,7 +1169,7 @@ en:
       title: "No such message"
       heading: "No such message"
       body: "Sorry there is no message with that id."
-    outbox: 
+    outbox:
       title: "Outbox"
       my_inbox: "My {{inbox_link}}"
       inbox: "inbox"
@@ -1492,7 +1469,7 @@ en:
       allow_write_api:   "modify the map."
       allow_read_gpx:    "read their private GPS traces."
       allow_write_gpx:   "upload GPS traces."
-    not_found: 
+    not_found:
       sorry: "Sorry, that {{type}} could not be found."
     create:
       flash: "Registered the information successfully"
@@ -1508,17 +1485,17 @@ en:
       create_account: "create an account"
       email or username: "Email Address or Username:"
       password: "Password:"
-      openid: "OpenID:"
-      openid description: "Use your OpenID to login"
+      openid: "{{logo}} OpenID:"
       username_heading: "Login with username and password:"
-      openid_heading: "Login with an OpenID:"
+      openid_heading: "Login with OpenID:"
       remember: "Remember me:"
       lost password link: "Lost your password?"
       login_button: "Login"
       account not active: "Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account."
+      account suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> if you wish to discuss this.
       auth failure: "Sorry, could not log in with those details."
       openid missing provider: "Sorry, could not contact your OpenID provider"
-      openid invalid: "Sorry, your OpenID seems misformed"
+      openid invalid: "Sorry, your OpenID seems to be malformed"
       openid_logo_alt: "Log in with an OpenID"
       openid_providers:
         openid:
@@ -1542,7 +1519,7 @@ en:
     logout:
       title: "Logout"
       heading: "Logout from OpenStreetMap"
-      logout_button: "Logout"      
+      logout_button: "Logout"
     lost_password:
       title: "Lost password"
       heading: "Forgotten Password?"
@@ -1571,11 +1548,21 @@ en:
       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."
+      openid: "{{logo}} OpenID:"
       password: "Password:"
       confirm password: "Confirm Password:"
-      openID: "OpenID:"
-      openID description: '(Optional) If you have an <a href="http://wiki.openstreetmap.org/wiki/openID">OpenID</a> you can associate it with this account to login'
-      openID association: 'Your OpenID is not associated with a OpenStreetMap account yet.<br><ul><li>If you are new to OpenStreetMap, please create a new account.<li>If you already have an account, you can normally login to your account and then associate the account with your openID in your user settings</ul> '
+      use openid: "Alternatively, use {{logo}} OpenID to login"
+      openid no password: "With OpenID a password is not required, but some extra tools or server may still need one."
+      openid association: |
+        <p>Your OpenID is not associated with a OpenStreetMap account yet.</p>
+        <ul>
+          <li>If you are new to OpenStreetMap, please create a new account using the form below.</li>
+          <li>
+            If you already have an account, you can login to your account
+            using your username and password and then associate the account
+            with your OpenID in your user settings.
+          </li>
+        </ul> 
       signup: Signup
       flash create success message: "User was successfully created. Check your email for a confirmation note, and you will be mapping in no time :-)<br /><br />Please note that you will not be able to login until you've received and confirmed your email address.<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."
     no_such_user:
@@ -1601,6 +1588,8 @@ en:
       ago: "({{time_in_words_ago}} ago)"
       email address: "Email address:"
       created from: "Created from:"
+      status: "Status:"
+      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."
@@ -1625,6 +1614,7 @@ en:
       create_block: "block this user"
       activate_user: "activate this user"
       deactivate_user: "deactivate this user"
+      confirm_user: "confirm this user"
       hide_user: "hide this user"
       unhide_user: "unhide this user"
       delete_user: "delete this user"
@@ -1696,6 +1686,30 @@ en:
       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:
+      title: Users
+      heading: Users
+      showing:
+        one: Showing page {{page}} ({{first_item}} of {{items}})
+        other: Showing 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
+      hide: Hide Selected Users
+      empty: No matching users found
+    suspended:
+      title: Account Suspended
+      heading: Account Suspended
+      body: |
+        <p>
+          Sorry, your account has been automatically suspended due to
+          suspicious activity.
+        </p>
+        <p>
+          This decision will be reviewed by an administrator shortly, or
+          you may contact the <a href="mailto:{{webmaster}}">webmaster</a> if
+          you wish to discuss this.
+        </p>
   user_role:
     filter:
       not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."