summaryrefslogtreecommitdiff
path: root/modules/g2_import
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2010-02-11 21:27:16 -0800
committerTim Almdal <tnalmdal@shaw.ca>2010-02-11 21:27:16 -0800
commit09739dfd2c52ebc1b898b6e3b3aabd8fe41f018e (patch)
tree39262d0039d70fdc0985c281c1cf301f8bc4c8f3 /modules/g2_import
parenta893b0317d5489552c4c001901ff246e0ec5af1d (diff)
parentcd45c94fe69f24b0f80a79e4b9c402763739ecfc (diff)
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/g2_import')
-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 3b7afec2..5c520172 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("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.") ?>
+ <?= t("Gallery 3 does not support per-user / per-item permissions. <b>Review permissions after your import is done.</b>") ?>
</li>
<li>
<?= t("The only supported file formats are JPG, PNG and GIF, FLV and MP4. Other formats will be skipped.") ?>