From 38708920181f3bb7787ccd11128e5f6f0b74cbf7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 27 May 2009 22:57:38 -0700
Subject: Commit an egregious hack to work around the fact that both Gallery 2
 and Gallery 3 have a class named Gallery.  Clone a subset of the Gallery 2
 files and munge them so that we can rename the Galery 2 version to
 G2_Gallery.

Also, update the disclaimer in Admin > Settings > Gallery 2 Import.
---
 modules/g2_import/views/admin_g2_import.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/g2_import/views')

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>
-- 
cgit v1.2.3