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

1 files changed, 2 insertions, 2 deletions

diff --git a/modules/gallery/helpers/l10n_scanner.php b/modules/gallery/helpers/l10n_scanner.php
index 80b6f01c..a68aa28b 100644
--- a/modules/gallery/helpers/l10n_scanner.php
+++ b/modules/gallery/helpers/l10n_scanner.php
@@ -125,7 +125,7 @@ class l10n_scanner_Core {
             && is_array($first_param) && $first_param[0] == T_CONSTANT_ENCAPSED_STRING
             && is_array($second_param) && $second_param[0] == T_CONSTANT_ENCAPSED_STRING) {
           $singular = self::_escape_quoted_string($first_param[1]);
-          $plural = self::_escape_quoted_string($first_param[1]);
+          $plural = self::_escape_quoted_string($second_param[1]);
           l10n_scanner::process_message(array("one" => $singular, "other" => $plural), $cache);
         } else {
           // t2() found, but inside is something which is not a string literal.
@@ -149,6 +149,6 @@ class l10n_scanner_Core {
     } else {
       $str = strtr($str, array("\\'" => "'", "\\\\" => "\\"));
     }
-    return addcslashes($str, "\0..\37\\\"");
+    return $str;
   }
 }