Add Messages API

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index cffc13823c98b1eb11fd9edfa580adf957db04d7..3f2e8a93b0d7bf78c346f7f0f255d51e1a09e2fd 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2641,6 +2641,8 @@ en:
       write_notes: Modify notes
       write_redactions: Redact map data
       read_email: Read user email address
       write_notes: Modify notes
       write_redactions: Redact map data
       read_email: Read user email address

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

       skip_authorization: Auto approve application
     for_roles:
       moderator: This permission is for actions available only to moderators
       skip_authorization: Auto approve application
     for_roles:
       moderator: This permission is for actions available only to moderators


@@ -2935,12 +2937,12 @@ en:
       show: "View this block"
       back: "View all blocks"
     filter:
       show: "View this block"
       back: "View all blocks"
     filter:

-      block_expired: "The block has already expired and cannot be edited."

       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."
       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_or_revoker_can_edit: "Only the moderators who created or revoked this block can edit it."

       success: "Block updated."
     index:
       title: "User blocks"
       success: "Block updated."
     index:
       title: "User blocks"


@@ -3112,7 +3114,7 @@ en:
       custom_dimensions: "Set custom dimensions"
       format: "Format:"
       scale: "Scale:"
       custom_dimensions: "Set custom dimensions"
       format: "Format:"
       scale: "Scale:"

-      image_dimensions: "Image will show %{layer} layer at %{width} x %{height}"
+      image_dimensions: "Image will show the %{layer} layer at %{width} x %{height}"

       download: "Download"
       short_url: "Short URL"
       include_marker: "Include marker"
       download: "Download"
       short_url: "Short URL"
       include_marker: "Include marker"