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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a62f4d34fc6b5ecf279701d8fb609a098bcd1056..21a7ce0f2aa85d52c87f0d7f727cb1abcb6485dd 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -20,9 +20,6 @@ en:
         create: Add Comment
       message:
         create: Send
-      client_application:
-        create: Register
-        update: Update
       oauth2_application:
         create: Register
         update: Update
@@ -321,7 +318,6 @@ en:
         readable_summary: human readable summary
         informal_translations: informal translations
         continue: "Continue"
-        declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
         cancel: "Cancel"
         you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue."
         legale_select: "Country of residence:"
@@ -329,6 +325,8 @@ en:
           france: "France"
           italy: "Italy"
           rest_of_world: "Rest of the world"
+      update:
+        terms accepted: "Thanks for accepting the new contributor terms!"
       terms_declined_flash:
         terms_declined_html: We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see %{terms_declined_link}.
         terms_declined_link: this wiki page
@@ -1870,8 +1868,6 @@ en:
   preferences:
     show:
       title: My Preferences
-      preferred_editor: Preferred Editor
-      preferred_languages: Preferred Languages
       preferred_site_color_scheme: Preferred Website Color Scheme
       site_color_schemes:
         auto: Auto
@@ -1882,11 +1878,7 @@ en:
         auto: Auto
         light: Light
         dark: Dark
-      edit_preferences: Edit Preferences
-    edit:
-      title: Edit Preferences
       save: Update Preferences
-      cancel: Cancel
     update:
       failure: Couldn't update preferences.
     update_success_flash:
@@ -2781,7 +2773,6 @@ en:
         contributor_terms_url: "https://osmfoundation.org/wiki/Licence/Contributor_Terms"
         contributor_terms: "contributor terms"
       continue: Sign Up
-      terms accepted: "Thanks for accepting the new contributor terms!"
       email_help:
         privacy_policy: privacy policy
         privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy
@@ -3087,9 +3078,19 @@ en:
     new:
       title: "New Note"
       intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem."
-      anonymous_warning_html: "You are not logged in. Please %{log_in} or %{sign_up} if you want to receive updates for your note."
+      anonymous_warning_html: "You are not logged in. Please %{log_in} or %{sign_up} to receive updates for your note and help mappers resolve it."
       anonymous_warning_log_in: "log in"
       anonymous_warning_sign_up: "sign up"
+      counter_warning_html: "You have already posted at least %{x_anonymous_notes}, that's great for the community, thank you! Now we encourage you to %{contribute_by_yourself}, it is not that complicated, and %{community_can_help}."
+      x_anonymous_notes:
+        one: "%{count} anonymous note"
+        other: "%{count} anonymous notes"
+      counter_warning_guide_link:
+        text: "contribute by yourself"
+        url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
+      counter_warning_forum_link:
+        text: "the community can help you"
+        url: https://community.openstreetmap.org/
       advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
       add: Add Note
     new_readonly: