X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e2609b9758bce891629a6b1949b810e3bcc8a83f..fe77d0daa1047767e374494063073d46a059f0b2:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 65b7f3639..ad6638cfb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -759,7 +759,7 @@ en:
spur: "Railway Spur"
station: "Railway Station"
stop: "Railway Stop"
- subway: "Subway Station"
+ subway: "Subway"
subway_entrance: "Subway Entrance"
switch: "Railway Points"
tram: "Tramway"
@@ -968,7 +968,8 @@ en:
intro_1_html: |
OpenStreetMap is open data, licensed under the Open Data
- Commons Open Database License (ODbL).
+ Commons Open Database License (ODbL) by the OpenStreetMap Foundation (OSMF).
intro_2_html: |
You are free to copy, distribute, transmit and adapt our data,
as long as you credit OpenStreetMap and its
@@ -1004,6 +1005,7 @@ en:
more_title_html: Finding out more
more_1_html: |
Read more about using our data, and how to credit us, at the OSMF Licence page and the community Legal
FAQ.
more_2_html: |
@@ -1043,6 +1045,11 @@ en:
contributors_nz_html: |
New Zealand: Contains data sourced from
Land Information New Zealand. Crown Copyright reserved.
+ contributors_si_html: |
+ Slovenia: Contains data from the
+ Surveying and Mapping Authority and
+ Ministry of Agriculture, Forestry and Food
+ (public information of Slovenia).
contributors_za_html: |
South Africa: Contains data sourced from
Chief Directorate:
@@ -1367,8 +1374,6 @@ en:
search: Search
get_directions: "Get directions"
get_directions_title: "Find directions between two points"
- close_directions: "Close directions"
- close_directions_title: "Close the directions panel"
from: "From"
to: "To"
where_am_i: "Where am I?"
@@ -1897,6 +1902,7 @@ en:
Confirm your account by clicking on the link in the email and you'll be able to start mapping.
press confirm button: "Press the confirm button below to activate your account."
button: Confirm
+ success: "Confirmed your account, thanks for signing up!"
already active: "This account has already been confirmed."
unknown token: "That confirmation code has expired or does not exist."
reconfirm_html: "If you need us to resend the confirmation email, click here."
@@ -1907,8 +1913,9 @@ en:
heading: Confirm a change of email address
press confirm button: "Press the confirm button below to confirm your new email address."
button: Confirm
- success: "Confirmed your email address, thanks for signing up!"
+ success: "Confirmed your change of email address!"
failure: "An email address has already been confirmed with this token."
+ unknown_token: "That confirmation code has expired or does not exist."
set_home:
flash success: "Home location saved successfully"
go_public: