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 e4100d307d3f7edcb3262d0e8d50ef411725bb6c..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:


@@ -2713,6 +2713,7 @@ en:
       write_gpx: Upload GPS traces
       write_notes: Modify notes
       write_redactions: Redact map data
       write_gpx: Upload GPS traces
       write_notes: Modify notes
       write_redactions: Redact map data

+      write_blocks: Create and revoke user blocks

       read_email: Read user email address
       consume_messages: Read, update status and delete user messages
       send_messages: Send private messages to other users
       read_email: Read user email address
       consume_messages: Read, update status and delete user messages
       send_messages: Send private messages to other users


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


@@ -3316,6 +3317,9 @@ en:
       show_address: Show address
       query_features: Query features
       centre_map: Centre map here
       show_address: Show address
       query_features: Query features
       centre_map: Centre map here

+    home:
+      marker_title: My home location
+      not_set: Home location is not set for your account

   redactions:
     edit:
       heading: "Edit Redaction"
   redactions:
     edit:
       heading: "Edit Redaction"