4 files changed, 11 insertions, 6 deletions
diff --git a/modules/g2_import/helpers/g2_import_task.php b/modules/g2_import/helpers/g2_import_task.php
index 21ba4c3a..e0212b33 100644
--- a/modules/g2_import/helpers/g2_import_task.php
+++ b/modules/g2_import/helpers/g2_import_task.php
@@ -189,7 +189,7 @@ class g2_import_task_Core {
         }
         $task->status = t(
           "Album highlights (%count of %total)",
-          array("count" => $done["tags"] + 1, "total" => $stats["albums"]));
+          array("count" => $done["highlights"] + 1, "total" => $stats["highlights"]));
 
         break;
 
diff --git a/modules/gallery/css/l10n_client.css b/modules/gallery/css/l10n_client.css
index 053b4432..90034d0c 100644
--- a/modules/gallery/css/l10n_client.css
+++ b/modules/gallery/css/l10n_client.css
@@ -45,7 +45,6 @@
   display:block;
   position:absolute; right:0em;
   height:2em; line-height:2em;
-  text-transform:uppercase;
   text-align:center; background:#000;
 }
 #l10n-client-toggler a {
@@ -62,7 +61,7 @@
   height:1em; line-height:1em;
   padding: .5em; margin:0px;
   font-size:1em;
-  text-transform:uppercase;}
+}
 
 #l10n-client .strings h2 {
   border:0px;}
diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index 2d4b11a1..1f7d2f64 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -25,10 +25,10 @@
           <a href="<?= url::site("admin/advanced_settings/edit/$var->module_name/" . html::clean($var->name)) ?>"
             class="g-dialog-link"
             title="<?= t("Edit %var (%module_name)", array("var" => $var->name, "module_name" => $var->module_name))->for_html_attr() ?>">
-            <? if (isset($var->value)): ?>
-            <?= html::clean($var->value) ?>
-            <? else: ?>
+            <? if (!isset($var->value) || $var->value === ""): ?>
             <i> <?= t("empty") ?> </i>
+            <? else: ?>
+            <?= html::clean($var->value) ?>
             <? endif ?>
         </a>
         </td>
diff --git a/modules/gallery/views/in_place_edit.html.php b/modules/gallery/views/in_place_edit.html.php
index 05a16ad4..2d6cbe90 100644
--- a/modules/gallery/views/in_place_edit.html.php
+++ b/modules/gallery/views/in_place_edit.html.php
@@ -9,7 +9,13 @@
       <?= form::submit(array("class" => "submit ui-state-default"), t("Save")) ?>
     </li>
     <li><a href="#" class="g-cancel"><?= t("Cancel") ?></a></li>
+    <? if (!empty($errors["input"])): ?>
+    <li>
+      <p id="g-in-place-edit-message" class="g-error"><?= $errors["input"] ?></p>
+    </li>
+    <? endif ?>
   </ul>
 </form>
 
 
+