X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9c2de4039c3053c35e76f596faa95557dc237c74..cb6d6c246332ffe3230df31f3acc1ed82e2b80ce:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index beccc22fa..7641d5532 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -87,9 +87,9 @@ en:
potlatch2:
name: "Potlatch 2"
description: "Potlatch 2 (in-browser editor)"
- josm:
- name: "JOSM"
- description: "JOSM (via remote-control plugin)"
+ remote:
+ name: "Remote Control"
+ description: "Remote Control (JOSM or Merkaartor)"
browse:
changeset:
title: "Changeset"
@@ -219,6 +219,8 @@ en:
zoom_or_select: "Zoom in or select an area of the map to view"
drag_a_box: "Drag a box on the map to select an area"
manually_select: "Manually select a different area"
+ hide_areas: "Hide areas"
+ show_areas: "Show areas"
loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
load_data: "Load Data"
unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than {{max_bbox_size}})"
@@ -936,19 +938,21 @@ en:
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."
donate_link_text: donating
- help_and_wiki: "{{help}} & {{wiki}}"
help: Help
+ help_centre: Help Centre
help_url: http://help.openstreetmap.org/
help_title: Help site for the project
wiki: Wiki
wiki_url: http://wiki.openstreetmap.org/
wiki_title: Wiki site for the project
+ documentation: Documentation
+ documentation_title: Documentation for the project
copyright: "Copyright & License"
- news_blog: "News blog"
- news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
- shop: Shop
- shop_tooltip: Shop with branded OpenStreetMap merchandise
- shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
+ community_blogs: "Community Blogs"
+ community_blogs_title: "Blogs from members of the OpenStreetMap community"
+ foundation: Foundation
+ foundation_title: The OpenStreetMap Foundation
+ sotm2011: 'Come to the 2011 OpenStreetMap Conference, The State of the Map, September 9-11th in Denver!'
license:
alt: CC by-sa 2.0
title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License
@@ -1238,7 +1242,7 @@ en:
license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
project_name: "OpenStreetMap project"
project_url: "http://openstreetmap.org"
- josm_failed: "Editing failed - make sure JOSM is loaded and the remote control plugin is enabled"
+ 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}}."
@@ -1248,6 +1252,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_not_configured: "Potlatch 2 has not been configured - please see http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information"
+ 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
@@ -1259,7 +1265,7 @@ en:
submit_text: "Go"
search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' more examples..."
key:
- map_key: "Map key"
+ map_key: "Map Key"
map_key_tooltip: "Key for the map"
table:
entry:
@@ -1435,6 +1441,7 @@ en:
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."
+ 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:
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."
@@ -1513,6 +1520,11 @@ en:
remember: "Remember me:"
lost password link: "Lost your password?"
login_button: "Login"
+ register now: Register now
+ already have: Already have an OpenStreetMap account? Please login.
+ new to osm: New to OpenStreetMap?
+ to make changes: To make changes to the OpenStreetMap data, you must have an account.
+ create account minute: Create an account. It only takes a minute.
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
@@ -1591,6 +1603,7 @@ en:
add as friend: add as friend
mapper since: "Mapper since:"
ago: "({{time_in_words_ago}} ago)"
+ latest edit: "Latest edit {{ago}}:"
email address: "Email address:"
created from: "Created from:"
status: "Status:"