Use a custom cop to check controller action names

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d1faa7a50c2b428938565059e94388e63fd6d20b..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


@@ -92,7 +89,7 @@ en:
         support_url: Support URL
         allow_read_prefs:  read their user preferences
         allow_write_prefs: modify their user preferences
         support_url: Support URL
         allow_read_prefs:  read their user preferences
         allow_write_prefs: modify their user preferences

-        allow_write_diary: create diary entries, comments and make friends
+        allow_write_diary: create diary entries and comments

         allow_write_api:   modify the map
         allow_read_gpx:    read their private GPS traces
         allow_write_gpx:   upload GPS traces
         allow_write_api:   modify the map
         allow_read_gpx:    read their private GPS traces
         allow_write_gpx:   upload GPS traces


@@ -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


@@ -478,7 +469,7 @@ en:
       title: "Changesets"
       title_user: "Changesets by %{user}"
       title_user_link_html: "Changesets by %{user_link}"
       title: "Changesets"
       title_user: "Changesets by %{user}"
       title_user_link_html: "Changesets by %{user_link}"

-      title_friend: "Changesets by my friends"
+      title_followed: "Changesets by followings"

       title_nearby: "Changesets by nearby users"
       empty: "No changesets found."
       empty_area: "No changesets in this area."
       title_nearby: "Changesets by nearby users"
       empty: "No changesets found."
       empty_area: "No changesets in this area."


@@ -544,17 +535,17 @@ en:
     popup:
       your location: "Your location"
       nearby mapper: "Nearby mapper"
     popup:
       your location: "Your location"
       nearby mapper: "Nearby mapper"

-      friend: "Friend"
+      following: "Following"

     show:
       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
     show:
       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

-      my friends: My friends
-      no friends: You have not added any friends yet.
+      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."
       nearby users: "Other nearby users"
       no nearby users: "There are no other users who admit to mapping nearby yet."

-      friends_changesets: "friends' changesets"
-      friends_diaries: "friends' diary entries"
+      followed_changesets: "changesets"
+      followed_diaries: "diary entries"

       nearby_changesets: "nearby user changesets"
       nearby_diaries: "nearby user diary entries"
   diary_entries:
       nearby_changesets: "nearby user changesets"
       nearby_diaries: "nearby user diary entries"
   diary_entries:


@@ -565,7 +556,7 @@ en:
       use_map_link: Use Map
     index:
       title: "Users' Diaries"
       use_map_link: Use Map
     index:
       title: "Users' Diaries"

-      title_friends: "Friends' Diaries"
+      title_followed: "Followings' Diaries"

       title_nearby: "Nearby Users' Diaries"
       user_title: "%{user}'s Diary"
       in_language_title: "Diary Entries in %{language}"
       title_nearby: "Nearby Users' Diaries"
       user_title: "%{user}'s Diary"
       in_language_title: "Diary Entries in %{language}"


@@ -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:


@@ -686,19 +668,22 @@ 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)
     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: "Add %{user} as a friend?"
-      button: "Add as friend"
-      success: "%{name} is now your friend!"
-      failed: "Sorry, failed to add %{name} as a friend."
-      already_a_friend: "You are already friends with %{name}."
-      limit_exceeded: "You have friended a lot of users recently. Please wait a while before trying to friend any more."
-    remove_friend:
-      heading: "Unfriend %{user}?"
-      button: "Unfriend"
-      success: "%{name} was removed from your friends."
-      not_a_friend: "%{name} is not one of your friends."
+  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."
+    destroy:
+      success: "You successfully unfollowed %{name}."
+      not_followed: "You are not following %{name}."

   geocoder:
     search:
       title:
   geocoder:
     search:
       title:


@@ -1660,14 +1645,14 @@ 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},"
       hi: "Hi %{to_user},"

-      subject: "[OpenStreetMap] %{user} added you as a friend"
-      had_added_you: "%{user} has added you as a friend on OpenStreetMap."
+      subject: "[OpenStreetMap] %{user} followed you"
+      followed_you: "%{user} is now following you on OpenStreetMap."

       see_their_profile: "You can see their profile at %{userurl}."
       see_their_profile_html: "You can see their profile at %{userurl}."
       see_their_profile: "You can see their profile at %{userurl}."
       see_their_profile_html: "You can see their profile at %{userurl}."

-      befriend_them: "You can also add them as a friend at %{befriendurl}."
-      befriend_them_html: "You can also add them as a friend at %{befriendurl}."
+      follow_them: "You can also follow them at %{followurl}."
+      follow_them_html: "You can also follow them at %{followurl}."

     gpx_details:
       details: "Your file details:"
       filename: Filename
     gpx_details:
       details: "Your file details:"
       filename: Filename


@@ -1870,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


@@ -1882,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:


@@ -1960,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


@@ -2628,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:


@@ -2698,7 +2681,7 @@ en:
       openid: Sign-in using OpenStreetMap
       read_prefs: Read user preferences
       write_prefs: Modify user preferences
       openid: Sign-in using OpenStreetMap
       read_prefs: Read user preferences
       write_prefs: Modify user preferences

-      write_diary: Create diary entries, comments and make friends
+      write_diary: Create diary entries and comments

       write_api: Modify the map
       read_gpx: Read private GPS traces
       write_gpx: Upload GPS traces
       write_api: Modify the map
       read_gpx: Read private GPS traces
       write_gpx: Upload GPS traces


@@ -2781,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


@@ -2818,8 +2800,8 @@ en:
       edits: Edits
       traces: Traces
       notes: Map Notes
       edits: Edits
       traces: Traces
       notes: Map Notes

-      remove as friend: Unfriend
-      add as friend: Add Friend
+      unfollow: Unfollow
+      follow: Follow

       mapper since: "Mapper since:"
       last map edit: "Last map edit:"
       no activity yet: "No activity yet"
       mapper since: "Mapper since:"
       last map edit: "Last map edit:"
       no activity yet: "No activity yet"


@@ -2894,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