Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

2 files changed, 4 insertions, 4 deletions

diff --git a/modules/notification/views/comment_published.html.php b/modules/notification/views/comment_published.html.php
index a8ca1899..ac36a2c1 100644
--- a/modules/notification/views/comment_published.html.php
+++ b/modules/notification/views/comment_published.html.php
@@ -11,11 +11,11 @@
   <td><?= nl2br(html::purify($comment->text)) ?></td>
       </tr>
       <tr>
-        <td><?= t("Author Name:") ?></td>
+        <td><?= t("Author name:") ?></td>
         <td><?= html::clean($comment->author_name()) ?></td>
       </tr>
       <tr>
-        <td><?= t("Author Email:") ?></td>
+        <td><?= t("Author email:") ?></td>
         <td><?= html::clean($comment->author_email()) ?></td>
       </tr>
       <tr>
diff --git a/modules/notification/views/item_updated.html.php b/modules/notification/views/item_updated.html.php
index 9c200964..47856cab 100644
--- a/modules/notification/views/item_updated.html.php
+++ b/modules/notification/views/item_updated.html.php
@@ -8,7 +8,7 @@
     <table>
       <tr>
         <? if ($item->original("title") != $item->title): ?>
-        <td><?= t("New Title:") ?></td>
+        <td><?= t("New title:") ?></td>
         <td><?= html::clean($item->title) ?></td>
         <? else: ?>
         <td><?= t("Title:") ?></td>
@@ -21,7 +21,7 @@
       </tr>
       <? if ($item->original("description") != $item->description): ?>
       <tr>
-        <td><?= t("New Description:") ?></td>
+        <td><?= t("New description:") ?></td>
         <td><?= html::clean($item->description) ?></td>
       </tr>
       <? elseif (!empty($item->description)): ?>