X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1f92b6f35b43fa36e42a924fb5561d889120e457..73f04687ff4e0d4d6f317619bac7ca0c9a79a4f3:/config/locales/en.yml?ds=sidebyside diff --git a/config/locales/en.yml b/config/locales/en.yml index 396fd28d6..7bd004e16 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -91,9 +91,9 @@ en: no_bounding_box: "No bounding box has been stored for this changeset." show_area_box: "Show Area Box" box: "box" - has_nodes: "Has the following {{node_count}} nodes:" - has_ways: "Has the following {{way_count}} ways:" - has_relations: "Has the following {{relation_count}} relations:" + has_nodes: "Has the following {{count}} nodes:" + has_ways: "Has the following {{count}} ways:" + has_relations: "Has the following {{count}} relations:" common_details: edited_at: "Edited at:" edited_by: "Edited by:" @@ -117,9 +117,10 @@ en: node: node: "Node" node_title: "Node: {{node_name}}" - download: "{{download_xml_link}} or {{view_history_link}}" + download: "{{download_xml_link}}, {{view_history_link}} or {{edit_link}}" download_xml: "Download XML" view_history: "view history" + edit: "edit" not_found: sorry: "Sorry, the {{type}} with the id {{id}}, could not be found." type: @@ -147,6 +148,7 @@ en: view_data: "View data for current map view" manually_select: "Manually select a different area" start_rjs: + data_layer_name: "Data" data_frame_title: "Data" 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" @@ -197,9 +199,10 @@ en: way: way: "Way" way_title: "Way: {{way_name}}" - download: "{{download_xml_link}} or {{view_history_link}}" + download: "{{download_xml_link}}, {{view_history_link}} or {{edit_link}}" download_xml: "Download XML" view_history: "view history" + edit: "edit" changeset: changeset_paging_nav: showing_page: "Showing page" @@ -246,6 +249,7 @@ en: list: title: "Users' diaries" user_title: "{{user}}'s diary" + in_language_title: "Diary Entries in {{language}}" new: New Diary Entry new_title: Compose a new entry in your user diary no_entries: No diary entries @@ -278,7 +282,7 @@ en: heading: "The user {{user}} does not exist" body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong." diary_entry: - posted_by: "Posted by {{link_user}} at {{created}} in {{language}}" + posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}" comment_link: Comment on this entry reply_link: Reply to this entry comment_count: @@ -374,7 +378,7 @@ en: news_blog: "News blog" news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc." shop: Shop - shop_tooltip: Shop with branded OpenStreetMap + 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 @@ -568,10 +572,14 @@ en: upload_trace: "Upload GPS Trace" trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion." edit: + title: "Editing trace {{name}}" + heading: "Editing trace {{name}}" filename: "Filename:" + download: "download" uploaded_at: "Uploaded at:" points: "Points:" start_coord: "Start coordinate:" + map: "map" edit: "edit" owner: "Owner:" description: "Description:" @@ -597,6 +605,8 @@ en: trace_optionals: tags: "Tags" view: + title: "Viewing trace {{name}}" + heading: "Viewing trace {{name}}" pending: "PENDING" filename: "Filename:" download: "download" @@ -612,7 +622,6 @@ en: make_public: "Make this track public permanently" edit_track: "Edit this track" delete_track: "Delete this track" - viewing_trace: "Viewing trace {{name}}" trace_not_found: "Trace not found!" trace_paging_nav: showing: "Showing page" @@ -640,6 +649,21 @@ en: scheduled_for_deletion: "Track scheduled for deletion" make_public: made_public: "Track made public" + oauth: + client_application: + 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." + allow_to: "Allow the client application to:" + allow_read_prefs: "read your user preferences." + allow_write_prefs: "modify your user preferences." + allow_write_diary: "create diary entries, comments and make friends." + allow_write_api: "modify the map." + allow_read_gpx: "read your private GPS traces." + allow_write_gpx: "upload GPS traces." + token: + none: "You have not authorised any clients to act on your behalf. You do not have to do anything now to authorise them, as they will ask for authorisation when they need it. After that time you can return here to revoke those permissions if you do not want the clients to have your authorisation any more." + application: "Application" + issued: "Issued" + revoke: "Revoke!" user: login: title: "Login" @@ -669,7 +693,7 @@ en: no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically." contact_webmaster: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible. ' fill_form: "Fill in the form and we'll send you a quick email to activate your account." - license_agreement: 'By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools which connect to openstreetmap.org is to be (non-exclusively) licensed under this Creative Commons license (by-sa).' + license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under this Creative Commons license (by-sa).' email address: "Email Address: " confirm email address: "Confirm Email Address: " not displayed publicly: 'Not displayed publicly (see privacy policy)' @@ -707,7 +731,7 @@ en: settings_link_text: settings your friends: Your friends no friends: You have not added any friends yet. - km away: "{{distance}}km away" + km away: "{{count}}km away" nearby users: "Nearby users: " no nearby users: "There are no users who admit to mapping nearby yet." change your settings: change your settings @@ -737,6 +761,12 @@ en: return to profile: Return to profile flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address." flash update success: "User information updated successfully." + my apps: "My client applications" + developers: "Application Developers" + dev_intro: "Have you written an application which you would like to register to make {{link}} requests to the OpenStreetMap server?" + register_app: "Register your application" + apps_registered: "You have the following client applications registered:" + register_another_app: "Register another application" confirm: heading: Confirm a user account press confirm button: "Press the confirm button below to activate your account."