Change submit button on block edit page when can only revoke

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c4cae4b221b79bfbba7559635ef4f145f053451b..80811cd1ff7e23177d759769e9d96d38666c28a2 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -538,6 +538,7 @@ en:
       new_title: Compose a new entry in my user diary
       my_diary: My Diary
       no_entries: No diary entries
+    page:
       recent_entries: "Recent diary entries"
       older_entries: Older Entries
       newer_entries: Newer Entries
@@ -604,6 +605,7 @@ en:
       heading: "%{user}'s Diary Comments"
       subheading_html: "Diary Comments added by %{user}"
       no_comments: "No diary comments"
+    page:
       post: Post
       when: When
       comment: Comment
@@ -2522,9 +2524,6 @@ en:
       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
       confirm_delete: "Delete this trace?"
-    trace_paging_nav:
-      older: "Older Traces"
-      newer: "Newer Traces"
     trace:
       pending: "PENDING"
       count_points:
@@ -2556,6 +2555,9 @@ en:
       my_traces: "My Traces"
       traces_from: "Public Traces from %{user}"
       remove_tag_filter: "Remove Tag Filter"
+    page:
+      older: "Older Traces"
+      newer: "Newer Traces"
     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"
     make_public:
@@ -2875,16 +2877,17 @@ en:
     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:
       older: "Older Users"
       newer: "Newer Users"
       found_users:
         one: "%{count} user found"
         other: "%{count} users found"
-      summary_html: "%{name} created from %{ip_address} on %{date}"
-      summary_no_ip_html: "%{name} created on %{date}"
       confirm: Confirm Selected Users
       hide: Hide Selected Users
-      empty: No matching users found
     suspended:
       title: Account Suspended
       heading: Account Suspended
@@ -2936,19 +2939,18 @@ en:
       title: "Creating block on %{name}"
       heading_html: "Creating block on %{name}"
       period: "How long, starting now, the user will be blocked from the API for."
-      back: "View all blocks"
     edit:
       title: "Editing block on %{name}"
       heading_html: "Editing block on %{name}"
       period: "How long, starting now, the user will be blocked from the API for."
-      show: "View this block"
-      back: "View all blocks"
+      revoke: "Revoke block"
     filter:
       block_period: "The blocking period must be one of the values selectable in the drop-down list."
     create:
       flash: "Created a block on user %{name}."
     update:
       only_creator_can_edit: "Only the moderator who created this block can edit it."
+      only_creator_can_edit_without_revoking: "Only the moderator who created this block can edit it without revoking."
       only_creator_or_revoker_can_edit: "Only the moderators who created or revoked this block can edit it."
       inactive_block_cannot_be_reactivated: "This block is inactive and cannot be reactivated."
       success: "Block updated."
@@ -3036,6 +3038,7 @@ en:
       blocks_by_me: "Blocks by Me"
       blocks_by_user: "Blocks by %{user}"
       block: "Block #%{id}"
+      new_block: "New Block"
   user_mutes:
     index:
       title: "Muted Users"