cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/3960'

Browse source
This commit is contained in:
Tom Hughes 2023-03-08 15:58:03 +00:00
commit 904b88b1db
1 changed files with 0 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

37
config/locales/en.yml
View file

@ -52,7 +52,6 @@ en:
message: "Message" message: "Message"
node: "Node" node: "Node"
node_tag: "Node Tag" node_tag: "Node Tag"
notifier: "Notifier"
old_node: "Old Node" old_node: "Old Node"
old_node_tag: "Old Node Tag" old_node_tag: "Old Node Tag"
old_relation: "Old Relation" old_relation: "Old Relation"
@ -1399,10 +1398,6 @@ en:
ignored: Ignored ignored: Ignored
open: Open open: Open
resolved: Resolved resolved: Resolved
update:
new_report: Your report has been registered successfully
successful_update: Your report has been updated successfully
provide_details: Please provide the required details
show: show:
title: "%{status} Issue #%{issue_id}" title: "%{status} Issue #%{issue_id}"
reports: reports:
@ -1485,10 +1480,8 @@ en:
home: Go to Home Location home: Go to Home Location
logout: Log Out logout: Log Out
log_in: Log In log_in: Log In
log_in_tooltip: Log in with an existing account
sign_up: Sign Up sign_up: Sign Up
start_mapping: Start Mapping start_mapping: Start Mapping
sign_up_tooltip: Create an account for editing
edit: Edit edit: Edit
history: History history: History
export: Export export: Export
@ -1520,8 +1513,6 @@ en:
community: Community community: Community
community_blogs: "Community Blogs" community_blogs: "Community Blogs"
community_blogs_title: "Blogs from members of the OpenStreetMap community" community_blogs_title: "Blogs from members of the OpenStreetMap community"
foundation: Foundation
foundation_title: The OpenStreetMap Foundation
make_a_donation: make_a_donation:
title: Support OpenStreetMap with a monetary donation title: Support OpenStreetMap with a monetary donation
text: Make a Donation text: Make a Donation
@ -1674,8 +1665,6 @@ en:
new: new:
title: "Send message" title: "Send message"
send_message_to_html: "Send a new message to %{name}" send_message_to_html: "Send a new message to %{name}"
subject: "Subject"
body: "Body"
back_to_inbox: "Back to inbox" back_to_inbox: "Back to inbox"
create: create:
message_sent: "Message sent" message_sent: "Message sent"
@ -1700,14 +1689,10 @@ en:
wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply." wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."
show: show:
title: "Read message" title: "Read message"
from: "From"
subject: "Subject"
date: "Date"
reply_button: "Reply" reply_button: "Reply"
unread_button: "Mark as unread" unread_button: "Mark as unread"
destroy_button: "Delete" destroy_button: "Delete"
back: "Back" back: "Back"
to: "To"
wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it." wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
sent_message_summary: sent_message_summary:
destroy_button: "Delete" destroy_button: "Delete"
@ -1779,13 +1764,8 @@ en:
lost password link: "Lost your password?" lost password link: "Lost your password?"
login_button: "Login" login_button: "Login"
register now: Register now 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:" 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? no account: Don't have an account?
account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>."
auth failure: "Sorry, could not log in with those details." auth failure: "Sorry, could not log in with those details."
openid_logo_alt: "Log in with an OpenID" openid_logo_alt: "Log in with an OpenID"
auth_providers: auth_providers:
@ -2073,9 +2053,6 @@ en:
geofabrik: geofabrik:
title: "Geofabrik Downloads" title: "Geofabrik Downloads"
description: "Regularly-updated extracts of continents, countries, and selected cities" 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: other:
title: "Other Sources" title: "Other Sources"
description: "Additional sources listed on the OpenStreetMap Wiki" description: "Additional sources listed on the OpenStreetMap Wiki"
@ -2575,9 +2552,6 @@ en:
header: Free and editable header: Free and editable
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_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. 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:"
display name description: "Your publicly displayed username. You can change this later in the preferences." display name description: "Your publicly displayed username. You can change this later in the preferences."
external auth: "Third Party Authentication:" external auth: "Third Party Authentication:"
use external auth: "Alternatively, use a third party to login" use external auth: "Alternatively, use a third party to login"
@ -2617,7 +2591,6 @@ en:
deleted: "deleted" deleted: "deleted"
show: show:
my diary: My Diary my diary: My Diary
new diary entry: new diary entry
my edits: My Edits my edits: My Edits
my traces: My Traces my traces: My Traces
my notes: My Notes my notes: My Notes
@ -2646,8 +2619,6 @@ en:
created from: "Created from:" created from: "Created from:"
status: "Status:" status: "Status:"
spam score: "Spam Score:" spam score: "Spam Score:"
description: Description
user location: User location
role: role:
administrator: "This user is an administrator" administrator: "This user is an administrator"
moderator: "This user is a moderator" moderator: "This user is a moderator"
@ -2662,7 +2633,6 @@ en:
comments: "Comments" comments: "Comments"
create_block: "Block this User" create_block: "Block this User"
activate_user: "Activate this User" activate_user: "Activate this User"
deactivate_user: "Deactivate this User"
confirm_user: "Confirm this User" confirm_user: "Confirm this User"
unconfirm_user: "Unconfirm this User" unconfirm_user: "Unconfirm this User"
unsuspend_user: "Unsuspend this User" unsuspend_user: "Unsuspend this User"
@ -2671,8 +2641,6 @@ en:
delete_user: "Delete this User" delete_user: "Delete this User"
confirm: "Confirm" confirm: "Confirm"
report: Report this User report: Report this User
set_home:
flash success: "Home location saved successfully"
go_public: go_public:
flash success: "All your edits are now public, and you are now allowed to edit." flash success: "All your edits are now public, and you are now allowed to edit."
index: index:
@ -2692,7 +2660,6 @@ en:
support: support support: support
automatically_suspended: Sorry, your account has been automatically suspended due to suspicious activity. automatically_suspended: Sorry, your account has been automatically suspended due to suspicious activity.
contact_support_html: This decision will be reviewed by an administrator shortly, or you may contact %{support_link} if you wish to discuss this. contact_support_html: This decision will be reviewed by an administrator shortly, or you may contact %{support_link} if you wish to discuss this.
support: support
auth_failure: auth_failure:
connection_failed: Connection to authentication provider failed connection_failed: Connection to authentication provider failed
invalid_credentials: Invalid authentication credentials invalid_credentials: Invalid authentication credentials
@ -2738,8 +2705,6 @@ en:
title: "Creating block on %{name}" title: "Creating block on %{name}"
heading_html: "Creating block on %{name}" heading_html: "Creating block on %{name}"
period: "How long, starting now, the user will be blocked from the API for." period: "How long, starting now, the user will be blocked from the API for."
tried_contacting: "I have contacted the user and asked them to stop."
tried_waiting: "I have given a reasonable amount of time for the user to respond to those communications."
back: "View all blocks" back: "View all blocks"
edit: edit:
title: "Editing block on %{name}" title: "Editing block on %{name}"
@ -2751,8 +2716,6 @@ en:
block_expired: "The block has already expired and cannot be edited." block_expired: "The block has already expired and cannot be edited."
block_period: "The blocking period must be one of the values selectable in the drop-down list." block_period: "The blocking period must be one of the values selectable in the drop-down list."
create: create:
try_contacting: "Please try contacting the user before blocking them and giving them a reasonable time to respond."
try_waiting: "Please try giving the user a reasonable time to respond before blocking them."
flash: "Created a block on user %{name}." flash: "Created a block on user %{name}."
update: update:
only_creator_can_edit: "Only the moderator who created this block can edit it." only_creator_can_edit: "Only the moderator who created this block can edit it."