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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1f9792d39608c15770e62285b2d5185de26b4eaf..2f7cae65e83b4e55036d8ceca56e2809a1c95763 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -246,7 +246,7 @@ en:
   accounts:
     edit:
       title: "Edit account"
   accounts:
     edit:
       title: "Edit account"

-      my settings: My Settings
+      my_account: My Account

       current email address: "Current Email Address"
       external auth: "External Authentication"
       openid:
       current email address: "Current Email Address"
       external auth: "External Authentication"
       openid:


@@ -1922,7 +1922,7 @@ en:
       failure: Couldn't update profile.
   sessions:
     new:
       failure: Couldn't update profile.
   sessions:
     new:

-      tab_title: "Log in"
+      tab_title: "Log In"

       login_to_authorize_html: "Log in to OpenStreetMap to access %{client_app_name}."
       email or username: "Email Address or Username"
       password: "Password"
       login_to_authorize_html: "Log in to OpenStreetMap to access %{client_app_name}."
       email or username: "Email Address or Username"
       password: "Password"


@@ -2653,8 +2653,8 @@ en:
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
     settings_menu:
       account_settings: Account Settings
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
     settings_menu:
       account_settings: Account Settings

-      oauth2_applications: OAuth 2 applications
-      oauth2_authorizations: OAuth 2 authorizations
+      oauth2_applications: OAuth 2 Applications
+      oauth2_authorizations: OAuth 2 Authorizations

       muted_users: Muted Users
     auth_providers:
       openid_url: "OpenID URL"
       muted_users: Muted Users
     auth_providers:
       openid_url: "OpenID URL"


@@ -2771,7 +2771,7 @@ en:
   users:
     new:
       title: "Sign Up"
   users:
     new:
       title: "Sign Up"

-      tab_title: "Sign up"
+      tab_title: "Sign Up"

       signup_to_authorize_html: "Sign up with OpenStreetMap to access %{client_app_name}."
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
       please_contact_support_html: 'Please contact %{support_link} to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
       signup_to_authorize_html: "Sign up with OpenStreetMap to access %{client_app_name}."
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
       please_contact_support_html: 'Please contact %{support_link} to arrange for an account to be created - we will try and deal with the request as quickly as possible.'


@@ -2810,7 +2810,7 @@ en:
       my notes: My Notes
       my messages: My Messages
       my profile: My Profile
       my notes: My Notes
       my messages: My Messages
       my profile: My Profile

-      my settings: My Settings
+      my_account: My Account

       my comments: My Comments
       my_preferences: My Preferences
       my_dashboard: My Dashboard
       my comments: My Comments
       my_preferences: My Preferences
       my_dashboard: My Dashboard


@@ -2904,7 +2904,7 @@ en:
       index:
         heading_html: "%{user}'s Comments"
         changesets: "Changesets"
       index:
         heading_html: "%{user}'s Comments"
         changesets: "Changesets"

-        diary_entries: "Diary entries"
+        diary_entries: "Diary Entries"

         no_comments: "No comments"
     changeset_comments:
       index:
         no_comments: "No comments"
     changeset_comments:
       index: