summaryrefslogtreecommitdiff
path: root/modules/g2_import/views
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-02-08 15:38:59 -0800
committerBharat Mediratta <bharat@menalto.com>2010-02-08 15:38:59 -0800
commit9ca521c71021b43f13950d246a15f6f0da0b7989 (patch)
treeb2435238db3231761efc9245c4627214c9c595db /modules/g2_import/views
parent6dfab72922bf20104d6032eb292d59c6bd6578ba (diff)
parent008174859dc25dade593abdf4ce670bc6c7ef332 (diff)
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules/g2_import/views')
-rw-r--r--modules/g2_import/views/admin_g2_import.html.php2
1 files changed, 1 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 41ef7f85..3b7afec2 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -13,7 +13,7 @@
</p>
<ul>
<li>
- <?= t("Permissions are <b>not imported</b>. You will have to set them again manually (for now).") ?>
+ <?= t("Please <b>review album permissions</b> after the import! Permissions are imported, but user specific and item specific permissions are not supported in Gallery 3 and thus ignored.") ?>
</li>
<li>
<?= t("The only supported file formats are JPG, PNG and GIF, FLV and MP4. Other formats will be skipped.") ?>