Show checkbox on pd declaration page

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index f9fe33041e08d7c0f2c23c83c99514f873629506..24d772da4de10db5f1e67f4105b304cef85b4142 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
@@ -254,13 +251,6 @@ en:
       openid:
         link: "https://wiki.openstreetmap.org/wiki/OpenID"
         link text: "what is this?"
-      public editing:
-        heading: "Public editing"
-        enabled: "Enabled. Not anonymous and can edit data."
-        enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits"
-        enabled link text: "what is this?"
-        disabled: "Disabled and cannot edit data, all previous edits are anonymous."
-        disabled link text: "why can't I edit?"
       contributor terms:
         heading: "Contributor Terms"
         agreed: "You have agreed to the new Contributor Terms."
@@ -321,7 +311,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,10 +318,16 @@ 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
         terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
+    pd_declarations:
+      show:
+        title: Consider my contributions to be in the Public Domain
+        consider_pd: "I consider my contributions to be in the Public Domain"
   browse:
     deleted_ago_by_html: "Deleted %{time_ago} by %{user}"
     edited_ago_by_html: "Edited %{time_ago} by %{user}"
@@ -549,7 +544,7 @@ en:
       title: My Dashboard
       no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users."
       edit_your_profile: Edit your profile
-      followings: Followings  
+      followings: Followings
       no followings: You have not followed any user yet.
       nearby users: "Other nearby users"
       no nearby users: "There are no other users who admit to mapping nearby yet."
@@ -686,17 +681,20 @@ en:
     not_found:
       title: File not found
       description: Couldn't find a file/directory/API operation by that name on the OpenStreetMap server (HTTP 404)
-  friendships:
-    make_friend:
-      heading: "Do you want to follow %{user}?"
-      button: "Follow User"
+  follows:
+    show:
+      follow:
+        heading: "Do you want to follow %{user}?"
+        button: "Follow User"
+      unfollow:
+        heading: "Do you want to unfollow %{user}?"
+        button: "Unfollow User"
+    create:
       success: "You are now following %{name}!"
       failed: "Sorry, your request to follow %{name} has failed."
       already_followed: "You already follow %{name}."
       limit_exceeded: "You have followed a lot of users recently. Please wait a while before trying to follow any more."
-    remove_friend:
-      heading: "Do you want to unfollow %{user}?"
-      button: "Unfollow"
+    destroy:
       success: "You successfully unfollowed %{name}."
       not_followed: "You are not following %{name}."
   geocoder:
@@ -1660,7 +1658,7 @@ en:
       header_html: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
       footer: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"
       footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"
-    friendship_notification:
+    follow_notification:
       hi: "Hi %{to_user},"
       subject: "[OpenStreetMap] %{user} followed you"
       followed_you: "%{user} is now following you on OpenStreetMap."
@@ -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