X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1f92b6f35b43fa36e42a924fb5561d889120e457..ff03138a978406b431da71aba64941d87b509098:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 396fd28d6..9581d83b7 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" @@ -219,33 +222,19 @@ en: user: "User" comment: "Comment" area: "Area" - list_bbox: - history: "History" - changesets_within_the_area: "Changesets within the area:" - show_area_box: "show area box" - no_changesets: "No changesets" - all_changes_everywhere: "For all changes everywhere see {{recent_changes_link}}" - recent_changes: "Recent Changes" - no_area_specified: "No area specified" - first_use_view: "First use the {{view_tab_link}} to pan and zoom to an area of interest, then click the history tab." - view_the_map: "view the map" - view_tab: "view tab" - alternatively_view: "Alternatively, view all {{recent_changes_link}}" list: - recent_changes: "Recent Changes" - recently_edited_changesets: "Recently edited changesets:" - for_more_changesets: "For more changesets, select a user and view their edits, or see the editing 'history' of a specific area." - list_user: - edits_by_username: "Edits by {{username_link}}" - no_visible_edits_by: "No visible edits by {{name}}." - for_all_changes: "For changes by all users see {{recent_changes_link}}" - recent_changes: "Recent Changes" + title: "Changesets" + description: "Recent edits" + description_user: "Recent edits by {{user}}" + description_bbox: "Recent edits within {{bbox}}" + description_user_bbox: "Recent edits by {{user}} within {{bbox}}" diary_entry: new: title: New Diary Entry 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 +267,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 +363,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 @@ -669,7 +658,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 +696,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