16 files changed, 133 insertions, 190 deletions

diff --git a/deskutils/hamster-applet/Makefile b/deskutils/hamster-applet/Makefile
index 8753f0e71149..72df3fa401db 100644
--- a/deskutils/hamster-applet/Makefile
+++ b/deskutils/hamster-applet/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/deskutils/hamster-applet/Makefile,v 1.2 2010/06/24 21:30:14 mezz Exp $
+#   $MCom: ports/deskutils/hamster-applet/Makefile,v 1.42 2010/06/06 11:27:47 kwm Exp $
 #
 
 PORTNAME=	hamster-applet
-PORTVERSION=	2.30.2
-PORTREVISION=	2
+PORTVERSION=	2.32.1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -26,8 +25,7 @@ USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_XORG=	xscrnsaver
 USE_GNOME=	gnomeprefix intlhack gnomehack pygnomedesktop \
-		gnomecontrolcenter2
-GNU_CONFIGURE=	yes
+		gnomecontrolcenter2 gnomedocutils
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -35,4 +33,23 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 GCONF_SCHEMAS=	hamster-applet.schemas
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+# WAF needs that
+CONFIGURE_ENV+=	CC="${CC}"
+
+do-configure:
+	@cd ${WRKSRC} && ./waf --prefix=${PREFIX} configure
+
+do-build:
+	@cd ${WRKSRC} && ./waf build
+
+do-install:
+	@cd ${WRKSRC} && dbus-launch ./waf install
+# -O -Qold
+	@${PYTHON_CMD} -Qold ${PYTHON_LIBDIR}/compileall.py -q \
+		${PYTHON_SITELIBDIR:S|${LOCALBASE}|${PREFIX}|}/hamster
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -q \
+		${PYTHON_SITELIBDIR:S|${LOCALBASE}|${PREFIX}|}/hamster
+
+.include <bsd.port.post.mk>
diff --git a/deskutils/hamster-applet/distinfo b/deskutils/hamster-applet/distinfo
index 72544ff3382d..bef9d491c35d 100644
--- a/deskutils/hamster-applet/distinfo
+++ b/deskutils/hamster-applet/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/hamster-applet-2.30.2.tar.bz2) = ad662fd81a09c5a0e19d1aa733e78588
-SHA256 (gnome2/hamster-applet-2.30.2.tar.bz2) = fd12c77acffc56fea8c3de46dcce0b31ab6856230fe49f547c4c74f70addc5e3
-SIZE (gnome2/hamster-applet-2.30.2.tar.bz2) = 614083
+SHA256 (gnome2/hamster-applet-2.32.1.tar.bz2) = 98302221efd4ccd4a2446d2cda15b795a0b23850f562935a3dd61afe3e2cd0aa
+SIZE (gnome2/hamster-applet-2.32.1.tar.bz2) = 454738
diff --git a/deskutils/hamster-applet/files/patch-data_wscript_build b/deskutils/hamster-applet/files/patch-data_wscript_build
new file mode 100644
index 000000000000..fba30d35968c
--- /dev/null
+++ b/deskutils/hamster-applet/files/patch-data_wscript_build
@@ -0,0 +1,10 @@
+--- data/wscript_build.orig	2010-11-16 12:21:16.000000000 +0100
++++ data/wscript_build	2010-11-16 12:21:40.000000000 +0100
+@@ -55,6 +55,6 @@
+ 
+ bld(features = 'intltool_in',
+     source   = 'Hamster_Applet.server.in',
+-    install_path = '${LIBDIR}/bonobo/servers',
++    install_path = '${PREFIX}/libdata/bonobo/servers',
+     podir    = '../po',
+     flags    = ['-o', '-u', '-c'])
diff --git a/deskutils/hamster-applet/files/patch-src-hamster-widgets_activityentry.py b/deskutils/hamster-applet/files/patch-src-hamster-widgets_activityentry.py
deleted file mode 100644
index 3fe830abbf35..000000000000
--- a/deskutils/hamster-applet/files/patch-src-hamster-widgets_activityentry.py
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/hamster/widgets/activityentry.py	2010-06-22 13:59:09.000000000 +0400
-+++ src/hamster/widgets/activityentry.py	2010-09-26 01:29:25.000000000 +0400
-@@ -20,10 +20,10 @@
- import gtk, gobject
- import datetime as dt
- 
--from .hamster.configuration import runtime
-+from hamster.configuration import runtime
- 
--from .hamster import stuff
--from .hamster.stuff import format_duration
-+from hamster import stuff
-+from hamster.stuff import format_duration
- 
- class ActivityEntry(gtk.Entry):
-     __gsignals__ = {
diff --git a/deskutils/hamster-applet/files/patch-src-hamster-widgets_dateinput.py b/deskutils/hamster-applet/files/patch-src-hamster-widgets_dateinput.py
deleted file mode 100644
index 97cba28904de..000000000000
--- a/deskutils/hamster-applet/files/patch-src-hamster-widgets_dateinput.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hamster/widgets/dateinput.py	2010-06-04 20:53:24.000000000 +0400
-+++ src/hamster/widgets/dateinput.py	2010-09-26 01:30:30.000000000 +0400
-@@ -17,7 +17,7 @@
- # You should have received a copy of the GNU General Public License
- # along with Project Hamster.  If not, see <http://www.gnu.org/licenses/>.
- 
--from .hamster.stuff import format_duration
-+from hamster.stuff import format_duration
- import gtk
- import datetime as dt
- import calendar
diff --git a/deskutils/hamster-applet/files/patch-src-hamster-widgets_dayline.py b/deskutils/hamster-applet/files/patch-src-hamster-widgets_dayline.py
deleted file mode 100644
index 0070fa254bba..000000000000
--- a/deskutils/hamster-applet/files/patch-src-hamster-widgets_dayline.py
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/hamster/widgets/dayline.py	2010-06-22 13:59:09.000000000 +0400
-+++ src/hamster/widgets/dayline.py	2010-09-26 01:31:11.000000000 +0400
-@@ -20,8 +20,8 @@
- import gtk
- import gobject
- 
--from .hamster import stuff
--from .hamster import graphics
-+from hamster import stuff
-+from hamster import graphics
- 
- import time
- import datetime as dt
diff --git a/deskutils/hamster-applet/files/patch-src-hamster-widgets_facttree.py b/deskutils/hamster-applet/files/patch-src-hamster-widgets_facttree.py
deleted file mode 100644
index a69168e51418..000000000000
--- a/deskutils/hamster-applet/files/patch-src-hamster-widgets_facttree.py
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/hamster/widgets/facttree.py	2010-06-22 13:59:09.000000000 +0400
-+++ src/hamster/widgets/facttree.py	2010-09-26 01:31:57.000000000 +0400
-@@ -20,8 +20,8 @@
- import gtk, gobject
- import datetime as dt
- 
--from .hamster import stuff
--from .hamster.stuff import format_duration, format_activity
-+from hamster import stuff
-+from hamster.stuff import format_duration, format_activity
- from tags import Tag
- 
- import pango
diff --git a/deskutils/hamster-applet/files/patch-src-hamster-widgets_tags.py b/deskutils/hamster-applet/files/patch-src-hamster-widgets_tags.py
deleted file mode 100644
index aed44a1b737a..000000000000
--- a/deskutils/hamster-applet/files/patch-src-hamster-widgets_tags.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/hamster/widgets/tags.py	2010-06-22 13:59:09.000000000 +0400
-+++ src/hamster/widgets/tags.py	2010-09-26 01:32:32.000000000 +0400
-@@ -21,9 +21,9 @@
- import pango, cairo
- from math import pi
- 
--from .hamster import graphics
-+from hamster import graphics
- 
--from .hamster.configuration import runtime
-+from hamster.configuration import runtime
- 
- class TagsEntry(gtk.Entry):
-     __gsignals__ = {
diff --git a/deskutils/hamster-applet/files/patch-src-hamster-widgets_timechart.py b/deskutils/hamster-applet/files/patch-src-hamster-widgets_timechart.py
deleted file mode 100644
index 7f5ee2e3b0f9..000000000000
--- a/deskutils/hamster-applet/files/patch-src-hamster-widgets_timechart.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hamster/widgets/timechart.py	2010-06-22 13:59:09.000000000 +0400
-+++ src/hamster/widgets/timechart.py	2010-09-26 01:33:04.000000000 +0400
-@@ -20,7 +20,7 @@
- import os  # for locale
- import gtk, pango
- 
--from .hamster import graphics
-+from hamster import graphics
- 
- import time, datetime as dt
- import calendar
diff --git a/deskutils/hamster-applet/files/patch-src-hamster-widgets_timeinput.py b/deskutils/hamster-applet/files/patch-src-hamster-widgets_timeinput.py
deleted file mode 100644
index c74a62b7fc58..000000000000
--- a/deskutils/hamster-applet/files/patch-src-hamster-widgets_timeinput.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hamster/widgets/timeinput.py	2010-06-04 20:53:24.000000000 +0400
-+++ src/hamster/widgets/timeinput.py	2010-09-26 01:33:38.000000000 +0400
-@@ -17,7 +17,7 @@
- # You should have received a copy of the GNU General Public License
- # along with Project Hamster.  If not, see <http://www.gnu.org/licenses/>.
- 
--from .hamster.stuff import format_duration
-+from hamster.stuff import format_duration
- import gtk
- from gtk import keysyms
- import datetime as dt
diff --git a/deskutils/hamster-applet/files/patch-src_gnome-time-tracker b/deskutils/hamster-applet/files/patch-src_gnome-time-tracker
deleted file mode 100644
index f12905f2ef68..000000000000
--- a/deskutils/hamster-applet/files/patch-src_gnome-time-tracker
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gnome-time-tracker	2010-06-22 13:59:09.000000000 +0400
-+++ src/gnome-time-tracker	2010-09-26 01:52:16.000000000 +0400
-@@ -525,7 +525,7 @@
- 
-     # Setup i18n
-     locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
--    for module in (gettext, locale):
-+    for module in (gettext,):
-         module.bindtextdomain('hamster-applet', locale_dir)
-         module.textdomain('hamster-applet')
- 
diff --git a/deskutils/hamster-applet/files/patch-src_hamster-applet.py b/deskutils/hamster-applet/files/patch-src_hamster-applet.py
deleted file mode 100644
index 4bb6fb72f558..000000000000
--- a/deskutils/hamster-applet/files/patch-src_hamster-applet.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hamster-applet.py	2010-06-22 13:59:09.000000000 +0400
-+++ src/hamster-applet.py	2010-09-26 01:52:33.000000000 +0400
-@@ -96,7 +96,7 @@
- 
-         # Setup i18n
-         locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
--        for module in (gettext, locale):
-+        for module in (gettext,):
-             module.bindtextdomain('hamster-applet', locale_dir)
-             module.textdomain('hamster-applet')
- 
diff --git a/deskutils/hamster-applet/files/patch-src_hamster-service b/deskutils/hamster-applet/files/patch-src_hamster-service
new file mode 100644
index 000000000000..10aca79799b1
--- /dev/null
+++ b/deskutils/hamster-applet/files/patch-src_hamster-service
@@ -0,0 +1,8 @@
+--- src/hamster-service.orig	2010-11-16 15:25:01.000000000 +0100
++++ src/hamster-service	2010-11-16 15:25:23.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python
+ # nicked off gwibber
+ 
+ import gobject, dbus
diff --git a/deskutils/hamster-applet/files/patch-src_hamster-standalone b/deskutils/hamster-applet/files/patch-src_hamster-standalone
deleted file mode 100644
index 193483c34cbe..000000000000
--- a/deskutils/hamster-applet/files/patch-src_hamster-standalone
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hamster-standalone	2010-06-22 13:59:09.000000000 +0400
-+++ src/hamster-standalone	2010-09-26 01:52:50.000000000 +0400
-@@ -525,7 +525,7 @@
- 
-     # Setup i18n
-     locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
--    for module in (gettext, locale):
-+    for module in (gettext,):
-         module.bindtextdomain('hamster-applet', locale_dir)
-         module.textdomain('hamster-applet')
- 
diff --git a/deskutils/hamster-applet/files/patch-src_hamster_i18n.py b/deskutils/hamster-applet/files/patch-src_hamster_i18n.py
new file mode 100644
index 000000000000..45b7ab880e19
--- /dev/null
+++ b/deskutils/hamster-applet/files/patch-src_hamster_i18n.py
@@ -0,0 +1,11 @@
+--- src/hamster/i18n.py.orig	2010-11-16 15:17:44.000000000 +0100
++++ src/hamster/i18n.py	2010-11-16 15:18:14.000000000 +0100
+@@ -19,7 +19,7 @@
+     if defs:
+         locale_dir = os.path.realpath(os.path.join(defs.DATA_DIR, "locale"))
+ 
+-        for module in (locale,gettext):
++        for module in (gettext,):
+             module.bindtextdomain('hamster-applet', locale_dir)
+             module.textdomain('hamster-applet')
+ 
diff --git a/deskutils/hamster-applet/pkg-plist b/deskutils/hamster-applet/pkg-plist
index 981c2fc9107f..bd1c5bfb63a5 100644
--- a/deskutils/hamster-applet/pkg-plist
+++ b/deskutils/hamster-applet/pkg-plist
@@ -1,5 +1,7 @@
 bin/gnome-time-tracker
-bin/hamster-standalone
+bin/hamster-cli
+bin/hamster-service
+bin/hamster-time-tracker
 lib/hamster-applet/hamster-applet
 %%PYTHON_SITELIBDIR%%/hamster/__init__.py
 %%PYTHON_SITELIBDIR%%/hamster/__init__.pyc
@@ -13,6 +15,9 @@ lib/hamster-applet/hamster-applet
 %%PYTHON_SITELIBDIR%%/hamster/charting.py
 %%PYTHON_SITELIBDIR%%/hamster/charting.pyc
 %%PYTHON_SITELIBDIR%%/hamster/charting.pyo
+%%PYTHON_SITELIBDIR%%/hamster/client.py
+%%PYTHON_SITELIBDIR%%/hamster/client.pyc
+%%PYTHON_SITELIBDIR%%/hamster/client.pyo
 %%PYTHON_SITELIBDIR%%/hamster/configuration.py
 %%PYTHON_SITELIBDIR%%/hamster/configuration.pyc
 %%PYTHON_SITELIBDIR%%/hamster/configuration.pyo
@@ -22,41 +27,30 @@ lib/hamster-applet/hamster-applet
 %%PYTHON_SITELIBDIR%%/hamster/defs.py
 %%PYTHON_SITELIBDIR%%/hamster/defs.pyc
 %%PYTHON_SITELIBDIR%%/hamster/defs.pyo
-%%PYTHON_SITELIBDIR%%/hamster/dispatcher.py
-%%PYTHON_SITELIBDIR%%/hamster/dispatcher.pyc
-%%PYTHON_SITELIBDIR%%/hamster/dispatcher.pyo
 %%PYTHON_SITELIBDIR%%/hamster/edit_activity.py
 %%PYTHON_SITELIBDIR%%/hamster/edit_activity.pyc
 %%PYTHON_SITELIBDIR%%/hamster/edit_activity.pyo
-%%PYTHON_SITELIBDIR%%/hamster/eds.py
-%%PYTHON_SITELIBDIR%%/hamster/eds.pyc
-%%PYTHON_SITELIBDIR%%/hamster/eds.pyo
+%%PYTHON_SITELIBDIR%%/hamster/external.py
+%%PYTHON_SITELIBDIR%%/hamster/external.pyc
+%%PYTHON_SITELIBDIR%%/hamster/external.pyo
 %%PYTHON_SITELIBDIR%%/hamster/graphics.py
 %%PYTHON_SITELIBDIR%%/hamster/graphics.pyc
 %%PYTHON_SITELIBDIR%%/hamster/graphics.pyo
-%%PYTHON_SITELIBDIR%%/hamster/hamsterdbus.py
-%%PYTHON_SITELIBDIR%%/hamster/hamsterdbus.pyc
-%%PYTHON_SITELIBDIR%%/hamster/hamsterdbus.pyo
 %%PYTHON_SITELIBDIR%%/hamster/i18n.py
 %%PYTHON_SITELIBDIR%%/hamster/i18n.pyc
 %%PYTHON_SITELIBDIR%%/hamster/i18n.pyo
 %%PYTHON_SITELIBDIR%%/hamster/idle.py
 %%PYTHON_SITELIBDIR%%/hamster/idle.pyc
 %%PYTHON_SITELIBDIR%%/hamster/idle.pyo
-%%PYTHON_SITELIBDIR%%/hamster/keybinder/__init__.py
-%%PYTHON_SITELIBDIR%%/hamster/keybinder/__init__.pyc
-%%PYTHON_SITELIBDIR%%/hamster/keybinder/__init__.pyo
-%%PYTHON_SITELIBDIR%%/hamster/keybinder/_keybinder.la
-%%PYTHON_SITELIBDIR%%/hamster/keybinder/_keybinder.so
+%%PYTHON_SITELIBDIR%%/hamster/overview.py
+%%PYTHON_SITELIBDIR%%/hamster/overview.pyc
+%%PYTHON_SITELIBDIR%%/hamster/overview.pyo
 %%PYTHON_SITELIBDIR%%/hamster/overview_activities.py
 %%PYTHON_SITELIBDIR%%/hamster/overview_activities.pyc
 %%PYTHON_SITELIBDIR%%/hamster/overview_activities.pyo
 %%PYTHON_SITELIBDIR%%/hamster/overview_totals.py
 %%PYTHON_SITELIBDIR%%/hamster/overview_totals.pyc
 %%PYTHON_SITELIBDIR%%/hamster/overview_totals.pyo
-%%PYTHON_SITELIBDIR%%/hamster/overview.py
-%%PYTHON_SITELIBDIR%%/hamster/overview.pyc
-%%PYTHON_SITELIBDIR%%/hamster/overview.pyo
 %%PYTHON_SITELIBDIR%%/hamster/preferences.py
 %%PYTHON_SITELIBDIR%%/hamster/preferences.pyc
 %%PYTHON_SITELIBDIR%%/hamster/preferences.pyo
@@ -90,6 +84,9 @@ lib/hamster-applet/hamster-applet
 %%PYTHON_SITELIBDIR%%/hamster/widgets/facttree.py
 %%PYTHON_SITELIBDIR%%/hamster/widgets/facttree.pyc
 %%PYTHON_SITELIBDIR%%/hamster/widgets/facttree.pyo
+%%PYTHON_SITELIBDIR%%/hamster/widgets/rangepick.py
+%%PYTHON_SITELIBDIR%%/hamster/widgets/rangepick.pyc
+%%PYTHON_SITELIBDIR%%/hamster/widgets/rangepick.pyo
 %%PYTHON_SITELIBDIR%%/hamster/widgets/reportchooserdialog.py
 %%PYTHON_SITELIBDIR%%/hamster/widgets/reportchooserdialog.pyc
 %%PYTHON_SITELIBDIR%%/hamster/widgets/reportchooserdialog.pyo
@@ -103,85 +100,112 @@ lib/hamster-applet/hamster-applet
 %%PYTHON_SITELIBDIR%%/hamster/widgets/timeinput.pyc
 %%PYTHON_SITELIBDIR%%/hamster/widgets/timeinput.pyo
 libdata/bonobo/servers/Hamster_Applet.server
-share/gnome-control-center/keybindings/99-hamster-applet.xml
-%%DATADIR%%/Hamster_Applet.xml
-%%DATADIR%%/applet.ui
-%%DATADIR%%/art/hamster-applet.png
-%%DATADIR%%/art/stock_calendar-view-day.png
-%%DATADIR%%/art/stock_calendar-view-month.png
-%%DATADIR%%/art/stock_calendar-view-week.png
-%%DATADIR%%/edit_activity.ui
-%%DATADIR%%/hamster.db
-%%DATADIR%%/hamster.ui
-%%DATADIR%%/overview.ui
-%%DATADIR%%/overview_totals.ui
-%%DATADIR%%/preferences.ui
-%%DATADIR%%/stats.ui
-share/applications/hamster-standalone.desktop
+share/applications/hamster-applet.desktop
+share/applications/hamster-time-tracker.desktop
+share/dbus-1/services/org.gnome.hamster.service
+share/dockmanager/metadata/hamster_control.py.info
+share/dockmanager/scripts/hamster_control.py
+share/docky/helpers/hamster_control.py
+share/docky/helpers/metadata/hamster_control.py.info
 share/gnome/help/hamster-applet/C/backup.page
-share/gnome/help/hamster-applet/C/figures/hamster-logo.png
 share/gnome/help/hamster-applet/C/index.page
 share/gnome/help/hamster-applet/C/input.page
-share/gnome/help/hamster-applet/C/legal.xml
 share/gnome/help/hamster-applet/C/merge.page
 share/gnome/help/hamster-applet/C/reports.page
 share/gnome/help/hamster-applet/C/statistics.page
+share/gnome/help/hamster-applet/C/tracking.page
 share/gnome/help/hamster-applet/cs/backup.page
-share/gnome/help/hamster-applet/cs/figures/hamster-logo.png
 share/gnome/help/hamster-applet/cs/index.page
 share/gnome/help/hamster-applet/cs/input.page
-share/gnome/help/hamster-applet/cs/legal.xml
 share/gnome/help/hamster-applet/cs/merge.page
 share/gnome/help/hamster-applet/cs/reports.page
 share/gnome/help/hamster-applet/cs/statistics.page
+share/gnome/help/hamster-applet/cs/tracking.page
 share/gnome/help/hamster-applet/de/backup.page
-share/gnome/help/hamster-applet/de/figures/hamster-logo.png
 share/gnome/help/hamster-applet/de/index.page
 share/gnome/help/hamster-applet/de/input.page
-share/gnome/help/hamster-applet/de/legal.xml
 share/gnome/help/hamster-applet/de/merge.page
 share/gnome/help/hamster-applet/de/reports.page
 share/gnome/help/hamster-applet/de/statistics.page
+share/gnome/help/hamster-applet/de/tracking.page
 share/gnome/help/hamster-applet/el/backup.page
-share/gnome/help/hamster-applet/el/figures/hamster-logo.png
 share/gnome/help/hamster-applet/el/index.page
 share/gnome/help/hamster-applet/el/input.page
-share/gnome/help/hamster-applet/el/legal.xml
 share/gnome/help/hamster-applet/el/merge.page
 share/gnome/help/hamster-applet/el/reports.page
 share/gnome/help/hamster-applet/el/statistics.page
+share/gnome/help/hamster-applet/el/tracking.page
 share/gnome/help/hamster-applet/es/backup.page
-share/gnome/help/hamster-applet/es/figures/hamster-logo.png
 share/gnome/help/hamster-applet/es/index.page
 share/gnome/help/hamster-applet/es/input.page
-share/gnome/help/hamster-applet/es/legal.xml
 share/gnome/help/hamster-applet/es/merge.page
 share/gnome/help/hamster-applet/es/reports.page
 share/gnome/help/hamster-applet/es/statistics.page
+share/gnome/help/hamster-applet/es/tracking.page
 share/gnome/help/hamster-applet/fr/backup.page
-share/gnome/help/hamster-applet/fr/figures/hamster-logo.png
 share/gnome/help/hamster-applet/fr/index.page
 share/gnome/help/hamster-applet/fr/input.page
-share/gnome/help/hamster-applet/fr/legal.xml
 share/gnome/help/hamster-applet/fr/merge.page
 share/gnome/help/hamster-applet/fr/reports.page
 share/gnome/help/hamster-applet/fr/statistics.page
+share/gnome/help/hamster-applet/fr/tracking.page
+share/gnome/help/hamster-applet/gl/backup.page
+share/gnome/help/hamster-applet/gl/index.page
+share/gnome/help/hamster-applet/gl/input.page
+share/gnome/help/hamster-applet/gl/merge.page
+share/gnome/help/hamster-applet/gl/reports.page
+share/gnome/help/hamster-applet/gl/statistics.page
+share/gnome/help/hamster-applet/gl/tracking.page
+share/gnome/help/hamster-applet/hu/backup.page
+share/gnome/help/hamster-applet/hu/index.page
+share/gnome/help/hamster-applet/hu/input.page
+share/gnome/help/hamster-applet/hu/merge.page
+share/gnome/help/hamster-applet/hu/reports.page
+share/gnome/help/hamster-applet/hu/statistics.page
+share/gnome/help/hamster-applet/hu/tracking.page
+share/gnome/help/hamster-applet/sv/backup.page
+share/gnome/help/hamster-applet/sv/index.page
+share/gnome/help/hamster-applet/sv/input.page
+share/gnome/help/hamster-applet/sv/merge.page
+share/gnome/help/hamster-applet/sv/reports.page
+share/gnome/help/hamster-applet/sv/statistics.page
+share/gnome/help/hamster-applet/sv/tracking.page
+share/gnome/help/hamster-applet/zh_CN/backup.page
+share/gnome/help/hamster-applet/zh_CN/index.page
+share/gnome/help/hamster-applet/zh_CN/input.page
+share/gnome/help/hamster-applet/zh_CN/merge.page
+share/gnome/help/hamster-applet/zh_CN/reports.page
+share/gnome/help/hamster-applet/zh_CN/statistics.page
+share/gnome/help/hamster-applet/zh_CN/tracking.page
 share/gnome/help/hamster-applet/zh_HK/backup.page
-share/gnome/help/hamster-applet/zh_HK/figures/hamster-logo.png
 share/gnome/help/hamster-applet/zh_HK/index.page
 share/gnome/help/hamster-applet/zh_HK/input.page
-share/gnome/help/hamster-applet/zh_HK/legal.xml
 share/gnome/help/hamster-applet/zh_HK/merge.page
 share/gnome/help/hamster-applet/zh_HK/reports.page
 share/gnome/help/hamster-applet/zh_HK/statistics.page
+share/gnome/help/hamster-applet/zh_HK/tracking.page
 share/gnome/help/hamster-applet/zh_TW/backup.page
-share/gnome/help/hamster-applet/zh_TW/figures/hamster-logo.png
 share/gnome/help/hamster-applet/zh_TW/index.page
 share/gnome/help/hamster-applet/zh_TW/input.page
-share/gnome/help/hamster-applet/zh_TW/legal.xml
 share/gnome/help/hamster-applet/zh_TW/merge.page
 share/gnome/help/hamster-applet/zh_TW/reports.page
 share/gnome/help/hamster-applet/zh_TW/statistics.page
+share/gnome/help/hamster-applet/zh_TW/tracking.page
+%%DATADIR%%/Hamster_Applet.xml
+%%DATADIR%%/applet.ui
+%%DATADIR%%/art/hamster-applet.png
+%%DATADIR%%/art/stock_calendar-view-day.png
+%%DATADIR%%/art/stock_calendar-view-month.png
+%%DATADIR%%/art/stock_calendar-view-week.png
+%%DATADIR%%/edit_activity.ui
+%%DATADIR%%/hamster.db
+%%DATADIR%%/hamster.ui
+%%DATADIR%%/overview.ui
+%%DATADIR%%/overview_totals.ui
+%%DATADIR%%/preferences.ui
+%%DATADIR%%/range_pick.ui
+%%DATADIR%%/report_template.html
+%%DATADIR%%/stats.ui
 share/icons/hicolor/16x16/apps/hamster-applet.png
 share/icons/hicolor/22x22/apps/hamster-applet.png
 share/icons/hicolor/32x32/apps/hamster-applet.png
@@ -199,8 +223,8 @@ share/locale/cs/LC_MESSAGES/hamster-applet.mo
 share/locale/da/LC_MESSAGES/hamster-applet.mo
 share/locale/de/LC_MESSAGES/hamster-applet.mo
 share/locale/el/LC_MESSAGES/hamster-applet.mo
-share/locale/en_GB/LC_MESSAGES/hamster-applet.mo
 share/locale/en@shaw/LC_MESSAGES/hamster-applet.mo
+share/locale/en_GB/LC_MESSAGES/hamster-applet.mo
 share/locale/es/LC_MESSAGES/hamster-applet.mo
 share/locale/et/LC_MESSAGES/hamster-applet.mo
 share/locale/eu/LC_MESSAGES/hamster-applet.mo
@@ -211,6 +235,7 @@ share/locale/gu/LC_MESSAGES/hamster-applet.mo
 share/locale/he/LC_MESSAGES/hamster-applet.mo
 share/locale/hi/LC_MESSAGES/hamster-applet.mo
 share/locale/hu/LC_MESSAGES/hamster-applet.mo
+share/locale/id/LC_MESSAGES/hamster-applet.mo
 share/locale/it/LC_MESSAGES/hamster-applet.mo
 share/locale/ja/LC_MESSAGES/hamster-applet.mo
 share/locale/kn/LC_MESSAGES/hamster-applet.mo
@@ -249,24 +274,19 @@ share/locale/zh_TW/LC_MESSAGES/hamster-applet.mo
 @dirrm %%DATADIR%%/art
 @dirrm %%DATADIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/hamster/widgets
-@dirrm %%PYTHON_SITELIBDIR%%/hamster/keybinder
 @dirrm %%PYTHON_SITELIBDIR%%/hamster
 @dirrm lib/hamster-applet
-@dirrm share/gnome/help/hamster-applet/zh_TW/figures
 @dirrm share/gnome/help/hamster-applet/zh_TW
-@dirrm share/gnome/help/hamster-applet/zh_HK/figures
 @dirrm share/gnome/help/hamster-applet/zh_HK
-@dirrm share/gnome/help/hamster-applet/fr/figures
+@dirrm share/gnome/help/hamster-applet/zh_CN
+@dirrm share/gnome/help/hamster-applet/sv
+@dirrm share/gnome/help/hamster-applet/hu
+@dirrm share/gnome/help/hamster-applet/gl
 @dirrm share/gnome/help/hamster-applet/fr
-@dirrm share/gnome/help/hamster-applet/es/figures
 @dirrm share/gnome/help/hamster-applet/es
-@dirrm share/gnome/help/hamster-applet/el/figures
 @dirrm share/gnome/help/hamster-applet/el
-@dirrm share/gnome/help/hamster-applet/de/figures
 @dirrm share/gnome/help/hamster-applet/de
-@dirrm share/gnome/help/hamster-applet/cs/figures
 @dirrm share/gnome/help/hamster-applet/cs
-@dirrm share/gnome/help/hamster-applet/C/figures
 @dirrm share/gnome/help/hamster-applet/C
 @dirrm share/gnome/help/hamster-applet
 @dirrmtry share/locale/zh_HK/LC_MESSAGES