X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/59bf6e0a04ff116b23ea0acc293049c295dd0981..0caaf54de5b85070548381a814106a07f366b11a:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 3f6518d4e..8afaa9717 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: @@ -127,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:" @@ -262,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" @@ -941,30 +952,20 @@ en: 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 + 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 page; Or you can - stop reading about copyright and {{mapping_link}}. - + 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: |

Copyright and License

-

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 @@ -974,9 +975,8 @@ en: href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">legal code explains your rights and responsibilities.

- +

How to credit OpenStreetMap

-

If you are using OpenStreetMap map images, we request that your credit reads at least “© OpenStreetMap @@ -984,7 +984,6 @@ en: we request “Map data © OpenStreetMap contributors, CC-BY-SA”.

-

Where possible, OpenStreetMap should be hyperlinked to http://www.openstreetmap.org/ @@ -996,32 +995,28 @@ en: ‘OpenStreetMap’ to this full address) and to www.creativecommons.org.

- +

Finding out more

-

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 contributors

-

Our CC-BY-SA licence requires you to “give the Original Author credit reasonable to the medium or means You are @@ -1032,41 +1027,34 @@ en: 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 @@ -1169,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" @@ -1192,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" @@ -1492,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" @@ -1512,11 +1500,12 @@ en: 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 suspended: Sorry, your account has been suspended due to suspicious activity.
Please contact the webmaster if you wish to discuss this. auth failure: "Sorry, could not log in with those details." logout: title: "Logout" heading: "Logout from OpenStreetMap" - logout_button: "Logout" + logout_button: "Logout" lost_password: title: "Lost password" heading: "Forgotten Password?" @@ -1572,6 +1561,8 @@ en: ago: "({{time_in_words_ago}} ago)" email address: "Email address:" created from: "Created from:" + status: "Status:" + spam score: "Spam Score:" description: Description user location: User location if set location: "If you set your location, a pretty map and stuff will appear here. You can set your home location on your {{settings_link}} page." @@ -1596,6 +1587,7 @@ en: create_block: "block this user" activate_user: "activate this user" deactivate_user: "deactivate this user" + confirm_user: "confirm this user" hide_user: "hide this user" unhide_user: "unhide this user" delete_user: "delete this user" @@ -1663,6 +1655,30 @@ en: not_a_friend: "{{name}} is not one of your friends." filter: not_an_administrator: "You need to be an administrator to perform that action." + list: + title: Users + heading: Users + showing: + one: Showing page {{page}} ({{first_item}} of {{items}}) + other: Showing page {{page}} ({{first_item}}-{{last_item}} of {{items}}) + summary: "{{name}} created from {{ip_address}} on {{date}}" + summary_no_ip: "{{name}} created on {{date}}" + confirm: Confirm Selected Users + hide: Hide Selected Users + empty: No matching users found + suspended: + title: Account Suspended + heading: Account Suspended + body: | +

+ 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." @@ -1770,6 +1786,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: