X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2ee5a63eaddc2917328bacf7feb90b0c8b1933b1..e6395508c41d8eebd0dabe897b7043686250b0d5:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b1752834b..f5ab514d1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -273,9 +273,6 @@ en:
enabled link text: "what is this?"
disabled: "Disabled and cannot edit data, all previous edits are anonymous."
disabled link text: "why can't I edit?"
- public editing note:
- heading: "Public editing"
- html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. Since the 0.6 API changeover, only public users can edit map data. (find out why).- Your email address will not be revealed by becoming public.
- This action cannot be reversed and all new users are now public by default.
"
contributor terms:
heading: "Contributor Terms"
agreed: "You have agreed to the new Contributor Terms."
@@ -285,8 +282,17 @@ en:
link: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
link text: "what is this?"
save changes button: Save Changes
- make edits public button: Make all my edits public
delete_account: Delete Account...
+ go_public:
+ heading: "Public editing"
+ currently_not_public: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below."
+ only_public_can_edit: Since the 0.6 API changeover, only public users can edit map data.
+ find_out_why_html: (%{link}).
+ find_out_why: "find out why"
+ find_out_why_url: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+ email_not_revealed: Your email address will not be revealed by becoming public.
+ not_reversible: This action cannot be reversed and all new users are now public by default.
+ make_edits_public_button: Make all my edits public
update:
success_confirm_needed: "User information updated successfully. Check your email for a note to confirm your new email address."
success: "User information updated successfully."
@@ -407,24 +413,6 @@ en:
telephone_link: "Call %{phone_number}"
colour_preview: "Colour %{colour_value} preview"
email_link: "Email %{email}"
- note:
- title: "Note: %{id}"
- new_note: "New Note"
- description: "Description"
- open_title: "Unresolved note #%{note_name}"
- closed_title: "Resolved note #%{note_name}"
- hidden_title: "Hidden note #%{note_name}"
- opened_by_html: "Created by %{user} %{when}"
- opened_by_anonymous_html: "Created by anonymous %{when}"
- commented_by_html: "Comment from %{user} %{when}"
- commented_by_anonymous_html: "Comment from anonymous %{when}"
- closed_by_html: "Resolved by %{user} %{when}"
- closed_by_anonymous_html: "Resolved by anonymous %{when}"
- reopened_by_html: "Reactivated by %{user} %{when}"
- reopened_by_anonymous_html: "Reactivated by anonymous %{when}"
- hidden_by_html: "Hidden by %{user} %{when}"
- report: report this note
- coordinates_html: "%{latitude}, %{longitude}"
query:
title: "Query Features"
introduction: "Click on the map to find nearby features."
@@ -988,7 +976,7 @@ en:
fitness_station: "Fitness Station"
garden: "Garden"
golf_course: "Golf Course"
- horse_riding: "Horse Riding"
+ horse_riding: "Horse Riding Centre"
ice_rink: "Ice Rink"
marina: "Marina"
miniature_golf: "Miniature Golf"
@@ -2070,7 +2058,9 @@ en:
map_image: "Map Image (shows standard layer)"
embeddable_html: "Embeddable HTML"
licence: "Licence"
- export_details_html: 'OpenStreetMap data is licensed under the Open Data Commons Open Database License (ODbL).'
+ licence_details_html: OpenStreetMap data is licensed under the %{odbl_link} (ODbL).
+ odbl: Open Data Commons Open Database License
+ odbl_url: https://opendatacommons.org/licenses/odbl/1.0/
too_large:
advice: "If the above export fails, please consider using one of the sources listed below:"
body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the sources listed below for bulk data downloads."
@@ -2168,8 +2158,20 @@ en:
description: Browse the wiki for in-depth OpenStreetMap documentation.
potlatch:
removed: Your default OpenStreetMap editor is set as Potlatch. Because Adobe Flash Player has been withdrawn, Potlatch is no longer available to use in a web browser.
- desktop_html: You can still use Potlatch by downloading the desktop application for Mac and Windows.
- id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. Change your preferences here.
+ desktop_application_html: You can still use Potlatch by %{download_link}.
+ download: downloading the desktop application for Mac and Windows
+ download_url: https://www.systemed.net/potlatch/
+ id_editor_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. %{change_preferences_link}.
+ change_preferences: Change your preferences here
+ any_questions:
+ title: Any questions?
+ paragraph_1_html: |
+ OpenStreetMap has several resources for learning about the project, asking and answering
+ questions, and collaboratively discussing and documenting mapping topics.
+ %{help_link}. With an organization making plans for OpenStreetMap? %{welcome_mat_link}.
+ get_help_here: Get help here
+ welcome_mat: Check out the Welcome Mat
+ welcome_mat_url: https://welcome.openstreetmap.org/
sidebar:
search_results: Search Results
close: Close
@@ -2256,57 +2258,56 @@ en:
toilets: "Toilets"
welcome:
title: Welcome!
- introduction_html: |
+ introduction: |
Welcome to OpenStreetMap, the free and editable map of the world. Now that you're signed
up, you're all set to get started mapping. Here's a quick guide with the most important
things you need to know.
whats_on_the_map:
title: What's on the Map
- on_html: |
- OpenStreetMap is a place for mapping things that are both real and current -
+ on_the_map_html: |
+ OpenStreetMap is a place for mapping things that are both %{real_and_current} -
it includes millions of buildings, roads, and other details about places. You can map
whatever real-world features are interesting to you.
- off_html: |
- What it doesn't include is opinionated data like ratings, historical or
+ real_and_current: real and current
+ off_the_map_html: |
+ What it %{doesnt} include is opinionated data like ratings, historical or
hypothetical features, and data from copyrighted sources. Unless you have special
permission, don't copy from online or paper maps.
+ doesnt: doesn't
basic_terms:
title: Basic Terms For Mapping
- paragraph_1_html: |
+ paragraph_1: |
OpenStreetMap has some of its own lingo. Here are a few key words that'll come in handy.
- editor_html: |
- An editor is a program or website you can use to edit the map.
- node_html: |
- A node is a point on the map, like a single restaurant or a tree.
- way_html: |
- A way is a line or area, like a road, stream, lake or building.
- tag_html: |
- A tag is a bit of data about a node or way, like a
- restaurant's name or a road's speed limit.
+ an_editor_html: An %{editor} is a program or website you can use to edit the map.
+ a_node_html: A %{node} is a point on the map, like a single restaurant or a tree.
+ a_way_html: A %{way} is a line or area, like a road, stream, lake or building.
+ a_tag_html: A %{tag} is a bit of data about a node or way, like a restaurant's name or a road's speed limit.
+ editor: editor
+ node: node
+ way: way
+ tag: tag
rules:
title: Rules!
- paragraph_1_html: |
+ para_1_html: |
OpenStreetMap has few formal rules but we expect all participants to collaborate
with, and communicate with, the community. If you are considering
any activities other than editing by hand, please read and follow the guidelines on
- Imports and
- Automated Edits.
- questions:
- title: Any questions?
- paragraph_1_html: |
- OpenStreetMap has several resources for learning about the project, asking and answering
- questions, and collaboratively discussing and documenting mapping topics.
- Get help here. With an organization making plans for OpenStreetMap? Check out the Welcome Mat.
+ %{imports_link} and %{automated_edits_link}.
+ imports: Imports
+ imports_url: https://wiki.openstreetmap.org/wiki/Import/Guidelines
+ automated_edits: Automated Edits
+ automated_edits_url: https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct
start_mapping: Start Mapping
add_a_note:
title: No Time To Edit? Add a Note!
- paragraph_1_html: |
+ para_1: |
If you just want something small fixed and don't have the time to sign up and learn how to edit, it's
easy to add a note.
- paragraph_2_html: |
- Just go to the map and click the note icon:
- . This will add a marker to the map, which you can move
- by dragging. Add your message, then click save, and other mappers will investigate.
+ para_2_html: |
+ Just go to %{map_link} and click the note icon: %{note_icon}.
+ This will add a marker to the map, which you can move by dragging.
+ Add your message, then click save, and other mappers will investigate.
+ the_map: the map
communities:
title: Communities
lede_text: |
@@ -2326,11 +2327,12 @@ en:
The following communities are formally established as Local Chapters:
other_groups:
title: Other Groups
- about_html: |
+ other_groups_html: |
There is no need to formally establish a group to the same extent as the Local Chapters.
Indeed many groups exist very sucessfully as an informal gathering of people or as a
- community group. Anyone can set up or join these. Read more on the
- Communities wiki page.
+ community group. Anyone can set up or join these. Read more on the %{communities_wiki_link}.
+ communities_wiki: Communities wiki page
+ communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group
traces:
visibility:
private: "Private (only shared as anonymous, unordered points)"
@@ -2406,7 +2408,11 @@ en:
public_traces_from: "Public GPS Traces from %{user}"
description: "Browse recent GPS trace uploads"
tagged_with: " tagged with %{tags}"
- empty_html: "Nothing here yet. Upload a new trace or learn more about GPS tracing on the wiki page."
+ empty_title: Nothing here yet
+ empty_upload_html: "%{upload_link} or learn more about GPS tracing on the %{wiki_link}."
+ upload_new: Upload a new trace
+ wiki_page: wiki page
+ wiki_page_url: https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2
upload_trace: "Upload a trace"
all_traces: "All Traces"
my_traces: "My Traces"
@@ -2571,10 +2577,8 @@ en:
support: support
about:
header: Free and editable
- html: |
- Unlike other maps, OpenStreetMap is completely created by people like you,
- and it's free for anyone to fix, update, download and use.
- Sign up to get started contributing. We'll send an email to confirm your account.
+ paragraph_1: Unlike other maps, OpenStreetMap is completely created by people like you, and it's free for anyone to fix, update, download and use.
+ paragraph_2: Sign up to get started contributing. We'll send an email to confirm your account.
email address: "Email Address:"
confirm email address: "Confirm Email Address:"
display name: "Display Name:"
@@ -2837,6 +2841,38 @@ en:
description: "Description"
created_at: "Created at"
last_changed: "Last changed"
+ show:
+ title: "Note: %{id}"
+ description: "Description"
+ open_title: "Unresolved note #%{note_name}"
+ closed_title: "Resolved note #%{note_name}"
+ hidden_title: "Hidden note #%{note_name}"
+ opened_by_html: "Created by %{user} %{when}"
+ opened_by_anonymous_html: "Created by anonymous %{when}"
+ commented_by_html: "Comment from %{user} %{when}"
+ commented_by_anonymous_html: "Comment from anonymous %{when}"
+ closed_by_html: "Resolved by %{user} %{when}"
+ closed_by_anonymous_html: "Resolved by anonymous %{when}"
+ reopened_by_html: "Reactivated by %{user} %{when}"
+ reopened_by_anonymous_html: "Reactivated by anonymous %{when}"
+ hidden_by_html: "Hidden by %{user} %{when}"
+ report: report this note
+ coordinates_html: "%{latitude}, %{longitude}"
+ anonymous_warning: This note includes comments from anonymous users which should be independently verified.
+ hide: Hide
+ resolve: Resolve
+ reactivate: Reactivate
+ comment_and_resolve: Comment & Resolve
+ comment: Comment
+ report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}."
+ other_problems_resolve: "For all other problems with the note, please resolve it yourself with a comment."
+ other_problems_resolved: "For all other problems, resolving is sufficient."
+ disappear_date_html: "This resolved note will disappear from the map in %{disappear_in}."
+ new:
+ title: "New Note"
+ intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem."
+ advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
+ add: Add Note
javascripts:
close: Close
share:
@@ -2914,22 +2950,6 @@ en:
unsubscribe: "Unsubscribe"
hide_comment: "hide"
unhide_comment: "unhide"
- notes:
- new:
- intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem."
- advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
- add: Add Note
- show:
- anonymous_warning: This note includes comments from anonymous users which should be independently verified.
- hide: Hide
- resolve: Resolve
- reactivate: Reactivate
- comment_and_resolve: Comment & Resolve
- comment: Comment
- report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}."
- other_problems_resolve: "For all other problems with the note, please resolve it yourself with a comment."
- other_problems_resolved: "For all other problems, resolving is sufficient."
- disappear_date_html: "This resolved note will disappear from the map in %{disappear_in}."
edit_help: Move the map and zoom in on a location you want to edit, then click here.
directions:
ascend: "Ascend"