diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/g2_import/views/admin_g2_import.html.php | 5 | ||||
| -rw-r--r-- | modules/gallery/controllers/quick.php | 4 |
2 files changed, 7 insertions, 2 deletions
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> 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)); } |