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

3 files changed, 8 insertions, 2 deletions

diff --git a/modules/recaptcha/views/admin_recaptcha.html.php b/modules/recaptcha/views/admin_recaptcha.html.php
index 74932a96..06a664e1 100644
--- a/modules/recaptcha/views/admin_recaptcha.html.php
+++ b/modules/recaptcha/views/admin_recaptcha.html.php
@@ -23,6 +23,7 @@
     Recaptcha.create("<?= $public_key ?>", "gRecaptcha", {
       callback: Recaptcha.focus_response_field,
       lang: "en",
+      custom_translations : { instructions_visual : "<?= t("Type words to check:") ?>"},
       theme: "white"
     });
   </script>
diff --git a/modules/recaptcha/views/form_recaptcha.html.php b/modules/recaptcha/views/form_recaptcha.html.php
index abdf8428..d4031586 100644
--- a/modules/recaptcha/views/form_recaptcha.html.php
+++ b/modules/recaptcha/views/form_recaptcha.html.php
@@ -6,7 +6,12 @@
     Recaptcha.create(
       "<?= $public_key ?>",
       "gRecaptcha",
-      { theme: "white", callback: Recaptcha.focus_response_field });
+      {
+        theme: "white",
+        custom_translations : { instructions_visual : "<?= t("Type words to check:") ?>"},
+        callback: Recaptcha.focus_response_field
+      }
+    );
   }, 0);
 </script>
 
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 68486e6d..542b8b8b 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -60,7 +60,7 @@
         <th><?= t("Full name") ?></th>
         <th><?= t("Email") ?></th>
         <th><?= t("Last login") ?></th>
-        <th>Actions</th>
+        <th><?= t("Actions") ?></th>
       </tr>
 
       <? foreach ($users as $i => $user): ?>