Rebase to current master

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 06f8bc9281ecf1315bf142bb0fc0d438a2272beb..e948ca37eb111c9327447fed91ae8533e7a28830 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1057,7 +1057,7 @@ en:
         partial_changeset_without_comment: "without comment"
       details: "More details about the changeset can be found at %{url}."
       unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
         partial_changeset_without_comment: "without comment"
       details: "More details about the changeset can be found at %{url}."
       unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'

-  message:
+  messages:

     inbox:
       title: "Inbox"
       my_inbox: "My Inbox"
     inbox:
       title: "Inbox"
       my_inbox: "My Inbox"


@@ -1078,7 +1078,7 @@ en:
       unread_button: "Mark as unread"
       read_button: "Mark as read"
       reply_button: "Reply"
       unread_button: "Mark as unread"
       read_button: "Mark as read"
       reply_button: "Reply"

-      delete_button: "Delete"
+      destroy_button: "Delete"

     new:
       title: "Send message"
       send_message_to: "Send a new message to %{name}"
     new:
       title: "Send message"
       send_message_to: "Send a new message to %{name}"


@@ -1107,24 +1107,24 @@ en:
       people_mapping_nearby: "people mapping nearby"
     reply:
       wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."
       people_mapping_nearby: "people mapping nearby"
     reply:
       wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."

-    read:
+    show:

       title: "Read message"
       from: "From"
       subject: "Subject"
       date: "Date"
       reply_button: "Reply"
       unread_button: "Mark as unread"
       title: "Read message"
       from: "From"
       subject: "Subject"
       date: "Date"
       reply_button: "Reply"
       unread_button: "Mark as unread"

-      delete_button: "Delete"
+      destroy_button: "Delete"

       back: "Back"
       to: "To"
       wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
     sent_message_summary:
       back: "Back"
       to: "To"
       wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
     sent_message_summary:

-      delete_button: "Delete"
+      destroy_button: "Delete"

     mark:
       as_read: "Message marked as read"
       as_unread: "Message marked as unread"
     mark:
       as_read: "Message marked as read"
       as_unread: "Message marked as unread"

-    delete:
-      deleted: "Message deleted"
+    destroy:
+      destroyed: "Message deleted"

   site:
     about:
       next: Next
   site:
     about:
       next: Next