diff --git a/ChangeLog b/ChangeLog
index 203dea07e840a1873ca682e00e1f86000dc748da..25ebe32347d3d2acb8717cb2f0a6650eb661148c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-15	Benedikt Meurer <benny@xfce.org>
+
+	* docs/manual/: Fix thunar-volman website URL.
+	* po-doc/Thunar.pot, po-doc/*.po: Merge new strings.
+
 2007-01-15	Benedikt Meurer <benny@xfce.org>
 
 	* docs/manual/: Add documentation for removable drive and media
diff --git a/docs/manual/C/Thunar.xml.in b/docs/manual/C/Thunar.xml.in
index fbcc4d0e958dc8f5c954b1311bd14f9df1dfca69..3eecb0f47611a61ec3fb8911ff974faa24b1401f 100644
--- a/docs/manual/C/Thunar.xml.in
+++ b/docs/manual/C/Thunar.xml.in
@@ -158,8 +158,8 @@
 
       <para>
         Thunar is also able to automatically manage removable drives and media if the <ulink type="http"
-        url="http://thunar.xfce.org/projects/thunar-volman/">thunar-volman</ulink> package is installed on your system.
-        Note however that this feature requires HAL support.
+        url="http://www.foo-projects.org/~benny/projects/thunar-volman/index.html">thunar-volman</ulink> package is installed on
+        your system.  Note however that this feature requires HAL support.
       </para>
 
       <para>
diff --git a/docs/manual/es/Thunar.xml.in b/docs/manual/es/Thunar.xml.in
index c53354221cbf46d30acae9a60f900d73581ad35c..5183b2d9b1458a7844b8e9beb4a62b073beb83f3 100644
--- a/docs/manual/es/Thunar.xml.in
+++ b/docs/manual/es/Thunar.xml.in
@@ -149,8 +149,8 @@
       <title>Management of Removable Drives and Media</title>
 
       <para>
-        Thunar is also able to automatically manage removable drives and media if the <ulink type="http" url="http://thunar.xfce.org/projects/thunar-volman/">thunar-volman</ulink> package is installed on your system.
-        Note however that this feature requires HAL support.
+        Thunar is also able to automatically manage removable drives and media if the <ulink type="http" url="http://www.foo-projects.org/~benny/projects/thunar-volman/index.html">thunar-volman</ulink> package is installed on
+        your system.  Note however that this feature requires HAL support.
       </para>
 
       <para>
diff --git a/docs/manual/eu/Thunar.xml.in b/docs/manual/eu/Thunar.xml.in
index 1cd584e5dcc7d178fcbf225816e3c097afc62f5a..1f5823b451d5145de79e9853bfb5f4edd029b701 100644
--- a/docs/manual/eu/Thunar.xml.in
+++ b/docs/manual/eu/Thunar.xml.in
@@ -139,8 +139,8 @@
       <title>Management of Removable Drives and Media</title>
 
       <para>
-        Thunar is also able to automatically manage removable drives and media if the <ulink type="http" url="http://thunar.xfce.org/projects/thunar-volman/">thunar-volman</ulink> package is installed on your system.
-        Note however that this feature requires HAL support.
+        Thunar is also able to automatically manage removable drives and media if the <ulink type="http" url="http://www.foo-projects.org/~benny/projects/thunar-volman/index.html">thunar-volman</ulink> package is installed on
+        your system.  Note however that this feature requires HAL support.
       </para>
 
       <para>
diff --git a/docs/manual/fr/Thunar.xml.in b/docs/manual/fr/Thunar.xml.in
index 46b6803de7c8cd3ad73977ce514ebcbfbe7dadd5..78aa345170e0c6dab8d3ceb70150d5465221205b 100644
--- a/docs/manual/fr/Thunar.xml.in
+++ b/docs/manual/fr/Thunar.xml.in
@@ -139,8 +139,8 @@
       <title>Management of Removable Drives and Media</title>
 
       <para>
-        Thunar is also able to automatically manage removable drives and media if the <ulink type="http" url="http://thunar.xfce.org/projects/thunar-volman/">thunar-volman</ulink> package is installed on your system.
-        Note however that this feature requires HAL support.
+        Thunar is also able to automatically manage removable drives and media if the <ulink type="http" url="http://www.foo-projects.org/~benny/projects/thunar-volman/index.html">thunar-volman</ulink> package is installed on
+        your system.  Note however that this feature requires HAL support.
       </para>
 
       <para>
diff --git a/docs/manual/ja/Thunar.xml.in b/docs/manual/ja/Thunar.xml.in
index b87bf29f17a461f6c284eee4bcc81995599212c2..93ad8460860e3c0278b402574d36c2203f373859 100644
--- a/docs/manual/ja/Thunar.xml.in
+++ b/docs/manual/ja/Thunar.xml.in
@@ -139,8 +139,8 @@
       <title>Management of Removable Drives and Media</title>
 
       <para>
-        Thunar is also able to automatically manage removable drives and media if the <ulink type="http" url="http://thunar.xfce.org/projects/thunar-volman/">thunar-volman</ulink> package is installed on your system.
-        Note however that this feature requires HAL support.
+        Thunar is also able to automatically manage removable drives and media if the <ulink type="http" url="http://www.foo-projects.org/~benny/projects/thunar-volman/index.html">thunar-volman</ulink> package is installed on
+        your system.  Note however that this feature requires HAL support.
       </para>
 
       <para>
diff --git a/docs/manual/ru/Thunar.xml.in b/docs/manual/ru/Thunar.xml.in
index 11813b44b7ce311b5fffb9277b27c27ccbf4faad..b56f8cb6ddb88b177e494440e80ffe65665eae8e 100644
--- a/docs/manual/ru/Thunar.xml.in
+++ b/docs/manual/ru/Thunar.xml.in
@@ -139,8 +139,8 @@
       <title>Management of Removable Drives and Media</title>
 
       <para>
-        Thunar is also able to automatically manage removable drives and media if the <ulink type="http" url="http://thunar.xfce.org/projects/thunar-volman/">thunar-volman</ulink> package is installed on your system.
-        Note however that this feature requires HAL support.
+        Thunar is also able to automatically manage removable drives and media if the <ulink type="http" url="http://www.foo-projects.org/~benny/projects/thunar-volman/index.html">thunar-volman</ulink> package is installed on
+        your system.  Note however that this feature requires HAL support.
       </para>
 
       <para>
diff --git a/docs/manual/zh_TW/Thunar.xml.in b/docs/manual/zh_TW/Thunar.xml.in
index cdb822d55385d998226e19ed54eed945af33c161..ac72da2414a82589608872be0e03526b9be78f18 100644
--- a/docs/manual/zh_TW/Thunar.xml.in
+++ b/docs/manual/zh_TW/Thunar.xml.in
@@ -139,8 +139,8 @@
       <title>Management of Removable Drives and Media</title>
 
       <para>
-        Thunar is also able to automatically manage removable drives and media if the <ulink type="http" url="http://thunar.xfce.org/projects/thunar-volman/">thunar-volman</ulink> package is installed on your system.
-        Note however that this feature requires HAL support.
+        Thunar is also able to automatically manage removable drives and media if the <ulink type="http" url="http://www.foo-projects.org/~benny/projects/thunar-volman/index.html">thunar-volman</ulink> package is installed on
+        your system.  Note however that this feature requires HAL support.
       </para>
 
       <para>
diff --git a/po-doc/ChangeLog b/po-doc/ChangeLog
index 83847bb1502eae6a07a5329d3d95226ff1f389eb..bf813a9d6d43181f6c37798e6543ff0ec185fb2e 100644
--- a/po-doc/ChangeLog
+++ b/po-doc/ChangeLog
@@ -2,6 +2,10 @@
 
 	* Thunar.pot, *.po: Merge new strings.
 
+2007-01-15  Benedikt Meurer <benny@xfce.org>
+
+	* Thunar.pot, *.po: Merge new strings.
+
 2007-01-04  Piarres Beobide <pi@beobide.net>
 
 	* eu.po, LINGUAS: Add basque translation for thunar po-doc
diff --git a/po-doc/Thunar.pot b/po-doc/Thunar.pot
index b161704ba9399920b4abdd893db915810be18914..8637f40d5c8d0d2137685854904941331a9e893c 100644
--- a/po-doc/Thunar.pot
+++ b/po-doc/Thunar.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-01-15 20:52+0100\n"
+"POT-Creation-Date: 2007-01-15 22:18+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -166,7 +166,7 @@ msgid "Management of Removable Drives and Media"
 msgstr ""
 
 #: ../docs/manual/C/Thunar.xml.in:159(para) 
-msgid "Thunar is also able to automatically manage removable drives and media if the <ulink type=\"http\" url=\"http://thunar.xfce.org/projects/thunar-volman/\">thunar-volman</ulink> package is installed on your system. Note however that this feature requires HAL support."
+msgid "Thunar is also able to automatically manage removable drives and media if the <ulink type=\"http\" url=\"http://www.foo-projects.org/~benny/projects/thunar-volman/index.html\">thunar-volman</ulink> package is installed on your system. Note however that this feature requires HAL support."
 msgstr ""
 
 #: ../docs/manual/C/Thunar.xml.in:165(para) 
diff --git a/po-doc/es.po b/po-doc/es.po
index 2edaebab7e030af97cd75023f61d7975fae1e03a..3d4cc2aea887435d09c4f0d00026df9839f86692 100644
--- a/po-doc/es.po
+++ b/po-doc/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.5.0rc2\n"
-"POT-Creation-Date: 2007-01-15 20:52+0100\n"
+"POT-Creation-Date: 2007-01-15 22:18+0100\n"
 "PO-Revision-Date: 2006-04-16 16:53+0100\n"
 "Last-Translator: José M <josem88@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -254,9 +254,9 @@ msgstr ""
 #: ../docs/manual/C/Thunar.xml.in:159 (para)
 msgid ""
 "Thunar is also able to automatically manage removable drives and media if "
-"the <ulink type=\"http\" url=\"http://thunar.xfce.org/projects/thunar-volman/"
-"\">thunar-volman</ulink> package is installed on your system. Note however "
-"that this feature requires HAL support."
+"the <ulink type=\"http\" url=\"http://www.foo-projects.org/~benny/projects/"
+"thunar-volman/index.html\">thunar-volman</ulink> package is installed on "
+"your system. Note however that this feature requires HAL support."
 msgstr ""
 
 #: ../docs/manual/C/Thunar.xml.in:165 (para)
diff --git a/po-doc/eu.po b/po-doc/eu.po
index 4a1629530427f9d5d6f7fad70c9201f3dd12da91..15e73aebacdc790520f7d2cd41928876254d839f 100644
--- a/po-doc/eu.po
+++ b/po-doc/eu.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
-"POT-Creation-Date: 2007-01-15 20:52+0100\n"
+"POT-Creation-Date: 2007-01-15 22:18+0100\n"
 "PO-Revision-Date: 2007-01-05 13:01+0100\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: librezale <librezale@librezale.org>\n"
@@ -249,9 +249,9 @@ msgstr ""
 #: ../docs/manual/C/Thunar.xml.in:159 (para)
 msgid ""
 "Thunar is also able to automatically manage removable drives and media if "
-"the <ulink type=\"http\" url=\"http://thunar.xfce.org/projects/thunar-volman/"
-"\">thunar-volman</ulink> package is installed on your system. Note however "
-"that this feature requires HAL support."
+"the <ulink type=\"http\" url=\"http://www.foo-projects.org/~benny/projects/"
+"thunar-volman/index.html\">thunar-volman</ulink> package is installed on "
+"your system. Note however that this feature requires HAL support."
 msgstr ""
 
 #: ../docs/manual/C/Thunar.xml.in:165 (para)
diff --git a/po-doc/fr.po b/po-doc/fr.po
index f71b77d67b41162bba7c6137bc51d6290cc54c51..056d99e5cad42103b3689cdaa01ea29baf733f96 100644
--- a/po-doc/fr.po
+++ b/po-doc/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.5.0rc2\n"
-"POT-Creation-Date: 2007-01-15 20:53+0100\n"
+"POT-Creation-Date: 2007-01-15 22:18+0100\n"
 "PO-Revision-Date: 2006-11-07 22:02+0100\n"
 "Last-Translator: Maximilian Schleiss <maxschleiss@bluewin.ch>\n"
 "Language-Team: French <i18n-xfce@xfce.org>\n"
@@ -251,9 +251,9 @@ msgstr ""
 #: ../docs/manual/C/Thunar.xml.in:159 (para)
 msgid ""
 "Thunar is also able to automatically manage removable drives and media if "
-"the <ulink type=\"http\" url=\"http://thunar.xfce.org/projects/thunar-volman/"
-"\">thunar-volman</ulink> package is installed on your system. Note however "
-"that this feature requires HAL support."
+"the <ulink type=\"http\" url=\"http://www.foo-projects.org/~benny/projects/"
+"thunar-volman/index.html\">thunar-volman</ulink> package is installed on "
+"your system. Note however that this feature requires HAL support."
 msgstr ""
 
 #: ../docs/manual/C/Thunar.xml.in:165 (para)
diff --git a/po-doc/ja.po b/po-doc/ja.po
index 7c31265a526b00d24dd4f94a99ed9431801da825..4cc1764835c6e9abe96f20145b12f65bb6c9dd09 100644
--- a/po-doc/ja.po
+++ b/po-doc/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.5.0rc2\n"
-"POT-Creation-Date: 2007-01-15 20:53+0100\n"
+"POT-Creation-Date: 2007-01-15 22:18+0100\n"
 "PO-Revision-Date: 2006-03-25 13:10+0900\n"
 "Last-Translator: Daichi Kawahata <daichi@xfce.org>\n"
 "Language-Team: Japanese <xfce-users-jp@ml.fdiary.net>\n"
@@ -251,9 +251,9 @@ msgstr ""
 #: ../docs/manual/C/Thunar.xml.in:159 (para)
 msgid ""
 "Thunar is also able to automatically manage removable drives and media if "
-"the <ulink type=\"http\" url=\"http://thunar.xfce.org/projects/thunar-volman/"
-"\">thunar-volman</ulink> package is installed on your system. Note however "
-"that this feature requires HAL support."
+"the <ulink type=\"http\" url=\"http://www.foo-projects.org/~benny/projects/"
+"thunar-volman/index.html\">thunar-volman</ulink> package is installed on "
+"your system. Note however that this feature requires HAL support."
 msgstr ""
 
 #: ../docs/manual/C/Thunar.xml.in:165 (para)
diff --git a/po-doc/ru.po b/po-doc/ru.po
index b6562ee6d546995d28c7cac5ad60c5ab210d6ca3..48fee32236629cedab2067819cad2295e275fcc7 100644
--- a/po-doc/ru.po
+++ b/po-doc/ru.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.5.0rc2\n"
-"POT-Creation-Date: 2007-01-15 20:53+0100\n"
+"POT-Creation-Date: 2007-01-15 22:18+0100\n"
 "PO-Revision-Date: 2006-04-26 14:53+0400\n"
 "Last-Translator: Maxim Zenin <webmechanics@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -252,9 +252,9 @@ msgstr ""
 #: ../docs/manual/C/Thunar.xml.in:159 (para)
 msgid ""
 "Thunar is also able to automatically manage removable drives and media if "
-"the <ulink type=\"http\" url=\"http://thunar.xfce.org/projects/thunar-volman/"
-"\">thunar-volman</ulink> package is installed on your system. Note however "
-"that this feature requires HAL support."
+"the <ulink type=\"http\" url=\"http://www.foo-projects.org/~benny/projects/"
+"thunar-volman/index.html\">thunar-volman</ulink> package is installed on "
+"your system. Note however that this feature requires HAL support."
 msgstr ""
 
 #: ../docs/manual/C/Thunar.xml.in:165 (para)
diff --git a/po-doc/zh_TW.po b/po-doc/zh_TW.po
index 918267cb10cc923c458d8e5e849e86ca643977ff..cd5cc65dd1ebab745d7ef1c2d3191bac8b223e8f 100644
--- a/po-doc/zh_TW.po
+++ b/po-doc/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-15 20:53+0100\n"
+"POT-Creation-Date: 2007-01-15 22:19+0100\n"
 "PO-Revision-Date: 2006-05-23 07:16+0800\n"
 "Last-Translator: Cosmo Chene <cosmolax@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -247,9 +247,9 @@ msgstr ""
 #: ../docs/manual/C/Thunar.xml.in:159 (para)
 msgid ""
 "Thunar is also able to automatically manage removable drives and media if "
-"the <ulink type=\"http\" url=\"http://thunar.xfce.org/projects/thunar-volman/"
-"\">thunar-volman</ulink> package is installed on your system. Note however "
-"that this feature requires HAL support."
+"the <ulink type=\"http\" url=\"http://www.foo-projects.org/~benny/projects/"
+"thunar-volman/index.html\">thunar-volman</ulink> package is installed on "
+"your system. Note however that this feature requires HAL support."
 msgstr ""
 
 #: ../docs/manual/C/Thunar.xml.in:165 (para)