5 files changed, 211 insertions, 142 deletions

diff --git a/deskutils/gourmet/Makefile b/deskutils/gourmet/Makefile
index a017edd228fa..5141102a12c7 100644
--- a/deskutils/gourmet/Makefile
+++ b/deskutils/gourmet/Makefile
@@ -2,40 +2,45 @@
 # $FreeBSD$
 
 PORTNAME=	gourmet
-PORTVERSION=	0.15.9
-PORTREVISION=	1
+PORTVERSION=	0.16.0
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	SF/grecipe-manager/0.15.8
+MASTER_SITES=	https://launchpadlibrarian.net/133161899/
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	GNOME recipe manager
 
 LICENSE=	GPLv2
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}distutils-extra>0:${PORTSDIR}/devel/py-distutils-extra
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0:${PORTSDIR}/databases/py-sqlalchemy \
 		${PYTHON_PKGNAMEPREFIX}imaging>=0:${PORTSDIR}/graphics/py-imaging \
 		${PYTHON_PKGNAMEPREFIX}poppler>=0:${PORTSDIR}/graphics/py-poppler \
 		${PYTHON_PKGNAMEPREFIX}rtf>=0:${PORTSDIR}/print/py-rtf \
-		${PYTHON_PKGNAMEPREFIX}reportlab>=0:${PORTSDIR}/print/py-reportlab
+		${PYTHON_PKGNAMEPREFIX}reportlab>=0:${PORTSDIR}/print/py-reportlab \
+		${PYTHON_PKGNAMEPREFIX}elib.intl>0:${PORTSDIR}/textproc/py-elib.intl
 
-MAN1=		${PORTNAME}.1
-USE_PYTHON=	-2.7
-USE_PYDISTUTILS=yes
+MAN1=		gourmet.1
+PORTDOCS=	FAQ LICENSE
+PORTSCOUT=	ignore:1
+
+USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	pygnome2 pygnomeextras pygtk2
+USE_PYTHON=	-2.7
+USE_PYDISTUTILS=yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
-		${WRKSRC}/tools/backup_gourmet_to_xml.py \
-		${WRKSRC}/src/lib/gglobals.py \
-		${WRKSRC}/src/lib/gtk_extras/chooserNotebook.py \
-		${WRKSRC}/src/lib/gtk_extras/mnemonic_manager.py \
-		${WRKSRC}/src/lib/plugins/import_export/pdf_plugin/print_plugin.py \
-		${WRKSRC}/src/lib/plugins/nutritional_information/nutritionDisplay.py \
-		${WRKSRC}/src/lib/plugins/nutritional_information/nutrition.py \
-		${WRKSRC}/src/lib/backends/db.py \
-		${WRKSRC}/src/gourmet
+		${WRKSRC}/gourmet/backends/db.py \
+		${WRKSRC}/gourmet/gtk_extras/chooserNotebook.py \
+		${WRKSRC}/gourmet/gtk_extras/mnemonic_manager.py \
+		${WRKSRC}/gourmet/plugins/import_export/pdf_plugin/print_plugin.py \
+		${WRKSRC}/gourmet/plugins/nutritional_information/nutritionDisplay.py \
+		${WRKSRC}/gourmet/plugins/nutritional_information/nutrition.py \
+		${WRKSRC}/gourmet/plugins/web_plugin/gourmetweb/manage.py \
+		${WRKSRC}/tools/backup_gourmet_to_xml.py
+
 post-install:
 	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${PREFIX}/man/man1/
 
diff --git a/deskutils/gourmet/distinfo b/deskutils/gourmet/distinfo
index 4089f44adb81..134da26adc2c 100644
--- a/deskutils/gourmet/distinfo
+++ b/deskutils/gourmet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gourmet-0.15.9.tar.gz) = a1d101a497bd573bbc3c05c4398a6e9db7d7393427128c60d0cd832596b91b8c
-SIZE (gourmet-0.15.9.tar.gz) = 3933250
+SHA256 (gourmet-0.16.0.tar.bz2) = 8baef8b6003785a83c968cf35ea06724751517b2968f893011b6307a557777a1
+SIZE (gourmet-0.16.0.tar.bz2) = 8474989
diff --git a/deskutils/gourmet/files/patch-gourmet__defaults__defaults_ru.py b/deskutils/gourmet/files/patch-gourmet__defaults__defaults_ru.py
new file mode 100644
index 000000000000..077c9fadfa4e
--- /dev/null
+++ b/deskutils/gourmet/files/patch-gourmet__defaults__defaults_ru.py
@@ -0,0 +1,27 @@
+--- ./gourmet/defaults/defaults_ru.py.orig	2013-03-02 03:01:49.000000000 +0400
++++ ./gourmet/defaults/defaults_ru.py	2013-03-23 17:02:12.000000000 +0400
+@@ -661,15 +661,15 @@
+          ["кг", ["килограмм","кг", "кг", "килограмм"]],
+          # These names aren't really convertible, but we want them to
+          # be recognized as units...
+-         ['мало'],         
+-         ['средне'],
+-         ['много'],
+-         ['луковица',['луковиц']],
+-         ['целый',['целый','целое','целая']],
+-         ['упаковка',['пакет']],
+-         ['ящик'],
+-         ['банка'],
+-         ['ломтей',['ломоть','ломти']],
++         ['мало', ['мало']],
++         ['средне', ['средне']],
++         ['много', ['много']],
++         ['луковица', ['луковица','луковиц']],
++         ['целый', ['целый','целое','целая']],
++         ['упаковка',['упаковка','пакет']],
++         ['ящик', ['ящик']],
++         ['банка', ['банка']],
++         ['ломтей', ['ломтей','ломоть','ломти']],
+          ]
+ 
+ METRIC_RANGE = (1,999)
diff --git a/deskutils/gourmet/pkg-descr b/deskutils/gourmet/pkg-descr
index a9a8dd457505..d3fdf9d69694 100644
--- a/deskutils/gourmet/pkg-descr
+++ b/deskutils/gourmet/pkg-descr
@@ -1,12 +1,6 @@
-Gourmet allows you to collect, search and organize your
-recipes, and to automatically generate shopping lists from
-your collection.
-
-Gourmet's features include:
-
-    * Simple searching and sorting
-    * Easy recipe editing
-    * Import and export from various formats
-    * A shopping list creator and organizer
+Gourmet Recipe Manager is a recipe-organizer for GNOME that generates shopping
+lists and allows rapid searching of recipes. It imports mealmaster & mastercook
+files and exports webpages & other formats.
+Gourmet uses Python, Gtk+ and SQLAlchemy.
 
 WWW: http://thinkle.github.com/gourmet/
diff --git a/deskutils/gourmet/pkg-plist b/deskutils/gourmet/pkg-plist
index 76a0fa9ab891..b97739b5467d 100644
--- a/deskutils/gourmet/pkg-plist
+++ b/deskutils/gourmet/pkg-plist
@@ -1,25 +1,13 @@
 bin/gourmet
-%%PYTHON_SITELIBDIR%%/gourmet/FileChooserSaveAs.py
-%%PYTHON_SITELIBDIR%%/gourmet/FileChooserSaveAs.pyc
-%%PYTHON_SITELIBDIR%%/gourmet/FileChooserSaveAs.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/GourmetFauxThreads.py
-%%PYTHON_SITELIBDIR%%/gourmet/GourmetFauxThreads.pyc
-%%PYTHON_SITELIBDIR%%/gourmet/GourmetFauxThreads.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/GourmetRecipeManager.py
 %%PYTHON_SITELIBDIR%%/gourmet/GourmetRecipeManager.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/GourmetRecipeManager.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/GourmetThreads.py
-%%PYTHON_SITELIBDIR%%/gourmet/GourmetThreads.pyc
-%%PYTHON_SITELIBDIR%%/gourmet/GourmetThreads.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/ImageExtras.py
 %%PYTHON_SITELIBDIR%%/gourmet/ImageExtras.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/ImageExtras.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/OptionParser.py
 %%PYTHON_SITELIBDIR%%/gourmet/OptionParser.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/OptionParser.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/PngImagePluginUpToDate.py
-%%PYTHON_SITELIBDIR%%/gourmet/PngImagePluginUpToDate.pyc
-%%PYTHON_SITELIBDIR%%/gourmet/PngImagePluginUpToDate.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/Undo.py
 %%PYTHON_SITELIBDIR%%/gourmet/Undo.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/Undo.pyo
@@ -35,6 +23,9 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/backends/db.py
 %%PYTHON_SITELIBDIR%%/gourmet/backends/db.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/backends/db.pyo
+%%PYTHON_SITELIBDIR%%/gourmet/backends/test_db.py
+%%PYTHON_SITELIBDIR%%/gourmet/backends/test_db.pyc
+%%PYTHON_SITELIBDIR%%/gourmet/backends/test_db.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/batchEditor.py
 %%PYTHON_SITELIBDIR%%/gourmet/batchEditor.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/batchEditor.pyo
@@ -77,6 +68,9 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/defaults/defaults_pt.py
 %%PYTHON_SITELIBDIR%%/gourmet/defaults/defaults_pt.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/defaults/defaults_pt.pyo
+%%PYTHON_SITELIBDIR%%/gourmet/defaults/defaults_ru.py
+%%PYTHON_SITELIBDIR%%/gourmet/defaults/defaults_ru.pyc
+%%PYTHON_SITELIBDIR%%/gourmet/defaults/defaults_ru.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/defaults/defaults_sk.py
 %%PYTHON_SITELIBDIR%%/gourmet/defaults/defaults_sk.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/defaults/defaults_sk.pyo
@@ -101,9 +95,6 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/exporters/gxml_exporter.py
 %%PYTHON_SITELIBDIR%%/gourmet/exporters/gxml_exporter.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/exporters/gxml_exporter.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/exporters/page_drawer.py
-%%PYTHON_SITELIBDIR%%/gourmet/exporters/page_drawer.pyc
-%%PYTHON_SITELIBDIR%%/gourmet/exporters/page_drawer.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/exporters/printer.py
 %%PYTHON_SITELIBDIR%%/gourmet/exporters/printer.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/exporters/printer.pyo
@@ -113,15 +104,15 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/exporters/rtf_exporter.py
 %%PYTHON_SITELIBDIR%%/gourmet/exporters/rtf_exporter.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/exporters/rtf_exporter.pyo
+%%PYTHON_SITELIBDIR%%/gourmet/exporters/test_exportManager.py
+%%PYTHON_SITELIBDIR%%/gourmet/exporters/test_exportManager.pyc
+%%PYTHON_SITELIBDIR%%/gourmet/exporters/test_exportManager.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/exporters/xml_exporter.py
 %%PYTHON_SITELIBDIR%%/gourmet/exporters/xml_exporter.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/exporters/xml_exporter.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/gdebug.py
 %%PYTHON_SITELIBDIR%%/gourmet/gdebug.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/gdebug.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/gettext_setup.py
-%%PYTHON_SITELIBDIR%%/gourmet/gettext_setup.pyc
-%%PYTHON_SITELIBDIR%%/gourmet/gettext_setup.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/gglobals.py
 %%PYTHON_SITELIBDIR%%/gourmet/gglobals.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/gglobals.pyo
@@ -182,9 +173,6 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/gtk_extras/validatingEntry.py
 %%PYTHON_SITELIBDIR%%/gourmet/gtk_extras/validatingEntry.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/gtk_extras/validatingEntry.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/importers/BeautifulSoup.py
-%%PYTHON_SITELIBDIR%%/gourmet/importers/BeautifulSoup.pyc
-%%PYTHON_SITELIBDIR%%/gourmet/importers/BeautifulSoup.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/importers/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/importers/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/importers/__init__.pyo
@@ -206,18 +194,21 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/importers/interactive_importer.py
 %%PYTHON_SITELIBDIR%%/gourmet/importers/interactive_importer.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/importers/interactive_importer.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/importers/mastercook_plaintext_importer.py
-%%PYTHON_SITELIBDIR%%/gourmet/importers/mastercook_plaintext_importer.pyc
-%%PYTHON_SITELIBDIR%%/gourmet/importers/mastercook_plaintext_importer.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/importers/mealmaster_importer.py
-%%PYTHON_SITELIBDIR%%/gourmet/importers/mealmaster_importer.pyc
-%%PYTHON_SITELIBDIR%%/gourmet/importers/mealmaster_importer.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/importers/plaintext_importer.py
 %%PYTHON_SITELIBDIR%%/gourmet/importers/plaintext_importer.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/importers/plaintext_importer.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/importers/rezkonv_importer.py
 %%PYTHON_SITELIBDIR%%/gourmet/importers/rezkonv_importer.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/importers/rezkonv_importer.pyo
+%%PYTHON_SITELIBDIR%%/gourmet/importers/test_importManager.py
+%%PYTHON_SITELIBDIR%%/gourmet/importers/test_importManager.pyc
+%%PYTHON_SITELIBDIR%%/gourmet/importers/test_importManager.pyo
+%%PYTHON_SITELIBDIR%%/gourmet/importers/test_importer.py
+%%PYTHON_SITELIBDIR%%/gourmet/importers/test_importer.pyc
+%%PYTHON_SITELIBDIR%%/gourmet/importers/test_importer.pyo
+%%PYTHON_SITELIBDIR%%/gourmet/importers/test_interactive_importer.py
+%%PYTHON_SITELIBDIR%%/gourmet/importers/test_interactive_importer.pyc
+%%PYTHON_SITELIBDIR%%/gourmet/importers/test_interactive_importer.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/importers/webextras.py
 %%PYTHON_SITELIBDIR%%/gourmet/importers/webextras.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/importers/webextras.pyo
@@ -260,7 +251,6 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/browse_plugin.gourmet-plugin
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/browse_recipes/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/browse_recipes/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/browse_recipes/__init__.pyo
@@ -285,18 +275,16 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/check_for_unicode_16/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/check_for_unicode_16/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/check_for_unicode_16/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/duplicate_finder.gourmet-plugin
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/duplicate_finder/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/duplicate_finder/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/duplicate_finder/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/duplicate_finder/recipeMerger.glade
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/duplicate_finder/recipeMerger.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/duplicate_finder/recipeMerger.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/duplicate_finder/recipeMerger.pyo
+%%PYTHON_SITELIBDIR%%/gourmet/plugins/duplicate_finder/recipeMerger.ui
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/duplicate_finder/recipeMergerPlugin.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/duplicate_finder/recipeMergerPlugin.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/duplicate_finder/recipeMergerPlugin.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/email.gourmet-plugin
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/email_plugin/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/email_plugin/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/email_plugin/__init__.pyo
@@ -309,7 +297,6 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/email_plugin/recipe_emailer.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/email_plugin/recipe_emailer.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/email_plugin/recipe_emailer.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/field_editor.gourmet-plugin
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/field_editor/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/field_editor/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/field_editor/__init__.pyo
@@ -319,7 +306,6 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/archive.gourmet-plugin
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/archive_plugin/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/archive_plugin/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/archive_plugin/__init__.pyo
@@ -329,7 +315,6 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/archive_plugin/zip_readers.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/archive_plugin/zip_readers.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/archive_plugin/zip_readers.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/gxml.gourmet-plugin
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/gxml_plugin/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/gxml_plugin/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/gxml_plugin/__init__.pyo
@@ -348,7 +333,6 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/gxml_plugin/gxml_importer_plugin.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/gxml_plugin/gxml_importer_plugin.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/gxml_plugin/gxml_importer_plugin.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/html.gourmet-plugin
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/html_plugin/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/html_plugin/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/html_plugin/__init__.pyo
@@ -358,7 +342,6 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/html_plugin/html_exporter_plugin.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/html_plugin/html_exporter_plugin.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/html_plugin/html_exporter_plugin.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/krecipe_plugin.gourmet-plugin
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/krecipe_plugin/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/krecipe_plugin/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/krecipe_plugin/__init__.pyo
@@ -380,8 +363,6 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/mastercook_import_plugin/mastercook_plaintext_importer.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/mastercook_import_plugin/mastercook_plaintext_importer.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/mastercook_import_plugin/mastercook_plaintext_importer.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/mastercook_plugin.gourmet-plugin
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/mealmaster.gourmet-plugin
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/mealmaster_plugin/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/mealmaster_plugin/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/mealmaster_plugin/__init__.pyo
@@ -397,7 +378,6 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/mealmaster_plugin/mealmaster_importer_plugin.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/mealmaster_plugin/mealmaster_importer_plugin.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/mealmaster_plugin/mealmaster_importer_plugin.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/pdf.gourmet-plugin
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/pdf_plugin/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/pdf_plugin/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/pdf_plugin/__init__.pyo
@@ -413,7 +393,6 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/pdf_plugin/print_plugin.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/pdf_plugin/print_plugin.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/pdf_plugin/print_plugin.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/plaintext.gourmet-plugin
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/plaintext_plugin/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/plaintext_plugin/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/plaintext_plugin/__init__.pyo
@@ -423,9 +402,6 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/plaintext_plugin/plaintext_importer_plugin.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/plaintext_plugin/plaintext_importer_plugin.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/plaintext_plugin/plaintext_importer_plugin.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/web_import_plugin/BeautifulSoup.py
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/web_import_plugin/BeautifulSoup.pyc
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/web_import_plugin/BeautifulSoup.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/web_import_plugin/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/web_import_plugin/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/web_import_plugin/__init__.pyo
@@ -435,8 +411,6 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/web_import_plugin/webpage_importer.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/web_import_plugin/webpage_importer.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/web_import_plugin/webpage_importer.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/webimport.gourmet-plugin
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/website_import.gourmet-plugin
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/website_import_plugins/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/website_import_plugins/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/website_import_plugins/__init__.pyo
@@ -449,7 +423,6 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/website_import_plugins/foodnetwork_plugin.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/website_import_plugins/foodnetwork_plugin.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/import_export/website_import_plugins/foodnetwork_plugin.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/key_editor.gourmet-plugin
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/key_editor/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/key_editor/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/key_editor/__init__.pyo
@@ -462,18 +435,16 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/key_editor/keyEditorPlugin.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/key_editor/keyEditorPlugin.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/key_editor/keyEditorPlugin.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/key_editor/keyeditor.glade
+%%PYTHON_SITELIBDIR%%/gourmet/plugins/key_editor/keyeditor.ui
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/key_editor/recipeEditorPlugin.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/key_editor/recipeEditorPlugin.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/key_editor/recipeEditorPlugin.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/listsaver.gourmet-plugin
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/listsaver/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/listsaver/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/listsaver/__init__.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/listsaver/shoppingSaverPlugin.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/listsaver/shoppingSaverPlugin.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/listsaver/shoppingSaverPlugin.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information.gourmet-plugin
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/__init__.pyo
@@ -499,17 +470,17 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/nutPrefsPlugin.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/nutPrefsPlugin.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/nutPrefsPlugin.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/nut_recipe_card_display.glade
+%%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/nut_recipe_card_display.ui
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/nutrition.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/nutrition.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/nutrition.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/nutritionDisplay.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/nutritionDisplay.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/nutritionDisplay.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/nutritionDruid.glade
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/nutritionDruid.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/nutritionDruid.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/nutritionDruid.pyo
+%%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/nutritionDruid.ui
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/nutritionGrabberGui.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/nutritionGrabberGui.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/nutritionGrabberGui.pyo
@@ -534,44 +505,37 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/shopping_plugin.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/shopping_plugin.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/nutritional_information/shopping_plugin.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/python_shell.gourmet-plugin
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/python_shell/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/python_shell/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/python_shell/__init__.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/python_shell/ipython_view.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/python_shell/ipython_view.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/python_shell/ipython_view.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/shopping_associations.gourmet-plugin
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/shopping_associations/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/shopping_associations/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/shopping_associations/__init__.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/shopping_associations/shopping_key_editor_plugin.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/shopping_associations/shopping_key_editor_plugin.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/shopping_associations/shopping_key_editor_plugin.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/spellcheck.gourmet-plugin
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/spellcheck/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/spellcheck/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/spellcheck/__init__.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/spellcheck/reccard_spellcheck_plugin.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/spellcheck/reccard_spellcheck_plugin.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/spellcheck/reccard_spellcheck_plugin.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/unit_converter.gourmet-plugin
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/unit_converter/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/unit_converter/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/unit_converter/__init__.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/unit_converter/convertGui.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/unit_converter/convertGui.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/unit_converter/convertGui.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/unit_converter/converter.glade
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/unit_converter/converter.ui
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/unit_display_prefs.gourmet-plugin
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/unit_display_prefs/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/unit_display_prefs/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/unit_display_prefs/__init__.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/unit_display_prefs/unit_prefs_dialog.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/unit_display_prefs/unit_prefs_dialog.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/unit_display_prefs/unit_prefs_dialog.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/plugins/utf16.gourmet-plugin
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/web_plugin/gourmetweb/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/web_plugin/gourmetweb/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/plugins/web_plugin/gourmetweb/__init__.pyo
@@ -617,9 +581,9 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/recipeManager.py
 %%PYTHON_SITELIBDIR%%/gourmet/recipeManager.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/recipeManager.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/recipeMerger.py
-%%PYTHON_SITELIBDIR%%/gourmet/recipeMerger.pyc
-%%PYTHON_SITELIBDIR%%/gourmet/recipeMerger.pyo
+%%PYTHON_SITELIBDIR%%/gourmet/settings.py
+%%PYTHON_SITELIBDIR%%/gourmet/settings.pyc
+%%PYTHON_SITELIBDIR%%/gourmet/settings.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/shopEditor.py
 %%PYTHON_SITELIBDIR%%/gourmet/shopEditor.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/shopEditor.pyo
@@ -632,12 +596,18 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/sound.py
 %%PYTHON_SITELIBDIR%%/gourmet/sound.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/sound.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/sound_gnome.py
-%%PYTHON_SITELIBDIR%%/gourmet/sound_gnome.pyc
-%%PYTHON_SITELIBDIR%%/gourmet/sound_gnome.pyo
+%%PYTHON_SITELIBDIR%%/gourmet/sound_gst.py
+%%PYTHON_SITELIBDIR%%/gourmet/sound_gst.pyc
+%%PYTHON_SITELIBDIR%%/gourmet/sound_gst.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/sound_windows.py
 %%PYTHON_SITELIBDIR%%/gourmet/sound_windows.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/sound_windows.pyo
+%%PYTHON_SITELIBDIR%%/gourmet/test_convert.py
+%%PYTHON_SITELIBDIR%%/gourmet/test_convert.pyc
+%%PYTHON_SITELIBDIR%%/gourmet/test_convert.pyo
+%%PYTHON_SITELIBDIR%%/gourmet/test_plugin_loader.py
+%%PYTHON_SITELIBDIR%%/gourmet/test_plugin_loader.pyc
+%%PYTHON_SITELIBDIR%%/gourmet/test_plugin_loader.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/threadManager.py
 %%PYTHON_SITELIBDIR%%/gourmet/threadManager.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/threadManager.pyo
@@ -655,75 +625,148 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/version.pyo
 share/applications/gourmet.desktop
 %%DATADIR%%/ABBREV.txt
-%%DATADIR%%/AddToShoppingList.png
-%%DATADIR%%/FAQ
 %%DATADIR%%/FOOD_DES.txt
-%%DATADIR%%/Nutrition.png
 %%DATADIR%%/WEIGHT.txt
-%%DATADIR%%/app.glade
-%%DATADIR%%/batchEditor.glade
-%%DATADIR%%/batchEditor.ui
-%%DATADIR%%/converter.glade
-%%DATADIR%%/converter.ui
-%%DATADIR%%/converter_new.glade
-%%DATADIR%%/converter_new.ui
-%%DATADIR%%/converter_old.glade
-%%DATADIR%%/databaseChooser.glade
-%%DATADIR%%/databaseChooser.ui
-%%DATADIR%%/default.css
-%%DATADIR%%/error.wav
-%%DATADIR%%/generic_importer.glade
-%%DATADIR%%/generic_importer.ui
-%%DATADIR%%/gold_star.png
-%%DATADIR%%/gourmet_logo.png
-%%DATADIR%%/half_gold_star.png
-%%DATADIR%%/keyeditor.glade
-%%DATADIR%%/no_star.png
-%%DATADIR%%/phone.wav
-%%DATADIR%%/preferenceDialog.glade
-%%DATADIR%%/preferenceDialog.ui
-%%DATADIR%%/recCardDescriptionEditor.glade
-%%DATADIR%%/recCardDescriptionEditor.ui
-%%DATADIR%%/recCardDisplay.glade
-%%DATADIR%%/recCardIngredientsEditor.glade
-%%DATADIR%%/recCardIngredientsEditor.ui
-%%DATADIR%%/recbox.ico
-%%DATADIR%%/recbox.png
-%%DATADIR%%/recbox_biggish.ico
-%%DATADIR%%/recbox_biggish.png
-%%DATADIR%%/recbox_icon.png
-%%DATADIR%%/recbox_icon_old.png
-%%DATADIR%%/recbox_old.ico
-%%DATADIR%%/reccard.ico
-%%DATADIR%%/reccard.png
-%%DATADIR%%/reccard_edit.png
-%%DATADIR%%/recipe_index.glade
-%%DATADIR%%/shopCatEditor.glade
-%%DATADIR%%/shopCatEditor.ui
-%%DATADIR%%/splash.png
-%%DATADIR%%/timerDialog.glade
-%%DATADIR%%/timerDialog.ui
-%%DATADIR%%/valueEditor.glade
-%%DATADIR%%/valueEditor.ui
-%%DATADIR%%/warning.wav
+%%DATADIR%%/icons/48x48/apps/gourmet.png
+%%DATADIR%%/icons/gourmet.ico
+%%DATADIR%%/icons/scalable/apps/gourmet.svg
+%%DATADIR%%/images/AddToShoppingList.png
+%%DATADIR%%/images/gold_star.png
+%%DATADIR%%/images/half_gold_star.png
+%%DATADIR%%/images/no_star.png
+%%DATADIR%%/images/reccard.png
+%%DATADIR%%/images/reccard_edit.png
+%%DATADIR%%/images/splash.png
+%%DATADIR%%/images/splash.svg
+%%DATADIR%%/nutritional_data_sr_version
+%%DATADIR%%/plugins/browse_plugin.gourmet-plugin
+%%DATADIR%%/plugins/duplicate_finder.gourmet-plugin
+%%DATADIR%%/plugins/email.gourmet-plugin
+%%DATADIR%%/plugins/field_editor.gourmet-plugin
+%%DATADIR%%/plugins/import_export/archive.gourmet-plugin
+%%DATADIR%%/plugins/import_export/gxml.gourmet-plugin
+%%DATADIR%%/plugins/import_export/html.gourmet-plugin
+%%DATADIR%%/plugins/import_export/krecipe_plugin.gourmet-plugin
+%%DATADIR%%/plugins/import_export/mastercook_plugin.gourmet-plugin
+%%DATADIR%%/plugins/import_export/mealmaster.gourmet-plugin
+%%DATADIR%%/plugins/import_export/pdf.gourmet-plugin
+%%DATADIR%%/plugins/import_export/plaintext.gourmet-plugin
+%%DATADIR%%/plugins/import_export/webimport.gourmet-plugin
+%%DATADIR%%/plugins/import_export/website_import.gourmet-plugin
+%%DATADIR%%/plugins/key_editor.gourmet-plugin
+%%DATADIR%%/plugins/listsaver.gourmet-plugin
+%%DATADIR%%/plugins/nutritional_information.gourmet-plugin
+%%DATADIR%%/plugins/python_shell.gourmet-plugin
+%%DATADIR%%/plugins/shopping_associations.gourmet-plugin
+%%DATADIR%%/plugins/spellcheck.gourmet-plugin
+%%DATADIR%%/plugins/unit_converter.gourmet-plugin
+%%DATADIR%%/plugins/unit_display_prefs.gourmet-plugin
+%%DATADIR%%/plugins/utf16.gourmet-plugin
+%%DATADIR%%/recipe.dtd
+%%DATADIR%%/sound/error.wav
+%%DATADIR%%/sound/phone.wav
+%%DATADIR%%/sound/warning.wav
+%%DATADIR%%/style/default.css
+%%DATADIR%%/ui/app.ui
+%%DATADIR%%/ui/batchEditor.ui
+%%DATADIR%%/ui/databaseChooser.ui
+%%DATADIR%%/ui/generic_importer.ui
+%%DATADIR%%/ui/preferenceDialog.ui
+%%DATADIR%%/ui/recCardDescriptionEditor.ui
+%%DATADIR%%/ui/recCardDisplay.ui
+%%DATADIR%%/ui/recCardIngredientsEditor.ui
+%%DATADIR%%/ui/recipe_index.ui
+%%DATADIR%%/ui/shopCatEditor.ui
+%%DATADIR%%/ui/timerDialog.ui
+%%DATADIR%%/ui/valueEditor.ui
+share/icons/hicolor/48x48/apps/gourmet.png
+share/icons/hicolor/scalable/apps/gourmet.svg
+share/locale/af/LC_MESSAGES/gourmet.mo
+share/locale/ar/LC_MESSAGES/gourmet.mo
+share/locale/az/LC_MESSAGES/gourmet.mo
+share/locale/bg/LC_MESSAGES/gourmet.mo
+share/locale/bs/LC_MESSAGES/gourmet.mo
+share/locale/ca/LC_MESSAGES/gourmet.mo
 share/locale/cs/LC_MESSAGES/gourmet.mo
+share/locale/da/LC_MESSAGES/gourmet.mo
+share/locale/de/LC_MESSAGES/gourmet.mo
 share/locale/de_AT/LC_MESSAGES/gourmet.mo
 share/locale/de_DE/LC_MESSAGES/gourmet.mo
+share/locale/el/LC_MESSAGES/gourmet.mo
+share/locale/en/LC_MESSAGES/gourmet.mo
+share/locale/en_AU/LC_MESSAGES/gourmet.mo
+share/locale/en_CA/LC_MESSAGES/gourmet.mo
+share/locale/en_GB/LC_MESSAGES/gourmet.mo
+share/locale/eo/LC_MESSAGES/gourmet.mo
 share/locale/es/LC_MESSAGES/gourmet.mo
 share/locale/es_ES/LC_MESSAGES/gourmet.mo
+share/locale/et/LC_MESSAGES/gourmet.mo
+share/locale/fa/LC_MESSAGES/gourmet.mo
+share/locale/fi/LC_MESSAGES/gourmet.mo
 share/locale/fr/LC_MESSAGES/gourmet.mo
+share/locale/ga/LC_MESSAGES/gourmet.mo
+share/locale/gl/LC_MESSAGES/gourmet.mo
+share/locale/he/LC_MESSAGES/gourmet.mo
+share/locale/hi/LC_MESSAGES/gourmet.mo
+share/locale/hr/LC_MESSAGES/gourmet.mo
+share/locale/hu/LC_MESSAGES/gourmet.mo
+share/locale/id/LC_MESSAGES/gourmet.mo
+share/locale/is/LC_MESSAGES/gourmet.mo
+share/locale/it/LC_MESSAGES/gourmet.mo
+share/locale/ja/LC_MESSAGES/gourmet.mo
+share/locale/lt/LC_MESSAGES/gourmet.mo
+share/locale/lv/LC_MESSAGES/gourmet.mo
+share/locale/mk/LC_MESSAGES/gourmet.mo
+share/locale/ms/LC_MESSAGES/gourmet.mo
+share/locale/nb/LC_MESSAGES/gourmet.mo
+share/locale/nl/LC_MESSAGES/gourmet.mo
 share/locale/nl_BE/LC_MESSAGES/gourmet.mo
+share/locale/nl_NL/LC_MESSAGES/gourmet.mo
+share/locale/oc/LC_MESSAGES/gourmet.mo
+share/locale/pl/LC_MESSAGES/gourmet.mo
+share/locale/pt/LC_MESSAGES/gourmet.mo
 share/locale/pt_BR/LC_MESSAGES/gourmet.mo
+share/locale/pt_PT/LC_MESSAGES/gourmet.mo
+share/locale/ro/LC_MESSAGES/gourmet.mo
+share/locale/ru/LC_MESSAGES/gourmet.mo
 share/locale/sk/LC_MESSAGES/gourmet.mo
+share/locale/sl/LC_MESSAGES/gourmet.mo
+share/locale/sr/LC_MESSAGES/gourmet.mo
+share/locale/sv/LC_MESSAGES/gourmet.mo
 share/locale/sv_SE/LC_MESSAGES/gourmet.mo
+share/locale/th/LC_MESSAGES/gourmet.mo
 share/locale/tr/LC_MESSAGES/gourmet.mo
-share/pixmaps/recbox.png
+share/locale/uk/LC_MESSAGES/gourmet.mo
+share/locale/yi/LC_MESSAGES/gourmet.mo
+share/locale/zh/LC_MESSAGES/gourmet.mo
+share/locale/zh_CN/LC_MESSAGES/gourmet.mo
+share/locale/zh_HK/LC_MESSAGES/gourmet.mo
+share/locale/zh_TW/LC_MESSAGES/gourmet.mo
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
 @dirrmtry share/locale/sv_SE/LC_MESSAGES
 @dirrmtry share/locale/sv_SE
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/nl_NL/LC_MESSAGES
+@dirrmtry share/locale/nl_NL
 @dirrmtry share/locale/nl_BE/LC_MESSAGES
 @dirrmtry share/locale/nl_BE
 @dirrmtry share/locale/de_DE/LC_MESSAGES
 @dirrmtry share/locale/de_DE
+@dirrm %%DATADIR%%/ui
+@dirrm %%DATADIR%%/style
+@dirrm %%DATADIR%%/sound
+@dirrm %%DATADIR%%/plugins/import_export
+@dirrm %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/icons/scalable/apps
+@dirrm %%DATADIR%%/icons/scalable
+@dirrm %%DATADIR%%/icons/48x48/apps
+@dirrm %%DATADIR%%/icons/48x48
+@dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
 @dirrm %%PYTHON_SITELIBDIR%%/gourmet/plugins/web_plugin/gourmetweb/recview