- Update to 2.3.6

6 files changed, 26 insertions, 106 deletions

diff --git a/misc/gnomesword/Makefile b/misc/gnomesword/Makefile
index 63b9e0717795..8f86adff851a 100644
--- a/misc/gnomesword/Makefile
+++ b/misc/gnomesword/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomesword
-PORTVERSION=	2.3.5
+PORTVERSION=	2.3.6
 CATEGORIES=	misc gnome
 MASTER_SITES=	SF
 
diff --git a/misc/gnomesword/distinfo b/misc/gnomesword/distinfo
index 7b31e1fc7f30..26b3b41c3cf8 100644
--- a/misc/gnomesword/distinfo
+++ b/misc/gnomesword/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnomesword-2.3.5.tar.gz) = 3f54f9750ce7d971afa53c71cc1973d1
-SHA256 (gnomesword-2.3.5.tar.gz) = c347c418078f4ea021721290a3badf875f079b8bba9256f2ddb167be5275ec8f
-SIZE (gnomesword-2.3.5.tar.gz) = 4285769
+MD5 (gnomesword-2.3.6.tar.gz) = b12e36f9728946fc6c9a405a827aabce
+SHA256 (gnomesword-2.3.6.tar.gz) = cdbe10fe89e13b7819b5ee108f79a9b0ec447f0943c70b72e77e8366595e52e6
+SIZE (gnomesword-2.3.6.tar.gz) = 4390055
diff --git a/misc/gnomesword/pkg-plist b/misc/gnomesword/pkg-plist
index 6a1d5ba34b16..fbe43d3442b0 100644
--- a/misc/gnomesword/pkg-plist
+++ b/misc/gnomesword/pkg-plist
@@ -23,6 +23,7 @@ share/gnome/help/gnomesword/C/figures/interface_shortcut.png
 share/gnome/help/gnomesword/C/figures/interface_sidepane.png
 share/gnome/help/gnomesword/C/figures/interface_toolbar.png
 share/gnome/help/gnomesword/C/figures/interface_viewer.png
+share/gnome/help/gnomesword/C/figures/journal.png
 share/gnome/help/gnomesword/C/figures/module.png
 share/gnome/help/gnomesword/C/figures/personal.png
 share/gnome/help/gnomesword/C/figures/preferences.png
@@ -43,6 +44,7 @@ share/gnome/help/gnomesword/C/figures/sword_sources.png
 share/gnome/help/gnomesword/C/gnomesword.xml
 share/gnome/help/gnomesword/C/interface.xml
 share/gnome/help/gnomesword/C/introduction.xml
+share/gnome/help/gnomesword/C/journals.xml
 share/gnome/help/gnomesword/C/legal.xml
 share/gnome/help/gnomesword/C/license.xml
 share/gnome/help/gnomesword/C/modules.xml
@@ -51,50 +53,6 @@ share/gnome/help/gnomesword/C/preferences.xml
 share/gnome/help/gnomesword/C/search.xml
 share/gnome/help/gnomesword/C/start.xml
 share/gnome/help/gnomesword/C/studypad.xml
-share/gnome/help/gnomesword/de/authors.xml
-share/gnome/help/gnomesword/de/figures/first_start.png
-share/gnome/help/gnomesword/de/figures/gtkhtml3-vs-mozembed.png
-share/gnome/help/gnomesword/de/figures/interface.png
-share/gnome/help/gnomesword/de/figures/interface_biblepane-options.png
-share/gnome/help/gnomesword/de/figures/interface_biblepane.png
-share/gnome/help/gnomesword/de/figures/interface_commentarypane.png
-share/gnome/help/gnomesword/de/figures/interface_dictionary.png
-share/gnome/help/gnomesword/de/figures/interface_menubar-view.png
-share/gnome/help/gnomesword/de/figures/interface_menubar.png
-share/gnome/help/gnomesword/de/figures/interface_parallel-separate.png
-share/gnome/help/gnomesword/de/figures/interface_parallel.png
-share/gnome/help/gnomesword/de/figures/interface_searchpane.png
-share/gnome/help/gnomesword/de/figures/interface_shortcut.png
-share/gnome/help/gnomesword/de/figures/interface_sidepane.png
-share/gnome/help/gnomesword/de/figures/interface_toolbar.png
-share/gnome/help/gnomesword/de/figures/interface_viewer.png
-share/gnome/help/gnomesword/de/figures/module.png
-share/gnome/help/gnomesword/de/figures/personal.png
-share/gnome/help/gnomesword/de/figures/preferences.png
-share/gnome/help/gnomesword/de/figures/preferences_fonts-color.png
-share/gnome/help/gnomesword/de/figures/preferences_fonts-misc.png
-share/gnome/help/gnomesword/de/figures/preferences_general-misc.png
-share/gnome/help/gnomesword/de/figures/preferences_general-tabs.png
-share/gnome/help/gnomesword/de/figures/preferences_modules-main.png
-share/gnome/help/gnomesword/de/figures/preferences_modules-misc.png
-share/gnome/help/gnomesword/de/figures/preferences_modules-parallel.png
-share/gnome/help/gnomesword/de/figures/search_search.png
-share/gnome/help/gnomesword/de/figures/studypad.png
-share/gnome/help/gnomesword/de/figures/sword3.png
-share/gnome/help/gnomesword/de/figures/sword_config.png
-share/gnome/help/gnomesword/de/figures/sword_install.png
-share/gnome/help/gnomesword/de/figures/sword_remove.png
-share/gnome/help/gnomesword/de/figures/sword_sources.png
-share/gnome/help/gnomesword/de/gnomesword.xml
-share/gnome/help/gnomesword/de/interface.xml
-share/gnome/help/gnomesword/de/introduction.xml
-share/gnome/help/gnomesword/de/license.xml
-share/gnome/help/gnomesword/de/modules.xml
-share/gnome/help/gnomesword/de/personal.xml
-share/gnome/help/gnomesword/de/preferences.xml
-share/gnome/help/gnomesword/de/search.xml
-share/gnome/help/gnomesword/de/start.xml
-share/gnome/help/gnomesword/de/studypad.xml
 share/gnome/help/gnomesword/fr/authors.xml
 share/gnome/help/gnomesword/fr/figures/first_start.png
 share/gnome/help/gnomesword/fr/figures/gtkhtml3-vs-mozembed.png
@@ -112,6 +70,7 @@ share/gnome/help/gnomesword/fr/figures/interface_shortcut.png
 share/gnome/help/gnomesword/fr/figures/interface_sidepane.png
 share/gnome/help/gnomesword/fr/figures/interface_toolbar.png
 share/gnome/help/gnomesword/fr/figures/interface_viewer.png
+share/gnome/help/gnomesword/fr/figures/journal.png
 share/gnome/help/gnomesword/fr/figures/module.png
 share/gnome/help/gnomesword/fr/figures/personal.png
 share/gnome/help/gnomesword/fr/figures/preferences.png
@@ -132,6 +91,7 @@ share/gnome/help/gnomesword/fr/figures/sword_sources.png
 share/gnome/help/gnomesword/fr/gnomesword.xml
 share/gnome/help/gnomesword/fr/interface.xml
 share/gnome/help/gnomesword/fr/introduction.xml
+share/gnome/help/gnomesword/fr/journals.xml
 share/gnome/help/gnomesword/fr/license.xml
 share/gnome/help/gnomesword/fr/modules.xml
 share/gnome/help/gnomesword/fr/personal.xml
@@ -147,6 +107,8 @@ share/gnome/help/gnomesword/fr/studypad.xml
 %%DATADIR%%/editor_note.xml
 %%DATADIR%%/editor_studypad.xml
 %%DATADIR%%/export-dialog.glade
+%%DATADIR%%/languages
+%%DATADIR%%/languages.cygwin
 %%DATADIR%%/logo.png
 %%DATADIR%%/module-manager.glade
 %%DATADIR%%/navbar_versekey.glade
@@ -190,14 +152,12 @@ share/pixmaps/gnomesword/sword.png
 share/pixmaps/gnomesword/sword3.png
 share/pixmaps/gnomesword/tt.png
 @dirrm %%DATADIR%%
+@dirrm share/pixmaps/gnomesword
+@dirrm share/locale/nb_NO/LC_MESSAGES
+@dirrm share/locale/nb_NO
 @dirrm share/gnome/help/gnomesword/fr/figures
 @dirrm share/gnome/help/gnomesword/fr
-@dirrm share/gnome/help/gnomesword/de/figures
-@dirrm share/gnome/help/gnomesword/de
 @dirrm share/gnome/help/gnomesword/C/figures
 @dirrm share/gnome/help/gnomesword/C
 @dirrm share/gnome/help/gnomesword
-@dirrm share/locale/nb_NO/LC_MESSAGES
-@dirrm share/locale/nb_NO
-@dirrm share/pixmaps/gnomesword
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index 63b9e0717795..8f86adff851a 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomesword
-PORTVERSION=	2.3.5
+PORTVERSION=	2.3.6
 CATEGORIES=	misc gnome
 MASTER_SITES=	SF
 
diff --git a/misc/xiphos/distinfo b/misc/xiphos/distinfo
index 7b31e1fc7f30..26b3b41c3cf8 100644
--- a/misc/xiphos/distinfo
+++ b/misc/xiphos/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnomesword-2.3.5.tar.gz) = 3f54f9750ce7d971afa53c71cc1973d1
-SHA256 (gnomesword-2.3.5.tar.gz) = c347c418078f4ea021721290a3badf875f079b8bba9256f2ddb167be5275ec8f
-SIZE (gnomesword-2.3.5.tar.gz) = 4285769
+MD5 (gnomesword-2.3.6.tar.gz) = b12e36f9728946fc6c9a405a827aabce
+SHA256 (gnomesword-2.3.6.tar.gz) = cdbe10fe89e13b7819b5ee108f79a9b0ec447f0943c70b72e77e8366595e52e6
+SIZE (gnomesword-2.3.6.tar.gz) = 4390055
diff --git a/misc/xiphos/pkg-plist b/misc/xiphos/pkg-plist
index 6a1d5ba34b16..fbe43d3442b0 100644
--- a/misc/xiphos/pkg-plist
+++ b/misc/xiphos/pkg-plist
@@ -23,6 +23,7 @@ share/gnome/help/gnomesword/C/figures/interface_shortcut.png
 share/gnome/help/gnomesword/C/figures/interface_sidepane.png
 share/gnome/help/gnomesword/C/figures/interface_toolbar.png
 share/gnome/help/gnomesword/C/figures/interface_viewer.png
+share/gnome/help/gnomesword/C/figures/journal.png
 share/gnome/help/gnomesword/C/figures/module.png
 share/gnome/help/gnomesword/C/figures/personal.png
 share/gnome/help/gnomesword/C/figures/preferences.png
@@ -43,6 +44,7 @@ share/gnome/help/gnomesword/C/figures/sword_sources.png
 share/gnome/help/gnomesword/C/gnomesword.xml
 share/gnome/help/gnomesword/C/interface.xml
 share/gnome/help/gnomesword/C/introduction.xml
+share/gnome/help/gnomesword/C/journals.xml
 share/gnome/help/gnomesword/C/legal.xml
 share/gnome/help/gnomesword/C/license.xml
 share/gnome/help/gnomesword/C/modules.xml
@@ -51,50 +53,6 @@ share/gnome/help/gnomesword/C/preferences.xml
 share/gnome/help/gnomesword/C/search.xml
 share/gnome/help/gnomesword/C/start.xml
 share/gnome/help/gnomesword/C/studypad.xml
-share/gnome/help/gnomesword/de/authors.xml
-share/gnome/help/gnomesword/de/figures/first_start.png
-share/gnome/help/gnomesword/de/figures/gtkhtml3-vs-mozembed.png
-share/gnome/help/gnomesword/de/figures/interface.png
-share/gnome/help/gnomesword/de/figures/interface_biblepane-options.png
-share/gnome/help/gnomesword/de/figures/interface_biblepane.png
-share/gnome/help/gnomesword/de/figures/interface_commentarypane.png
-share/gnome/help/gnomesword/de/figures/interface_dictionary.png
-share/gnome/help/gnomesword/de/figures/interface_menubar-view.png
-share/gnome/help/gnomesword/de/figures/interface_menubar.png
-share/gnome/help/gnomesword/de/figures/interface_parallel-separate.png
-share/gnome/help/gnomesword/de/figures/interface_parallel.png
-share/gnome/help/gnomesword/de/figures/interface_searchpane.png
-share/gnome/help/gnomesword/de/figures/interface_shortcut.png
-share/gnome/help/gnomesword/de/figures/interface_sidepane.png
-share/gnome/help/gnomesword/de/figures/interface_toolbar.png
-share/gnome/help/gnomesword/de/figures/interface_viewer.png
-share/gnome/help/gnomesword/de/figures/module.png
-share/gnome/help/gnomesword/de/figures/personal.png
-share/gnome/help/gnomesword/de/figures/preferences.png
-share/gnome/help/gnomesword/de/figures/preferences_fonts-color.png
-share/gnome/help/gnomesword/de/figures/preferences_fonts-misc.png
-share/gnome/help/gnomesword/de/figures/preferences_general-misc.png
-share/gnome/help/gnomesword/de/figures/preferences_general-tabs.png
-share/gnome/help/gnomesword/de/figures/preferences_modules-main.png
-share/gnome/help/gnomesword/de/figures/preferences_modules-misc.png
-share/gnome/help/gnomesword/de/figures/preferences_modules-parallel.png
-share/gnome/help/gnomesword/de/figures/search_search.png
-share/gnome/help/gnomesword/de/figures/studypad.png
-share/gnome/help/gnomesword/de/figures/sword3.png
-share/gnome/help/gnomesword/de/figures/sword_config.png
-share/gnome/help/gnomesword/de/figures/sword_install.png
-share/gnome/help/gnomesword/de/figures/sword_remove.png
-share/gnome/help/gnomesword/de/figures/sword_sources.png
-share/gnome/help/gnomesword/de/gnomesword.xml
-share/gnome/help/gnomesword/de/interface.xml
-share/gnome/help/gnomesword/de/introduction.xml
-share/gnome/help/gnomesword/de/license.xml
-share/gnome/help/gnomesword/de/modules.xml
-share/gnome/help/gnomesword/de/personal.xml
-share/gnome/help/gnomesword/de/preferences.xml
-share/gnome/help/gnomesword/de/search.xml
-share/gnome/help/gnomesword/de/start.xml
-share/gnome/help/gnomesword/de/studypad.xml
 share/gnome/help/gnomesword/fr/authors.xml
 share/gnome/help/gnomesword/fr/figures/first_start.png
 share/gnome/help/gnomesword/fr/figures/gtkhtml3-vs-mozembed.png
@@ -112,6 +70,7 @@ share/gnome/help/gnomesword/fr/figures/interface_shortcut.png
 share/gnome/help/gnomesword/fr/figures/interface_sidepane.png
 share/gnome/help/gnomesword/fr/figures/interface_toolbar.png
 share/gnome/help/gnomesword/fr/figures/interface_viewer.png
+share/gnome/help/gnomesword/fr/figures/journal.png
 share/gnome/help/gnomesword/fr/figures/module.png
 share/gnome/help/gnomesword/fr/figures/personal.png
 share/gnome/help/gnomesword/fr/figures/preferences.png
@@ -132,6 +91,7 @@ share/gnome/help/gnomesword/fr/figures/sword_sources.png
 share/gnome/help/gnomesword/fr/gnomesword.xml
 share/gnome/help/gnomesword/fr/interface.xml
 share/gnome/help/gnomesword/fr/introduction.xml
+share/gnome/help/gnomesword/fr/journals.xml
 share/gnome/help/gnomesword/fr/license.xml
 share/gnome/help/gnomesword/fr/modules.xml
 share/gnome/help/gnomesword/fr/personal.xml
@@ -147,6 +107,8 @@ share/gnome/help/gnomesword/fr/studypad.xml
 %%DATADIR%%/editor_note.xml
 %%DATADIR%%/editor_studypad.xml
 %%DATADIR%%/export-dialog.glade
+%%DATADIR%%/languages
+%%DATADIR%%/languages.cygwin
 %%DATADIR%%/logo.png
 %%DATADIR%%/module-manager.glade
 %%DATADIR%%/navbar_versekey.glade
@@ -190,14 +152,12 @@ share/pixmaps/gnomesword/sword.png
 share/pixmaps/gnomesword/sword3.png
 share/pixmaps/gnomesword/tt.png
 @dirrm %%DATADIR%%
+@dirrm share/pixmaps/gnomesword
+@dirrm share/locale/nb_NO/LC_MESSAGES
+@dirrm share/locale/nb_NO
 @dirrm share/gnome/help/gnomesword/fr/figures
 @dirrm share/gnome/help/gnomesword/fr
-@dirrm share/gnome/help/gnomesword/de/figures
-@dirrm share/gnome/help/gnomesword/de
 @dirrm share/gnome/help/gnomesword/C/figures
 @dirrm share/gnome/help/gnomesword/C
 @dirrm share/gnome/help/gnomesword
-@dirrm share/locale/nb_NO/LC_MESSAGES
-@dirrm share/locale/nb_NO
-@dirrm share/pixmaps/gnomesword
 %%PORTDOCS%%@dirrm %%DOCSDIR%%