Update to 3.0, as 2.2.7 doesn't work with the new PHP.

"IMP 3.0 is now available! This major release delivers a brand-new, cleaner
user interface, improved internationalization, mail filtering, identities,
and much more, the result of over two years of feedback and experience
based on the successful IMP 2.2.x releases."

Note that the database format has changed, use
${PREFIX}share/horde/imp/scripts/imp2horde.pl
to convert to the new format.

6 files changed, 285 insertions, 992 deletions

diff --git a/mail/imp/MESSAGE b/mail/imp/MESSAGE
index 89236523c0a..5391498ea0e 100644
--- a/mail/imp/MESSAGE
+++ b/mail/imp/MESSAGE
@@ -1,19 +1,13 @@
 ==========================================================================
-$NetBSD: MESSAGE,v 1.2 2001/11/26 07:34:05 jlam Exp $
+$NetBSD: MESSAGE,v 1.3 2002/02/01 22:44:27 bouyer Exp $
 
 Please refer to the file:
 
-	${PREFIX}/share/doc/imp/SECURITY
+	${PREFIX}/share/doc/imp/INSTALL
 
-on how to secure the IMP installation.  It is at least recommended that
-you change the default database password used by horde-phplib and imp.
-You may setup the Horde/IMP installation by pointing a web browser at:
+on how to setup your IMP installation. You need to at last edit
 
-	http://www.domain.com/horde/setup.php3
-
-or by manually editting:
-
-	${IMPDIR}/config/defaults.php3
+	${IMPDIR}/config/conf.php
 
 You will also need to make IMP accessible through your HTTP server.  If
 you are running Apache and ap-php, then you can add the following lines
@@ -22,8 +16,12 @@ to httpd.conf:
 	Include ${PKG_SYSCONFDIR}/horde.conf
 	Include ${PKG_SYSCONFDIR}/imp.conf
 
-to make Horde accessible through:
-	
-	http://www.domain.com/horde/imp/
+and then you have to edit
+	${PREFIX}/share/horde/config/registry.php
+to enable IMP in the horde framework.
+
+If you are updating from IMP 2.2.x, use the script
+	${PREFIX}share/horde/imp/config
+to convert the IMP 2.2.x user preference database to the new format.
 
 ==========================================================================
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index de1619452fc..72bfe7e4a8f 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2001/12/02 06:56:41 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2002/02/01 22:44:27 bouyer Exp $
 
-DISTNAME=	imp-2.2.7
+DISTNAME=	imp-3.0
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/imp/tarballs/
 
@@ -8,8 +8,8 @@ MAINTAINER=	bouyer@netbsd.org
 HOMEPAGE=	http://www.horde.org/imp/
 COMMENT=	Internet Messaging Program
 
-DEPENDS+=	horde-1.2.7:../../www/horde
-DEPENDS+=	php-imap>3.0.17:../../mail/php4-imap
+DEPENDS+=	horde-2.0:../../www/horde
+DEPENDS+=	php-imap>4.0.0:../../mail/php4-imap
 
 DOCDIR=		${PREFIX}/share/doc/imp
 EGDIR=		${PREFIX}/share/examples/imp
@@ -24,63 +24,29 @@ MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 PKG_SYSCONFSUBDIR?=	httpd
 
 CONF_FILES=	${EGDIR}/imp.conf ${PKG_SYSCONFDIR}/imp.conf
-CONF_FILES+=	${IMPDIR}/config/defaults.php3.dist			\
-		${IMPDIR}/config/defaults.php3
-CONF_FILES+=	${IMPDIR}/config/ldap.php3.dist				\
-		${IMPDIR}/config/ldap.php3
-CONF_FILES+=	${IMPDIR}/config/servers.php3.dist			\
-		${IMPDIR}/config/servers.php3
-SUPPORT_FILES+=	${IMPDIR}/config/MOTD.html.dist				\
-		${IMPDIR}/config/MOTD.html
+CONF_FILES+=	${IMPDIR}/config/conf.php.dist			\
+		${IMPDIR}/config/conf.php
+CONF_FILES+=	${IMPDIR}/config/servers.php.dist			\
+		${IMPDIR}/config/servers.php
+SUPPORT_FILES+=	${IMPDIR}/config/filter.txt.dist			\
+		${IMPDIR}/config/filter.txt
 SUPPORT_FILES+=	${IMPDIR}/config/header.txt.dist			\
 		${IMPDIR}/config/header.txt
-SUPPORT_FILES+=	${IMPDIR}/config/html.php3.dist				\
-		${IMPDIR}/config/html.php3
-SUPPORT_FILES+=	${IMPDIR}/config/imp_module_config.php3.dist		\
-		${IMPDIR}/config/imp_module_config.php3
-SUPPORT_FILES+=	${IMPDIR}/config/lang.php3.dist				\
-		${IMPDIR}/config/lang.php3
-SUPPORT_FILES+=	${IMPDIR}/config/mailbox.php3.dist			\
-		${IMPDIR}/config/mailbox.php3
-SUPPORT_FILES+=	${IMPDIR}/config/menu.txt.dist				\
-		${IMPDIR}/config/menu.txt
-SUPPORT_FILES+=	${IMPDIR}/config/mime.php3.dist				\
-		${IMPDIR}/config/mime.php3
-SUPPORT_FILES+=	${IMPDIR}/config/prefs.php3.dist			\
-		${IMPDIR}/config/prefs.php3
+SUPPORT_FILES+=	${IMPDIR}/config/html.php.dist				\
+		${IMPDIR}/config/html.php
+SUPPORT_FILES+=	${IMPDIR}/config/menu.php.dist		\
+		${IMPDIR}/config/menu.php
+SUPPORT_FILES+=	${IMPDIR}/config/mime_drivers.php.dist				\
+		${IMPDIR}/config/mime_drivers.php
+SUPPORT_FILES+=	${IMPDIR}/config/motd.php.dist			\
+		${IMPDIR}/config/motd.php
+SUPPORT_FILES+=	${IMPDIR}/config/prefs.php.dist			\
+		${IMPDIR}/config/prefs.php
 SUPPORT_FILES+=	${IMPDIR}/config/trailer.txt.dist			\
 		${IMPDIR}/config/trailer.txt
 
-post-extract:
-	cd ${WRKSRC};							\
-	for file in							\
-		config/MOTD.html config/header.txt config/html.php3	\
-		config/imp_module_config.php3	config/lang.php3	\
-		config/mailbox.php3 config/menu.txt config/trailer.txt ; \
-	do								\
-		${MV} $${file} $${file}.dist;				\
-	done
-
-post-patch:
-	cd ${WRKSRC}/config;						\
-	for file in defaults.php3.dist; do				\
-		${MV} -f $${file} $${file}.orig;			\
-		${SED}	-e "s|/usr/bin/ispell|${LOCALBASE}/bin/ispell|g" \
-			-e "s|/usr/bin/wvHtml|${LOCALBASE}/bin/wvHTML|g" \
-			-e "s|/usr/bin/xlHtml|${LOCALBASE}/bin/xlHTML|g" \
-			-e "s|/bin/tar|/usr/bin/tar|g"			\
-			-e "s|/usr/bin/zipinfo|${LOCALBASE}/bin/zipinfo|g" \
-			$${file}.orig > $${file};			\
-	done
-	cd ${WRKSRC}/scripts;						\
-	for file in pine2imp.pl; do					\
-		${MV} -f $${file} $${file}.orig;			\
-		${SED}	-e "s|/usr/bin/perl|${PERL5}|g"			\
-			-e "s|/usr/local/|${LOCALBASE}/|g"		\
-			$${file}.orig > $${file};			\
-	done
-
 do-build:
+	${FIND} ${WRKSRC} -name .htaccess -print | ${XARGS} ${RM} -f
 	${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
 	${FIND} ${WRKSRC} -name "*.pl" -print | ${XARGS} ${CHMOD} +x
 	${FIND} ${WRKSRC} -name "*.sh" -print | ${XARGS} ${CHMOD} +x
@@ -93,10 +59,10 @@ do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR} ${EGDIR} ${IMPDIR}
 	cd ${WRKDIR}; ${INSTALL_DATA} imp.conf.dist ${EGDIR}/imp.conf
 	cd ${WRKSRC}; ${INSTALL_DATA} COPYING README docs/* ${DOCDIR}
-	cd ${WRKSRC}; ${CP} -R graphics lib locale scripts templates ${IMPDIR}
+	cd ${WRKSRC}; ${CP} -R graphics lib locale po scripts templates ${IMPDIR}
 	${INSTALL_DATA_DIR} ${IMPDIR}/config
 	cd ${WRKSRC}/config; ${INSTALL_DATA} * ${IMPDIR}/config
-	cd ${WRKSRC}; ${INSTALL_DATA} *.css *.php3 ${IMPDIR}
+	cd ${WRKSRC}; ${INSTALL_DATA} *.php ${IMPDIR}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${IMPDIR}
 	${CHMOD} -R a-w ${IMPDIR}
 
diff --git a/mail/imp/PLIST b/mail/imp/PLIST
index 043121b0897..bcb5ef1929b 100644
--- a/mail/imp/PLIST
+++ b/mail/imp/PLIST
@@ -1,908 +1,275 @@
-@comment $NetBSD: PLIST,v 1.2 2001/11/11 19:29:10 bouyer Exp $
-share/doc/imp/CHANGES
+@comment $NetBSD: PLIST,v 1.3 2002/02/01 22:44:28 bouyer Exp $
 share/doc/imp/COPYING
+share/doc/imp/README
+share/doc/imp/CHANGES
 share/doc/imp/CREDITS
-share/doc/imp/DATABASE
-share/doc/imp/HELP
 share/doc/imp/INSTALL
-share/doc/imp/KNOWN_BUGS
-share/doc/imp/PACKAGES
-share/doc/imp/README
-share/doc/imp/SECURITY
 share/examples/imp/imp.conf
-share/horde/imp/addcontact.php3
-share/horde/imp/compose.php3
-share/horde/imp/config/MOTD.html.dist
-share/horde/imp/config/defaults.php3.dist
-share/horde/imp/config/header.txt.dist
-share/horde/imp/config/html.php3.dist
-share/horde/imp/config/imp_module_config.php3.dist
-share/horde/imp/config/lang.php3.dist
-share/horde/imp/config/ldap.php3.dist
-share/horde/imp/config/mailbox.php3.dist
-share/horde/imp/config/menu.txt.dist
-share/horde/imp/config/mime.php3.dist
-share/horde/imp/config/servers.php3.dist
-share/horde/imp/config/trailer.txt.dist
-share/horde/imp/contacts.php3
-share/horde/imp/contactsFrame.php3
-share/horde/imp/contactsLdapFrame.php3
-share/horde/imp/folders.php3
-share/horde/imp/graphics/addressbook-blue.gif
-share/horde/imp/graphics/addressbook-red.gif
+share/horde/imp/templates/index/css.inc
+share/horde/imp/templates/index/notconfigured.inc
+share/horde/imp/templates/search/javascript.inc
+share/horde/imp/templates/search/main.inc
+share/horde/imp/templates/prefs/folderselect.inc
+share/horde/imp/templates/prefs/identityselect.inc
+share/horde/imp/templates/prefs/sourceselect.inc
+share/horde/imp/templates/prefs/trashselect.inc
+share/horde/imp/templates/filters/javascript.inc
+share/horde/imp/templates/filters/list.inc
+share/horde/imp/templates/filters/manage.inc
+share/horde/imp/templates/folders/foot.inc
+share/horde/imp/templates/folders/alert.inc
+share/horde/imp/templates/folders/confirm.inc
+share/horde/imp/templates/folders/actions.inc
+share/horde/imp/templates/folders/head.inc
+share/horde/imp/templates/folders/javascript.inc
+share/horde/imp/templates/folders/row.inc
+share/horde/imp/templates/identities/javascript.inc
+share/horde/imp/templates/identities/manage.inc
+share/horde/imp/templates/message/headers.inc
+share/horde/imp/templates/message/javascript.inc
+share/horde/imp/templates/message/message.inc
+share/horde/imp/templates/message/navbar.inc
+share/horde/imp/templates/message/navbar_aux_bottom.inc
+share/horde/imp/templates/message/navbar_aux_top.inc
+share/horde/imp/templates/compose/bounce.inc
+share/horde/imp/templates/compose/compose.inc
+share/horde/imp/templates/compose/javascript.inc
+share/horde/imp/templates/compose/spelling.inc
+share/horde/imp/templates/javascript/open_compose_win.js
+share/horde/imp/templates/javascript/open_print_win.js
+share/horde/imp/templates/login/login.inc
+share/horde/imp/templates/mailbox/searchfolder.inc
+share/horde/imp/templates/mailbox/alert.inc
+share/horde/imp/templates/mailbox/empty_mailbox.inc
+share/horde/imp/templates/mailbox/footer.inc
+share/horde/imp/templates/mailbox/header.inc
+share/horde/imp/templates/mailbox/javascript.inc
+share/horde/imp/templates/mailbox/legend.inc
+share/horde/imp/templates/mailbox/message_footers.inc
+share/horde/imp/templates/mailbox/message_headers.inc
+share/horde/imp/templates/mailbox/message_summaries.inc
+share/horde/imp/templates/mailbox/navbar.inc
+share/horde/imp/templates/mailbox/actions.inc
+share/horde/imp/templates/menu/menu.inc
+share/horde/imp/templates/menu
+share/horde/imp/templates/intro/main.inc
+share/horde/imp/templates/intro
+share/horde/imp/templates/common-header.inc
+share/horde/imp/templates/common-footer.inc
+share/horde/imp/scripts/Imp.reg
+share/horde/imp/scripts/custom_login.php
+share/horde/imp/scripts/imp-cleanup.cron
+share/horde/imp/scripts/imp2horde.pl
+share/horde/imp/scripts/imp2turba.pl
+share/horde/imp/po/zh_TW.po
+share/horde/imp/po/README
+share/horde/imp/po/cs_CZ.po
+share/horde/imp/po/de_DE.po
+share/horde/imp/po/el_GR.po
+share/horde/imp/po/es_ES.po
+share/horde/imp/po/extract.pl
+share/horde/imp/po/fi_FI.po
+share/horde/imp/po/fr_FR.po
+share/horde/imp/po/it_IT.po
+share/horde/imp/po/ko_KR.po
+share/horde/imp/po/nl_NL.po
+share/horde/imp/po/no_BOK.po
+share/horde/imp/po/pl_PL.po
+share/horde/imp/po/pt_BR.po
+share/horde/imp/po/ru_win.po
+share/horde/imp/po/shtool
+share/horde/imp/po/sv_SE.po
+share/horde/imp/po/uk.po
+share/horde/imp/po/xgettext.sh
+share/horde/imp/po/zh_CN.po
+share/horde/imp/po/Makefile
+share/horde/imp/locale/nl_NL/LC_MESSAGES/imp.mo
+share/horde/imp/locale/nl_NL/help.xml
+share/horde/imp/locale/de_DE/LC_MESSAGES/imp.mo
+share/horde/imp/locale/de_DE/help.xml
+share/horde/imp/locale/el_GR/LC_MESSAGES/imp.mo
+share/horde/imp/locale/el_GR/help.xml
+share/horde/imp/locale/en_US/help.xml
+share/horde/imp/locale/es_ES/LC_MESSAGES/imp.mo
+share/horde/imp/locale/es_ES/help.xml
+share/horde/imp/locale/fi_FI/LC_MESSAGES/imp.mo
+share/horde/imp/locale/fi_FI/help.xml
+share/horde/imp/locale/fr_FR/LC_MESSAGES/imp.mo
+share/horde/imp/locale/fr_FR/help.xml
+share/horde/imp/locale/it_IT/LC_MESSAGES/imp.mo
+share/horde/imp/locale/it_IT/help.xml
+share/horde/imp/locale/ko_KR/LC_MESSAGES/imp.mo
+share/horde/imp/locale/ko_KR/help.xml
+share/horde/imp/locale/cs_CZ/LC_MESSAGES/imp.mo
+share/horde/imp/locale/cs_CZ/help.xml
+share/horde/imp/locale/no_BOK/LC_MESSAGES/imp.mo
+share/horde/imp/locale/no_BOK/help.xml
+share/horde/imp/locale/pl_PL/LC_MESSAGES/imp.mo
+share/horde/imp/locale/pl_PL/help.xml
+share/horde/imp/locale/pt_BR/LC_MESSAGES/imp.mo
+share/horde/imp/locale/pt_BR/help.xml
+share/horde/imp/locale/ru_win/LC_MESSAGES/imp.mo
+share/horde/imp/locale/ru_win/help.xml
+share/horde/imp/locale/sv_SE/LC_MESSAGES/imp.mo
+share/horde/imp/locale/sv_SE/help.xml
+share/horde/imp/locale/uk/LC_MESSAGES/imp.mo
+share/horde/imp/locale/uk/help.xml
+share/horde/imp/locale/zh_CN/LC_MESSAGES/imp.mo
+share/horde/imp/locale/zh_CN/help.xml
+share/horde/imp/locale/zh_TW/LC_MESSAGES/imp.mo
+share/horde/imp/locale/zh_TW/help.xml
+share/horde/imp/lib/MIME/Viewer/html.php
+share/horde/imp/lib/MIME/Viewer/text.php
+share/horde/imp/lib/Identity/IMP.php
+share/horde/imp/lib/Maintenance/Task/delete_sentmail_monthly.php
+share/horde/imp/lib/Maintenance/Task/purge_trash.php
+share/horde/imp/lib/Maintenance/Task/rename_sentmail_monthly.php
+share/horde/imp/lib/Maintenance/Task
+share/horde/imp/lib/Maintenance/imp.php
+share/horde/imp/lib/base.php
+share/horde/imp/lib/Tree.php
+share/horde/imp/lib/api.php
+share/horde/imp/lib/Message.php
+share/horde/imp/lib/version.php
+share/horde/imp/lib/IMP.php
+share/horde/imp/lib/Folder.php
+share/horde/imp/graphics/folders/spacer.gif
+share/horde/imp/graphics/folders/empty.gif
+share/horde/imp/graphics/folders/expanded.gif
+share/horde/imp/graphics/folders/folder.gif
+share/horde/imp/graphics/folders/folder_open.gif
+share/horde/imp/graphics/folders/inbox.gif
+share/horde/imp/graphics/folders/mbox.gif
+share/horde/imp/graphics/folders/mbox_marked.gif
+share/horde/imp/graphics/folders/mbox_noselect.gif
+share/horde/imp/graphics/folders/mbox_unmarked.gif
+share/horde/imp/graphics/folders/collapsed.gif
+share/horde/imp/graphics/mime/html.gif
+share/horde/imp/graphics/mime/text.gif
 share/horde/imp/graphics/addressbook-yellow.gif
-share/horde/imp/graphics/addressbook.gif
+share/horde/imp/graphics/alternative.gif
 share/horde/imp/graphics/answered.gif
 share/horde/imp/graphics/attachment.gif
-share/horde/imp/graphics/check.gif
+share/horde/imp/graphics/checkbox.gif
 share/horde/imp/graphics/compose.gif
 share/horde/imp/graphics/deleted.gif
 share/horde/imp/graphics/down.gif
 share/horde/imp/graphics/download.gif
-share/horde/imp/graphics/exclamation.gif
+share/horde/imp/graphics/draft.gif
+share/horde/imp/graphics/expand.gif
+share/horde/imp/graphics/fetchmail.gif
+share/horde/imp/graphics/filters.gif
 share/horde/imp/graphics/first-grey.gif
 share/horde/imp/graphics/first.gif
-share/horde/imp/graphics/folder.gif
-share/horde/imp/graphics/green.gif
-share/horde/imp/graphics/impsmall.gif
-share/horde/imp/graphics/inbox.gif
+share/horde/imp/graphics/folders.gif
+share/horde/imp/graphics/imp.gif
+share/horde/imp/graphics/up.gif
+share/horde/imp/graphics/addressbook-blue.gif
 share/horde/imp/graphics/last-grey.gif
 share/horde/imp/graphics/last.gif
 share/horde/imp/graphics/lhand.gif
 share/horde/imp/graphics/lock.gif
-share/horde/imp/graphics/login.gif
-share/horde/imp/graphics/logout.gif
-share/horde/imp/graphics/mime_audio.gif
-share/horde/imp/graphics/mime_broken.gif
-share/horde/imp/graphics/mime_compressed.gif
-share/horde/imp/graphics/mime_deb.gif
-share/horde/imp/graphics/mime_excel.gif
-share/horde/imp/graphics/mime_html.gif
-share/horde/imp/graphics/mime_image.gif
-share/horde/imp/graphics/mime_imp_signature.gif
-share/horde/imp/graphics/mime_mail.gif
-share/horde/imp/graphics/mime_msword.gif
-share/horde/imp/graphics/mime_pdf.gif
-share/horde/imp/graphics/mime_php.gif
-share/horde/imp/graphics/mime_text.gif
-share/horde/imp/graphics/mime_unknown.gif
-share/horde/imp/graphics/newmail.gif
+share/horde/imp/graphics/manage_attachments.gif
 share/horde/imp/graphics/next-grey.gif
 share/horde/imp/graphics/next.gif
-share/horde/imp/graphics/open_folder.gif
-share/horde/imp/graphics/prefs.gif
+share/horde/imp/graphics/personal.gif
 share/horde/imp/graphics/prev-grey.gif
 share/horde/imp/graphics/prev.gif
-share/horde/imp/graphics/red.gif
+share/horde/imp/graphics/print.gif
 share/horde/imp/graphics/reload.gif
 share/horde/imp/graphics/rhand.gif
 share/horde/imp/graphics/search.gif
-share/horde/imp/graphics/sm-lg.gif
-share/horde/imp/graphics/source.gif
-share/horde/imp/graphics/up.gif
-share/horde/imp/imp.css
-share/horde/imp/index.php3
-share/horde/imp/ldap.result.php3
-share/horde/imp/ldap.search.php3
-share/horde/imp/lib/db.dummy
-share/horde/imp/lib/db.informix
-share/horde/imp/lib/db.mysql
-share/horde/imp/lib/db.oci8
-share/horde/imp/lib/db.oracle
-share/horde/imp/lib/db.pgsql
-share/horde/imp/lib/db.sybase
-share/horde/imp/lib/imp.lib
-share/horde/imp/lib/js/browser_detect.js
-share/horde/imp/lib/js/browser_detect_full.js
-share/horde/imp/lib/js/msie_generic_help.js
-share/horde/imp/lib/js/ns_generic_help.js
-share/horde/imp/lib/js/open_compose_win.js
-share/horde/imp/lib/js/open_contacts.js
-share/horde/imp/lib/mimetypes.lib
-share/horde/imp/lib/postconf.php3
-share/horde/imp/lib/version.php
-share/horde/imp/locale/ca/compose.help
-share/horde/imp/locale/ca/compose.lang
-share/horde/imp/locale/ca/contacts.help
-share/horde/imp/locale/ca/contacts.lang
-share/horde/imp/locale/ca/folders.help
-share/horde/imp/locale/ca/folders.lang
-share/horde/imp/locale/ca/help.lang
-share/horde/imp/locale/ca/horde.lang
-share/horde/imp/locale/ca/login.help
-share/horde/imp/locale/ca/login.lang
-share/horde/imp/locale/ca/mailbox.lang
-share/horde/imp/locale/ca/menu.lang
-share/horde/imp/locale/ca/message.lang
-share/horde/imp/locale/ca/newuser.entro.txt
-share/horde/imp/locale/ca/newuser.intro.txt
-share/horde/imp/locale/ca/newuser.lang
-share/horde/imp/locale/ca/newuser.start.txt
-share/horde/imp/locale/ca/openwin.lang
-share/horde/imp/locale/ca/passwd.lang
-share/horde/imp/locale/ca/prefs.lang
-share/horde/imp/locale/ca/select.lang
-share/horde/imp/locale/ca/spelling.lang
-share/horde/imp/locale/ca/status.lang
-share/horde/imp/locale/cs/compose.help
-share/horde/imp/locale/cs/compose.lang
-share/horde/imp/locale/cs/contacts.help
-share/horde/imp/locale/cs/contacts.lang
-share/horde/imp/locale/cs/folders.help
-share/horde/imp/locale/cs/folders.lang
-share/horde/imp/locale/cs/help.lang
-share/horde/imp/locale/cs/horde.lang
-share/horde/imp/locale/cs/login.help
-share/horde/imp/locale/cs/login.lang
-share/horde/imp/locale/cs/mailbox.lang
-share/horde/imp/locale/cs/menu.lang
-share/horde/imp/locale/cs/message.lang
-share/horde/imp/locale/cs/newuser.entro.txt
-share/horde/imp/locale/cs/newuser.intro.txt
-share/horde/imp/locale/cs/newuser.lang
-share/horde/imp/locale/cs/newuser.start.txt
-share/horde/imp/locale/cs/openwin.lang
-share/horde/imp/locale/cs/passwd.lang
-share/horde/imp/locale/cs/prefs.lang
-share/horde/imp/locale/cs/select.lang
-share/horde/imp/locale/cs/spelling.lang
-share/horde/imp/locale/cs/status.lang
-share/horde/imp/locale/da/compose.help
-share/horde/imp/locale/da/compose.lang
-share/horde/imp/locale/da/contacts.help
-share/horde/imp/locale/da/contacts.lang
-share/horde/imp/locale/da/folders.help
-share/horde/imp/locale/da/folders.lang
-share/horde/imp/locale/da/help.lang
-share/horde/imp/locale/da/horde.lang
-share/horde/imp/locale/da/login.help
-share/horde/imp/locale/da/login.lang
-share/horde/imp/locale/da/mailbox.lang
-share/horde/imp/locale/da/menu.lang
-share/horde/imp/locale/da/message.lang
-share/horde/imp/locale/da/newuser.entro.txt
-share/horde/imp/locale/da/newuser.intro.txt
-share/horde/imp/locale/da/newuser.lang
-share/horde/imp/locale/da/newuser.start.txt
-share/horde/imp/locale/da/openwin.lang
-share/horde/imp/locale/da/passwd.lang
-share/horde/imp/locale/da/prefs.lang
-share/horde/imp/locale/da/select.lang
-share/horde/imp/locale/da/spelling.lang
-share/horde/imp/locale/da/status.lang
-share/horde/imp/locale/de/compose.help
-share/horde/imp/locale/de/compose.lang
-share/horde/imp/locale/de/contacts.help
-share/horde/imp/locale/de/contacts.lang
-share/horde/imp/locale/de/folders.help
-share/horde/imp/locale/de/folders.lang
-share/horde/imp/locale/de/help.lang
-share/horde/imp/locale/de/horde.lang
-share/horde/imp/locale/de/login.help
-share/horde/imp/locale/de/login.lang
-share/horde/imp/locale/de/mailbox.lang
-share/horde/imp/locale/de/menu.lang
-share/horde/imp/locale/de/message.lang
-share/horde/imp/locale/de/newuser.entro.txt
-share/horde/imp/locale/de/newuser.intro.txt
-share/horde/imp/locale/de/newuser.lang
-share/horde/imp/locale/de/newuser.start.txt
-share/horde/imp/locale/de/openwin.lang
-share/horde/imp/locale/de/passwd.lang
-share/horde/imp/locale/de/prefs.lang
-share/horde/imp/locale/de/select.lang
-share/horde/imp/locale/de/spelling.lang
-share/horde/imp/locale/de/status.lang
-share/horde/imp/locale/defines/compose.help
-share/horde/imp/locale/defines/contacts.help
-share/horde/imp/locale/defines/folders.help
-share/horde/imp/locale/defines/login.help
-share/horde/imp/locale/el/compose.help
-share/horde/imp/locale/el/compose.lang
-share/horde/imp/locale/el/contacts.help
-share/horde/imp/locale/el/contacts.lang
-share/horde/imp/locale/el/folders.help
-share/horde/imp/locale/el/folders.lang
-share/horde/imp/locale/el/help.lang
-share/horde/imp/locale/el/horde.lang
-share/horde/imp/locale/el/login.help
-share/horde/imp/locale/el/login.lang
-share/horde/imp/locale/el/mailbox.lang
-share/horde/imp/locale/el/menu.lang
-share/horde/imp/locale/el/message.lang
-share/horde/imp/locale/el/newuser.entro.txt
-share/horde/imp/locale/el/newuser.intro.txt
-share/horde/imp/locale/el/newuser.lang
-share/horde/imp/locale/el/newuser.start.txt
-share/horde/imp/locale/el/openwin.lang
-share/horde/imp/locale/el/passwd.lang
-share/horde/imp/locale/el/prefs.lang
-share/horde/imp/locale/el/select.lang
-share/horde/imp/locale/el/spelling.lang
-share/horde/imp/locale/el/status.lang
-share/horde/imp/locale/en/compose.help
-share/horde/imp/locale/en/compose.lang
-share/horde/imp/locale/en/contacts.help
-share/horde/imp/locale/en/contacts.lang
-share/horde/imp/locale/en/folders.help
-share/horde/imp/locale/en/folders.lang
-share/horde/imp/locale/en/help.lang
-share/horde/imp/locale/en/horde.lang
-share/horde/imp/locale/en/login.help
-share/horde/imp/locale/en/login.lang
-share/horde/imp/locale/en/mailbox.lang
-share/horde/imp/locale/en/menu.lang
-share/horde/imp/locale/en/message.lang
-share/horde/imp/locale/en/newuser.entro.txt
-share/horde/imp/locale/en/newuser.intro.txt
-share/horde/imp/locale/en/newuser.lang
-share/horde/imp/locale/en/newuser.start.txt
-share/horde/imp/locale/en/openwin.lang
-share/horde/imp/locale/en/passwd.lang
-share/horde/imp/locale/en/prefs.lang
-share/horde/imp/locale/en/select.lang
-share/horde/imp/locale/en/spelling.lang
-share/horde/imp/locale/en/status.lang
-share/horde/imp/locale/es/compose.help
-share/horde/imp/locale/es/compose.lang
-share/horde/imp/locale/es/contacts.help
-share/horde/imp/locale/es/contacts.lang
-share/horde/imp/locale/es/folders.help
-share/horde/imp/locale/es/folders.lang
-share/horde/imp/locale/es/help.lang
-share/horde/imp/locale/es/horde.lang
-share/horde/imp/locale/es/login.help
-share/horde/imp/locale/es/login.lang
-share/horde/imp/locale/es/mailbox.lang
-share/horde/imp/locale/es/menu.lang
-share/horde/imp/locale/es/message.lang
-share/horde/imp/locale/es/newuser.entro.txt
-share/horde/imp/locale/es/newuser.intro.txt
-share/horde/imp/locale/es/newuser.lang
-share/horde/imp/locale/es/newuser.start.txt
-share/horde/imp/locale/es/openwin.lang
-share/horde/imp/locale/es/passwd.lang
-share/horde/imp/locale/es/prefs.lang
-share/horde/imp/locale/es/select.lang
-share/horde/imp/locale/es/spelling.lang
-share/horde/imp/locale/es/status.lang
-share/horde/imp/locale/et/compose.help
-share/horde/imp/locale/et/compose.lang
-share/horde/imp/locale/et/contacts.help
-share/horde/imp/locale/et/contacts.lang
-share/horde/imp/locale/et/folders.help
-share/horde/imp/locale/et/folders.lang
-share/horde/imp/locale/et/help.lang
-share/horde/imp/locale/et/horde.lang
-share/horde/imp/locale/et/login.help
-share/horde/imp/locale/et/login.lang
-share/horde/imp/locale/et/mailbox.lang
-share/horde/imp/locale/et/menu.lang
-share/horde/imp/locale/et/message.lang
-share/horde/imp/locale/et/newuser.entro.txt
-share/horde/imp/locale/et/newuser.intro.txt
-share/horde/imp/locale/et/newuser.lang
-share/horde/imp/locale/et/newuser.start.txt
-share/horde/imp/locale/et/openwin.lang
-share/horde/imp/locale/et/passwd.lang
-share/horde/imp/locale/et/prefs.lang
-share/horde/imp/locale/et/select.lang
-share/horde/imp/locale/et/spelling.lang
-share/horde/imp/locale/et/status.lang
-share/horde/imp/locale/fi/compose.help
-share/horde/imp/locale/fi/compose.lang
-share/horde/imp/locale/fi/contacts.help
-share/horde/imp/locale/fi/contacts.lang
-share/horde/imp/locale/fi/folders.help
-share/horde/imp/locale/fi/folders.lang
-share/horde/imp/locale/fi/help.lang
-share/horde/imp/locale/fi/horde.lang
-share/horde/imp/locale/fi/login.help
-share/horde/imp/locale/fi/login.lang
-share/horde/imp/locale/fi/mailbox.lang
-share/horde/imp/locale/fi/menu.lang
-share/horde/imp/locale/fi/message.lang
-share/horde/imp/locale/fi/newuser.entro.txt
-share/horde/imp/locale/fi/newuser.intro.txt
-share/horde/imp/locale/fi/newuser.lang
-share/horde/imp/locale/fi/newuser.start.txt
-share/horde/imp/locale/fi/openwin.lang
-share/horde/imp/locale/fi/passwd.lang
-share/horde/imp/locale/fi/prefs.lang
-share/horde/imp/locale/fi/select.lang
-share/horde/imp/locale/fi/spelling.lang
-share/horde/imp/locale/fi/status.lang
-share/horde/imp/locale/fr/compose.help
-share/horde/imp/locale/fr/compose.lang
-share/horde/imp/locale/fr/contacts.help
-share/horde/imp/locale/fr/contacts.lang
-share/horde/imp/locale/fr/folders.help
-share/horde/imp/locale/fr/folders.lang
-share/horde/imp/locale/fr/help.lang
-share/horde/imp/locale/fr/horde.lang
-share/horde/imp/locale/fr/lang.lang
-share/horde/imp/locale/fr/login.help
-share/horde/imp/locale/fr/login.lang
-share/horde/imp/locale/fr/mailbox.lang
-share/horde/imp/locale/fr/menu.lang
-share/horde/imp/locale/fr/message.lang
-share/horde/imp/locale/fr/newuser.entro.txt
-share/horde/imp/locale/fr/newuser.intro.txt
-share/horde/imp/locale/fr/newuser.lang
-share/horde/imp/locale/fr/newuser.start.txt
-share/horde/imp/locale/fr/openwin.lang
-share/horde/imp/locale/fr/passwd.lang
-share/horde/imp/locale/fr/prefs.lang
-share/horde/imp/locale/fr/select.lang
-share/horde/imp/locale/fr/spelling.lang
-share/horde/imp/locale/fr/status.lang
-share/horde/imp/locale/hu/compose.help
-share/horde/imp/locale/hu/compose.lang
-share/horde/imp/locale/hu/contacts.help
-share/horde/imp/locale/hu/contacts.lang
-share/horde/imp/locale/hu/folders.help
-share/horde/imp/locale/hu/folders.lang
-share/horde/imp/locale/hu/help.lang
-share/horde/imp/locale/hu/horde.lang
-share/horde/imp/locale/hu/login.help
-share/horde/imp/locale/hu/login.lang
-share/horde/imp/locale/hu/mailbox.lang
-share/horde/imp/locale/hu/menu.lang
-share/horde/imp/locale/hu/message.lang
-share/horde/imp/locale/hu/newuser.entro.txt
-share/horde/imp/locale/hu/newuser.intro.txt
-share/horde/imp/locale/hu/newuser.lang
-share/horde/imp/locale/hu/newuser.start.txt
-share/horde/imp/locale/hu/openwin.lang
-share/horde/imp/locale/hu/passwd.lang
-share/horde/imp/locale/hu/prefs.lang
-share/horde/imp/locale/hu/select.lang
-share/horde/imp/locale/hu/spelling.lang
-share/horde/imp/locale/hu/status.lang
-share/horde/imp/locale/id/compose.help
-share/horde/imp/locale/id/compose.lang
-share/horde/imp/locale/id/contacts.help
-share/horde/imp/locale/id/contacts.lang
-share/horde/imp/locale/id/folders.help
-share/horde/imp/locale/id/folders.lang
-share/horde/imp/locale/id/help.lang
-share/horde/imp/locale/id/horde.lang
-share/horde/imp/locale/id/login.help
-share/horde/imp/locale/id/login.lang
-share/horde/imp/locale/id/mailbox.lang
-share/horde/imp/locale/id/menu.lang
-share/horde/imp/locale/id/message.lang
-share/horde/imp/locale/id/newuser.entro.txt
-share/horde/imp/locale/id/newuser.intro.txt
-share/horde/imp/locale/id/newuser.lang
-share/horde/imp/locale/id/newuser.start.txt
-share/horde/imp/locale/id/openwin.lang
-share/horde/imp/locale/id/passwd.lang
-share/horde/imp/locale/id/prefs.lang
-share/horde/imp/locale/id/select.lang
-share/horde/imp/locale/id/spelling.lang
-share/horde/imp/locale/id/status.lang
-share/horde/imp/locale/is/compose.help
-share/horde/imp/locale/is/compose.lang
-share/horde/imp/locale/is/contacts.help
-share/horde/imp/locale/is/contacts.lang
-share/horde/imp/locale/is/folders.help
-share/horde/imp/locale/is/folders.lang
-share/horde/imp/locale/is/help.lang
-share/horde/imp/locale/is/horde.lang
-share/horde/imp/locale/is/login.help
-share/horde/imp/locale/is/login.lang
-share/horde/imp/locale/is/mailbox.lang
-share/horde/imp/locale/is/menu.lang
-share/horde/imp/locale/is/message.lang
-share/horde/imp/locale/is/newuser.entro.txt
-share/horde/imp/locale/is/newuser.intro.txt
-share/horde/imp/locale/is/newuser.lang
-share/horde/imp/locale/is/newuser.start.txt
-share/horde/imp/locale/is/openwin.lang
-share/horde/imp/locale/is/passwd.lang
-share/horde/imp/locale/is/prefs.lang
-share/horde/imp/locale/is/select.lang
-share/horde/imp/locale/is/spelling.lang
-share/horde/imp/locale/is/status.lang
-share/horde/imp/locale/it/compose.help
-share/horde/imp/locale/it/compose.lang
-share/horde/imp/locale/it/contacts.help
-share/horde/imp/locale/it/contacts.lang
-share/horde/imp/locale/it/folders.help
-share/horde/imp/locale/it/folders.lang
-share/horde/imp/locale/it/help.lang
-share/horde/imp/locale/it/horde.lang
-share/horde/imp/locale/it/login.help
-share/horde/imp/locale/it/login.lang
-share/horde/imp/locale/it/mailbox.lang
-share/horde/imp/locale/it/menu.lang
-share/horde/imp/locale/it/message.lang
-share/horde/imp/locale/it/newuser.entro.txt
-share/horde/imp/locale/it/newuser.intro.txt
-share/horde/imp/locale/it/newuser.lang
-share/horde/imp/locale/it/newuser.start.txt
-share/horde/imp/locale/it/openwin.lang
-share/horde/imp/locale/it/passwd.lang
-share/horde/imp/locale/it/prefs.lang
-share/horde/imp/locale/it/select.lang
-share/horde/imp/locale/it/spelling.lang
-share/horde/imp/locale/it/status.lang
-share/horde/imp/locale/kr/compose.help
-share/horde/imp/locale/kr/compose.lang
-share/horde/imp/locale/kr/contacts.help
-share/horde/imp/locale/kr/contacts.lang
-share/horde/imp/locale/kr/folders.help
-share/horde/imp/locale/kr/folders.lang
-share/horde/imp/locale/kr/help.lang
-share/horde/imp/locale/kr/horde.lang
-share/horde/imp/locale/kr/login.help
-share/horde/imp/locale/kr/login.lang
-share/horde/imp/locale/kr/mailbox.lang
-share/horde/imp/locale/kr/menu.lang
-share/horde/imp/locale/kr/message.lang
-share/horde/imp/locale/kr/newuser.entro.txt
-share/horde/imp/locale/kr/newuser.intro.txt
-share/horde/imp/locale/kr/newuser.lang
-share/horde/imp/locale/kr/newuser.start.txt
-share/horde/imp/locale/kr/openwin.lang
-share/horde/imp/locale/kr/passwd.lang
-share/horde/imp/locale/kr/prefs.lang
-share/horde/imp/locale/kr/select.lang
-share/horde/imp/locale/kr/spelling.lang
-share/horde/imp/locale/kr/status.lang
-share/horde/imp/locale/local/compose.help
-share/horde/imp/locale/local/compose.lang
-share/horde/imp/locale/local/contacts.help
-share/horde/imp/locale/local/contacts.lang
-share/horde/imp/locale/local/folders.help
-share/horde/imp/locale/local/folders.lang
-share/horde/imp/locale/local/help.lang
-share/horde/imp/locale/local/horde.lang
-share/horde/imp/locale/local/lang.lang
-share/horde/imp/locale/local/login.help
-share/horde/imp/locale/local/login.lang
-share/horde/imp/locale/local/mailbox.lang
-share/horde/imp/locale/local/menu.lang
-share/horde/imp/locale/local/message.lang
-share/horde/imp/locale/local/newuser.lang
-share/horde/imp/locale/local/openwin.lang
-share/horde/imp/locale/local/passwd.lang
-share/horde/imp/locale/local/prefs.lang
-share/horde/imp/locale/local/select.lang
-share/horde/imp/locale/local/spelling.lang
-share/horde/imp/locale/local/status.lang
-share/horde/imp/locale/lt/compose.help
-share/horde/imp/locale/lt/compose.lang
-share/horde/imp/locale/lt/contacts.help
-share/horde/imp/locale/lt/contacts.lang
-share/horde/imp/locale/lt/folders.help
-share/horde/imp/locale/lt/folders.lang
-share/horde/imp/locale/lt/help.lang
-share/horde/imp/locale/lt/horde.lang
-share/horde/imp/locale/lt/ldap.result.lang
-share/horde/imp/locale/lt/ldap.search.lang
-share/horde/imp/locale/lt/login.help
-share/horde/imp/locale/lt/login.lang
-share/horde/imp/locale/lt/mailbox.lang
-share/horde/imp/locale/lt/menu.lang
-share/horde/imp/locale/lt/message.lang
-share/horde/imp/locale/lt/newuser.entro.txt
-share/horde/imp/locale/lt/newuser.intro.txt
-share/horde/imp/locale/lt/newuser.lang
-share/horde/imp/locale/lt/newuser.start.txt
-share/horde/imp/locale/lt/openwin.lang
-share/horde/imp/locale/lt/passwd.lang
-share/horde/imp/locale/lt/prefs.lang
-share/horde/imp/locale/lt/select.lang
-share/horde/imp/locale/lt/spelling.lang
-share/horde/imp/locale/lt/status.lang
-share/horde/imp/locale/nl/compose.help
-share/horde/imp/locale/nl/compose.lang
-share/horde/imp/locale/nl/contacts.help
-share/horde/imp/locale/nl/contacts.lang
-share/horde/imp/locale/nl/folders.help
-share/horde/imp/locale/nl/folders.lang
-share/horde/imp/locale/nl/help.lang
-share/horde/imp/locale/nl/horde.lang
-share/horde/imp/locale/nl/login.help
-share/horde/imp/locale/nl/login.lang
-share/horde/imp/locale/nl/mailbox.lang
-share/horde/imp/locale/nl/menu.lang
-share/horde/imp/locale/nl/message.lang
-share/horde/imp/locale/nl/newuser.entro.txt
-share/horde/imp/locale/nl/newuser.intro.txt
-share/horde/imp/locale/nl/newuser.lang
-share/horde/imp/locale/nl/newuser.start.txt
-share/horde/imp/locale/nl/openwin.lang
-share/horde/imp/locale/nl/passwd.lang
-share/horde/imp/locale/nl/prefs.lang
-share/horde/imp/locale/nl/select.lang
-share/horde/imp/locale/nl/spelling.lang
-share/horde/imp/locale/nl/status.lang
-share/horde/imp/locale/no-bok/compose.help
-share/horde/imp/locale/no-bok/compose.lang
-share/horde/imp/locale/no-bok/contacts.help
-share/horde/imp/locale/no-bok/contacts.lang
-share/horde/imp/locale/no-bok/folders.help
-share/horde/imp/locale/no-bok/folders.lang
-share/horde/imp/locale/no-bok/help.lang
-share/horde/imp/locale/no-bok/horde.lang
-share/horde/imp/locale/no-bok/login.help
-share/horde/imp/locale/no-bok/login.lang
-share/horde/imp/locale/no-bok/mailbox.lang
-share/horde/imp/locale/no-bok/menu.lang
-share/horde/imp/locale/no-bok/message.lang
-share/horde/imp/locale/no-bok/newuser.entro.txt
-share/horde/imp/locale/no-bok/newuser.intro.txt
-share/horde/imp/locale/no-bok/newuser.lang
-share/horde/imp/locale/no-bok/newuser.start.txt
-share/horde/imp/locale/no-bok/openwin.lang
-share/horde/imp/locale/no-bok/passwd.lang
-share/horde/imp/locale/no-bok/prefs.lang
-share/horde/imp/locale/no-bok/select.lang
-share/horde/imp/locale/no-bok/spelling.lang
-share/horde/imp/locale/no-bok/status.lang
-share/horde/imp/locale/no-nyn/compose.help
-share/horde/imp/locale/no-nyn/compose.lang
-share/horde/imp/locale/no-nyn/contacts.help
-share/horde/imp/locale/no-nyn/contacts.lang
-share/horde/imp/locale/no-nyn/folders.help
-share/horde/imp/locale/no-nyn/folders.lang
-share/horde/imp/locale/no-nyn/help.lang
-share/horde/imp/locale/no-nyn/horde.lang
-share/horde/imp/locale/no-nyn/login.help
-share/horde/imp/locale/no-nyn/login.lang
-share/horde/imp/locale/no-nyn/mailbox.lang
-share/horde/imp/locale/no-nyn/menu.lang
-share/horde/imp/locale/no-nyn/message.lang
-share/horde/imp/locale/no-nyn/newuser.entro.txt
-share/horde/imp/locale/no-nyn/newuser.intro.txt
-share/horde/imp/locale/no-nyn/newuser.lang
-share/horde/imp/locale/no-nyn/newuser.start.txt
-share/horde/imp/locale/no-nyn/openwin.lang
-share/horde/imp/locale/no-nyn/passwd.lang
-share/horde/imp/locale/no-nyn/prefs.lang
-share/horde/imp/locale/no-nyn/select.lang
-share/horde/imp/locale/no-nyn/spelling.lang
-share/horde/imp/locale/no-nyn/status.lang
-share/horde/imp/locale/pl/compose.help
-share/horde/imp/locale/pl/compose.lang
-share/horde/imp/locale/pl/contacts.help
-share/horde/imp/locale/pl/contacts.lang
-share/horde/imp/locale/pl/folders.help
-share/horde/imp/locale/pl/folders.lang
-share/horde/imp/locale/pl/help.lang
-share/horde/imp/locale/pl/horde.lang
-share/horde/imp/locale/pl/login.help
-share/horde/imp/locale/pl/login.lang
-share/horde/imp/locale/pl/mailbox.lang
-share/horde/imp/locale/pl/menu.lang
-share/horde/imp/locale/pl/message.lang
-share/horde/imp/locale/pl/newuser.entro.txt
-share/horde/imp/locale/pl/newuser.intro.txt
-share/horde/imp/locale/pl/newuser.lang
-share/horde/imp/locale/pl/newuser.start.txt
-share/horde/imp/locale/pl/openwin.lang
-share/horde/imp/locale/pl/passwd.lang
-share/horde/imp/locale/pl/prefs.lang
-share/horde/imp/locale/pl/select.lang
-share/horde/imp/locale/pl/spelling.lang
-share/horde/imp/locale/pl/status.lang
-share/horde/imp/locale/pt-BR/compose.help
-share/horde/imp/locale/pt-BR/compose.lang
-share/horde/imp/locale/pt-BR/contacts.help
-share/horde/imp/locale/pt-BR/contacts.lang
-share/horde/imp/locale/pt-BR/folders.help
-share/horde/imp/locale/pt-BR/folders.lang
-share/horde/imp/locale/pt-BR/help.lang
-share/horde/imp/locale/pt-BR/horde.lang
-share/horde/imp/locale/pt-BR/login.help
-share/horde/imp/locale/pt-BR/login.lang
-share/horde/imp/locale/pt-BR/mailbox.lang
-share/horde/imp/locale/pt-BR/menu.lang
-share/horde/imp/locale/pt-BR/message.lang
-share/horde/imp/locale/pt-BR/newuser.entro.txt
-share/horde/imp/locale/pt-BR/newuser.intro.txt
-share/horde/imp/locale/pt-BR/newuser.lang
-share/horde/imp/locale/pt-BR/newuser.start.txt
-share/horde/imp/locale/pt-BR/openwin.lang
-share/horde/imp/locale/pt-BR/passwd.lang
-share/horde/imp/locale/pt-BR/prefs.lang
-share/horde/imp/locale/pt-BR/select.lang
-share/horde/imp/locale/pt-BR/spelling.lang
-share/horde/imp/locale/pt-BR/status.lang
-share/horde/imp/locale/pt/compose.help
-share/horde/imp/locale/pt/compose.lang
-share/horde/imp/locale/pt/contacts.help
-share/horde/imp/locale/pt/contacts.lang
-share/horde/imp/locale/pt/folders.help
-share/horde/imp/locale/pt/folders.lang
-share/horde/imp/locale/pt/help.lang
-share/horde/imp/locale/pt/horde.lang
-share/horde/imp/locale/pt/login.help
-share/horde/imp/locale/pt/login.lang
-share/horde/imp/locale/pt/mailbox.lang
-share/horde/imp/locale/pt/menu.lang
-share/horde/imp/locale/pt/message.lang
-share/horde/imp/locale/pt/newuser.entro.txt
-share/horde/imp/locale/pt/newuser.intro.txt
-share/horde/imp/locale/pt/newuser.lang
-share/horde/imp/locale/pt/newuser.start.txt
-share/horde/imp/locale/pt/openwin.lang
-share/horde/imp/locale/pt/passwd.lang
-share/horde/imp/locale/pt/prefs.lang
-share/horde/imp/locale/pt/select.lang
-share/horde/imp/locale/pt/spelling.lang
-share/horde/imp/locale/pt/status.lang
-share/horde/imp/locale/ru/compose.help
-share/horde/imp/locale/ru/compose.lang
-share/horde/imp/locale/ru/contacts.help
-share/horde/imp/locale/ru/contacts.lang
-share/horde/imp/locale/ru/folders.help
-share/horde/imp/locale/ru/folders.lang
-share/horde/imp/locale/ru/help.lang
-share/horde/imp/locale/ru/horde.lang
-share/horde/imp/locale/ru/login.help
-share/horde/imp/locale/ru/login.lang
-share/horde/imp/locale/ru/mailbox.lang
-share/horde/imp/locale/ru/menu.lang
-share/horde/imp/locale/ru/message.lang
-share/horde/imp/locale/ru/newuser.entro.txt
-share/horde/imp/locale/ru/newuser.intro.txt
-share/horde/imp/locale/ru/newuser.lang
-share/horde/imp/locale/ru/newuser.start.txt
-share/horde/imp/locale/ru/openwin.lang
-share/horde/imp/locale/ru/passwd.lang
-share/horde/imp/locale/ru/prefs.lang
-share/horde/imp/locale/ru/select.lang
-share/horde/imp/locale/ru/spelling.lang
-share/horde/imp/locale/ru/status.lang
-share/horde/imp/locale/se/compose.help
-share/horde/imp/locale/se/compose.lang
-share/horde/imp/locale/se/contacts.help
-share/horde/imp/locale/se/contacts.lang
-share/horde/imp/locale/se/folders.help
-share/horde/imp/locale/se/folders.lang
-share/horde/imp/locale/se/help.lang
-share/horde/imp/locale/se/horde.lang
-share/horde/imp/locale/se/login.help
-share/horde/imp/locale/se/login.lang
-share/horde/imp/locale/se/mailbox.lang
-share/horde/imp/locale/se/menu.lang
-share/horde/imp/locale/se/message.lang
-share/horde/imp/locale/se/newuser.entro.txt
-share/horde/imp/locale/se/newuser.intro.txt
-share/horde/imp/locale/se/newuser.lang
-share/horde/imp/locale/se/newuser.start.txt
-share/horde/imp/locale/se/openwin.lang
-share/horde/imp/locale/se/passwd.lang
-share/horde/imp/locale/se/prefs.lang
-share/horde/imp/locale/se/select.lang
-share/horde/imp/locale/se/spelling.lang
-share/horde/imp/locale/se/status.lang
-share/horde/imp/locale/sk/compose.help
-share/horde/imp/locale/sk/compose.lang
-share/horde/imp/locale/sk/contacts.help
-share/horde/imp/locale/sk/contacts.lang
-share/horde/imp/locale/sk/folders.help
-share/horde/imp/locale/sk/folders.lang
-share/horde/imp/locale/sk/help.lang
-share/horde/imp/locale/sk/horde.lang
-share/horde/imp/locale/sk/login.help
-share/horde/imp/locale/sk/login.lang
-share/horde/imp/locale/sk/mailbox.lang
-share/horde/imp/locale/sk/menu.lang
-share/horde/imp/locale/sk/message.lang
-share/horde/imp/locale/sk/newuser.entro.txt
-share/horde/imp/locale/sk/newuser.intro.txt
-share/horde/imp/locale/sk/newuser.lang
-share/horde/imp/locale/sk/newuser.start.txt
-share/horde/imp/locale/sk/openwin.lang
-share/horde/imp/locale/sk/passwd.lang
-share/horde/imp/locale/sk/prefs.lang
-share/horde/imp/locale/sk/select.lang
-share/horde/imp/locale/sk/spelling.lang
-share/horde/imp/locale/sk/status.lang
-share/horde/imp/locale/sl/compose.help
-share/horde/imp/locale/sl/compose.lang
-share/horde/imp/locale/sl/contacts.help
-share/horde/imp/locale/sl/contacts.lang
-share/horde/imp/locale/sl/folders.help
-share/horde/imp/locale/sl/folders.lang
-share/horde/imp/locale/sl/help.lang
-share/horde/imp/locale/sl/horde.lang
-share/horde/imp/locale/sl/login.help
-share/horde/imp/locale/sl/login.lang
-share/horde/imp/locale/sl/mailbox.lang
-share/horde/imp/locale/sl/menu.lang
-share/horde/imp/locale/sl/message.lang
-share/horde/imp/locale/sl/newuser.entro.txt
-share/horde/imp/locale/sl/newuser.intro.txt
-share/horde/imp/locale/sl/newuser.lang
-share/horde/imp/locale/sl/newuser.start.txt
-share/horde/imp/locale/sl/openwin.lang
-share/horde/imp/locale/sl/passwd.lang
-share/horde/imp/locale/sl/prefs.lang
-share/horde/imp/locale/sl/select.lang
-share/horde/imp/locale/sl/spelling.lang
-share/horde/imp/locale/sl/status.lang
-share/horde/imp/locale/zh/compose.help
-share/horde/imp/locale/zh/compose.lang
-share/horde/imp/locale/zh/contacts.help
-share/horde/imp/locale/zh/contacts.lang
-share/horde/imp/locale/zh/folders.help
-share/horde/imp/locale/zh/folders.lang
-share/horde/imp/locale/zh/help.lang
-share/horde/imp/locale/zh/horde.lang
-share/horde/imp/locale/zh/login.help
-share/horde/imp/locale/zh/login.lang
-share/horde/imp/locale/zh/mailbox.lang
-share/horde/imp/locale/zh/menu.lang
-share/horde/imp/locale/zh/message.lang
-share/horde/imp/locale/zh/newuser.entro.txt
-share/horde/imp/locale/zh/newuser.intro.txt
-share/horde/imp/locale/zh/newuser.lang
-share/horde/imp/locale/zh/newuser.start.txt
-share/horde/imp/locale/zh/openwin.lang
-share/horde/imp/locale/zh/passwd.lang
-share/horde/imp/locale/zh/prefs.lang
-share/horde/imp/locale/zh/select.lang
-share/horde/imp/locale/zh/spelling.lang
-share/horde/imp/locale/zh/status.lang
-share/horde/imp/locale/zh-tw/compose.help
-share/horde/imp/locale/zh-tw/compose.lang
-share/horde/imp/locale/zh-tw/contacts.help
-share/horde/imp/locale/zh-tw/contacts.lang
-share/horde/imp/locale/zh-tw/folders.help
-share/horde/imp/locale/zh-tw/folders.lang
-share/horde/imp/locale/zh-tw/help.lang
-share/horde/imp/locale/zh-tw/horde.lang
-share/horde/imp/locale/zh-tw/login.help
-share/horde/imp/locale/zh-tw/login.lang
-share/horde/imp/locale/zh-tw/mailbox.lang
-share/horde/imp/locale/zh-tw/menu.lang
-share/horde/imp/locale/zh-tw/message.lang
-share/horde/imp/locale/zh-tw/newuser.entro.txt
-share/horde/imp/locale/zh-tw/newuser.intro.txt
-share/horde/imp/locale/zh-tw/newuser.lang
-share/horde/imp/locale/zh-tw/newuser.start.txt
-share/horde/imp/locale/zh-tw/openwin.lang
-share/horde/imp/locale/zh-tw/passwd.lang
-share/horde/imp/locale/zh-tw/prefs.lang
-share/horde/imp/locale/zh-tw/select.lang
-share/horde/imp/locale/zh-tw/spelling.lang
-share/horde/imp/locale/zh-tw/status.lang
-share/horde/imp/login.php3
-share/horde/imp/mailbox.php3
-share/horde/imp/menu.php3
-share/horde/imp/message.php3
-share/horde/imp/newuser.php3
-share/horde/imp/poppassd.php3
-share/horde/imp/prefs.php3
-share/horde/imp/remote_login.php3
-share/horde/imp/scripts/imp-cleanup.cron
-share/horde/imp/scripts/pine2imp.pl
-share/horde/imp/scripts/realsecure.sh
-share/horde/imp/select.php3
-share/horde/imp/spelling.php3
-share/horde/imp/status.php3
-share/horde/imp/templates/common-footer.inc
-share/horde/imp/templates/common-header.inc
-share/horde/imp/templates/compose/bounce.inc
-share/horde/imp/templates/compose/compose.inc
-share/horde/imp/templates/compose/javascript.inc
-share/horde/imp/templates/compose/lynx_bounce.inc
-share/horde/imp/templates/compose/lynx_compose.inc
-share/horde/imp/templates/compose/results.inc
-share/horde/imp/templates/contacts/add-contact-php3.inc
-share/horde/imp/templates/contacts/addr-php3.inc
-share/horde/imp/templates/contacts/header.inc
-share/horde/imp/templates/contacts/javascript.inc
-share/horde/imp/templates/contacts/ldap-php3.inc
-share/horde/imp/templates/doctype.inc
-share/horde/imp/templates/folders/create.inc
-share/horde/imp/templates/folders/delete.inc
-share/horde/imp/templates/folders/header.inc
-share/horde/imp/templates/folders/rename.inc
-share/horde/imp/templates/folders/subscribe.inc
-share/horde/imp/templates/generic-footer.inc
-share/horde/imp/templates/generic-header.inc
-share/horde/imp/templates/generic-header_reload.inc
-share/horde/imp/templates/index/frames_mode.inc
-share/horde/imp/templates/index/imp_configurable.inc
-share/horde/imp/templates/index/imp_notconfigured.inc
-share/horde/imp/templates/index/imp_notsecure.inc
-share/horde/imp/templates/login/login.inc
-share/horde/imp/templates/login/login_lynx.inc
-share/horde/imp/templates/mailbox/actions.inc
-share/horde/imp/templates/mailbox/deleted_summary.inc
-share/horde/imp/templates/mailbox/empty_mailbox.inc
-share/horde/imp/templates/mailbox/footer.inc
-share/horde/imp/templates/mailbox/header.inc
-share/horde/imp/templates/mailbox/javascript.inc
-share/horde/imp/templates/mailbox/lynx_actions.inc
-share/horde/imp/templates/mailbox/lynx_header.inc
-share/horde/imp/templates/mailbox/lynx_message_headers.inc
-share/horde/imp/templates/mailbox/lynx_navbar_top.inc
-share/horde/imp/templates/mailbox/message_footers.inc
-share/horde/imp/templates/mailbox/message_headers.inc
-share/horde/imp/templates/mailbox/message_summaries.inc
-share/horde/imp/templates/mailbox/navbar_bottom.inc
-share/horde/imp/templates/mailbox/navbar_top.inc
-share/horde/imp/templates/mailbox/refresh_menu.inc
-share/horde/imp/templates/mailbox/refresh_toolbar-javascript.inc
-share/horde/imp/templates/menu/lynx_main.inc
-share/horde/imp/templates/menu/menu.inc
-share/horde/imp/templates/message/headers.inc
-share/horde/imp/templates/message/javascript.inc
-share/horde/imp/templates/message/message.inc
-share/horde/imp/templates/message/navbar.inc
-share/horde/imp/templates/message/navbar_aux_bottom.inc
-share/horde/imp/templates/message/navbar_aux_top.inc
-share/horde/imp/templates/newuser/intro.inc
-share/horde/imp/templates/passwd/poppassd_error.inc
-share/horde/imp/templates/passwd/poppassd_input.inc
-share/horde/imp/templates/prefs/begin.inc
-share/horde/imp/templates/prefs/end.inc
-share/horde/imp/templates/prefs/from.inc
-share/horde/imp/templates/prefs/fullname.inc
-share/horde/imp/templates/prefs/lang.inc
-share/horde/imp/templates/prefs/signature.inc
-share/horde/imp/templates/select/body.inc
-share/horde/imp/templates/select/header.inc
-share/horde/imp/templates/spelling/footer.inc
-share/horde/imp/templates/status/body.inc
-share/horde/imp/view.php3
-@dirrm share/horde/imp/templates/status
-@dirrm share/horde/imp/templates/spelling
-@dirrm share/horde/imp/templates/select
-@dirrm share/horde/imp/templates/prefs
-@dirrm share/horde/imp/templates/passwd
-@dirrm share/horde/imp/templates/newuser
-@dirrm share/horde/imp/templates/message
-@dirrm share/horde/imp/templates/menu
-@dirrm share/horde/imp/templates/mailbox
-@dirrm share/horde/imp/templates/login
+share/horde/imp/graphics/signed.gif
+share/horde/imp/graphics/spellcheck.gif
+share/horde/imp/graphics/unseen.gif
+share/horde/imp/graphics/important.gif
+share/horde/imp/graphics/addressbook-red.gif
+share/horde/imp/config/conf.php.dist
+share/horde/imp/config/filter.txt.dist
+share/horde/imp/config/header.txt.dist
+share/horde/imp/config/html.php.dist
+share/horde/imp/config/menu.php.dist
+share/horde/imp/config/mime_drivers.php.dist
+share/horde/imp/config/motd.php.dist
+share/horde/imp/config/prefs.php.dist
+share/horde/imp/config/servers.php.dist
+share/horde/imp/config/trailer.txt.dist
+share/horde/imp/compose.php
+share/horde/imp/filters.php
+share/horde/imp/folders.php
+share/horde/imp/identities.php
+share/horde/imp/index.php
+share/horde/imp/intro.php
+share/horde/imp/login.php
+share/horde/imp/mailbox.php
+share/horde/imp/menu.php
+share/horde/imp/message.php
+share/horde/imp/prefs.php
+share/horde/imp/redirect.php
+share/horde/imp/search.php
+share/horde/imp/spelling.php
+share/horde/imp/status.php
+share/horde/imp/view.php
+
+@dirrm share/doc/imp
+@dirrm share/examples/imp
 @dirrm share/horde/imp/templates/index
+@dirrm share/horde/imp/templates/search
+@dirrm share/horde/imp/templates/prefs
+@dirrm share/horde/imp/templates/filters
 @dirrm share/horde/imp/templates/folders
-@dirrm share/horde/imp/templates/contacts
+@dirrm share/horde/imp/templates/identities
+@dirrm share/horde/imp/templates/message
 @dirrm share/horde/imp/templates/compose
+@dirrm share/horde/imp/templates/javascript
+@dirrm share/horde/imp/templates/login
+@dirrm share/horde/imp/templates/mailbox
 @dirrm share/horde/imp/templates
 @dirrm share/horde/imp/scripts
-@dirrm share/horde/imp/locale/zh-tw
-@dirrm share/horde/imp/locale/zh
-@dirrm share/horde/imp/locale/sl
-@dirrm share/horde/imp/locale/sk
-@dirrm share/horde/imp/locale/se
-@dirrm share/horde/imp/locale/ru
-@dirrm share/horde/imp/locale/pt-BR
-@dirrm share/horde/imp/locale/pt
-@dirrm share/horde/imp/locale/pl
-@dirrm share/horde/imp/locale/no-nyn
-@dirrm share/horde/imp/locale/no-bok
-@dirrm share/horde/imp/locale/nl
-@dirrm share/horde/imp/locale/lt
-@dirrm share/horde/imp/locale/local
-@dirrm share/horde/imp/locale/kr
-@dirrm share/horde/imp/locale/it
-@dirrm share/horde/imp/locale/is
-@dirrm share/horde/imp/locale/id
-@dirrm share/horde/imp/locale/hu
-@dirrm share/horde/imp/locale/fr
-@dirrm share/horde/imp/locale/fi
-@dirrm share/horde/imp/locale/et
-@dirrm share/horde/imp/locale/es
-@dirrm share/horde/imp/locale/en
-@dirrm share/horde/imp/locale/el
-@dirrm share/horde/imp/locale/defines
-@dirrm share/horde/imp/locale/de
-@dirrm share/horde/imp/locale/da
-@dirrm share/horde/imp/locale/cs
-@dirrm share/horde/imp/locale/ca
+@dirrm share/horde/imp/po
+@dirrm share/horde/imp/locale/nl_NL/LC_MESSAGES
+@dirrm share/horde/imp/locale/nl_NL
+@dirrm share/horde/imp/locale/de_DE/LC_MESSAGES
+@dirrm share/horde/imp/locale/de_DE
+@dirrm share/horde/imp/locale/el_GR/LC_MESSAGES
+@dirrm share/horde/imp/locale/el_GR
+@dirrm share/horde/imp/locale/en_US
+@dirrm share/horde/imp/locale/es_ES/LC_MESSAGES
+@dirrm share/horde/imp/locale/es_ES
+@dirrm share/horde/imp/locale/fi_FI/LC_MESSAGES
+@dirrm share/horde/imp/locale/fi_FI
+@dirrm share/horde/imp/locale/fr_FR/LC_MESSAGES
+@dirrm share/horde/imp/locale/fr_FR
+@dirrm share/horde/imp/locale/it_IT/LC_MESSAGES
+@dirrm share/horde/imp/locale/it_IT
+@dirrm share/horde/imp/locale/ko_KR/LC_MESSAGES
+@dirrm share/horde/imp/locale/ko_KR
+@dirrm share/horde/imp/locale/cs_CZ/LC_MESSAGES
+@dirrm share/horde/imp/locale/cs_CZ
+@dirrm share/horde/imp/locale/no_BOK/LC_MESSAGES
+@dirrm share/horde/imp/locale/no_BOK
+@dirrm share/horde/imp/locale/pl_PL/LC_MESSAGES
+@dirrm share/horde/imp/locale/pl_PL
+@dirrm share/horde/imp/locale/pt_BR/LC_MESSAGES
+@dirrm share/horde/imp/locale/pt_BR
+@dirrm share/horde/imp/locale/ru_win/LC_MESSAGES
+@dirrm share/horde/imp/locale/ru_win
+@dirrm share/horde/imp/locale/sv_SE/LC_MESSAGES
+@dirrm share/horde/imp/locale/sv_SE
+@dirrm share/horde/imp/locale/uk/LC_MESSAGES
+@dirrm share/horde/imp/locale/uk
+@dirrm share/horde/imp/locale/zh_CN/LC_MESSAGES
+@dirrm share/horde/imp/locale/zh_CN
+@dirrm share/horde/imp/locale/zh_TW/LC_MESSAGES
+@dirrm share/horde/imp/locale/zh_TW
 @dirrm share/horde/imp/locale
-@dirrm share/horde/imp/lib/js
+@dirrm share/horde/imp/lib/MIME/Viewer
+@dirrm share/horde/imp/lib/MIME
+@dirrm share/horde/imp/lib/Identity
+@dirrm share/horde/imp/lib/Maintenance
 @dirrm share/horde/imp/lib
+@dirrm share/horde/imp/graphics/folders
+@dirrm share/horde/imp/graphics/mime
 @dirrm share/horde/imp/graphics
-@dirrm share/examples/imp
-@dirrm share/doc/imp
+@dirrm share/horde/imp/config
+@dirrm share/horde/imp
diff --git a/mail/imp/distinfo b/mail/imp/distinfo
index d9ff6b236e2..59258835df4 100644
--- a/mail/imp/distinfo
+++ b/mail/imp/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.5 2001/11/11 19:29:10 bouyer Exp $
+$NetBSD: distinfo,v 1.6 2002/02/01 22:44:28 bouyer Exp $
 
-SHA1 (imp-2.2.7.tar.gz) = 76c2de6b7e1c26abeb870850fdc39231fe804b5f
-Size (imp-2.2.7.tar.gz) = 372578 bytes
-SHA1 (patch-aa) = 2149a5a9954d975b9b8c1df5c64c09cd0bf330d3
+SHA1 (imp-3.0.tar.gz) = b0b7619c4753fb7e09ffb4c4b04e9eb4e7c81e0c
+Size (imp-3.0.tar.gz) = 708355 bytes
diff --git a/mail/imp/files/imp.conf.dist b/mail/imp/files/imp.conf.dist
index a278c9365e5..02631f95122 100644
--- a/mail/imp/files/imp.conf.dist
+++ b/mail/imp/files/imp.conf.dist
@@ -1,4 +1,4 @@
-# $NetBSD: imp.conf.dist,v 1.1.1.1 2001/02/12 15:27:41 jlam Exp $
+# $NetBSD: imp.conf.dist,v 1.2 2002/02/01 22:44:28 bouyer Exp $
 #
 # IMP configuration file fragment for Apache
 
@@ -17,6 +17,10 @@
     Order deny,allow
     Deny from all
 </Directory>
+<Directory "@IMPDIR@/po">
+    Order deny,allow
+    Deny from all
+</Directory>
 <Directory "@IMPDIR@/scripts">
     Order deny,allow
     Deny from all
diff --git a/mail/imp/patches/patch-aa b/mail/imp/patches/patch-aa
deleted file mode 100644
index 877485d8e04..00000000000
--- a/mail/imp/patches/patch-aa
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/02/12 15:27:43 jlam Exp $
-
---- config/defaults.php3.dist.orig	Tue Aug 22 21:57:38 2000
-+++ config/defaults.php3.dist
-@@ -8,7 +8,7 @@
- // _not_ put a trailing slash on this value. If IMP is the top-level
- // thing in the web tree, the correct value is '' (empty string), not
- // '/'.
--$default->root_url = '';
-+$default->root_url = '/horde/imp';
- 
- // Where do the graphics live _in the web tree_?. So, if IMP is at
- // /horde/imp, and the graphics are at /horde/imp/graphics, then this
-@@ -322,11 +322,11 @@
- // Should we allow users to use the addressbook? For this to have any
- // effect, you must be using a non-dummy database driver to store the
- // addresses in.
--$default->user_use_addressbook = false;
-+$default->user_use_addressbook = true;
- 
- // Allow LDAP searching? If you enable this, you will need to
- // configure at least one LDAP server in config/ldap.php3.
--$default->use_ldap_search = true;
-+$default->use_ldap_search = false;
- 
- // Hide deleted messages from the mailbox listing?
- $default->hide_deleted = false;
-@@ -359,9 +359,12 @@
-  ** Database Configuration
-  **/
- 
-+// Use a database?  This needs to be true to have user preferences.
-+$default->use_db = true;
-+
- // What database_driver should we use? Valid options are: dummy,
- // pgsql, mysql, informix oracle, or sybase.
--$default->database_driver = 'dummy';
-+$default->database_driver = 'mysql';
- 
- // What username should we use to connect to the database server?
- $default->db_user_name = 'hordemgr';