Move admin users list to its own controller

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 16270548bd68c7ab3f925b9f07c35d1c34f4a9bd..89686d4e3b8229cad819739fb08bd7d2f8481ffd 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -59,6 +59,7 @@ en:
       message: "Message"
       node: "Node"
       node_tag: "Node Tag"
       message: "Message"
       node: "Node"
       node_tag: "Node Tag"

+      note: "Note"

       old_node: "Old Node"
       old_node_tag: "Old Node Tag"
       old_relation: "Old Relation"
       old_node: "Old Node"
       old_node_tag: "Old Node Tag"
       old_relation: "Old Relation"


@@ -356,8 +357,7 @@ en:
         way: "Way"
         relation: "Relation"
     containing_relation:
         way: "Way"
         relation: "Relation"
     containing_relation:

-      entry_html: "Relation %{relation_name}"
-      entry_role_html: "Relation %{relation_name} (as %{relation_role})"
+      entry_role_html: "%{relation_name} (as %{relation_role})"

     not_found:
       title: Not Found
       sorry: "Sorry, %{type} #%{id} could not be found."
     not_found:
       title: Not Found
       sorry: "Sorry, %{type} #%{id} could not be found."


@@ -1477,7 +1477,10 @@ en:
         open: Open
         resolved: Resolved
     show:
         open: Open
         resolved: Resolved
     show:

-      title: "%{status} Issue #%{issue_id}"
+      title:
+        open: "Open Issue #%{issue_id}"
+        ignored: "Ignored Issue #%{issue_id}"
+        resolved: "Resolved Issue #%{issue_id}"

       reports:
         one: "%{count} report"
         other: "%{count} reports"
       reports:
         one: "%{count} report"
         other: "%{count} reports"


@@ -2544,7 +2547,7 @@ en:
       upload_trace: "Upload a trace"
       all_traces: "All Traces"
       my_traces: "My Traces"
       upload_trace: "Upload a trace"
       all_traces: "All Traces"
       my_traces: "My Traces"

-      traces_from: "Public Traces from %{user}"
+      traces_from_html: "Public Traces from %{user}"

       remove_tag_filter: "Remove Tag Filter"
     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"
       remove_tag_filter: "Remove Tag Filter"
     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"


@@ -2790,18 +2793,20 @@ en:
       report: Report this User
     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."
       report: Report this User
     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."

-    index:
-      title: Users
-      heading: Users
-      summary_html: "%{name} created from %{ip_address} on %{date}"
-      summary_no_ip_html: "%{name} created on %{date}"
-      empty: No matching users found
-    page:
-      found_users:
-        one: "%{count} user found"
-        other: "%{count} users found"
-      confirm: Confirm Selected Users
-      hide: Hide Selected Users
+    lists:
+      show:
+        title: Users
+        heading: Users
+        empty: No matching users found
+      page:
+        found_users:
+          one: "%{count} user found"
+          other: "%{count} users found"
+        confirm: Confirm Selected Users
+        hide: Hide Selected Users
+      user:
+        summary_html: "%{name} created from %{ip_address} on %{date}"
+        summary_no_ip_html: "%{name} created on %{date}"

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


@@ -2925,9 +2930,9 @@ en:
     navigation:
       all_blocks: "All Blocks"
       blocks_on_me: "Blocks on Me"
     navigation:
       all_blocks: "All Blocks"
       blocks_on_me: "Blocks on Me"

-      blocks_on_user: "Blocks on %{user}"
+      blocks_on_user_html: "Blocks on %{user}"

       blocks_by_me: "Blocks by Me"
       blocks_by_me: "Blocks by Me"

-      blocks_by_user: "Blocks by %{user}"
+      blocks_by_user_html: "Blocks by %{user}"

       block: "Block #%{id}"
       new_block: "New Block"
   user_mutes:
       block: "Block #%{id}"
       new_block: "New Block"
   user_mutes:


@@ -2966,6 +2971,11 @@ en:
       description: "Description"
       created_at: "Created at"
       last_changed: "Last changed"
       description: "Description"
       created_at: "Created at"
       last_changed: "Last changed"

+      apply: "Apply"
+      all: "All"
+      open: "Open"
+      closed: "Closed"
+      status: "Status"

     show:
       title: "Note: %{id}"
       description: "Description"
     show:
       title: "Note: %{id}"
       description: "Description"


@@ -2984,6 +2994,9 @@ en:
       report: report this note
       coordinates_html: "%{latitude}, %{longitude}"
       anonymous_warning: This note includes comments from anonymous users which should be independently verified.
       report: report this note
       coordinates_html: "%{latitude}, %{longitude}"
       anonymous_warning: This note includes comments from anonymous users which should be independently verified.

+      discussion: Discussion
+      subscribe: Subscribe
+      unsubscribe: Unsubscribe

       hide: Hide
       resolve: Resolve
       reactivate: Reactivate
       hide: Hide
       resolve: Resolve
       reactivate: Reactivate


@@ -3147,16 +3160,16 @@ en:
         slight_left_without_exit: Slight left onto %{name}
         via_point_without_exit: (via point)
         follow_without_exit: Follow %{name}
         slight_left_without_exit: Slight left onto %{name}
         via_point_without_exit: (via point)
         follow_without_exit: Follow %{name}

-        roundabout_without_exit: At roundabout take exit onto %{name}
-        leave_roundabout_without_exit: Leave roundabout - %{name}
-        stay_roundabout_without_exit: Stay on roundabout - %{name}
+        roundabout_without_exit: At the roundabout take the exit onto %{name}
+        leave_roundabout_without_exit: Leave the roundabout - %{name}
+        stay_roundabout_without_exit: Stay on the roundabout - %{name}

         start_without_exit: Start on %{name}
         destination_without_exit: Reach destination
         against_oneway_without_exit: Go against one-way on %{name}
         end_oneway_without_exit: End of one-way on %{name}
         start_without_exit: Start on %{name}
         destination_without_exit: Reach destination
         against_oneway_without_exit: Go against one-way on %{name}
         end_oneway_without_exit: End of one-way on %{name}

-        roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
-        roundabout_with_exit_ordinal: At roundabout take %{exit} exit onto %{name}
-        exit_roundabout: Exit roundabout onto %{name}
+        roundabout_with_exit: At the roundabout take the exit %{exit} onto %{name}
+        roundabout_with_exit_ordinal: At the roundabout take the %{exit} exit onto %{name}
+        exit_roundabout: Exit the roundabout onto %{name}

         unnamed: "unnamed road"
         courtesy: "Directions courtesy of %{link}"
         exit_counts:
         unnamed: "unnamed road"
         courtesy: "Directions courtesy of %{link}"
         exit_counts: