From d95fcb189f7fb9709b5ee30cbeded611fc04a7a2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 13 Jun 2009 17:15:32 -0700
Subject: Add a warning about eAccelerator interfering with g2_import.

---
 modules/g2_import/views/admin_g2_import.html.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index c0ee2b17..d5e29e12 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -3,7 +3,10 @@
   <h1> <?= t("Gallery 2 Import") ?> </h1>
   <p>
     <?= t("Import your Gallery 2 users, photos, movies, comments and tags into your new Gallery 3 installation.") ?>
-    <?= t("<b>Note: The importer is a work in progress and does not currently support permissions, and movie formats other than Flash video and MP4</b>") ?>
+    <br/>
+    <?= t("<b>Note</b>: The importer is a work in progress and does not currently support permissions, and movie formats other than Flash video and MP4") ?>
+    <br/>
+    <?= t("<b>Note</b>: The importer has <i>known issues</i> with the eAccelerator PHP accelerator.  If you're using eAccelerator, please disable it.  One way to do that is to put <code>php_value eaccelerator.enable 0</code> in gallery3/.htaccess") ?>
   </p>
   <?= $form ?>
 </div>
-- 
cgit v1.2.3


From aaa215a285845b6dbfcb1eed86593dee1f557b43 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 14 Jun 2009 10:41:34 -0700
Subject: Get rid of the word "items" in the delete confirmation dialog.

---
 modules/gallery/controllers/quick.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index 30383307..cff6686b 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -101,7 +101,9 @@ class Quick_Controller extends Controller {
     access::required("edit", $item);
 
     if ($item->is_album()) {
-      print t("Delete the album <b>%title</b>? All items within the album will also be deleted.", array("title" => $item->title));
+      print t(
+        "Delete the album <b>%title</b>? All photos and movies in the album will also be deleted.",
+        array("title" => $item->title));
     } else {
       print t("Are you sure you want to delete <b>%title</b>?", array("title" => $item->title));
     }
-- 
cgit v1.2.3