summaryrefslogtreecommitdiff
path: root/modules/g2_import/views
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-05-27 23:15:09 -0700
committerBharat Mediratta <bharat@menalto.com>2009-05-27 23:15:09 -0700
commit93053cf83152082ce2fb365ad2ab6034c9edd4ee (patch)
tree2b509460486741547cab2541ca372dbb4b43c02b /modules/g2_import/views
parent993eecfee61e502660f490bec5b394640b917bd1 (diff)
parent38708920181f3bb7787ccd11128e5f6f0b74cbf7 (diff)
Merge branch 'master' of git://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 42c422c7..85525a81 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -3,7 +3,7 @@
<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 comments, tags, permissions, capture dates and movies (other than Flash video)</b>") ?>
+ <?= 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>") ?>
</p>
<?= $form ?>
</div>