X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/db691133d384cef053204cda8188234da2dd2782..959442d087b9b25fbec9c78ec122106b82d887dd:/config/locales/en.yml?ds=sidebyside diff --git a/config/locales/en.yml b/config/locales/en.yml index 8699d600c..93f114df4 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3,7 +3,7 @@ en: 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: @@ -89,7 +89,7 @@ en: feed: title: "Changeset {{id}}" title_comment: "Changeset {{id}} - {{comment}}" - changeset_navigation: + navigation: paging: user: prev: "« {{id}}" @@ -98,12 +98,18 @@ en: prev: "« {{id}}" next: "{{id}} »" user: - name_tooltip: "View edits by {{user}}" - prev_tooltip: "Previous edit by {{user}}" - next_tooltip: "Next edit by {{user}}" + name_changeset_tooltip: "View edits by {{user}}" + prev_changeset_tooltip: "Previous edit by {{user}}" + next_changeset_tooltip: "Next edit by {{user}}" all: - prev_tooltip: "Previous changeset" - next_tooltip: "Next changeset" + prev_node_tooltip: "Previous node" + next_node_tooltip: "Next node" + prev_way_tooltip: "Previous way" + next_way_tooltip: "Next way" + prev_relation_tooltip: "Previous relation" + next_relation_tooltip: "Next relation" + prev_changeset_tooltip: "Previous changeset" + next_changeset_tooltip: "Next changeset" changeset_details: created_at: "Created at:" closed_at: "Closed at:" @@ -121,7 +127,7 @@ en: 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:" @@ -233,6 +239,10 @@ en: # There is no 'relation' type because it is not represented in OpenLayers tag_details: tags: "Tags:" + wiki_link: + key: "The wiki description page for the {{key}} tag" + tag: "The wiki description page for the {{key}}={{value}} tag" + wikipedia_link: "The {{page}} article on Wikipedia" way_details: nodes: "Nodes:" part_of: "Part of:" @@ -252,8 +262,19 @@ en: download_xml: "Download XML" view_history: "view history" edit: "edit" + bug: + open_title: "Unresolved issue: {{bug_name}}" + closed_title: "Resolved issue: {{bug_name}}" + created_at: "Created at:" + edited_at: "Edited at:" + closed_at: "Closed at:" + opened_by: "Opened by:" + description: "Description:" + comment_by: "Comment by: " + comment: "Comment:" + date: "Date:" changeset: - changeset_paging_nav: + changeset_paging_nav: showing_page: "Showing page {{page}}" next: "Next »" previous: "« Previous" @@ -914,6 +935,7 @@ en: help_wiki: "Help & Wiki" help_wiki_tooltip: "Help & Wiki site for the project" help_wiki_url: "http://wiki.openstreetmap.org" + copyright: "Copyright & License" news_blog: "News blog" news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc." shop: Shop @@ -926,6 +948,118 @@ en: make_a_donation: title: Support OpenStreetMap with a monetary donation text: Make a Donation + + 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 + 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 pag or you can stop reading about copyright and {{mapping_link}}. + native_link: THIS_LANGUAGE_NAME_HERE version + mapping_link: start mapping + legal_babble: | +
+ OpenStreetMap is open data, licensed under the Creative + Commons Attribution-ShareAlike 2.0 licence (CC-BY-SA). +
++ You are free to copy, distribute, transmit and adapt our maps + and data, as long as you credit OpenStreetMap and its + contributors. If you alter or build upon our maps or data, you + may distribute the result only under the same licence. The + full legal + code explains your rights and responsibilities. +
+ ++ If you are using OpenStreetMap map images, we request that + your credit reads at least “© OpenStreetMap + contributors, CC-BY-SA”. If you are using map data only, + we request “Map data © OpenStreetMap contributors, + CC-BY-SA”. +
++ Where possible, OpenStreetMap should be hyperlinked to http://www.openstreetmap.org/ + and CC-BY-SA to http://creativecommons.org/licenses/by-sa/2.0/. If + you are using a medium where links are not possible (e.g. a + printed work), we suggest you direct your readers to + www.openstreetmap.org (perhaps by expanding + ‘OpenStreetMap’ to this full address) and to + www.creativecommons.org. +
+ ++ Read more about using our data at the Legal + FAQ. +
++ 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. +
++ Although OpenStreetMap is open data, we cannot provide a + free-of-charge map API for third-party developers. + + See our API Usage Policy, + Tile Usage Policy + and Nominatim Usage Policy. +
+ ++ Our CC-BY-SA licence requires you to “give the Original + Author credit reasonable to the medium or means You are + utilising”. Individual OSM mappers do not request a + credit over and above that to “OpenStreetMap + contributors”, but where data from a national mapping + agency or other major source has been included in + OpenStreetMap, it may be reasonable to credit them by directly + reproducing their credit or by linking to it on this page. +
+ + + ++ Inclusion of data in OpenStreetMap does not imply that the original + data provider endorses OpenStreetMap, provides any warranty, or + accepts any liability. +
notifier: diary_comment_notification: subject: "[OpenStreetMap] {{user}} commented on your diary entry" @@ -1023,7 +1157,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}}?" - people_mapping_nearby: "people mapping nearby" + people_mapping_nearby: "people mapping nearby" message_summary: unread_button: "Mark as unread" read_button: "Mark as read" @@ -1046,7 +1180,7 @@ en: 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" @@ -1346,7 +1480,7 @@ en: 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" @@ -1366,11 +1500,12 @@ en: lost password link: "Lost your password?" login_button: "Login" account not active: "Sorry, your account is not active yet.+ Sorry, your account has been automatically suspended due to + suspicious activity. +
++ This decision will be reviewed by an administrator shortly, or + you may contact the webmaster if + you wish to discuss this. +
user_role: filter: not_an_administrator: "Only administrators can perform user role management, and you are not an administrator." @@ -1624,6 +1801,20 @@ en: back: "View all blocks" revoker: "Revoker:" needs_view: "The user needs to log in before this block will be cleared." + bugs: + rss: + description_area: "A list of bugs, reported, commented on or closed in your area [({{min_lat}}|{{min_lon}}) -- ({{max_lat}}|{{max_lon}})]" + description_item: "An rss feed for bug {{id}}" + closed: "closed bug (near {{place}})" + new: "new bug (near {{place}})" + comment: "new comment (near {{place}})" + user: + title_user: "Bugs submitted or commented on by {{user}}" + heading_user: "{{user}}'s bugs" + description_user: "Bugs submitted or commented on by {{user}}" + id: "Id" + last_changed: "Last changed" + javascripts: map: base: