X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/483936772db85ebcf438b47927f85262ea0d5723..0ea9f92be50a8763331a81d3c32a5f5a157265c6:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e2bcd1ef5..72d111f8a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -79,6 +79,17 @@ en:
with_id: "{{id}}"
with_version: "{{id}}, v{{version}}"
with_name: "{{name}} ({{id}})"
+ editor:
+ default: "Default (currently {{name}})"
+ potlatch:
+ name: "Potlatch 1"
+ description: "Potlatch 1 (in-browser editor)"
+ potlatch2:
+ name: "Potlatch 2"
+ description: "Potlatch 2 (in-browser editor)"
+ remote:
+ name: "Remote Control"
+ description: "Remote Control (JOSM or Merkaartor)"
browse:
changeset:
title: "Changeset"
@@ -912,6 +923,7 @@ en:
gps_traces_tooltip: Manage GPS traces
user_diaries: User Diaries
user_diaries_tooltip: View user diaries
+ edit_with: Edit with {{editor}}
tag_line: The Free Wiki World Map
intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you."
intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth."
@@ -1226,6 +1238,7 @@ en:
license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
project_name: "OpenStreetMap project"
project_url: "http://openstreetmap.org"
+ remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
edit:
not_public: "You have not set your edits to be public."
not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
@@ -1235,6 +1248,8 @@ en:
anon_edits_link_text: "Find out why this is the case."
flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can download Flash Player from Adobe.com. Several other options are also available for editing OpenStreetMap.'
potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"
+ potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)"
+ no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
sidebar:
search_results: Search Results
close: Close
@@ -1246,9 +1261,8 @@ en:
search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' more examples..."
key:
map_key: "Map key"
- map_key_tooltip: "Map key for the mapnik rendering at this zoom level"
+ map_key_tooltip: "Key for the map"
table:
- heading: "Legend for z{{zoom_level}}"
entry:
motorway: "Motorway"
trunk: "Trunk road"
@@ -1497,14 +1511,39 @@ en:
create_account: "create an account"
email or username: "Email Address or Username:"
password: "Password:"
+ openid: "{{logo}} OpenID:"
+ username_heading: "Login with username and password:"
+ 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.
Please click on the link in the account confirmation email to activate your account."
+ account not active: "Sorry, your account is not active yet.
Please use the link in the account confirmation email to activate your account, or request a new confirmation email."
account suspended: Sorry, your account has been suspended due to suspicious activity.
Please contact the {{webmaster}} if you wish to discuss this.
webmaster: webmaster
auth failure: "Sorry, could not log in with those details."
notice: "Find out more about OpenStreetMap's upcoming license change (translations) (discussion)"
+ openid missing provider: "Sorry, could not contact your OpenID provider"
+ openid invalid: "Sorry, your OpenID seems to be malformed"
+ openid_logo_alt: "Log in with an OpenID"
+ openid_providers:
+ openid:
+ title: Login with an OpenID URL
+ alt: Login with an OpenID URL
+ yahoo:
+ title: Login with a Yahoo! OpenID
+ alt: Login with a Yahoo! OpenID
+ google:
+ title: Login with a Google OpenID
+ alt: Login with a Google OpenID
+ myopenid:
+ title: Login with a myOpenID OpenID
+ alt: Login with a myOpenID OpenID
+ wordpress:
+ title: Login with a Wordpress.com OpenID
+ alt: Login with a Wordpress.com OpenID
+ myspace:
+ title: Login with a MySpace OpenID
+ alt: Login with a MySpace OpenID
logout:
title: "Logout"
heading: "Logout from OpenStreetMap"
@@ -1537,8 +1576,21 @@ en:
not displayed publicly: 'Not displayed publicly (see privacy policy)'
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:"
+ 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: |
+
Your OpenID is not associated with a OpenStreetMap account yet.
+