Merge branch 'pull/5715'

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e4100d307d3f7edcb3262d0e8d50ef411725bb6c..0deb199a38d034a4f8828891046ab418fa841674 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -244,9 +244,9 @@ en:
         comment: Comment
         full: Full note
   accounts:
         comment: Comment
         full: Full note
   accounts:

-    edit:
+    show:

       title: "Edit account"
       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


@@ -2889,13 +2890,23 @@ en:
       show:
         title: Users
         heading: Users
       show:
         title: Users
         heading: Users

-        empty: No matching users found
+        select_status: Select Status
+        states:
+          pending: Pending
+          active: Active
+          confirmed: Confirmed
+          suspended: Suspended
+          deleted: Deleted
+        name_or_email: Name or Email
+        ip_address: IP Address
+        search: Search

       page:
         found_users:
           one: "%{count} user found"
           other: "%{count} users found"
         confirm: Confirm Selected Users
         hide: Hide Selected Users
       page:
         found_users:
           one: "%{count} user found"
           other: "%{count} users found"
         confirm: Confirm Selected Users
         hide: Hide Selected Users

+        empty: No matching users found

       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}"


@@ -3085,6 +3096,7 @@ en:
       closed_title: "Resolved note #%{note_name}"
       hidden_title: "Hidden note #%{note_name}"
       description_when_author_is_deleted: "deleted"
       closed_title: "Resolved note #%{note_name}"
       hidden_title: "Hidden note #%{note_name}"
       description_when_author_is_deleted: "deleted"

+      description_when_there_is_no_opening_comment: "unknown"

       event_opened_by_html: "Created by %{user} %{time_ago}"
       event_opened_by_anonymous_html: "Created by anonymous %{time_ago}"
       event_commented_by_html: "Comment from %{user} %{time_ago}"
       event_opened_by_html: "Created by %{user} %{time_ago}"
       event_opened_by_anonymous_html: "Created by anonymous %{time_ago}"
       event_commented_by_html: "Comment from %{user} %{time_ago}"


@@ -3302,6 +3314,8 @@ en:
           ninth: "9th"
           tenth: "10th"
       time: "Time"
           ninth: "9th"
           tenth: "10th"
       time: "Time"

+      download: "Download route as GeoJSON"
+      filename: "route"

     query:
       node: Node
       way: Way
     query:
       node: Node
       way: Way


@@ -3316,6 +3330,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"