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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ff43a0787ab63d555c59624edb76e1b830d6878a..50c9cc754da25a053298903e39272b3e9f4697d0 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -20,9 +20,6 @@ en:
         create: Add Comment
       message:
         create: Send
         create: Add Comment
       message:
         create: Send

-      client_application:
-        create: Register
-        update: Update

       oauth2_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?"
       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."
       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"
         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:"
         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 +318,8 @@ en:
           france: "France"
           italy: "Italy"
           rest_of_world: "Rest of the world"
           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_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


@@ -549,7 +540,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
       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."
       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."


@@ -631,15 +622,6 @@ en:
       heading: Unsubscribe from the following diary entry discussion?
       button: Unsubscribe from discussion
   diary_comments:
       heading: Unsubscribe from the following diary entry discussion?
       button: Unsubscribe from discussion
   diary_comments:

-    index:
-      title: "Diary Comments added by %{user}"
-      heading: "%{user}'s Diary Comments"
-      subheading_html: "Diary Comments added by %{user}"
-      no_comments: "No diary comments"
-    page:
-      post: Post
-      when: When
-      comment: Comment

     new:
       heading: Add a comment to the following diary entry discussion?
   doorkeeper:
     new:
       heading: Add a comment to the following diary entry discussion?
   doorkeeper:


@@ -1663,7 +1645,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}"
       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."
       hi: "Hi %{to_user},"
       subject: "[OpenStreetMap] %{user} followed you"
       followed_you: "%{user} is now following you on OpenStreetMap."


@@ -1873,8 +1855,6 @@ en:
   preferences:
     show:
       title: My Preferences
   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
       preferred_site_color_scheme: Preferred Website Color Scheme
       site_color_schemes:
         auto: Auto


@@ -1885,11 +1865,7 @@ en:
         auto: Auto
         light: Light
         dark: Dark
         auto: Auto
         light: Light
         dark: Dark

-      edit_preferences: Edit Preferences
-    edit:
-      title: Edit Preferences

       save: Update Preferences
       save: Update Preferences

-      cancel: Cancel

     update:
       failure: Couldn't update preferences.
     update_success_flash:
     update:
       failure: Couldn't update preferences.
     update_success_flash:


@@ -1963,6 +1939,9 @@ en:
       preview: Preview
       help: Help
     pagination:
       preview: Preview
       help: Help
     pagination:

+      changeset_comments:
+        older: Older Comments
+        newer: Newer Comments

       diary_comments:
         older: Older Comments
         newer: Newer Comments
       diary_comments:
         older: Older Comments
         newer: Newer Comments


@@ -2631,13 +2610,14 @@ en:
     offline:
       heading: "GPX Storage Offline"
       message: "The GPX file storage and upload system is currently unavailable."
     offline:
       heading: "GPX Storage Offline"
       message: "The GPX file storage and upload system is currently unavailable."

-    georss:
-      title: "OpenStreetMap GPS Traces"
-    description:
-      description_with_count:
-        one: "GPX file with %{count} point from %{user}"
-        other: "GPX file with %{count} points from %{user}"
-      description_without_count: "GPX file from %{user}"
+    feeds:
+      show:
+        title: "OpenStreetMap GPS Traces"
+      description:
+        description_with_count:
+          one: "GPX file with %{count} point from %{user}"
+          other: "GPX file with %{count} points from %{user}"
+        description_without_count: "GPX file from %{user}"

   application:
     permission_denied: You do not have permission to access that action
     require_cookies:
   application:
     permission_denied: You do not have permission to access that action
     require_cookies:


@@ -2784,7 +2764,6 @@ en:
         contributor_terms_url: "https://osmfoundation.org/wiki/Licence/Contributor_Terms"
         contributor_terms: "contributor terms"
       continue: Sign Up
         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
       email_help:
         privacy_policy: privacy policy
         privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy


@@ -2897,6 +2876,26 @@ en:
       user:
         summary_html: "%{name} created from %{ip_address} on %{date}"
         summary_no_ip_html: "%{name} created on %{date}"
       user:
         summary_html: "%{name} created from %{ip_address} on %{date}"
         summary_no_ip_html: "%{name} created on %{date}"

+    comments:
+      index:
+        heading_html: "%{user}'s Comments"
+        changesets: "Changesets"
+        diary_entries: "Diary entries"
+        no_comments: "No comments"
+    changeset_comments:
+      index:
+        title: "Changeset Comments added by %{user}"
+      page:
+        changeset: Changeset
+        when: When
+        comment: Comment
+    diary_comments:
+      index:
+        title: "Diary Comments added by %{user}"
+      page:
+        post: Post
+        when: When
+        comment: Comment

     suspended:
       title: Account Suspended
       heading: Account Suspended
     suspended:
       title: Account Suspended
       heading: Account Suspended