Merge branch 'master' of git@github.com:gallery/gallery3

2 files changed, 2 insertions, 2 deletions

diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index 95f07baf..854f9554 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -16,7 +16,7 @@
              width="40"
              height="40" />
       </a>
-      <?= t("on %date <a href=#>%name</a> said",
+      <?= t('on %date <a href="#">%name</a> said',
             array("date" => date("Y-M-d H:i:s", $comment->created),
                   "name" => p::clean($comment->author_name()))); ?>
     </p>
diff --git a/modules/gallery/helpers/l10n_scanner.php b/modules/gallery/helpers/l10n_scanner.php
index 80b6f01c..bae455f2 100644
--- a/modules/gallery/helpers/l10n_scanner.php
+++ b/modules/gallery/helpers/l10n_scanner.php
@@ -149,6 +149,6 @@ class l10n_scanner_Core {
     } else {
       $str = strtr($str, array("\\'" => "'", "\\\\" => "\\"));
     }
-    return addcslashes($str, "\0..\37\\\"");
+    return $str;
   }
 }