diff options
author | Tim Almdal <tnalmdal@shaw.ca> | 2009-06-14 12:40:42 -0700 |
---|---|---|
committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-06-14 12:40:42 -0700 |
commit | f18fb934427ce09896b51d49520b04fba0f1dd44 (patch) | |
tree | f3af7e63cfcc1fcdd7ea8e69a9408fcd546ae5f1 /modules/g2_import | |
parent | 8b7f7a2fbe30c8e17f60177db7f371e1d1f2152c (diff) | |
parent | 80b464fdbda4a10a318fa2203dbea8d51ba83709 (diff) |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/g2_import')
-rw-r--r-- | modules/g2_import/views/admin_g2_import.html.php | 5 |
1 files changed, 4 insertions, 1 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> |