Merge branch 'master' into openid

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2d4a634ad64fd7a02e2f0f22977b458fd3bc45a8..569890f9bc025460fa28487db1ce5cb4d6170595 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3,7 +3,7 @@ en:
     dir: ltr
   time:
     formats:
     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:
   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:"
       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:"
       edited_at: "Edited at:"
       edited_by: "Edited by:"
       version: "Version:"


@@ -263,7 +263,7 @@ en:
       view_history: "view history"
       edit: "edit"
   changeset:
       view_history: "view history"
       edit: "edit"
   changeset:

-    changeset_paging_nav: 
+    changeset_paging_nav:

       showing_page: "Showing page {{page}}"
       next: "Next »"
       previous: "« Previous"
       showing_page: "Showing page {{page}}"
       next: "Next »"
       previous: "« Previous"


@@ -941,30 +941,20 @@ en:
   license_page:
     foreign:
       title: About this translation
   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
       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>
       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>
          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
       <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>
         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>
       <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
       <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>
         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>
       <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>
         &lsquo;OpenStreetMap&rsquo; to this full address) and to
         www.creativecommons.org.
       </p>

-      
+

       <h3>Finding out more</h3>
       <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>
         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>
         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.
       <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>
         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>
       <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
       <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>
         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
       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.
       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.
       Any additions here must be discussed with OSM sysadmins first.

-      

       -->
       -->

-      
+

       <ul id="contributors">
       <ul id="contributors">

-      

           <li><strong>Australia</strong>: Contains suburb data based
           on Australian Bureau of Statistics data.</li>
           <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>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>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>
           <li><strong>United Kingdom</strong>: Contains Ordnance
           Survey data &copy; Crown copyright and database right
           2010.</li>

-

       </ul>
       </ul>

-      
+

       <p>
         Inclusion of data in OpenStreetMap does not imply that the original
         data provider endorses OpenStreetMap, provides any warranty, or
       <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}}?"
       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"
     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."
       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"
       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."
       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"
       sorry: "Sorry, that {{type}} could not be found."
     create:
       flash: "Registered the information successfully"


@@ -1509,16 +1486,16 @@ en:
       email or username: "Email Address or Username:"
       password: "Password:"
       openid: "OpenID:"
       email or username: "Email Address or Username:"
       password: "Password:"
       openid: "OpenID:"

-      openid description: "Use your OpenID to login"

       username_heading: "Login with username and password:"
       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."
       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"
       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:
       openid_logo_alt: "Log in with an OpenID"
       openid_providers:
         openid:


@@ -1542,7 +1519,7 @@ en:
     logout:
       title: "Logout"
       heading: "Logout from OpenStreetMap"
     logout:
       title: "Logout"
       heading: "Logout from OpenStreetMap"

-      logout_button: "Logout"      
+      logout_button: "Logout"

     lost_password:
       title: "Lost password"
       heading: "Forgotten Password?"
     lost_password:
       title: "Lost password"
       heading: "Forgotten Password?"


@@ -1573,9 +1550,20 @@ en:
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       password: "Password:"
       confirm password: "Confirm Password:"
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       password: "Password:"
       confirm password: "Confirm Password:"

+      openID associate: "Associate an OpenID with your account"

       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: "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> '
+      openID nopassword: "With OpenID, you don't need to specify a password during signup, but some extra OpenStreetMap services or tools may still need one"
+      openID association: |
+        Your OpenID is not associated with a OpenStreetMap account yet.
+        <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:
       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 +1589,8 @@ en:
       ago: "({{time_in_words_ago}} ago)"
       email address: "Email address:"
       created from: "Created from:"
       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."
       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 +1615,7 @@ en:
       create_block: "block this user"
       activate_user: "activate this user"
       deactivate_user: "deactivate this user"
       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"
       hide_user: "hide this user"
       unhide_user: "unhide this user"
       delete_user: "delete this user"


@@ -1696,6 +1687,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."
       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."
   user_role:
     filter:
       not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."