3 files changed, 468 insertions, 50 deletions

diff --git a/deskutils/tomboy/Makefile b/deskutils/tomboy/Makefile
index 597053e1e767..8f8c8bd4a167 100644
--- a/deskutils/tomboy/Makefile
+++ b/deskutils/tomboy/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	tomboy
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.4.0
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -33,10 +32,7 @@ INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_ARGS+=--enable-evolution=yes \
-		--enable-dbus=yes \
-		--enable-dbus-service-dir-check=no \
-		--with-dbus-service-dir=${PREFIX}/share/dbus-1/services
+CONFIGURE_ARGS+=--enable-evolution=yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		DBUS_SERVICE_DIR="${PREFIX}/share/dbus-1/services"
diff --git a/deskutils/tomboy/distinfo b/deskutils/tomboy/distinfo
index 381f386a11ab..6afaa0dfdaca 100644
--- a/deskutils/tomboy/distinfo
+++ b/deskutils/tomboy/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/tomboy-1.2.1.tar.bz2) = f5a6396b1b93919f461653446d2571c6
-SHA256 (gnome2/tomboy-1.2.1.tar.bz2) = 9cb69d399e25e2a773cce5518c60b65dfdb70a46f487527e38cc013688762f99
-SIZE (gnome2/tomboy-1.2.1.tar.bz2) = 6548915
+MD5 (gnome2/tomboy-1.4.0.tar.bz2) = c7c1d9151fd91987b66b4ab887b316cd
+SHA256 (gnome2/tomboy-1.4.0.tar.bz2) = 64650bc11330f087fa96caf70de1ec43d35afe967a65ec42b0c325ef0b748b8e
+SIZE (gnome2/tomboy-1.4.0.tar.bz2) = 7068614
diff --git a/deskutils/tomboy/pkg-plist b/deskutils/tomboy/pkg-plist
index f1ae56cf2bef..643dec9dadb0 100644
--- a/deskutils/tomboy/pkg-plist
+++ b/deskutils/tomboy/pkg-plist
@@ -1,6 +1,5 @@
 @comment $FreeBSD$
 bin/tomboy
-bin/tomboy-panel
 lib/tomboy/Tomboy.exe
 lib/tomboy/Tomboy.exe.config
 lib/tomboy/Tomboy.exe.mdb
@@ -37,10 +36,19 @@ lib/tomboy/addins/WebSyncServiceAddin.dll
 lib/tomboy/addins/WebSyncServiceAddin.dll.mdb
 lib/tomboy/libtomboy.la
 lib/tomboy/libtomboy.so
-libdata/bonobo/servers/GNOME_TomboyApplet.server
 libdata/pkgconfig/tomboy-addins.pc
 share/applications/tomboy.desktop
 share/dbus-1/services/org.gnome.Tomboy.service
+share/gnome/help/tomboy/C/addins-desktop.page
+share/gnome/help/tomboy/C/addins-formatting.page
+share/gnome/help/tomboy/C/addins-sync.page
+share/gnome/help/tomboy/C/addins-tools.page
+share/gnome/help/tomboy/C/addins.page
+share/gnome/help/tomboy/C/advanced.page
+share/gnome/help/tomboy/C/create-note.page
+share/gnome/help/tomboy/C/create-notebook.page
+share/gnome/help/tomboy/C/delete-notes.page
+share/gnome/help/tomboy/C/edit-note.page
 share/gnome/help/tomboy/C/figures/add-notebook-search.png
 share/gnome/help/tomboy/C/figures/add-to-notebook.png
 share/gnome/help/tomboy/C/figures/delete-notebook.png
@@ -58,8 +66,27 @@ share/gnome/help/tomboy/C/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/C/figures/tomboy-preferences-hotkeys.png
 share/gnome/help/tomboy/C/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/C/figures/tomboy-tools.png
+share/gnome/help/tomboy/C/figures/tomboy.png
+share/gnome/help/tomboy/C/hotkeys.page
+share/gnome/help/tomboy/C/index.page
+share/gnome/help/tomboy/C/introduction.page
 share/gnome/help/tomboy/C/legal.xml
-share/gnome/help/tomboy/C/tomboy.xml
+share/gnome/help/tomboy/C/note-edit-prefs.page
+share/gnome/help/tomboy/C/prefs.page
+share/gnome/help/tomboy/C/problems.page
+share/gnome/help/tomboy/C/search.page
+share/gnome/help/tomboy/C/sync.page
+share/gnome/help/tomboy/C/whatsnew.page
+share/gnome/help/tomboy/ca/addins-desktop.page
+share/gnome/help/tomboy/ca/addins-formatting.page
+share/gnome/help/tomboy/ca/addins-sync.page
+share/gnome/help/tomboy/ca/addins-tools.page
+share/gnome/help/tomboy/ca/addins.page
+share/gnome/help/tomboy/ca/advanced.page
+share/gnome/help/tomboy/ca/create-note.page
+share/gnome/help/tomboy/ca/create-notebook.page
+share/gnome/help/tomboy/ca/delete-notes.page
+share/gnome/help/tomboy/ca/edit-note.page
 share/gnome/help/tomboy/ca/figures/add-notebook-search.png
 share/gnome/help/tomboy/ca/figures/add-to-notebook.png
 share/gnome/help/tomboy/ca/figures/delete-notebook.png
@@ -77,8 +104,27 @@ share/gnome/help/tomboy/ca/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/ca/figures/tomboy-preferences-hotkeys.png
 share/gnome/help/tomboy/ca/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/ca/figures/tomboy-tools.png
+share/gnome/help/tomboy/ca/figures/tomboy.png
+share/gnome/help/tomboy/ca/hotkeys.page
+share/gnome/help/tomboy/ca/index.page
+share/gnome/help/tomboy/ca/introduction.page
 share/gnome/help/tomboy/ca/legal.xml
-share/gnome/help/tomboy/ca/tomboy.xml
+share/gnome/help/tomboy/ca/note-edit-prefs.page
+share/gnome/help/tomboy/ca/prefs.page
+share/gnome/help/tomboy/ca/problems.page
+share/gnome/help/tomboy/ca/search.page
+share/gnome/help/tomboy/ca/sync.page
+share/gnome/help/tomboy/ca/whatsnew.page
+share/gnome/help/tomboy/cs/addins-desktop.page
+share/gnome/help/tomboy/cs/addins-formatting.page
+share/gnome/help/tomboy/cs/addins-sync.page
+share/gnome/help/tomboy/cs/addins-tools.page
+share/gnome/help/tomboy/cs/addins.page
+share/gnome/help/tomboy/cs/advanced.page
+share/gnome/help/tomboy/cs/create-note.page
+share/gnome/help/tomboy/cs/create-notebook.page
+share/gnome/help/tomboy/cs/delete-notes.page
+share/gnome/help/tomboy/cs/edit-note.page
 share/gnome/help/tomboy/cs/figures/add-notebook-search.png
 share/gnome/help/tomboy/cs/figures/add-to-notebook.png
 share/gnome/help/tomboy/cs/figures/delete-notebook.png
@@ -96,8 +142,27 @@ share/gnome/help/tomboy/cs/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/cs/figures/tomboy-preferences-hotkeys.png
 share/gnome/help/tomboy/cs/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/cs/figures/tomboy-tools.png
+share/gnome/help/tomboy/cs/figures/tomboy.png
+share/gnome/help/tomboy/cs/hotkeys.page
+share/gnome/help/tomboy/cs/index.page
+share/gnome/help/tomboy/cs/introduction.page
 share/gnome/help/tomboy/cs/legal.xml
-share/gnome/help/tomboy/cs/tomboy.xml
+share/gnome/help/tomboy/cs/note-edit-prefs.page
+share/gnome/help/tomboy/cs/prefs.page
+share/gnome/help/tomboy/cs/problems.page
+share/gnome/help/tomboy/cs/search.page
+share/gnome/help/tomboy/cs/sync.page
+share/gnome/help/tomboy/cs/whatsnew.page
+share/gnome/help/tomboy/de/addins-desktop.page
+share/gnome/help/tomboy/de/addins-formatting.page
+share/gnome/help/tomboy/de/addins-sync.page
+share/gnome/help/tomboy/de/addins-tools.page
+share/gnome/help/tomboy/de/addins.page
+share/gnome/help/tomboy/de/advanced.page
+share/gnome/help/tomboy/de/create-note.page
+share/gnome/help/tomboy/de/create-notebook.page
+share/gnome/help/tomboy/de/delete-notes.page
+share/gnome/help/tomboy/de/edit-note.page
 share/gnome/help/tomboy/de/figures/add-notebook-search.png
 share/gnome/help/tomboy/de/figures/add-to-notebook.png
 share/gnome/help/tomboy/de/figures/delete-notebook.png
@@ -115,8 +180,27 @@ share/gnome/help/tomboy/de/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/de/figures/tomboy-preferences-hotkeys.png
 share/gnome/help/tomboy/de/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/de/figures/tomboy-tools.png
+share/gnome/help/tomboy/de/figures/tomboy.png
+share/gnome/help/tomboy/de/hotkeys.page
+share/gnome/help/tomboy/de/index.page
+share/gnome/help/tomboy/de/introduction.page
 share/gnome/help/tomboy/de/legal.xml
-share/gnome/help/tomboy/de/tomboy.xml
+share/gnome/help/tomboy/de/note-edit-prefs.page
+share/gnome/help/tomboy/de/prefs.page
+share/gnome/help/tomboy/de/problems.page
+share/gnome/help/tomboy/de/search.page
+share/gnome/help/tomboy/de/sync.page
+share/gnome/help/tomboy/de/whatsnew.page
+share/gnome/help/tomboy/el/addins-desktop.page
+share/gnome/help/tomboy/el/addins-formatting.page
+share/gnome/help/tomboy/el/addins-sync.page
+share/gnome/help/tomboy/el/addins-tools.page
+share/gnome/help/tomboy/el/addins.page
+share/gnome/help/tomboy/el/advanced.page
+share/gnome/help/tomboy/el/create-note.page
+share/gnome/help/tomboy/el/create-notebook.page
+share/gnome/help/tomboy/el/delete-notes.page
+share/gnome/help/tomboy/el/edit-note.page
 share/gnome/help/tomboy/el/figures/add-notebook-search.png
 share/gnome/help/tomboy/el/figures/add-to-notebook.png
 share/gnome/help/tomboy/el/figures/delete-notebook.png
@@ -134,8 +218,27 @@ share/gnome/help/tomboy/el/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/el/figures/tomboy-preferences-hotkeys.png
 share/gnome/help/tomboy/el/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/el/figures/tomboy-tools.png
+share/gnome/help/tomboy/el/figures/tomboy.png
+share/gnome/help/tomboy/el/hotkeys.page
+share/gnome/help/tomboy/el/index.page
+share/gnome/help/tomboy/el/introduction.page
 share/gnome/help/tomboy/el/legal.xml
-share/gnome/help/tomboy/el/tomboy.xml
+share/gnome/help/tomboy/el/note-edit-prefs.page
+share/gnome/help/tomboy/el/prefs.page
+share/gnome/help/tomboy/el/problems.page
+share/gnome/help/tomboy/el/search.page
+share/gnome/help/tomboy/el/sync.page
+share/gnome/help/tomboy/el/whatsnew.page
+share/gnome/help/tomboy/en_GB/addins-desktop.page
+share/gnome/help/tomboy/en_GB/addins-formatting.page
+share/gnome/help/tomboy/en_GB/addins-sync.page
+share/gnome/help/tomboy/en_GB/addins-tools.page
+share/gnome/help/tomboy/en_GB/addins.page
+share/gnome/help/tomboy/en_GB/advanced.page
+share/gnome/help/tomboy/en_GB/create-note.page
+share/gnome/help/tomboy/en_GB/create-notebook.page
+share/gnome/help/tomboy/en_GB/delete-notes.page
+share/gnome/help/tomboy/en_GB/edit-note.page
 share/gnome/help/tomboy/en_GB/figures/add-notebook-search.png
 share/gnome/help/tomboy/en_GB/figures/add-to-notebook.png
 share/gnome/help/tomboy/en_GB/figures/delete-notebook.png
@@ -153,8 +256,27 @@ share/gnome/help/tomboy/en_GB/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/en_GB/figures/tomboy-preferences-hotkeys.png
 share/gnome/help/tomboy/en_GB/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/en_GB/figures/tomboy-tools.png
+share/gnome/help/tomboy/en_GB/figures/tomboy.png
+share/gnome/help/tomboy/en_GB/hotkeys.page
+share/gnome/help/tomboy/en_GB/index.page
+share/gnome/help/tomboy/en_GB/introduction.page
 share/gnome/help/tomboy/en_GB/legal.xml
-share/gnome/help/tomboy/en_GB/tomboy.xml
+share/gnome/help/tomboy/en_GB/note-edit-prefs.page
+share/gnome/help/tomboy/en_GB/prefs.page
+share/gnome/help/tomboy/en_GB/problems.page
+share/gnome/help/tomboy/en_GB/search.page
+share/gnome/help/tomboy/en_GB/sync.page
+share/gnome/help/tomboy/en_GB/whatsnew.page
+share/gnome/help/tomboy/es/addins-desktop.page
+share/gnome/help/tomboy/es/addins-formatting.page
+share/gnome/help/tomboy/es/addins-sync.page
+share/gnome/help/tomboy/es/addins-tools.page
+share/gnome/help/tomboy/es/addins.page
+share/gnome/help/tomboy/es/advanced.page
+share/gnome/help/tomboy/es/create-note.page
+share/gnome/help/tomboy/es/create-notebook.page
+share/gnome/help/tomboy/es/delete-notes.page
+share/gnome/help/tomboy/es/edit-note.page
 share/gnome/help/tomboy/es/figures/add-notebook-search.png
 share/gnome/help/tomboy/es/figures/add-to-notebook.png
 share/gnome/help/tomboy/es/figures/delete-notebook.png
@@ -172,8 +294,27 @@ share/gnome/help/tomboy/es/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/es/figures/tomboy-preferences-hotkeys.png
 share/gnome/help/tomboy/es/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/es/figures/tomboy-tools.png
+share/gnome/help/tomboy/es/figures/tomboy.png
+share/gnome/help/tomboy/es/hotkeys.page
+share/gnome/help/tomboy/es/index.page
+share/gnome/help/tomboy/es/introduction.page
 share/gnome/help/tomboy/es/legal.xml
-share/gnome/help/tomboy/es/tomboy.xml
+share/gnome/help/tomboy/es/note-edit-prefs.page
+share/gnome/help/tomboy/es/prefs.page
+share/gnome/help/tomboy/es/problems.page
+share/gnome/help/tomboy/es/search.page
+share/gnome/help/tomboy/es/sync.page
+share/gnome/help/tomboy/es/whatsnew.page
+share/gnome/help/tomboy/eu/addins-desktop.page
+share/gnome/help/tomboy/eu/addins-formatting.page
+share/gnome/help/tomboy/eu/addins-sync.page
+share/gnome/help/tomboy/eu/addins-tools.page
+share/gnome/help/tomboy/eu/addins.page
+share/gnome/help/tomboy/eu/advanced.page
+share/gnome/help/tomboy/eu/create-note.page
+share/gnome/help/tomboy/eu/create-notebook.page
+share/gnome/help/tomboy/eu/delete-notes.page
+share/gnome/help/tomboy/eu/edit-note.page
 share/gnome/help/tomboy/eu/figures/add-notebook-search.png
 share/gnome/help/tomboy/eu/figures/add-to-notebook.png
 share/gnome/help/tomboy/eu/figures/delete-notebook.png
@@ -191,8 +332,27 @@ share/gnome/help/tomboy/eu/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/eu/figures/tomboy-preferences-hotkeys.png
 share/gnome/help/tomboy/eu/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/eu/figures/tomboy-tools.png
+share/gnome/help/tomboy/eu/figures/tomboy.png
+share/gnome/help/tomboy/eu/hotkeys.page
+share/gnome/help/tomboy/eu/index.page
+share/gnome/help/tomboy/eu/introduction.page
 share/gnome/help/tomboy/eu/legal.xml
-share/gnome/help/tomboy/eu/tomboy.xml
+share/gnome/help/tomboy/eu/note-edit-prefs.page
+share/gnome/help/tomboy/eu/prefs.page
+share/gnome/help/tomboy/eu/problems.page
+share/gnome/help/tomboy/eu/search.page
+share/gnome/help/tomboy/eu/sync.page
+share/gnome/help/tomboy/eu/whatsnew.page
+share/gnome/help/tomboy/fr/addins-desktop.page
+share/gnome/help/tomboy/fr/addins-formatting.page
+share/gnome/help/tomboy/fr/addins-sync.page
+share/gnome/help/tomboy/fr/addins-tools.page
+share/gnome/help/tomboy/fr/addins.page
+share/gnome/help/tomboy/fr/advanced.page
+share/gnome/help/tomboy/fr/create-note.page
+share/gnome/help/tomboy/fr/create-notebook.page
+share/gnome/help/tomboy/fr/delete-notes.page
+share/gnome/help/tomboy/fr/edit-note.page
 share/gnome/help/tomboy/fr/figures/add-notebook-search.png
 share/gnome/help/tomboy/fr/figures/add-to-notebook.png
 share/gnome/help/tomboy/fr/figures/delete-notebook.png
@@ -210,8 +370,103 @@ share/gnome/help/tomboy/fr/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/fr/figures/tomboy-preferences-hotkeys.png
 share/gnome/help/tomboy/fr/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/fr/figures/tomboy-tools.png
+share/gnome/help/tomboy/fr/figures/tomboy.png
+share/gnome/help/tomboy/fr/hotkeys.page
+share/gnome/help/tomboy/fr/index.page
+share/gnome/help/tomboy/fr/introduction.page
 share/gnome/help/tomboy/fr/legal.xml
-share/gnome/help/tomboy/fr/tomboy.xml
+share/gnome/help/tomboy/fr/note-edit-prefs.page
+share/gnome/help/tomboy/fr/prefs.page
+share/gnome/help/tomboy/fr/problems.page
+share/gnome/help/tomboy/fr/search.page
+share/gnome/help/tomboy/fr/sync.page
+share/gnome/help/tomboy/fr/whatsnew.page
+share/gnome/help/tomboy/gl/addins-desktop.page
+share/gnome/help/tomboy/gl/addins-formatting.page
+share/gnome/help/tomboy/gl/addins-sync.page
+share/gnome/help/tomboy/gl/addins-tools.page
+share/gnome/help/tomboy/gl/addins.page
+share/gnome/help/tomboy/gl/advanced.page
+share/gnome/help/tomboy/gl/create-note.page
+share/gnome/help/tomboy/gl/create-notebook.page
+share/gnome/help/tomboy/gl/delete-notes.page
+share/gnome/help/tomboy/gl/edit-note.page
+share/gnome/help/tomboy/gl/figures/add-notebook-search.png
+share/gnome/help/tomboy/gl/figures/add-to-notebook.png
+share/gnome/help/tomboy/gl/figures/delete-notebook.png
+share/gnome/help/tomboy/gl/figures/move-notes-search.png
+share/gnome/help/tomboy/gl/figures/new-notebook.png
+share/gnome/help/tomboy/gl/figures/note-template.png
+share/gnome/help/tomboy/gl/figures/notebook-icon.png
+share/gnome/help/tomboy/gl/figures/tomboy-main-menu.png
+share/gnome/help/tomboy/gl/figures/tomboy-new-note.png
+share/gnome/help/tomboy/gl/figures/tomboy-panel.png
+share/gnome/help/tomboy/gl/figures/tomboy-pindown.png
+share/gnome/help/tomboy/gl/figures/tomboy-pinup.png
+share/gnome/help/tomboy/gl/figures/tomboy-preferences-add-ins.png
+share/gnome/help/tomboy/gl/figures/tomboy-preferences-editing.png
+share/gnome/help/tomboy/gl/figures/tomboy-preferences-hotkeys.png
+share/gnome/help/tomboy/gl/figures/tomboy-preferences-synchronization.png
+share/gnome/help/tomboy/gl/figures/tomboy-tools.png
+share/gnome/help/tomboy/gl/figures/tomboy.png
+share/gnome/help/tomboy/gl/hotkeys.page
+share/gnome/help/tomboy/gl/index.page
+share/gnome/help/tomboy/gl/introduction.page
+share/gnome/help/tomboy/gl/legal.xml
+share/gnome/help/tomboy/gl/note-edit-prefs.page
+share/gnome/help/tomboy/gl/prefs.page
+share/gnome/help/tomboy/gl/problems.page
+share/gnome/help/tomboy/gl/search.page
+share/gnome/help/tomboy/gl/sync.page
+share/gnome/help/tomboy/gl/whatsnew.page
+share/gnome/help/tomboy/hu/addins-desktop.page
+share/gnome/help/tomboy/hu/addins-formatting.page
+share/gnome/help/tomboy/hu/addins-sync.page
+share/gnome/help/tomboy/hu/addins-tools.page
+share/gnome/help/tomboy/hu/addins.page
+share/gnome/help/tomboy/hu/advanced.page
+share/gnome/help/tomboy/hu/create-note.page
+share/gnome/help/tomboy/hu/create-notebook.page
+share/gnome/help/tomboy/hu/delete-notes.page
+share/gnome/help/tomboy/hu/edit-note.page
+share/gnome/help/tomboy/hu/figures/add-notebook-search.png
+share/gnome/help/tomboy/hu/figures/add-to-notebook.png
+share/gnome/help/tomboy/hu/figures/delete-notebook.png
+share/gnome/help/tomboy/hu/figures/move-notes-search.png
+share/gnome/help/tomboy/hu/figures/new-notebook.png
+share/gnome/help/tomboy/hu/figures/note-template.png
+share/gnome/help/tomboy/hu/figures/notebook-icon.png
+share/gnome/help/tomboy/hu/figures/tomboy-main-menu.png
+share/gnome/help/tomboy/hu/figures/tomboy-new-note.png
+share/gnome/help/tomboy/hu/figures/tomboy-panel.png
+share/gnome/help/tomboy/hu/figures/tomboy-pindown.png
+share/gnome/help/tomboy/hu/figures/tomboy-pinup.png
+share/gnome/help/tomboy/hu/figures/tomboy-preferences-add-ins.png
+share/gnome/help/tomboy/hu/figures/tomboy-preferences-editing.png
+share/gnome/help/tomboy/hu/figures/tomboy-preferences-hotkeys.png
+share/gnome/help/tomboy/hu/figures/tomboy-preferences-synchronization.png
+share/gnome/help/tomboy/hu/figures/tomboy-tools.png
+share/gnome/help/tomboy/hu/figures/tomboy.png
+share/gnome/help/tomboy/hu/hotkeys.page
+share/gnome/help/tomboy/hu/index.page
+share/gnome/help/tomboy/hu/introduction.page
+share/gnome/help/tomboy/hu/legal.xml
+share/gnome/help/tomboy/hu/note-edit-prefs.page
+share/gnome/help/tomboy/hu/prefs.page
+share/gnome/help/tomboy/hu/problems.page
+share/gnome/help/tomboy/hu/search.page
+share/gnome/help/tomboy/hu/sync.page
+share/gnome/help/tomboy/hu/whatsnew.page
+share/gnome/help/tomboy/it/addins-desktop.page
+share/gnome/help/tomboy/it/addins-formatting.page
+share/gnome/help/tomboy/it/addins-sync.page
+share/gnome/help/tomboy/it/addins-tools.page
+share/gnome/help/tomboy/it/addins.page
+share/gnome/help/tomboy/it/advanced.page
+share/gnome/help/tomboy/it/create-note.page
+share/gnome/help/tomboy/it/create-notebook.page
+share/gnome/help/tomboy/it/delete-notes.page
+share/gnome/help/tomboy/it/edit-note.page
 share/gnome/help/tomboy/it/figures/add-notebook-search.png
 share/gnome/help/tomboy/it/figures/add-to-notebook.png
 share/gnome/help/tomboy/it/figures/delete-notebook.png
@@ -229,8 +484,27 @@ share/gnome/help/tomboy/it/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/it/figures/tomboy-preferences-hotkeys.png
 share/gnome/help/tomboy/it/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/it/figures/tomboy-tools.png
+share/gnome/help/tomboy/it/figures/tomboy.png
+share/gnome/help/tomboy/it/hotkeys.page
+share/gnome/help/tomboy/it/index.page
+share/gnome/help/tomboy/it/introduction.page
 share/gnome/help/tomboy/it/legal.xml
-share/gnome/help/tomboy/it/tomboy.xml
+share/gnome/help/tomboy/it/note-edit-prefs.page
+share/gnome/help/tomboy/it/prefs.page
+share/gnome/help/tomboy/it/problems.page
+share/gnome/help/tomboy/it/search.page
+share/gnome/help/tomboy/it/sync.page
+share/gnome/help/tomboy/it/whatsnew.page
+share/gnome/help/tomboy/lt/addins-desktop.page
+share/gnome/help/tomboy/lt/addins-formatting.page
+share/gnome/help/tomboy/lt/addins-sync.page
+share/gnome/help/tomboy/lt/addins-tools.page
+share/gnome/help/tomboy/lt/addins.page
+share/gnome/help/tomboy/lt/advanced.page
+share/gnome/help/tomboy/lt/create-note.page
+share/gnome/help/tomboy/lt/create-notebook.page
+share/gnome/help/tomboy/lt/delete-notes.page
+share/gnome/help/tomboy/lt/edit-note.page
 share/gnome/help/tomboy/lt/figures/add-notebook-search.png
 share/gnome/help/tomboy/lt/figures/add-to-notebook.png
 share/gnome/help/tomboy/lt/figures/delete-notebook.png
@@ -248,8 +522,27 @@ share/gnome/help/tomboy/lt/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/lt/figures/tomboy-preferences-hotkeys.png
 share/gnome/help/tomboy/lt/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/lt/figures/tomboy-tools.png
+share/gnome/help/tomboy/lt/figures/tomboy.png
+share/gnome/help/tomboy/lt/hotkeys.page
+share/gnome/help/tomboy/lt/index.page
+share/gnome/help/tomboy/lt/introduction.page
 share/gnome/help/tomboy/lt/legal.xml
-share/gnome/help/tomboy/lt/tomboy.xml
+share/gnome/help/tomboy/lt/note-edit-prefs.page
+share/gnome/help/tomboy/lt/prefs.page
+share/gnome/help/tomboy/lt/problems.page
+share/gnome/help/tomboy/lt/search.page
+share/gnome/help/tomboy/lt/sync.page
+share/gnome/help/tomboy/lt/whatsnew.page
+share/gnome/help/tomboy/oc/addins-desktop.page
+share/gnome/help/tomboy/oc/addins-formatting.page
+share/gnome/help/tomboy/oc/addins-sync.page
+share/gnome/help/tomboy/oc/addins-tools.page
+share/gnome/help/tomboy/oc/addins.page
+share/gnome/help/tomboy/oc/advanced.page
+share/gnome/help/tomboy/oc/create-note.page
+share/gnome/help/tomboy/oc/create-notebook.page
+share/gnome/help/tomboy/oc/delete-notes.page
+share/gnome/help/tomboy/oc/edit-note.page
 share/gnome/help/tomboy/oc/figures/add-notebook-search.png
 share/gnome/help/tomboy/oc/figures/add-to-notebook.png
 share/gnome/help/tomboy/oc/figures/delete-notebook.png
@@ -267,8 +560,27 @@ share/gnome/help/tomboy/oc/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/oc/figures/tomboy-preferences-hotkeys.png
 share/gnome/help/tomboy/oc/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/oc/figures/tomboy-tools.png
+share/gnome/help/tomboy/oc/figures/tomboy.png
+share/gnome/help/tomboy/oc/hotkeys.page
+share/gnome/help/tomboy/oc/index.page
+share/gnome/help/tomboy/oc/introduction.page
 share/gnome/help/tomboy/oc/legal.xml
-share/gnome/help/tomboy/oc/tomboy.xml
+share/gnome/help/tomboy/oc/note-edit-prefs.page
+share/gnome/help/tomboy/oc/prefs.page
+share/gnome/help/tomboy/oc/problems.page
+share/gnome/help/tomboy/oc/search.page
+share/gnome/help/tomboy/oc/sync.page
+share/gnome/help/tomboy/oc/whatsnew.page
+share/gnome/help/tomboy/pl/addins-desktop.page
+share/gnome/help/tomboy/pl/addins-formatting.page
+share/gnome/help/tomboy/pl/addins-sync.page
+share/gnome/help/tomboy/pl/addins-tools.page
+share/gnome/help/tomboy/pl/addins.page
+share/gnome/help/tomboy/pl/advanced.page
+share/gnome/help/tomboy/pl/create-note.page
+share/gnome/help/tomboy/pl/create-notebook.page
+share/gnome/help/tomboy/pl/delete-notes.page
+share/gnome/help/tomboy/pl/edit-note.page
 share/gnome/help/tomboy/pl/figures/add-notebook-search.png
 share/gnome/help/tomboy/pl/figures/add-to-notebook.png
 share/gnome/help/tomboy/pl/figures/delete-notebook.png
@@ -286,8 +598,27 @@ share/gnome/help/tomboy/pl/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/pl/figures/tomboy-preferences-hotkeys.png
 share/gnome/help/tomboy/pl/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/pl/figures/tomboy-tools.png
+share/gnome/help/tomboy/pl/figures/tomboy.png
+share/gnome/help/tomboy/pl/hotkeys.page
+share/gnome/help/tomboy/pl/index.page
+share/gnome/help/tomboy/pl/introduction.page
 share/gnome/help/tomboy/pl/legal.xml
-share/gnome/help/tomboy/pl/tomboy.xml
+share/gnome/help/tomboy/pl/note-edit-prefs.page
+share/gnome/help/tomboy/pl/prefs.page
+share/gnome/help/tomboy/pl/problems.page
+share/gnome/help/tomboy/pl/search.page
+share/gnome/help/tomboy/pl/sync.page
+share/gnome/help/tomboy/pl/whatsnew.page
+share/gnome/help/tomboy/pt_BR/addins-desktop.page
+share/gnome/help/tomboy/pt_BR/addins-formatting.page
+share/gnome/help/tomboy/pt_BR/addins-sync.page
+share/gnome/help/tomboy/pt_BR/addins-tools.page
+share/gnome/help/tomboy/pt_BR/addins.page
+share/gnome/help/tomboy/pt_BR/advanced.page
+share/gnome/help/tomboy/pt_BR/create-note.page
+share/gnome/help/tomboy/pt_BR/create-notebook.page
+share/gnome/help/tomboy/pt_BR/delete-notes.page
+share/gnome/help/tomboy/pt_BR/edit-note.page
 share/gnome/help/tomboy/pt_BR/figures/add-notebook-search.png
 share/gnome/help/tomboy/pt_BR/figures/add-to-notebook.png
 share/gnome/help/tomboy/pt_BR/figures/delete-notebook.png
@@ -305,8 +636,27 @@ share/gnome/help/tomboy/pt_BR/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/pt_BR/figures/tomboy-preferences-hotkeys.png
 share/gnome/help/tomboy/pt_BR/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/pt_BR/figures/tomboy-tools.png
+share/gnome/help/tomboy/pt_BR/figures/tomboy.png
+share/gnome/help/tomboy/pt_BR/hotkeys.page
+share/gnome/help/tomboy/pt_BR/index.page
+share/gnome/help/tomboy/pt_BR/introduction.page
 share/gnome/help/tomboy/pt_BR/legal.xml
-share/gnome/help/tomboy/pt_BR/tomboy.xml
+share/gnome/help/tomboy/pt_BR/note-edit-prefs.page
+share/gnome/help/tomboy/pt_BR/prefs.page
+share/gnome/help/tomboy/pt_BR/problems.page
+share/gnome/help/tomboy/pt_BR/search.page
+share/gnome/help/tomboy/pt_BR/sync.page
+share/gnome/help/tomboy/pt_BR/whatsnew.page
+share/gnome/help/tomboy/ru/addins-desktop.page
+share/gnome/help/tomboy/ru/addins-formatting.page
+share/gnome/help/tomboy/ru/addins-sync.page
+share/gnome/help/tomboy/ru/addins-tools.page
+share/gnome/help/tomboy/ru/addins.page
+share/gnome/help/tomboy/ru/advanced.page
+share/gnome/help/tomboy/ru/create-note.page
+share/gnome/help/tomboy/ru/create-notebook.page
+share/gnome/help/tomboy/ru/delete-notes.page
+share/gnome/help/tomboy/ru/edit-note.page
 share/gnome/help/tomboy/ru/figures/add-notebook-search.png
 share/gnome/help/tomboy/ru/figures/add-to-notebook.png
 share/gnome/help/tomboy/ru/figures/delete-notebook.png
@@ -324,8 +674,27 @@ share/gnome/help/tomboy/ru/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/ru/figures/tomboy-preferences-hotkeys.png
 share/gnome/help/tomboy/ru/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/ru/figures/tomboy-tools.png
+share/gnome/help/tomboy/ru/figures/tomboy.png
+share/gnome/help/tomboy/ru/hotkeys.page
+share/gnome/help/tomboy/ru/index.page
+share/gnome/help/tomboy/ru/introduction.page
 share/gnome/help/tomboy/ru/legal.xml
-share/gnome/help/tomboy/ru/tomboy.xml
+share/gnome/help/tomboy/ru/note-edit-prefs.page
+share/gnome/help/tomboy/ru/prefs.page
+share/gnome/help/tomboy/ru/problems.page
+share/gnome/help/tomboy/ru/search.page
+share/gnome/help/tomboy/ru/sync.page
+share/gnome/help/tomboy/ru/whatsnew.page
+share/gnome/help/tomboy/sv/addins-desktop.page
+share/gnome/help/tomboy/sv/addins-formatting.page
+share/gnome/help/tomboy/sv/addins-sync.page
+share/gnome/help/tomboy/sv/addins-tools.page
+share/gnome/help/tomboy/sv/addins.page
+share/gnome/help/tomboy/sv/advanced.page
+share/gnome/help/tomboy/sv/create-note.page
+share/gnome/help/tomboy/sv/create-notebook.page
+share/gnome/help/tomboy/sv/delete-notes.page
+share/gnome/help/tomboy/sv/edit-note.page
 share/gnome/help/tomboy/sv/figures/add-notebook-search.png
 share/gnome/help/tomboy/sv/figures/add-to-notebook.png
 share/gnome/help/tomboy/sv/figures/delete-notebook.png
@@ -343,8 +712,27 @@ share/gnome/help/tomboy/sv/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/sv/figures/tomboy-preferences-hotkeys.png
 share/gnome/help/tomboy/sv/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/sv/figures/tomboy-tools.png
+share/gnome/help/tomboy/sv/figures/tomboy.png
+share/gnome/help/tomboy/sv/hotkeys.page
+share/gnome/help/tomboy/sv/index.page
+share/gnome/help/tomboy/sv/introduction.page
 share/gnome/help/tomboy/sv/legal.xml
-share/gnome/help/tomboy/sv/tomboy.xml
+share/gnome/help/tomboy/sv/note-edit-prefs.page
+share/gnome/help/tomboy/sv/prefs.page
+share/gnome/help/tomboy/sv/problems.page
+share/gnome/help/tomboy/sv/search.page
+share/gnome/help/tomboy/sv/sync.page
+share/gnome/help/tomboy/sv/whatsnew.page
+share/gnome/help/tomboy/uk/addins-desktop.page
+share/gnome/help/tomboy/uk/addins-formatting.page
+share/gnome/help/tomboy/uk/addins-sync.page
+share/gnome/help/tomboy/uk/addins-tools.page
+share/gnome/help/tomboy/uk/addins.page
+share/gnome/help/tomboy/uk/advanced.page
+share/gnome/help/tomboy/uk/create-note.page
+share/gnome/help/tomboy/uk/create-notebook.page
+share/gnome/help/tomboy/uk/delete-notes.page
+share/gnome/help/tomboy/uk/edit-note.page
 share/gnome/help/tomboy/uk/figures/add-notebook-search.png
 share/gnome/help/tomboy/uk/figures/add-to-notebook.png
 share/gnome/help/tomboy/uk/figures/delete-notebook.png
@@ -362,8 +750,27 @@ share/gnome/help/tomboy/uk/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/uk/figures/tomboy-preferences-hotkeys.png
 share/gnome/help/tomboy/uk/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/uk/figures/tomboy-tools.png
+share/gnome/help/tomboy/uk/figures/tomboy.png
+share/gnome/help/tomboy/uk/hotkeys.page
+share/gnome/help/tomboy/uk/index.page
+share/gnome/help/tomboy/uk/introduction.page
 share/gnome/help/tomboy/uk/legal.xml
-share/gnome/help/tomboy/uk/tomboy.xml
+share/gnome/help/tomboy/uk/note-edit-prefs.page
+share/gnome/help/tomboy/uk/prefs.page
+share/gnome/help/tomboy/uk/problems.page
+share/gnome/help/tomboy/uk/search.page
+share/gnome/help/tomboy/uk/sync.page
+share/gnome/help/tomboy/uk/whatsnew.page
+share/gnome/help/tomboy/vi/addins-desktop.page
+share/gnome/help/tomboy/vi/addins-formatting.page
+share/gnome/help/tomboy/vi/addins-sync.page
+share/gnome/help/tomboy/vi/addins-tools.page
+share/gnome/help/tomboy/vi/addins.page
+share/gnome/help/tomboy/vi/advanced.page
+share/gnome/help/tomboy/vi/create-note.page
+share/gnome/help/tomboy/vi/create-notebook.page
+share/gnome/help/tomboy/vi/delete-notes.page
+share/gnome/help/tomboy/vi/edit-note.page
 share/gnome/help/tomboy/vi/figures/add-notebook-search.png
 share/gnome/help/tomboy/vi/figures/add-to-notebook.png
 share/gnome/help/tomboy/vi/figures/delete-notebook.png
@@ -381,8 +788,27 @@ share/gnome/help/tomboy/vi/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/vi/figures/tomboy-preferences-hotkeys.png
 share/gnome/help/tomboy/vi/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/vi/figures/tomboy-tools.png
+share/gnome/help/tomboy/vi/figures/tomboy.png
+share/gnome/help/tomboy/vi/hotkeys.page
+share/gnome/help/tomboy/vi/index.page
+share/gnome/help/tomboy/vi/introduction.page
 share/gnome/help/tomboy/vi/legal.xml
-share/gnome/help/tomboy/vi/tomboy.xml
+share/gnome/help/tomboy/vi/note-edit-prefs.page
+share/gnome/help/tomboy/vi/prefs.page
+share/gnome/help/tomboy/vi/problems.page
+share/gnome/help/tomboy/vi/search.page
+share/gnome/help/tomboy/vi/sync.page
+share/gnome/help/tomboy/vi/whatsnew.page
+share/gnome/help/tomboy/zh_CN/addins-desktop.page
+share/gnome/help/tomboy/zh_CN/addins-formatting.page
+share/gnome/help/tomboy/zh_CN/addins-sync.page
+share/gnome/help/tomboy/zh_CN/addins-tools.page
+share/gnome/help/tomboy/zh_CN/addins.page
+share/gnome/help/tomboy/zh_CN/advanced.page
+share/gnome/help/tomboy/zh_CN/create-note.page
+share/gnome/help/tomboy/zh_CN/create-notebook.page
+share/gnome/help/tomboy/zh_CN/delete-notes.page
+share/gnome/help/tomboy/zh_CN/edit-note.page
 share/gnome/help/tomboy/zh_CN/figures/add-notebook-search.png
 share/gnome/help/tomboy/zh_CN/figures/add-to-notebook.png
 share/gnome/help/tomboy/zh_CN/figures/delete-notebook.png
@@ -400,8 +826,17 @@ share/gnome/help/tomboy/zh_CN/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/zh_CN/figures/tomboy-preferences-hotkeys.png
 share/gnome/help/tomboy/zh_CN/figures/tomboy-preferences-synchronization.png
 share/gnome/help/tomboy/zh_CN/figures/tomboy-tools.png
+share/gnome/help/tomboy/zh_CN/figures/tomboy.png
+share/gnome/help/tomboy/zh_CN/hotkeys.page
+share/gnome/help/tomboy/zh_CN/index.page
+share/gnome/help/tomboy/zh_CN/introduction.page
 share/gnome/help/tomboy/zh_CN/legal.xml
-share/gnome/help/tomboy/zh_CN/tomboy.xml
+share/gnome/help/tomboy/zh_CN/note-edit-prefs.page
+share/gnome/help/tomboy/zh_CN/prefs.page
+share/gnome/help/tomboy/zh_CN/problems.page
+share/gnome/help/tomboy/zh_CN/search.page
+share/gnome/help/tomboy/zh_CN/sync.page
+share/gnome/help/tomboy/zh_CN/whatsnew.page
 share/icons/hicolor/16x16/apps/tomboy.png
 share/icons/hicolor/16x16/mimetypes/application-x-note.png
 share/icons/hicolor/22x22/apps/tomboy.png
@@ -411,6 +846,7 @@ share/icons/hicolor/32x32/apps/tomboy.png
 share/icons/hicolor/48x48/apps/tomboy.png
 share/icons/hicolor/48x48/mimetypes/application-x-note.png
 share/icons/hicolor/scalable/apps/tomboy.svg
+share/locale/af/LC_MESSAGES/tomboy.mo
 share/locale/ar/LC_MESSAGES/tomboy.mo
 share/locale/as/LC_MESSAGES/tomboy.mo
 share/locale/ast/LC_MESSAGES/tomboy.mo
@@ -430,6 +866,7 @@ share/locale/el/LC_MESSAGES/tomboy.mo
 share/locale/en@shaw/LC_MESSAGES/tomboy.mo
 share/locale/en_CA/LC_MESSAGES/tomboy.mo
 share/locale/en_GB/LC_MESSAGES/tomboy.mo
+share/locale/eo/LC_MESSAGES/tomboy.mo
 share/locale/es/LC_MESSAGES/tomboy.mo
 share/locale/et/LC_MESSAGES/tomboy.mo
 share/locale/eu/LC_MESSAGES/tomboy.mo
@@ -454,6 +891,7 @@ share/locale/mai/LC_MESSAGES/tomboy.mo
 share/locale/mk/LC_MESSAGES/tomboy.mo
 share/locale/ml/LC_MESSAGES/tomboy.mo
 share/locale/mr/LC_MESSAGES/tomboy.mo
+share/locale/ms/LC_MESSAGES/tomboy.mo
 share/locale/nb/LC_MESSAGES/tomboy.mo
 share/locale/ne/LC_MESSAGES/tomboy.mo
 share/locale/nl/LC_MESSAGES/tomboy.mo
@@ -485,25 +923,6 @@ share/locale/zh_HK/LC_MESSAGES/tomboy.mo
 share/locale/zh_TW/LC_MESSAGES/tomboy.mo
 share/mime/application/x-note.xml
 share/mime/packages/tomboy.xml
-share/omf/tomboy/tomboy-C.omf
-share/omf/tomboy/tomboy-ca.omf
-share/omf/tomboy/tomboy-cs.omf
-share/omf/tomboy/tomboy-de.omf
-share/omf/tomboy/tomboy-el.omf
-share/omf/tomboy/tomboy-en_GB.omf
-share/omf/tomboy/tomboy-es.omf
-share/omf/tomboy/tomboy-eu.omf
-share/omf/tomboy/tomboy-fr.omf
-share/omf/tomboy/tomboy-it.omf
-share/omf/tomboy/tomboy-lt.omf
-share/omf/tomboy/tomboy-oc.omf
-share/omf/tomboy/tomboy-pl.omf
-share/omf/tomboy/tomboy-pt_BR.omf
-share/omf/tomboy/tomboy-ru.omf
-share/omf/tomboy/tomboy-sv.omf
-share/omf/tomboy/tomboy-uk.omf
-share/omf/tomboy/tomboy-vi.omf
-share/omf/tomboy/tomboy-zh_CN.omf
 %%DATADIR%%/icons/hicolor/16x16/actions/note-new.png
 %%DATADIR%%/icons/hicolor/16x16/actions/notebook-new.png
 %%DATADIR%%/icons/hicolor/16x16/places/note.png
@@ -542,7 +961,6 @@ share/omf/tomboy/tomboy-zh_CN.omf
 @dirrm %%DATADIR%%/icons/hicolor
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
-@dirrm share/omf/tomboy
 @dirrm share/gnome/help/tomboy/zh_CN/figures
 @dirrm share/gnome/help/tomboy/zh_CN
 @dirrm share/gnome/help/tomboy/vi/figures
@@ -563,6 +981,10 @@ share/omf/tomboy/tomboy-zh_CN.omf
 @dirrm share/gnome/help/tomboy/lt
 @dirrm share/gnome/help/tomboy/it/figures
 @dirrm share/gnome/help/tomboy/it
+@dirrm share/gnome/help/tomboy/hu/figures
+@dirrm share/gnome/help/tomboy/hu
+@dirrm share/gnome/help/tomboy/gl/figures
+@dirrm share/gnome/help/tomboy/gl
 @dirrm share/gnome/help/tomboy/fr/figures
 @dirrm share/gnome/help/tomboy/fr
 @dirrm share/gnome/help/tomboy/eu/figures