X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7d0a94552c78652c1c8a858b15998b6254184ed1..b15a8c73d9c555243952d300e19d6d4127843f19:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a56aa0a57..9e923185d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -968,43 +968,6 @@ en:
text: Make a Donation
learn_more: "Learn More"
more: More
- help_page:
- title: Getting Help
- introduction: |
- OpenStreetMap has several resources for learning about the project, asking and answering questions,
- and collaboratively discussing and documenting mapping topics.
- welcome:
- url: /welcome
- title: Welcome to OSM
- description: Start with this quick guide covering the OpenStreetMap basics.
- beginners_guide:
- url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
- title: Beginners' Guide
- description: Community maintained guide for beginners.
- help:
- url: https://help.openstreetmap.org/
- title: help.openstreetmap.org
- description: Ask a question or look up answers on OSM's question-and-answer site.
- mailing_lists:
- url: https://lists.openstreetmap.org/
- title: Mailing Lists
- description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists.
- forums:
- url: https://forum.openstreetmap.org/
- title: Forums
- description: Questions and discussions for those that prefer a bulletin board style interface.
- irc:
- url: https://irc.openstreetmap.org/
- title: IRC
- description: Interactive chat in many different languages and on many topics.
- switch2osm:
- url: https://switch2osm.org/
- title: switch2osm
- description: Help for companies and organisations switching to OpenStreetMap based maps and other services.
- wiki:
- url: https://wiki.openstreetmap.org/
- title: wiki.openstreetmap.org
- description: Browse the wiki for in-depth OSM documentation.
notifier:
diary_comment_notification:
subject: "[OpenStreetMap] %{user} commented on a diary entry"
@@ -1416,6 +1379,43 @@ en:
If you have concerns about how our data is being used or about the contents please consult our
copyright page for more legal information, or contact the appropriate
OSMF working group.
+ help:
+ title: Getting Help
+ introduction: |
+ OpenStreetMap has several resources for learning about the project, asking and answering questions,
+ and collaboratively discussing and documenting mapping topics.
+ welcome:
+ url: /welcome
+ title: Welcome to OSM
+ description: Start with this quick guide covering the OpenStreetMap basics.
+ beginners_guide:
+ url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
+ title: Beginners' Guide
+ description: Community maintained guide for beginners.
+ help:
+ url: https://help.openstreetmap.org/
+ title: help.openstreetmap.org
+ description: Ask a question or look up answers on OSM's question-and-answer site.
+ mailing_lists:
+ url: https://lists.openstreetmap.org/
+ title: Mailing Lists
+ description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists.
+ forums:
+ url: https://forum.openstreetmap.org/
+ title: Forums
+ description: Questions and discussions for those that prefer a bulletin board style interface.
+ irc:
+ url: https://irc.openstreetmap.org/
+ title: IRC
+ description: Interactive chat in many different languages and on many topics.
+ switch2osm:
+ url: https://switch2osm.org/
+ title: switch2osm
+ description: Help for companies and organisations switching to OpenStreetMap based maps and other services.
+ wiki:
+ url: https://wiki.openstreetmap.org/
+ title: wiki.openstreetmap.org
+ description: Browse the wiki for in-depth OSM documentation.
sidebar:
search_results: Search Results
close: Close
@@ -1689,7 +1689,7 @@ en:
blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
oauth:
- oauthorize:
+ authorize:
title: "Authorize access to your account"
request_access: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
allow_to: "Allow the client application to:"
@@ -1701,11 +1701,11 @@ en:
allow_write_gpx: "upload GPS traces."
allow_write_notes: "modify notes."
grant_access: "Grant Access"
- oauthorize_success:
+ authorize_success:
title: "Authorization request allowed"
allowed: "You have granted application %{app_name} access to your account."
verification: "The verification code is %{code}."
- oauthorize_failure:
+ authorize_failure:
title: "Authorization request failed"
denied: "You have denied application %{app_name} access to your account."
invalid: "The authorization token is not valid."
@@ -2107,7 +2107,7 @@ en:
are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?"
confirm: "Confirm"
fail: "Could not revoke role `%{role}' from user `%{name}'. Please check that the user and role are both valid."
- user_block:
+ user_blocks:
model:
non_moderator_update: "Must be a moderator to create or update a block."
non_moderator_revoke: "Must be a moderator to revoke a block."
@@ -2187,7 +2187,6 @@ en:
back: "View all blocks"
revoker: "Revoker:"
needs_view: "The user needs to log in before this block will be cleared."
- user_blocks:
block:
not_revoked: "(not revoked)"
show: "Show"
@@ -2202,8 +2201,8 @@ en:
showing_page: "Page %{page}"
next: "Next »"
previous: "« Previous"
- note:
- description:
+ notes:
+ comment:
opened_at_html: "Created %{when} ago"
opened_at_by_html: "Created %{when} ago by %{user}"
commented_at_html: "Updated %{when} ago"
@@ -2400,7 +2399,7 @@ en:
show_address: Show address
query_features: Query features
centre_map: Centre map here
- redaction:
+ redactions:
edit:
description: "Description"
heading: "Edit redaction"