X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/10e035df932b194c13cc319d8db0f41212454cee..7e68566c46dd62ae102592c6015f764da5205d3a:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 025f24fb0..9632c7e09 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -976,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"
@@ -1779,13 +1779,8 @@ en:
lost password link: "Lost your password?"
login_button: "Login"
register now: Register now
- with username: "Already have an OpenStreetMap account? Please login with your username and password:"
with external: "Alternatively, use a third party to login:"
- new to osm: New to OpenStreetMap?
- to make changes: To make changes to the OpenStreetMap data, you must have an account.
- create account minute: Create an account. It only takes a minute.
no account: Don't have an account?
- account not active: "Sorry, your account is not active yet.
Please use the link in the account confirmation email to activate your account, or request a new confirmation email."
auth failure: "Sorry, could not log in with those details."
openid_logo_alt: "Log in with an OpenID"
auth_providers:
@@ -2073,9 +2068,6 @@ en:
geofabrik:
title: "Geofabrik Downloads"
description: "Regularly-updated extracts of continents, countries, and selected cities"
- metro:
- title: "Metro Extracts"
- description: "Extracts for major world cities and their surrounding areas"
other:
title: "Other Sources"
description: "Additional sources listed on the OpenStreetMap Wiki"
@@ -2160,6 +2152,15 @@ en:
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.
+ 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
@@ -2246,57 +2247,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: |
@@ -2565,10 +2565,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:"