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

[rails.git] / config / locales / en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4f97a3fb196a3ddf99d534d490b379379e707bd6..24f2348c160d150457b5c221c69ecd92995ed8cb 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -130,6 +130,9 @@ en:
     help:
       trace:
         tagstring: comma delimited
+      user_block:
+        reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms.
+        needs_view: Does the user need to log in before this block will be cleared?
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1278,7 +1281,7 @@ en:
         open: Open
         resolved: Resolved
     update:
-      new_report: Your report has been registered sucessfully
+      new_report: Your report has been registered successfully
       successful_update: Your report has been updated successfully
       provide_details: Please provide the required details
     show:
@@ -1349,7 +1352,7 @@ en:
           abusive_label: This note is abusive
           other_label: Other
     create:
-      successful_report: Your report has been registered sucessfully
+      successful_report: Your report has been registered successfully
       provide_details: Please provide the required details
   layouts:
     project_name:
@@ -2552,20 +2555,16 @@ en:
     new:
       title: "Creating block on %{name}"
       heading_html: "Creating block on %{name}"
-      reason: "The reason why %{name} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms."
       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."
-      needs_view: "User needs to log in before this block will be cleared"
       back: "View all blocks"
     edit:
       title: "Editing block on %{name}"
       heading_html: "Editing block on %{name}"
-      reason: "The reason why %{name} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation. Bear in mind that not all users understand the community jargon, so please try to use laymans terms."
       period: "How long, starting now, the user will be blocked from the API for."
       show: "View this block"
       back: "View all blocks"
-      needs_view: "Does the user need to log in before this block will be cleared?"
     filter:
       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."
@@ -2696,6 +2695,7 @@ en:
           other: You are within %{count} feet of this point
       base:
         standard: Standard
+        cyclosm: CyclOSM
         cycle_map: Cycle Map
         transport_map: Transport Map
         hot: Humanitarian
@@ -2710,6 +2710,7 @@ en:
       copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
       donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"
       terms: "<a href='%{terms_url}' target='_blank'>Website and API terms</a>"
+      cyclosm: "Tiles style by <a href='%{cyclosm_url}' target='_blank'>CyclOSM</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"
       thunderforest: "Tiles courtesy of <a href='%{thunderforest_url}' target='_blank'>Andy Allan</a>"
       opnvkarte: "Tiles courtesy of <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>"
       hotosm: "Tiles style by <a href='%{hotosm_url}' target='_blank'>Humanitarian OpenStreetMap Team</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"