6 files changed, 244 insertions, 160 deletions

diff --git a/deskutils/horde-mnemo/Makefile b/deskutils/horde-mnemo/Makefile
index f8f00ccd7667..ce00022adddd 100644
--- a/deskutils/horde-mnemo/Makefile
+++ b/deskutils/horde-mnemo/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	mnemo
-PORTVERSION=	2.1.2
+PORTVERSION=	2.2
+DISTVERSIONSUFFIX=	-rc2
 CATEGORIES=	deskutils www
 
 MAINTAINER=	beech@FreeBSD.org
diff --git a/deskutils/horde-mnemo/distinfo b/deskutils/horde-mnemo/distinfo
index 7c16c6be8542..32af29210718 100644
--- a/deskutils/horde-mnemo/distinfo
+++ b/deskutils/horde-mnemo/distinfo
@@ -1,3 +1,3 @@
-MD5 (mnemo-h3-2.1.2.tar.gz) = ba819d555634bfd88c52703e530b0da9
-SHA256 (mnemo-h3-2.1.2.tar.gz) = 3bcdaa84acf9ba38f795dd85d15a7d13541ca223a69660791889d8961688494b
-SIZE (mnemo-h3-2.1.2.tar.gz) = 1270345
+MD5 (mnemo-h3-2.2-rc2.tar.gz) = 083febbf8794aa1f82689fd10c2561b4
+SHA256 (mnemo-h3-2.2-rc2.tar.gz) = 3e1a63ae3a2dbf88284e9daf0f79ccfba82a8760c7472c1f2f01e42a5cf7468d
+SIZE (mnemo-h3-2.2-rc2.tar.gz) = 1383037
diff --git a/deskutils/horde-mnemo/pkg-plist b/deskutils/horde-mnemo/pkg-plist
index 7a181a19c6ab..164c3840a5fc 100644
--- a/deskutils/horde-mnemo/pkg-plist
+++ b/deskutils/horde-mnemo/pkg-plist
@@ -3,13 +3,20 @@
 %%HORDIR%%/config/prefs.php.dist
 %%HORDIR%%/data.php
 %%HORDIR%%/index.php
-%%HORDIR%%/js/fixUnstyledOptions.js
+%%HORDIR%%/js/QuickFinder.js
 %%HORDIR%%/js/prototype.js
+%%HORDIR%%/js/src/QuickFinder.js
+%%HORDIR%%/js/src/prototype.js
+%%HORDIR%%/js/src/tables.js
 %%HORDIR%%/js/tables.js
 %%HORDIR%%/lib/Block/summary.php
+%%HORDIR%%/lib/Block/tree_menu.php
+%%HORDIR%%/lib/Driver.php
 %%HORDIR%%/lib/Driver/kolab.php
 %%HORDIR%%/lib/Driver/sql.php
-%%HORDIR%%/lib/Driver.php
+%%HORDIR%%/lib/Forms/CreateNotepad.php
+%%HORDIR%%/lib/Forms/DeleteNotepad.php
+%%HORDIR%%/lib/Forms/EditNotepad.php
 %%HORDIR%%/lib/Mnemo.php
 %%HORDIR%%/lib/api.php
 %%HORDIR%%/lib/base.php
@@ -53,7 +60,12 @@
 %%HORDIR%%/locale/zh_CN/LC_MESSAGES/mnemo.mo
 %%HORDIR%%/locale/zh_TW/LC_MESSAGES/mnemo.mo
 %%HORDIR%%/memo.php
-%%HORDIR%%/notepads.php
+%%HORDIR%%/note/index.php
+%%HORDIR%%/note/pdf.php
+%%HORDIR%%/notepads/create.php
+%%HORDIR%%/notepads/delete.php
+%%HORDIR%%/notepads/edit.php
+%%HORDIR%%/notepads/index.php
 %%HORDIR%%/po/README
 %%HORDIR%%/po/bg_BG.po
 %%HORDIR%%/po/cs_CZ.po
@@ -91,7 +103,6 @@
 %%HORDIR%%/scripts/sql/mnemo.xml
 %%HORDIR%%/scripts/upgrades/1.1_to_2.0.mysql.sql
 %%HORDIR%%/scripts/upgrades/1.1_to_2.0.pgsq.sql
-%%HORDIR%%/scripts/upgrades/2004-12-21_add_memo_uid.sql
 %%HORDIR%%/search.php
 %%HORDIR%%/templates/common-header.inc
 %%HORDIR%%/templates/data/export.inc
@@ -103,91 +114,121 @@
 %%HORDIR%%/templates/list/memo_summaries.inc
 %%HORDIR%%/templates/memo/memo.inc
 %%HORDIR%%/templates/menu.inc
-%%HORDIR%%/templates/notepads/notepads.inc
+%%HORDIR%%/templates/notepad_list.php
+%%HORDIR%%/templates/panel.inc
 %%HORDIR%%/templates/prefs/notepadselect.inc
 %%HORDIR%%/templates/search/search.inc
 %%HORDIR%%/templates/view/memo.inc
+%%HORDIR%%/themes/bluewhite/screen.css
+%%HORDIR%%/themes/fadetogreen/screen.css
 %%HORDIR%%/themes/graphics/add.png
 %%HORDIR%%/themes/graphics/az.png
 %%HORDIR%%/themes/graphics/favicon.ico
+%%HORDIR%%/themes/graphics/minus.png
 %%HORDIR%%/themes/graphics/mnemo.png
 %%HORDIR%%/themes/graphics/notepads.png
+%%HORDIR%%/themes/graphics/plus.png
+%%HORDIR%%/themes/graphics/search.png
 %%HORDIR%%/themes/graphics/za.png
 %%HORDIR%%/themes/screen.css
+%%HORDIR%%/themes/silver/graphics/add.png
+%%HORDIR%%/themes/silver/graphics/az.png
+%%HORDIR%%/themes/silver/graphics/favicon.ico
+%%HORDIR%%/themes/silver/graphics/mnemo.png
+%%HORDIR%%/themes/silver/graphics/notepads.png
+%%HORDIR%%/themes/silver/graphics/za.png
+%%HORDIR%%/themes/silver/screen.css
+%%HORDIR%%/themes/silver/themed_graphics
+%%HORDIR%%/themes/tango-blue/graphics/add.png
+%%HORDIR%%/themes/tango-blue/graphics/az.png
+%%HORDIR%%/themes/tango-blue/graphics/favicon.ico
+%%HORDIR%%/themes/tango-blue/graphics/mnemo.png
+%%HORDIR%%/themes/tango-blue/graphics/notepads.png
+%%HORDIR%%/themes/tango-blue/graphics/za.png
+%%HORDIR%%/themes/tango-blue/themed_graphics
 %%HORDIR%%/view.php
-@dirrmtry %%HORDIR%%/config
-@dirrm %%HORDIR%%/js
-@dirrm %%HORDIR%%/lib/Block
-@dirrm %%HORDIR%%/lib/Driver
-@dirrm %%HORDIR%%/lib
-@dirrm %%HORDIR%%/locale/bg_BG/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/bg_BG
-@dirrm %%HORDIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/cs_CZ
-@dirrm %%HORDIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/da_DK
-@dirrm %%HORDIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/de_DE
-@dirrm %%HORDIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/el_GR
-@dirrm %%HORDIR%%/locale/en_US
-@dirrm %%HORDIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/es_ES
-@dirrm %%HORDIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fi_FI
-@dirrm %%HORDIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fr_FR
-@dirrm %%HORDIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/hu_HU
-@dirrm %%HORDIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/it_IT
-@dirrm %%HORDIR%%/locale/ja_JP/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ja_JP
-@dirrm %%HORDIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/lt_LT
-@dirrm %%HORDIR%%/locale/lv_LV/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/lv_LV
-@dirrm %%HORDIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nb_NO
-@dirrm %%HORDIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nl_NL
-@dirrm %%HORDIR%%/locale/nn_NO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nn_NO
-@dirrm %%HORDIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pl_PL
-@dirrm %%HORDIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pt_BR
-@dirrm %%HORDIR%%/locale/pt_PT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pt_PT
-@dirrm %%HORDIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ro_RO
-@dirrm %%HORDIR%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ru_RU
-@dirrm %%HORDIR%%/locale/sk_SK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sk_SK
-@dirrm %%HORDIR%%/locale/sl_SI/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sl_SI
-@dirrm %%HORDIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sv_SE
-@dirrm %%HORDIR%%/locale/tr_TR
-@dirrm %%HORDIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/zh_CN
+@dirrm %%HORDIR%%/themes/tango-blue/graphics
+@dirrm %%HORDIR%%/themes/tango-blue
+@dirrm %%HORDIR%%/themes/silver/graphics
+@dirrm %%HORDIR%%/themes/silver
+@dirrm %%HORDIR%%/themes/graphics
+@dirrm %%HORDIR%%/themes/fadetogreen
+@dirrm %%HORDIR%%/themes/bluewhite
+@dirrm %%HORDIR%%/themes
+@dirrm %%HORDIR%%/templates/view
+@dirrm %%HORDIR%%/templates/search
+@dirrm %%HORDIR%%/templates/prefs
+@dirrm %%HORDIR%%/templates/memo
+@dirrm %%HORDIR%%/templates/list
+@dirrm %%HORDIR%%/templates/data
+@dirrm %%HORDIR%%/templates
+@dirrm %%HORDIR%%/scripts/upgrades
+@dirrm %%HORDIR%%/scripts/sql
+@dirrm %%HORDIR%%/scripts
+@dirrm %%HORDIR%%/po
+@dirrm %%HORDIR%%/notepads
+@dirrm %%HORDIR%%/note
 @dirrm %%HORDIR%%/locale/zh_TW/LC_MESSAGES
 @dirrm %%HORDIR%%/locale/zh_TW
+@dirrm %%HORDIR%%/locale/zh_CN/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/zh_CN
+@dirrm %%HORDIR%%/locale/tr_TR
+@dirrm %%HORDIR%%/locale/sv_SE/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sv_SE
+@dirrm %%HORDIR%%/locale/sl_SI/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sl_SI
+@dirrm %%HORDIR%%/locale/sk_SK/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sk_SK
+@dirrm %%HORDIR%%/locale/ru_RU/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ru_RU
+@dirrm %%HORDIR%%/locale/ro_RO/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ro_RO
+@dirrm %%HORDIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pt_PT
+@dirrm %%HORDIR%%/locale/pt_BR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pt_BR
+@dirrm %%HORDIR%%/locale/pl_PL/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pl_PL
+@dirrm %%HORDIR%%/locale/nn_NO/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nn_NO
+@dirrm %%HORDIR%%/locale/nl_NL/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nl_NL
+@dirrm %%HORDIR%%/locale/nb_NO/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nb_NO
+@dirrm %%HORDIR%%/locale/lv_LV/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/lv_LV
+@dirrm %%HORDIR%%/locale/lt_LT/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/lt_LT
+@dirrm %%HORDIR%%/locale/ja_JP/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ja_JP
+@dirrm %%HORDIR%%/locale/it_IT/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/it_IT
+@dirrm %%HORDIR%%/locale/hu_HU/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/hu_HU
+@dirrm %%HORDIR%%/locale/fr_FR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fr_FR
+@dirrm %%HORDIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fi_FI
+@dirrm %%HORDIR%%/locale/es_ES/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/es_ES
+@dirrm %%HORDIR%%/locale/en_US
+@dirrm %%HORDIR%%/locale/el_GR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/el_GR
+@dirrm %%HORDIR%%/locale/de_DE/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/de_DE
+@dirrm %%HORDIR%%/locale/da_DK/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/da_DK
+@dirrm %%HORDIR%%/locale/cs_CZ/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/cs_CZ
+@dirrm %%HORDIR%%/locale/bg_BG/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/bg_BG
 @dirrm %%HORDIR%%/locale
-@dirrm %%HORDIR%%/po
-@dirrm %%HORDIR%%/scripts/sql
-@dirrm %%HORDIR%%/scripts/upgrades
-@dirrm %%HORDIR%%/scripts
-@dirrm %%HORDIR%%/templates/data
-@dirrm %%HORDIR%%/templates/list
-@dirrm %%HORDIR%%/templates/memo
-@dirrm %%HORDIR%%/templates/notepads
-@dirrm %%HORDIR%%/templates/prefs
-@dirrm %%HORDIR%%/templates/search
-@dirrm %%HORDIR%%/templates/view
-@dirrm %%HORDIR%%/templates
-@dirrm %%HORDIR%%/themes/graphics
-@dirrm %%HORDIR%%/themes
+@dirrm %%HORDIR%%/lib/Forms
+@dirrm %%HORDIR%%/lib/Driver
+@dirrm %%HORDIR%%/lib/Block
+@dirrm %%HORDIR%%/lib
+@dirrm %%HORDIR%%/js/src
+@dirrm %%HORDIR%%/js
+@dirrmtry %%HORDIR%%/config
 @dirrmtry %%HORDIR%%
 @dirrmtry %%HORBAS%%
diff --git a/deskutils/horde4-mnemo/Makefile b/deskutils/horde4-mnemo/Makefile
index f8f00ccd7667..ce00022adddd 100644
--- a/deskutils/horde4-mnemo/Makefile
+++ b/deskutils/horde4-mnemo/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	mnemo
-PORTVERSION=	2.1.2
+PORTVERSION=	2.2
+DISTVERSIONSUFFIX=	-rc2
 CATEGORIES=	deskutils www
 
 MAINTAINER=	beech@FreeBSD.org
diff --git a/deskutils/horde4-mnemo/distinfo b/deskutils/horde4-mnemo/distinfo
index 7c16c6be8542..32af29210718 100644
--- a/deskutils/horde4-mnemo/distinfo
+++ b/deskutils/horde4-mnemo/distinfo
@@ -1,3 +1,3 @@
-MD5 (mnemo-h3-2.1.2.tar.gz) = ba819d555634bfd88c52703e530b0da9
-SHA256 (mnemo-h3-2.1.2.tar.gz) = 3bcdaa84acf9ba38f795dd85d15a7d13541ca223a69660791889d8961688494b
-SIZE (mnemo-h3-2.1.2.tar.gz) = 1270345
+MD5 (mnemo-h3-2.2-rc2.tar.gz) = 083febbf8794aa1f82689fd10c2561b4
+SHA256 (mnemo-h3-2.2-rc2.tar.gz) = 3e1a63ae3a2dbf88284e9daf0f79ccfba82a8760c7472c1f2f01e42a5cf7468d
+SIZE (mnemo-h3-2.2-rc2.tar.gz) = 1383037
diff --git a/deskutils/horde4-mnemo/pkg-plist b/deskutils/horde4-mnemo/pkg-plist
index 7a181a19c6ab..164c3840a5fc 100644
--- a/deskutils/horde4-mnemo/pkg-plist
+++ b/deskutils/horde4-mnemo/pkg-plist
@@ -3,13 +3,20 @@
 %%HORDIR%%/config/prefs.php.dist
 %%HORDIR%%/data.php
 %%HORDIR%%/index.php
-%%HORDIR%%/js/fixUnstyledOptions.js
+%%HORDIR%%/js/QuickFinder.js
 %%HORDIR%%/js/prototype.js
+%%HORDIR%%/js/src/QuickFinder.js
+%%HORDIR%%/js/src/prototype.js
+%%HORDIR%%/js/src/tables.js
 %%HORDIR%%/js/tables.js
 %%HORDIR%%/lib/Block/summary.php
+%%HORDIR%%/lib/Block/tree_menu.php
+%%HORDIR%%/lib/Driver.php
 %%HORDIR%%/lib/Driver/kolab.php
 %%HORDIR%%/lib/Driver/sql.php
-%%HORDIR%%/lib/Driver.php
+%%HORDIR%%/lib/Forms/CreateNotepad.php
+%%HORDIR%%/lib/Forms/DeleteNotepad.php
+%%HORDIR%%/lib/Forms/EditNotepad.php
 %%HORDIR%%/lib/Mnemo.php
 %%HORDIR%%/lib/api.php
 %%HORDIR%%/lib/base.php
@@ -53,7 +60,12 @@
 %%HORDIR%%/locale/zh_CN/LC_MESSAGES/mnemo.mo
 %%HORDIR%%/locale/zh_TW/LC_MESSAGES/mnemo.mo
 %%HORDIR%%/memo.php
-%%HORDIR%%/notepads.php
+%%HORDIR%%/note/index.php
+%%HORDIR%%/note/pdf.php
+%%HORDIR%%/notepads/create.php
+%%HORDIR%%/notepads/delete.php
+%%HORDIR%%/notepads/edit.php
+%%HORDIR%%/notepads/index.php
 %%HORDIR%%/po/README
 %%HORDIR%%/po/bg_BG.po
 %%HORDIR%%/po/cs_CZ.po
@@ -91,7 +103,6 @@
 %%HORDIR%%/scripts/sql/mnemo.xml
 %%HORDIR%%/scripts/upgrades/1.1_to_2.0.mysql.sql
 %%HORDIR%%/scripts/upgrades/1.1_to_2.0.pgsq.sql
-%%HORDIR%%/scripts/upgrades/2004-12-21_add_memo_uid.sql
 %%HORDIR%%/search.php
 %%HORDIR%%/templates/common-header.inc
 %%HORDIR%%/templates/data/export.inc
@@ -103,91 +114,121 @@
 %%HORDIR%%/templates/list/memo_summaries.inc
 %%HORDIR%%/templates/memo/memo.inc
 %%HORDIR%%/templates/menu.inc
-%%HORDIR%%/templates/notepads/notepads.inc
+%%HORDIR%%/templates/notepad_list.php
+%%HORDIR%%/templates/panel.inc
 %%HORDIR%%/templates/prefs/notepadselect.inc
 %%HORDIR%%/templates/search/search.inc
 %%HORDIR%%/templates/view/memo.inc
+%%HORDIR%%/themes/bluewhite/screen.css
+%%HORDIR%%/themes/fadetogreen/screen.css
 %%HORDIR%%/themes/graphics/add.png
 %%HORDIR%%/themes/graphics/az.png
 %%HORDIR%%/themes/graphics/favicon.ico
+%%HORDIR%%/themes/graphics/minus.png
 %%HORDIR%%/themes/graphics/mnemo.png
 %%HORDIR%%/themes/graphics/notepads.png
+%%HORDIR%%/themes/graphics/plus.png
+%%HORDIR%%/themes/graphics/search.png
 %%HORDIR%%/themes/graphics/za.png
 %%HORDIR%%/themes/screen.css
+%%HORDIR%%/themes/silver/graphics/add.png
+%%HORDIR%%/themes/silver/graphics/az.png
+%%HORDIR%%/themes/silver/graphics/favicon.ico
+%%HORDIR%%/themes/silver/graphics/mnemo.png
+%%HORDIR%%/themes/silver/graphics/notepads.png
+%%HORDIR%%/themes/silver/graphics/za.png
+%%HORDIR%%/themes/silver/screen.css
+%%HORDIR%%/themes/silver/themed_graphics
+%%HORDIR%%/themes/tango-blue/graphics/add.png
+%%HORDIR%%/themes/tango-blue/graphics/az.png
+%%HORDIR%%/themes/tango-blue/graphics/favicon.ico
+%%HORDIR%%/themes/tango-blue/graphics/mnemo.png
+%%HORDIR%%/themes/tango-blue/graphics/notepads.png
+%%HORDIR%%/themes/tango-blue/graphics/za.png
+%%HORDIR%%/themes/tango-blue/themed_graphics
 %%HORDIR%%/view.php
-@dirrmtry %%HORDIR%%/config
-@dirrm %%HORDIR%%/js
-@dirrm %%HORDIR%%/lib/Block
-@dirrm %%HORDIR%%/lib/Driver
-@dirrm %%HORDIR%%/lib
-@dirrm %%HORDIR%%/locale/bg_BG/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/bg_BG
-@dirrm %%HORDIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/cs_CZ
-@dirrm %%HORDIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/da_DK
-@dirrm %%HORDIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/de_DE
-@dirrm %%HORDIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/el_GR
-@dirrm %%HORDIR%%/locale/en_US
-@dirrm %%HORDIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/es_ES
-@dirrm %%HORDIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fi_FI
-@dirrm %%HORDIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fr_FR
-@dirrm %%HORDIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/hu_HU
-@dirrm %%HORDIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/it_IT
-@dirrm %%HORDIR%%/locale/ja_JP/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ja_JP
-@dirrm %%HORDIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/lt_LT
-@dirrm %%HORDIR%%/locale/lv_LV/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/lv_LV
-@dirrm %%HORDIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nb_NO
-@dirrm %%HORDIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nl_NL
-@dirrm %%HORDIR%%/locale/nn_NO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nn_NO
-@dirrm %%HORDIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pl_PL
-@dirrm %%HORDIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pt_BR
-@dirrm %%HORDIR%%/locale/pt_PT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pt_PT
-@dirrm %%HORDIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ro_RO
-@dirrm %%HORDIR%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ru_RU
-@dirrm %%HORDIR%%/locale/sk_SK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sk_SK
-@dirrm %%HORDIR%%/locale/sl_SI/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sl_SI
-@dirrm %%HORDIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sv_SE
-@dirrm %%HORDIR%%/locale/tr_TR
-@dirrm %%HORDIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/zh_CN
+@dirrm %%HORDIR%%/themes/tango-blue/graphics
+@dirrm %%HORDIR%%/themes/tango-blue
+@dirrm %%HORDIR%%/themes/silver/graphics
+@dirrm %%HORDIR%%/themes/silver
+@dirrm %%HORDIR%%/themes/graphics
+@dirrm %%HORDIR%%/themes/fadetogreen
+@dirrm %%HORDIR%%/themes/bluewhite
+@dirrm %%HORDIR%%/themes
+@dirrm %%HORDIR%%/templates/view
+@dirrm %%HORDIR%%/templates/search
+@dirrm %%HORDIR%%/templates/prefs
+@dirrm %%HORDIR%%/templates/memo
+@dirrm %%HORDIR%%/templates/list
+@dirrm %%HORDIR%%/templates/data
+@dirrm %%HORDIR%%/templates
+@dirrm %%HORDIR%%/scripts/upgrades
+@dirrm %%HORDIR%%/scripts/sql
+@dirrm %%HORDIR%%/scripts
+@dirrm %%HORDIR%%/po
+@dirrm %%HORDIR%%/notepads
+@dirrm %%HORDIR%%/note
 @dirrm %%HORDIR%%/locale/zh_TW/LC_MESSAGES
 @dirrm %%HORDIR%%/locale/zh_TW
+@dirrm %%HORDIR%%/locale/zh_CN/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/zh_CN
+@dirrm %%HORDIR%%/locale/tr_TR
+@dirrm %%HORDIR%%/locale/sv_SE/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sv_SE
+@dirrm %%HORDIR%%/locale/sl_SI/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sl_SI
+@dirrm %%HORDIR%%/locale/sk_SK/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sk_SK
+@dirrm %%HORDIR%%/locale/ru_RU/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ru_RU
+@dirrm %%HORDIR%%/locale/ro_RO/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ro_RO
+@dirrm %%HORDIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pt_PT
+@dirrm %%HORDIR%%/locale/pt_BR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pt_BR
+@dirrm %%HORDIR%%/locale/pl_PL/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pl_PL
+@dirrm %%HORDIR%%/locale/nn_NO/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nn_NO
+@dirrm %%HORDIR%%/locale/nl_NL/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nl_NL
+@dirrm %%HORDIR%%/locale/nb_NO/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nb_NO
+@dirrm %%HORDIR%%/locale/lv_LV/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/lv_LV
+@dirrm %%HORDIR%%/locale/lt_LT/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/lt_LT
+@dirrm %%HORDIR%%/locale/ja_JP/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ja_JP
+@dirrm %%HORDIR%%/locale/it_IT/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/it_IT
+@dirrm %%HORDIR%%/locale/hu_HU/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/hu_HU
+@dirrm %%HORDIR%%/locale/fr_FR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fr_FR
+@dirrm %%HORDIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fi_FI
+@dirrm %%HORDIR%%/locale/es_ES/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/es_ES
+@dirrm %%HORDIR%%/locale/en_US
+@dirrm %%HORDIR%%/locale/el_GR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/el_GR
+@dirrm %%HORDIR%%/locale/de_DE/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/de_DE
+@dirrm %%HORDIR%%/locale/da_DK/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/da_DK
+@dirrm %%HORDIR%%/locale/cs_CZ/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/cs_CZ
+@dirrm %%HORDIR%%/locale/bg_BG/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/bg_BG
 @dirrm %%HORDIR%%/locale
-@dirrm %%HORDIR%%/po
-@dirrm %%HORDIR%%/scripts/sql
-@dirrm %%HORDIR%%/scripts/upgrades
-@dirrm %%HORDIR%%/scripts
-@dirrm %%HORDIR%%/templates/data
-@dirrm %%HORDIR%%/templates/list
-@dirrm %%HORDIR%%/templates/memo
-@dirrm %%HORDIR%%/templates/notepads
-@dirrm %%HORDIR%%/templates/prefs
-@dirrm %%HORDIR%%/templates/search
-@dirrm %%HORDIR%%/templates/view
-@dirrm %%HORDIR%%/templates
-@dirrm %%HORDIR%%/themes/graphics
-@dirrm %%HORDIR%%/themes
+@dirrm %%HORDIR%%/lib/Forms
+@dirrm %%HORDIR%%/lib/Driver
+@dirrm %%HORDIR%%/lib/Block
+@dirrm %%HORDIR%%/lib
+@dirrm %%HORDIR%%/js/src
+@dirrm %%HORDIR%%/js
+@dirrmtry %%HORDIR%%/config
 @dirrmtry %%HORDIR%%
 @dirrmtry %%HORBAS%%