[debian-edu-commits] debian-edu/ 121/183: Added updated french translation Removed medium priority debconf note as per the mass bug filing Minor changes to man pages, related to above

Alexander Alemayhu ccscanf-guest at moszumanska.debian.org
Wed Jun 11 16:48:39 UTC 2014


This is an automated email from the git hooks/post-receive script.

ccscanf-guest pushed a commit to branch master
in repository desktop-profiles.

commit 6a26d10ed2b25b520853443114f1bbddd30f746d
Author: Bart Cornelis <cobaco at linux.be>
Date:   Sat Oct 7 13:05:05 2006 +0000

    Added updated french translation
    Removed medium priority debconf note as per the mass bug filing
    Minor changes to man pages, related to above
---
 debian/changelog        |  10 +++--
 debian/config           |  16 +++-----
 debian/control          |   2 +-
 debian/po/cs.po         |  73 +++++++++++++++------------------
 debian/po/es.po         |  75 ++++++++++++++++++++++------------
 debian/po/eu.po         |  77 ++++++++++++++++-------------------
 debian/po/fr.po         |  72 +++++++++++++++------------------
 debian/po/nl.po         | 103 ++++++++++++++++++-----------------------------
 debian/po/pt.po         |  83 ++++++++++++++++++--------------------
 debian/po/pt_BR.po      |  77 ++++++++++++++++-------------------
 debian/po/sv.po         |  78 +++++++++++++++++++++++------------
 debian/po/templates.pot |  41 +++++--------------
 debian/po/vi.po         | 105 ++++++++++++++++++++++++++----------------------
 debian/templates        |  15 -------
 desktop-profiles.7      |   6 +--
 path2listing.1          |  10 ++---
 16 files changed, 401 insertions(+), 442 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a132ba6..fe3dd1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 desktop-profiles (1.4.13) unstable; urgency=low
 
-  * fixed small mistake in for_each_requirement function of listingmodule
-    (triggered for profiles multiple shell-command requirements)
+  * fixed small bug in for_each_requirement function of listingmodule
+    (triggered when a profile had multiple shell-commands as activation 
+    requirements)
+  * Adapted man page to unclude reference to /usr/sbin/path2listing for gconf
   * Updated French translation by Jean-Luc Coulon (Closes: #387015)
+  * Removed medium priority note pointing gconf users to the path2listing
+    script, that info is now in the man-page and the README (Closes: #388884)
 
- -- Bart Cornelis (cobaco) <cobaco at skolelinux.no>  Tue, 12 Sep 2006 09:02:16 +0200
+ -- Bart Cornelis (cobaco) <cobaco at linux.be>  Fri,  6 Oct 2006 21:47:06 +0200
 
 desktop-profiles (1.4.12) unstable; urgency=low
 
diff --git a/debian/config b/debian/config
index 4e601d4..a10cfa3 100755
--- a/debian/config
+++ b/debian/config
@@ -9,23 +9,17 @@
 if (test -e /etc/gconf/2/path) ; then
   if ! ( (grep 'include *\$(ENV_MANDATORY_PATH)' /etc/gconf/2/path 2>&1 > /dev/null ) ||
          (grep 'include *\$(ENV_DEFAULTS_PATH)'  /etc/gconf/2/path 2>&1 > /dev/null ) ); then
-    if ! ( (grep 'include /var/cache/desktop-profiles/\$(USER)_mandatory.path' /etc/gconf/2/path 2>&1 > /dev/null ) ||
-           (grep 'include /var/cache/desktop-profiles/\$(USER)_defaults.path'  /etc/gconf/2/path 2>&1 > /dev/null ) ); then
-      db_input medium desktop-profiles/replace-gconf-system-wide-path-file || true;
-      db_go || true;
-    else  
+    if ( (grep 'include /var/cache/desktop-profiles/\$(USER)_mandatory.path' /etc/gconf/2/path 2>&1 > /dev/null ) ||
+         (grep 'include /var/cache/desktop-profiles/\$(USER)_defaults.path'  /etc/gconf/2/path 2>&1 > /dev/null ) ); then
       db_input critical desktop-profiles/replace-old-vars || true;
       db_go || true;
     fi;  
   fi;	 
-elif (test -e /etc/gconf/2/path) ; then
+elif (test -e /etc/gconf/1/path) ; then
   if ! ( (grep 'include *\$(ENV_MANDATORY_PATH)' /etc/gconf/1/path 2>&1 > /dev/null ) ||
          (grep 'include *\$(ENV_DEFAULTS_PATH)'  /etc/gconf/1/path 2>&1 > /dev/null ) ); then
-    if ! ( (grep 'include /var/cache/desktop-profiles/\$(USER)_mandatory.path' /etc/gconf/1/path 2>&1 > /dev/null ) ||
-           (grep 'include /var/cache/desktop-profiles/\$(USER)_defaults.path'  /etc/gconf/1/path 2>&1 > /dev/null ) ); then
-      db_input medium desktop-profiles/replace-gconf-system-wide-path-file || true;
-      db_go || true;
-    else  
+    if ( (grep 'include /var/cache/desktop-profiles/\$(USER)_mandatory.path' /etc/gconf/1/path 2>&1 > /dev/null ) ||
+         (grep 'include /var/cache/desktop-profiles/\$(USER)_defaults.path'  /etc/gconf/1/path 2>&1 > /dev/null ) ); then
       db_input critical desktop-profiles/replace-old-vars || true;
       db_go || true;
     fi;  
diff --git a/debian/control b/debian/control
index f5c026d..0ea89d6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: desktop-profiles
 Section: x11
 Priority: optional
-Maintainer: Bart Cornelis (cobaco) <cobaco at skolelinux.no>
+Maintainer: Bart Cornelis (cobaco) <cobaco at linux.be>
 Uploaders: Marco Presi (Zufus) <zufus at debian.org>
 Build-Depends: debhelper (>= 5.0.0)
 Build-Depends-Indep: po-debconf, intltool
diff --git a/debian/po/cs.po b/debian/po/cs.po
index dc257f9..eda9fbe 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: desktop-profiles\n"
-"Report-Msgid-Bugs-To: cobaco at linux.be\n"
-"POT-Creation-Date: 2005-10-10 22:40+0200\n"
+"Report-Msgid-Bugs-To: cobaco at skolelinux.no\n"
+"POT-Creation-Date: 2006-10-06 11:32+0200\n"
 "PO-Revision-Date: 2005-10-02 17:25+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -25,43 +25,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates:3
-msgid ""
-"Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
-"configuration sources managed by desktop-profiles. The system wide path file "
-"(/etc/gconf/2/path) needs to be changed to get such configuration sources to "
-"work."
-msgstr ""
-"Vaše stávající nastavení gconfu (tj. GNOME) nevyužívá konfiguraci "
-"spravovanou pomocí desktop-profiles. Aby vše fungovalo očekávaným způsobem, "
-"musíte upravit celosystémový soubor path (/etc/gconf/2/path)."
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid ""
-"This package includes a conversion script (/usr/sbin/path2listing) that will "
-"create the necessary changes to have all your configuration sources managed "
-"by desktop-profiles. Running this script should not result in user-visible "
-"changes to the system. See the README in /usr/share/doc/desktop-profiles/ "
-"for more information on this script, or for info on changing the path file "
-"manually."
-msgstr ""
-"Tento balíček obsahuje konverzní skript (/usr/sbin/path2listing), který se "
-"postará o nezbytné změny, aby byly všechny vaše konfigurační soubory "
-"spravovány pomocí desktop-profiles. Spuštění skriptu by nemělo způsobit "
-"uživatelsky viditelné změny. Více informací o skriptu nebo o ruční změně "
-"souboru path naleznete v souboru /usr/share/doc/desktop-profiles/README."
-
-#. Type: note
-#. Description
-#: ../templates:18
+#: ../templates:1001
 msgid "Global gconf path file needs to be changed!"
 msgstr "Globální gconf soubor 'path' je třeba upravit!"
 
 #. Type: note
 #. Description
-#: ../templates:18
+#: ../templates:1001
 msgid ""
 "The include directives used by desktop-profiles have changed (in response "
 "to  bug 309978, see the bug report and corresponding entry in the changelog "
@@ -73,13 +43,12 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates:18
+#: ../templates:1001
 msgid ""
-"To reenable gconf profiles you need to change /etc/gconf/2/path as follows:\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should be "
-"'include \\$(ENV_MANDATORY_PATH)' and\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' should be "
-"'include \\$(ENV_DEFAULTS_PATH)'"
+"To reenable gconf profiles you need to change /etc/gconf/2/path as follows:"
+"\\n - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should "
+"be 'include \\$(ENV_MANDATORY_PATH)' and\\n - 'include /var/cache/desktop-"
+"profiles/\\$(USER)_defaults.path' should be 'include \\$(ENV_DEFAULTS_PATH)'"
 msgstr ""
 "Pro znovupovolení gconf profilů musíte upravit soubor /etc/gconf/2/path:\n"
 "- místo 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' by "
@@ -87,6 +56,30 @@ msgstr ""
 "- a 'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' je nutno "
 "nahradit za 'include \\$(ENV_DEFAULTS_PATH)'"
 
+#~ msgid ""
+#~ "Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
+#~ "configuration sources managed by desktop-profiles. The system wide path "
+#~ "file (/etc/gconf/2/path) needs to be changed to get such configuration "
+#~ "sources to work."
+#~ msgstr ""
+#~ "Vaše stávající nastavení gconfu (tj. GNOME) nevyužívá konfiguraci "
+#~ "spravovanou pomocí desktop-profiles. Aby vše fungovalo očekávaným "
+#~ "způsobem, musíte upravit celosystémový soubor path (/etc/gconf/2/path)."
+
+#~ msgid ""
+#~ "This package includes a conversion script (/usr/sbin/path2listing) that "
+#~ "will create the necessary changes to have all your configuration sources "
+#~ "managed by desktop-profiles. Running this script should not result in "
+#~ "user-visible changes to the system. See the README in /usr/share/doc/"
+#~ "desktop-profiles/ for more information on this script, or for info on "
+#~ "changing the path file manually."
+#~ msgstr ""
+#~ "Tento balíček obsahuje konverzní skript (/usr/sbin/path2listing), který "
+#~ "se postará o nezbytné změny, aby byly všechny vaše konfigurační soubory "
+#~ "spravovány pomocí desktop-profiles. Spuštění skriptu by nemělo způsobit "
+#~ "uživatelsky viditelné změny. Více informací o skriptu nebo o ruční změně "
+#~ "souboru path naleznete v souboru /usr/share/doc/desktop-profiles/README."
+
 #~ msgid "Replace the default system-wide 'path' file?"
 #~ msgstr "Nahradit systémový soubor 'path'?"
 
diff --git a/debian/po/es.po b/debian/po/es.po
index f013946..d27af2d 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -26,8 +26,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: desktop-profiles\n"
-"Report-Msgid-Bugs-To: cobaco at linux.be\n"
-"POT-Creation-Date: 2005-10-10 22:40+0200\n"
+"Report-Msgid-Bugs-To: cobaco at skolelinux.no\n"
+"POT-Creation-Date: 2006-10-06 11:32+0200\n"
 "PO-Revision-Date: 2005-10-31 17:00+0100\n"
 "Last-Translator: César Gómez Martín <cesar.gomez at gmail.com>\n"
 "Language-Team: Debian l10n spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -40,37 +40,62 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates:3
-msgid "Your current gconf (i.e. GNOME) setup doesn't facilitate the use of configuration sources managed by desktop-profiles. The system wide path file (/etc/gconf/2/path) needs to be changed to get such configuration sources to work."
-msgstr "La instalación actual de gconf (i.e. GNOME) no facilita el uso de fuentes de configuración gestionadas por desktop-profiles. Para que esas fuentes de configuración funcionen, se necesita cambiar el fichero de rutas de sistema  (/etc/gconf/2/path)."
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid "This package includes a conversion script (/usr/sbin/path2listing) that will create the necessary changes to have all your configuration sources managed by desktop-profiles. Running this script should not result in user-visible changes to the system. See the README in /usr/share/doc/desktop-profiles/ for more information on this script, or for info on changing the path file manually."
-msgstr "Este paquete incluye un script de conversión (/usr/sbin/path2listing) que creará los cambios necesarios para que desktop-profiles gestione todos sus fuentes de configuración. La ejecución de este script no hará cambios al sistema que sean visibles para el usuario. Si desea más información sobre este script o sobre cómo cambiar el fichero de rutas manualmente lea el fichero README que se encuentra en el directorio /usr/share/doc/desktop-profiles/."
-
-#. Type: note
-#. Description
-#: ../templates:18
+#: ../templates:1001
 msgid "Global gconf path file needs to be changed!"
 msgstr "¡Es necesario cambiar el fichero global de rutas de gconf!"
 
 #. Type: note
 #. Description
-#: ../templates:18
-msgid "The include directives used by desktop-profiles have changed (in response to  bug 309978, see the bug report and corresponding entry in the changelog of  version 1.4.6 of this package for details)."
-msgstr "Las directivas de inclusión utilizadas por desktop-profiles han cambiado (en respuesta al fallo 309978, si desea más detalles consulte el informe del fallo y la entrada correspondiente en ell registro de cambios de la versión 1.4.6 de este paquete)."
+#: ../templates:1001
+msgid ""
+"The include directives used by desktop-profiles have changed (in response "
+"to  bug 309978, see the bug report and corresponding entry in the changelog "
+"of  version 1.4.6 of this package for details)."
+msgstr ""
+"Las directivas de inclusión utilizadas por desktop-profiles han cambiado (en "
+"respuesta al fallo 309978, si desea más detalles consulte el informe del "
+"fallo y la entrada correspondiente en ell registro de cambios de la versión "
+"1.4.6 de este paquete)."
 
 #. Type: note
 #. Description
-#: ../templates:18
+#: ../templates:1001
 msgid ""
-"To reenable gconf profiles you need to change /etc/gconf/2/path as follows:\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should be 'include \\$(ENV_MANDATORY_PATH)' and\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' should be 'include \\$(ENV_DEFAULTS_PATH)'"
+"To reenable gconf profiles you need to change /etc/gconf/2/path as follows:"
+"\\n - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should "
+"be 'include \\$(ENV_MANDATORY_PATH)' and\\n - 'include /var/cache/desktop-"
+"profiles/\\$(USER)_defaults.path' should be 'include \\$(ENV_DEFAULTS_PATH)'"
 msgstr ""
-"Para reactivar los perfiles gconf necesita cambiar /etc/gconf/2/path de la siguiente manera:\n"
-" - «include /var/cache/desktop-profiles/\\$(USER)_mandatory.path» debe ser «include \\$(ENV_MANDATORY_PATH)» y\n"
-" - «include /var/cache/desktop-profiles/\\$(USER)_defaults.path» debe ser «include \\$(ENV_DEFAULTS_PATH)»"
+"Para reactivar los perfiles gconf necesita cambiar /etc/gconf/2/path de la "
+"siguiente manera:\n"
+" - «include /var/cache/desktop-profiles/\\$(USER)_mandatory.path» debe ser "
+"«include \\$(ENV_MANDATORY_PATH)» y\n"
+" - «include /var/cache/desktop-profiles/\\$(USER)_defaults.path» debe ser "
+"«include \\$(ENV_DEFAULTS_PATH)»"
+
+#~ msgid ""
+#~ "Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
+#~ "configuration sources managed by desktop-profiles. The system wide path "
+#~ "file (/etc/gconf/2/path) needs to be changed to get such configuration "
+#~ "sources to work."
+#~ msgstr ""
+#~ "La instalación actual de gconf (i.e. GNOME) no facilita el uso de fuentes "
+#~ "de configuración gestionadas por desktop-profiles. Para que esas fuentes "
+#~ "de configuración funcionen, se necesita cambiar el fichero de rutas de "
+#~ "sistema  (/etc/gconf/2/path)."
 
+#~ msgid ""
+#~ "This package includes a conversion script (/usr/sbin/path2listing) that "
+#~ "will create the necessary changes to have all your configuration sources "
+#~ "managed by desktop-profiles. Running this script should not result in "
+#~ "user-visible changes to the system. See the README in /usr/share/doc/"
+#~ "desktop-profiles/ for more information on this script, or for info on "
+#~ "changing the path file manually."
+#~ msgstr ""
+#~ "Este paquete incluye un script de conversión (/usr/sbin/path2listing) que "
+#~ "creará los cambios necesarios para que desktop-profiles gestione todos "
+#~ "sus fuentes de configuración. La ejecución de este script no hará cambios "
+#~ "al sistema que sean visibles para el usuario. Si desea más información "
+#~ "sobre este script o sobre cómo cambiar el fichero de rutas manualmente "
+#~ "lea el fichero README que se encuentra en el directorio /usr/share/doc/"
+#~ "desktop-profiles/."
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 2e5c483..f074ca2 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: desktop-profiles\n"
-"Report-Msgid-Bugs-To: cobaco at linux.be\n"
-"POT-Creation-Date: 2005-10-10 22:40+0200\n"
+"Report-Msgid-Bugs-To: cobaco at skolelinux.no\n"
+"POT-Creation-Date: 2006-10-06 11:32+0200\n"
 "PO-Revision-Date: 2005-10-03 10:34+0100\n"
 "Last-Translator: Piarres Beobide Egaa <pi at beobide.net>\n"
 "Language-Team: Basque\n"
@@ -17,45 +17,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates:3
-msgid ""
-"Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
-"configuration sources managed by desktop-profiles. The system wide path file "
-"(/etc/gconf/2/path) needs to be changed to get such configuration sources to "
-"work."
-msgstr ""
-"Erabiltzen ari zaren gconf (adib GNOME) konfigurazioak ez du desktop-"
-"profiles erabiltzen dituen konfigurazio iturburuak errazten. Sistema bide "
-"fitxategia (/etc/gconf/2/path) aldatu egin behar da konfigurazio honek "
-"funtziona dezan."
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid ""
-"This package includes a conversion script (/usr/sbin/path2listing) that will "
-"create the necessary changes to have all your configuration sources managed "
-"by desktop-profiles. Running this script should not result in user-visible "
-"changes to the system. See the README in /usr/share/doc/desktop-profiles/ "
-"for more information on this script, or for info on changing the path file "
-"manually."
-msgstr ""
-"Pakete honek desktop-profiles-ek zure konfigurazio iturburu guztiak kudea "
-"ditzan behar dituen aldaketak egingo dituen eraldaketa script (/usr/sbin/"
-"path2listing) bat dakar. Script hau abiarazteak ez ditu erabiltzaileak "
-"ikusiko dituen aldaketarik egingo. Ikusi /usr/share/doc/desktop-profiles/ "
-"direktorioa dagoen README fitxategia script honen edo bide fitxategia eskuz "
-"aldatzearen argibide gehiagorako."
-
-#. Type: note
-#. Description
-#: ../templates:18
+#: ../templates:1001
 msgid "Global gconf path file needs to be changed!"
 msgstr "gconf bide orokor fitxategia aldatu egin ebhar da!"
 
 #. Type: note
 #. Description
-#: ../templates:18
+#: ../templates:1001
 msgid ""
 "The include directives used by desktop-profiles have changed (in response "
 "to  bug 309978, see the bug report and corresponding entry in the changelog "
@@ -67,13 +35,12 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates:18
+#: ../templates:1001
 msgid ""
-"To reenable gconf profiles you need to change /etc/gconf/2/path as follows:\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should be "
-"'include \\$(ENV_MANDATORY_PATH)' and\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' should be "
-"'include \\$(ENV_DEFAULTS_PATH)'"
+"To reenable gconf profiles you need to change /etc/gconf/2/path as follows:"
+"\\n - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should "
+"be 'include \\$(ENV_MANDATORY_PATH)' and\\n - 'include /var/cache/desktop-"
+"profiles/\\$(USER)_defaults.path' should be 'include \\$(ENV_DEFAULTS_PATH)'"
 msgstr ""
 "Gconf profila berri zgaitzeko /etc/gconf/2/path fitxategi honekla aldatu "
 "behar duzu:\n"
@@ -81,3 +48,29 @@ msgstr ""
 "\\$(ENV_MANDATORY_PATH)' izan behar da eta  'include /var/cache/desktop-"
 "profiles/\\$(USER)_defaults.path' 'include \\$(ENV_DEFAULTS_PATH)' izan "
 "behar da."
+
+#~ msgid ""
+#~ "Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
+#~ "configuration sources managed by desktop-profiles. The system wide path "
+#~ "file (/etc/gconf/2/path) needs to be changed to get such configuration "
+#~ "sources to work."
+#~ msgstr ""
+#~ "Erabiltzen ari zaren gconf (adib GNOME) konfigurazioak ez du desktop-"
+#~ "profiles erabiltzen dituen konfigurazio iturburuak errazten. Sistema bide "
+#~ "fitxategia (/etc/gconf/2/path) aldatu egin behar da konfigurazio honek "
+#~ "funtziona dezan."
+
+#~ msgid ""
+#~ "This package includes a conversion script (/usr/sbin/path2listing) that "
+#~ "will create the necessary changes to have all your configuration sources "
+#~ "managed by desktop-profiles. Running this script should not result in "
+#~ "user-visible changes to the system. See the README in /usr/share/doc/"
+#~ "desktop-profiles/ for more information on this script, or for info on "
+#~ "changing the path file manually."
+#~ msgstr ""
+#~ "Pakete honek desktop-profiles-ek zure konfigurazio iturburu guztiak kudea "
+#~ "ditzan behar dituen aldaketak egingo dituen eraldaketa script (/usr/sbin/"
+#~ "path2listing) bat dakar. Script hau abiarazteak ez ditu erabiltzaileak "
+#~ "ikusiko dituen aldaketarik egingo. Ikusi /usr/share/doc/desktop-profiles/ "
+#~ "direktorioa dagoen README fitxategia script honen edo bide fitxategia "
+#~ "eskuz aldatzearen argibide gehiagorako."
diff --git a/debian/po/fr.po b/debian/po/fr.po
index c5467b2..42e42a9 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: desktop-profiles\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-09 11:54-0600\n"
+"Report-Msgid-Bugs-To: cobaco at skolelinux.no\n"
+"POT-Creation-Date: 2006-10-06 11:32+0200\n"
 "PO-Revision-Date: 2006-09-11 13:38+0200\n"
 "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon at wanadoo.fr>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.or>\n"
@@ -24,9 +24,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#. Type: note
-#. Description
-#: ../templates:1001 ../templates:2001
+#: ../templates:1001
 msgid "Global gconf path file needs to be changed!"
 msgstr "Fichier ��path�� de gconf modifi� pour l'ensemble du syst�me"
 
@@ -34,40 +32,6 @@ msgstr "Fichier 
 #. Description
 #: ../templates:1001
 msgid ""
-"Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
-"configuration sources managed by desktop-profiles. The system wide path file "
-"(/etc/gconf/2/path) needs to be changed to get such configuration sources to "
-"work."
-msgstr ""
-"Votre configuration actuelle de gconf (par exemple celle de GNOME) rend "
-"difficile l'utilisation de sources de configuration g�r�es par desktop-"
-"profiles. Le fichier ��path�� utilis� pour l'ensemble du syst�me (/etc/"
-"gconf/2/path) doit �tre ajust� afin de permettre le fonctionnement de telles "
-"sources de configuration."
-
-#. Type: note
-#. Description
-#: ../templates:1001
-msgid ""
-"This package includes a conversion script (/usr/sbin/path2listing) that will "
-"create the necessary changes to have all your configuration sources managed "
-"by desktop-profiles. Running this script should not result in user-visible "
-"changes to the system. See the README in /usr/share/doc/desktop-profiles/ "
-"for more information on this script, or for info on changing the path file "
-"manually."
-msgstr ""
-"Ce paquet comporte un script de conversion (/usr/bin/path2listing) qui va "
-"effectuer les modifications n�cessaires pour que toutes vos sources de "
-"configuration soient g�r�es par desktop-profiles. L'ex�cution de ce script "
-"ne devrait pas provoquer de modifications du syst�me visibles de "
-"l'utilisateur. Veuillez consulter le fichier README dans /usr/share/doc/"
-"desktop-profiles/ pour davantage d'informations concernant ce script, ou sur "
-"la mani�re de modifier vous-m�me le fichier ��path��."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
 "The include directives used by desktop-profiles have changed (in response "
 "to  bug 309978, see the bug report and corresponding entry in the changelog "
 "of  version 1.4.6 of this package for details)."
@@ -79,7 +43,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates:2001
+#: ../templates:1001
 msgid ""
 "To reenable gconf profiles you need to change /etc/gconf/2/path as follows:"
 "\\n - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should "
@@ -92,3 +56,31 @@ msgstr ""
 "�tre remplac� par ��include \\($ENV_MANDATORY_PATH)���;\n"
 " - ��include /var/cache/desktop-profiles/\\$(USER)_default.path�� doit �tre "
 "remplac� par ��include \\$(ENV_DEFAULTS_PATH)��."
+
+#~ msgid ""
+#~ "Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
+#~ "configuration sources managed by desktop-profiles. The system wide path "
+#~ "file (/etc/gconf/2/path) needs to be changed to get such configuration "
+#~ "sources to work."
+#~ msgstr ""
+#~ "Votre configuration actuelle de gconf (par exemple celle de GNOME) rend "
+#~ "difficile l'utilisation de sources de configuration g�r�es par desktop-"
+#~ "profiles. Le fichier ��path�� utilis� pour l'ensemble du syst�me (/etc/"
+#~ "gconf/2/path) doit �tre ajust� afin de permettre le fonctionnement de "
+#~ "telles sources de configuration."
+
+#~ msgid ""
+#~ "This package includes a conversion script (/usr/sbin/path2listing) that "
+#~ "will create the necessary changes to have all your configuration sources "
+#~ "managed by desktop-profiles. Running this script should not result in "
+#~ "user-visible changes to the system. See the README in /usr/share/doc/"
+#~ "desktop-profiles/ for more information on this script, or for info on "
+#~ "changing the path file manually."
+#~ msgstr ""
+#~ "Ce paquet comporte un script de conversion (/usr/bin/path2listing) qui va "
+#~ "effectuer les modifications n�cessaires pour que toutes vos sources de "
+#~ "configuration soient g�r�es par desktop-profiles. L'ex�cution de ce "
+#~ "script ne devrait pas provoquer de modifications du syst�me visibles de "
+#~ "l'utilisateur. Veuillez consulter le fichier README dans /usr/share/doc/"
+#~ "desktop-profiles/ pour davantage d'informations concernant ce script, ou "
+#~ "sur la mani�re de modifier vous-m�me le fichier ��path��."
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 6022a9a..422dfe2 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -14,9 +14,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: desktop-profiles\n"
-"Report-Msgid-Bugs-To: cobaco at linux.be\n"
-"POT-Creation-Date: 2005-10-10 22:40+0200\n"
-"PO-Revision-Date: 2005-10-01 15:07+0100\n"
+"Report-Msgid-Bugs-To: cobaco at skolelinux.no\n"
+"POT-Creation-Date: 2006-10-06 11:32+0200\n"
+"PO-Revision-Date: 2006-10-06 11:47+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at linux.be>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,73 +26,54 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates:3
-msgid ""
-"Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
-"configuration sources managed by desktop-profiles. The system wide path file "
-"(/etc/gconf/2/path) needs to be changed to get such configuration sources to "
-"work."
-msgstr ""
-"Uw huidige gconf (i.e. GNOME) opzet ondersteund het gebruik van "
-"configuratiebronnen die door desktop-profiles beheerd worden niet. Het "
-"systeemwijde 'path'-bestand (/etc/gconf/2/path) dient aangepast te worden om "
-"zo'n configuratiebronnen te ondersteunen."
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid ""
-"This package includes a conversion script (/usr/sbin/path2listing) that will "
-"create the necessary changes to have all your configuration sources managed "
-"by desktop-profiles. Running this script should not result in user-visible "
-"changes to the system. See the README in /usr/share/doc/desktop-profiles/ "
-"for more information on this script, or for info on changing the path file "
-"manually."
-msgstr ""
-"Dit pakket bevat een conversie-script (/usr/sbin/path2listing) dat de "
-"veranderingen nodig om alle uw configuratiebronnen via desktop-profiles te "
-"beheren uitvoerd. Het uitvoeren van dit script heeft geen voor gewone "
-"gebruikers zichtbare gevolgen. Zie het 'README'-bestand in de map /usr/share/"
-"doc/desktop-profiles/ voor meer informatie over dit script, of informatie "
-"over hoe het 'path'-bestand handmatig aan te passen."
-
-#. Type: note
-#. Description
-#: ../templates:18
+#: ../templates:1001
 msgid "Global gconf path file needs to be changed!"
 msgstr "Het systeemwijde gconf 'path'-bestand dient aangepast te worden!"
 
 #. Type: note
 #. Description
-#: ../templates:18
-msgid ""
-"The include directives used by desktop-profiles have changed (in response "
-"to  bug 309978, see the bug report and corresponding entry in the changelog "
-"of  version 1.4.6 of this package for details)."
-msgstr ""
-"De door dit pakket gebruikte include-ingangen zijn veranderd (in opvolging "
-"van bug #309978, zie het bugrapport, of de overeenkomstige ingang in het "
-"changelog van versie 1.4.6 van dit pakket voor meer informatie)."
+#: ../templates:1001
+msgid "The include directives used by desktop-profiles have changed (in response to  bug 309978, see the bug report and corresponding entry in the changelog of  version 1.4.6 of this package for details)."
+msgstr "De door dit pakket gebruikte include-ingangen zijn veranderd (in opvolging van bug #309978, zie het bugrapport, of de overeenkomstige ingang in het changelog van versie 1.4.6 van dit pakket voor meer informatie)."
 
 #. Type: note
 #. Description
-#: ../templates:18
+#: ../templates:1001
 msgid ""
-"To reenable gconf profiles you need to change /etc/gconf/2/path as follows:\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should be "
-"'include \\$(ENV_MANDATORY_PATH)' and\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' should be "
-"'include \\$(ENV_DEFAULTS_PATH)'"
+"To reenable gconf profiles you need to change /etc/gconf/2/path as follows:\\n"
+" - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should be 'include \\$(ENV_MANDATORY_PATH)' and\\n"
+" - 'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' should be 'include \\$(ENV_DEFAULTS_PATH)'"
 msgstr ""
-"Om gconf-profielen opnieuw te activeren dient u het bestand '/etc/gconf/2/"
-"path' als volgt te veranderen:\n"
-" 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' moet worden "
-"'include \\$(ENV_MANDATORY_PATH)' en\n"
-" 'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' moet worden "
-"'include \\$(ENV_DEFAULTS_PATH)'"
+"Om gconf-profielen opnieuw te activeren dient u het bestand '/etc/gconf/2/path' als volgt te veranderen:\n"
+" 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' moet worden 'include \\$(ENV_MANDATORY_PATH)' en\n"
+" 'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' moet worden 'include \\$(ENV_DEFAULTS_PATH)'"
 
 #~ msgid ""
 #~ "Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
+#~ "configuration sources managed by desktop-profiles. The system wide path "
+#~ "file (/etc/gconf/2/path) needs to be changed to get such configuration "
+#~ "sources to work."
+#~ msgstr ""
+#~ "Uw huidige gconf (i.e. GNOME) opzet ondersteund het gebruik van "
+#~ "configuratiebronnen die door desktop-profiles beheerd worden niet. Het "
+#~ "systeemwijde 'path'-bestand (/etc/gconf/2/path) dient aangepast te worden "
+#~ "om zo'n configuratiebronnen te ondersteunen."
+#~ msgid ""
+#~ "This package includes a conversion script (/usr/sbin/path2listing) that "
+#~ "will create the necessary changes to have all your configuration sources "
+#~ "managed by desktop-profiles. Running this script should not result in "
+#~ "user-visible changes to the system. See the README in /usr/share/doc/"
+#~ "desktop-profiles/ for more information on this script, or for info on "
+#~ "changing the path file manually."
+#~ msgstr ""
+#~ "Dit pakket bevat een conversie-script (/usr/sbin/path2listing) dat de "
+#~ "veranderingen nodig om alle uw configuratiebronnen via desktop-profiles "
+#~ "te beheren uitvoerd. Het uitvoeren van dit script heeft geen voor gewone "
+#~ "gebruikers zichtbare gevolgen. Zie het 'README'-bestand in de map /usr/"
+#~ "share/doc/desktop-profiles/ voor meer informatie over dit script, of "
+#~ "informatie over hoe het 'path'-bestand handmatig aan te passen."
+#~ msgid ""
+#~ "Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
 #~ "configuration sources managed by desktop-profiles (either because  you "
 #~ "haven't made the necessary changes yet, or because you had a version "
 #~ "previous to 1.4.6 of this package installed which used a different path-"
@@ -110,7 +91,6 @@ msgstr ""
 #~ "gconf 'path'-bestand aangepast te worden, en anderzijds de door desktop-"
 #~ "profiles benodigde metadata betreffende de door dit bestand gebruikte "
 #~ "configuratiebronnen beschikbaar gemaakt te worden."
-
 #~ msgid ""
 #~ "Running this script shouldn't create any user-visible differences, it "
 #~ "will allow you to manage all configuration sources through desktop-"
@@ -122,17 +102,14 @@ msgstr ""
 #~ "desktop-profiles. Dit script maakt een reservekopie van alle bestanden "
 #~ "waar het veranderingen in aanbrengt, u kunt dus altijd terug naar de "
 #~ "vorige situatie."
-
 #~ msgid ""
 #~ "If you want to do the conversion manually this is off course possible, "
 #~ "see /usr/share/doc/desktop-profiles/README for more information."
 #~ msgstr ""
 #~ "Deze conversie handmatig uitvoeren is natuurlijk ook mogelijk, zie /usr/"
 #~ "share/doc/desktop-profiles/README voor meer informatie."
-
 #~ msgid "gconf profiles won't work by default"
 #~ msgstr "gconf-profielen werken standaard niet"
-
 #~ msgid ""
 #~ "The default gconf (i.e. GNOME) setup doesn't facilitate the use of "
 #~ "profiles for certain groups only. This package provides an alternative "
@@ -147,10 +124,8 @@ msgstr ""
 #~ "ondersteund. Om ervoor te zorgen dat gconf de aanpak van dit pakket "
 #~ "gebruikt dient het systeemwijde 'path'-bestand (/etc/gconf.<gconf-"
 #~ "version>/path) aangepast te worden."
-
 #~ msgid "Replace the default system-wide 'path' file?"
 #~ msgstr "Systeemwijd 'path'-bestand vervangen?"
-
 #~ msgid ""
 #~ "This package includes an replacement system-wide gconf 'path' file that "
 #~ "will reproduce the default behaviour of gconf, but will also allow the "
@@ -163,7 +138,6 @@ msgstr ""
 #~ "installatie van extra configuratiebronnen via desktop-profiles toelaat. U "
 #~ "wordt aangeraden om het standaard systeem-wijde gconf 'path'-bestand te "
 #~ "vervangen."
-
 #~ msgid ""
 #~ "If you choose not to replace the default gconf 'path' file at this point, "
 #~ "you can always do this later by running `dpkg-reconfigure desktop-"
@@ -177,3 +151,4 @@ msgstr ""
 #~ "version>path te vervangen door /usr/share/desktop-profiles/path, of een "
 #~ "ander 'path'-bestand zoals beschreven in /usr/share/doc/desktop-profiles/"
 #~ "README"
+
diff --git a/debian/po/pt.po b/debian/po/pt.po
index e69dbad..e6977ab 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: desktop-profiles 1.4.5\n"
-"Report-Msgid-Bugs-To: cobaco at linux.be\n"
-"POT-Creation-Date: 2005-10-10 22:40+0200\n"
+"Report-Msgid-Bugs-To: cobaco at skolelinux.no\n"
+"POT-Creation-Date: 2006-10-06 11:32+0200\n"
 "PO-Revision-Date: 2005-10-05 12:54+0100\n"
 "Last-Translator: Rui Branco <ruipb at netcabo.pt>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -17,46 +17,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates:3
-msgid ""
-"Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
-"configuration sources managed by desktop-profiles. The system wide path file "
-"(/etc/gconf/2/path) needs to be changed to get such configuration sources to "
-"work."
-msgstr ""
-"A sua configuração actual do gconf (p.e. GNOME) não lhe facilita o uso de "
-"fontes de configuração geridas pelo desktop-profiles. O ficheiro de sistema "
-"de âmbito geral (/etc/gconf/2/path) necessita de ser modificado para que "
-"funcionem as ditas fontes de configuração."
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid ""
-"This package includes a conversion script (/usr/sbin/path2listing) that will "
-"create the necessary changes to have all your configuration sources managed "
-"by desktop-profiles. Running this script should not result in user-visible "
-"changes to the system. See the README in /usr/share/doc/desktop-profiles/ "
-"for more information on this script, or for info on changing the path file "
-"manually."
-msgstr ""
-"Este pacote inclui um script de conversão (/usr/sbin/path2listing) que "
-"criará as modificações necessárias para que as suas fontes de configuração "
-"sejam geridas pelo desktop-profiles. A execução deste 'script' não resultará "
-"em alterações do sistema visíveis ao utilizador. Para mais informações "
-"acerca deste script, ou para informações sobre como alterar manualmente o "
-"caminho do ficheiro veja o ficheiro README em /usr/share/doc/desktop-"
-"profiles/."
-
-#. Type: note
-#. Description
-#: ../templates:18
+#: ../templates:1001
 msgid "Global gconf path file needs to be changed!"
 msgstr "O caminho global do ficheiro gconf precisa de ser alterado!"
 
 #. Type: note
 #. Description
-#: ../templates:18
+#: ../templates:1001
 msgid ""
 "The include directives used by desktop-profiles have changed (in response "
 "to  bug 309978, see the bug report and corresponding entry in the changelog "
@@ -69,19 +36,45 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates:18
+#: ../templates:1001
 msgid ""
-"To reenable gconf profiles you need to change /etc/gconf/2/path as follows:\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should be "
-"'include \\$(ENV_MANDATORY_PATH)' and\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' should be "
-"'include \\$(ENV_DEFAULTS_PATH)'"
+"To reenable gconf profiles you need to change /etc/gconf/2/path as follows:"
+"\\n - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should "
+"be 'include \\$(ENV_MANDATORY_PATH)' and\\n - 'include /var/cache/desktop-"
+"profiles/\\$(USER)_defaults.path' should be 'include \\$(ENV_DEFAULTS_PATH)'"
 msgstr ""
 "Para re-activar os perfis (profiles) do gconf necessita modificar o "
 "ficheiro /etc/gconf/2/path do seguinte modo:\n"
 " - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' deverá ser "
-"'include \\$(ENV_MANDATORY_PATH)' - e 'include /var/cache/desktop-profiles/"
-"\\$(USER)_defaults.path' deverá ser 'include \\$(ENV_DEFAULTS_PATH)'"
+"'include \\$(ENV_MANDATORY_PATH)' - e 'include /var/cache/desktop-profiles/\\"
+"$(USER)_defaults.path' deverá ser 'include \\$(ENV_DEFAULTS_PATH)'"
+
+#~ msgid ""
+#~ "Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
+#~ "configuration sources managed by desktop-profiles. The system wide path "
+#~ "file (/etc/gconf/2/path) needs to be changed to get such configuration "
+#~ "sources to work."
+#~ msgstr ""
+#~ "A sua configuração actual do gconf (p.e. GNOME) não lhe facilita o uso de "
+#~ "fontes de configuração geridas pelo desktop-profiles. O ficheiro de "
+#~ "sistema de âmbito geral (/etc/gconf/2/path) necessita de ser modificado "
+#~ "para que funcionem as ditas fontes de configuração."
+
+#~ msgid ""
+#~ "This package includes a conversion script (/usr/sbin/path2listing) that "
+#~ "will create the necessary changes to have all your configuration sources "
+#~ "managed by desktop-profiles. Running this script should not result in "
+#~ "user-visible changes to the system. See the README in /usr/share/doc/"
+#~ "desktop-profiles/ for more information on this script, or for info on "
+#~ "changing the path file manually."
+#~ msgstr ""
+#~ "Este pacote inclui um script de conversão (/usr/sbin/path2listing) que "
+#~ "criará as modificações necessárias para que as suas fontes de "
+#~ "configuração sejam geridas pelo desktop-profiles. A execução deste "
+#~ "'script' não resultará em alterações do sistema visíveis ao utilizador. "
+#~ "Para mais informações acerca deste script, ou para informações sobre como "
+#~ "alterar manualmente o caminho do ficheiro veja o ficheiro README em /usr/"
+#~ "share/doc/desktop-profiles/."
 
 #~ msgid "Replace the default system-wide 'path' file?"
 #~ msgstr "Substituir o 'caminho' do ficheiro por omissão para todo o sistema?"
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index f47de13..37798a2 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: desktop-profiles VERSION\n"
-"Report-Msgid-Bugs-To: cobaco at linux.be\n"
-"POT-Creation-Date: 2005-10-01 15:07+0200\n"
+"Report-Msgid-Bugs-To: cobaco at skolelinux.no\n"
+"POT-Creation-Date: 2006-10-06 11:32+0200\n"
 "PO-Revision-Date: 2006-01-18 09:19+0100\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <felipe at cathedrallabs."
 "org>\n"
@@ -20,45 +20,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates:3
-msgid ""
-"Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
-"configuration sources managed by desktop-profiles. The system wide path file "
-"(/etc/gconf/2/path) needs to be changed to get such configuration sources to "
-"work."
-msgstr ""
-"A sua configuração atual do gconf (i.e. GNOME) não facilita o uso de fontes "
-"de configuração gerenciadas pelo desktop-profiles. O arquivo path para o "
-"sistema como um todo (/etc/gconf/2/path) precisa ser modificado para que as "
-"fontes de configuração funcionem."
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid ""
-"This package includes a conversion script (/usr/sbin/path2listing) that will "
-"create the necessary changes to have all your configuration sources managed "
-"by desktop-profiles. Running this script should not result in user-visible "
-"changes to the system. See the README in /usr/share/doc/desktop-profiles/ "
-"for more information on this script, or for info on changing the path file "
-"manually."
-msgstr ""
-"Esse pacote inclui um script de conversão (/usr/sbin/path2listing) que "
-"criará as modificações necessárias para ter todas as suas fontes de "
-"configuração gerenciadas pelo desktop-profiles. Executar este script não "
-"deve resultar em mudanças no sistema visíveis ao usuário. Veja o README em /"
-"usr/share/doc/desktop-profiles/ para mais informações sobre este script, ou "
-"para informações sobre a mudança manual do arquivo path."
-
-#. Type: note
-#. Description
-#: ../templates:18
+#: ../templates:1001
 msgid "Global gconf path file needs to be changed!"
 msgstr "O arquivo path global do gconf precisa ser modificado!"
 
 #. Type: note
 #. Description
-#: ../templates:18
+#: ../templates:1001
 msgid ""
 "The include directives used by desktop-profiles have changed (in response "
 "to  bug 309978, see the bug report and corresponding entry in the changelog "
@@ -70,16 +38,41 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates:18
+#: ../templates:1001
 msgid ""
-"To reenable gconf profiles you need to change /etc/gconf/2/path as follows:\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should be "
-"'include \\$(ENV_MANDATORY_PATH)' and\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' should be "
-"'include \\$(ENV_DEFAULTS_PATH)'"
+"To reenable gconf profiles you need to change /etc/gconf/2/path as follows:"
+"\\n - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should "
+"be 'include \\$(ENV_MANDATORY_PATH)' and\\n - 'include /var/cache/desktop-"
+"profiles/\\$(USER)_defaults.path' should be 'include \\$(ENV_DEFAULTS_PATH)'"
 msgstr ""
 "Para reabilitar os perfis do gconf você precisa mudar /etc/gconf/2/path como "
 "segue: - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' deve "
 "ser 'include \\$(ENV_MANDATORY_PATH)' - e 'include /var/cache/desktop-"
 "profiles/\\$(USER)_defaults.path' deveria ser 'include \\"
 "$(ENV_DEFAULTS_PATH)'"
+
+#~ msgid ""
+#~ "Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
+#~ "configuration sources managed by desktop-profiles. The system wide path "
+#~ "file (/etc/gconf/2/path) needs to be changed to get such configuration "
+#~ "sources to work."
+#~ msgstr ""
+#~ "A sua configuração atual do gconf (i.e. GNOME) não facilita o uso de "
+#~ "fontes de configuração gerenciadas pelo desktop-profiles. O arquivo path "
+#~ "para o sistema como um todo (/etc/gconf/2/path) precisa ser modificado "
+#~ "para que as fontes de configuração funcionem."
+
+#~ msgid ""
+#~ "This package includes a conversion script (/usr/sbin/path2listing) that "
+#~ "will create the necessary changes to have all your configuration sources "
+#~ "managed by desktop-profiles. Running this script should not result in "
+#~ "user-visible changes to the system. See the README in /usr/share/doc/"
+#~ "desktop-profiles/ for more information on this script, or for info on "
+#~ "changing the path file manually."
+#~ msgstr ""
+#~ "Esse pacote inclui um script de conversão (/usr/sbin/path2listing) que "
+#~ "criará as modificações necessárias para ter todas as suas fontes de "
+#~ "configuração gerenciadas pelo desktop-profiles. Executar este script não "
+#~ "deve resultar em mudanças no sistema visíveis ao usuário. Veja o README "
+#~ "em /usr/share/doc/desktop-profiles/ para mais informações sobre este "
+#~ "script, ou para informações sobre a mudança manual do arquivo path."
diff --git a/debian/po/sv.po b/debian/po/sv.po
index fddfee5..5f5d88c 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: desktop-profiles 1.4.5\n"
-"Report-Msgid-Bugs-To: cobaco at linux.be\n"
-"POT-Creation-Date: 2005-10-10 22:40+0200\n"
+"Report-Msgid-Bugs-To: cobaco at skolelinux.no\n"
+"POT-Creation-Date: 2006-10-06 11:32+0200\n"
 "PO-Revision-Date: 2005-10-14 16:51+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <sv at li.org>\n"
@@ -24,42 +24,67 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates:3
-msgid "Your current gconf (i.e. GNOME) setup doesn't facilitate the use of configuration sources managed by desktop-profiles. The system wide path file (/etc/gconf/2/path) needs to be changed to get such configuration sources to work."
-msgstr "Din nuvarande gconf (allts� GNOME) konfiguration har inte m�jligheten f�r anv�nda konfigurationsk�llor som hanteras av desktop-profiles. Den systembreda filen path (/etc/gconf/2/path) beh�ver �ndras f�r att f� konfigurationsk�llor att fungera."
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid "This package includes a conversion script (/usr/sbin/path2listing) that will create the necessary changes to have all your configuration sources managed by desktop-profiles. Running this script should not result in user-visible changes to the system. See the README in /usr/share/doc/desktop-profiles/ for more information on this script, or for info on changing the path file manually."
-msgstr "Detta paket inkluderar ett konversionsskript (/usr/sbin/path2listing) som kommer att skapa de n�dv�ndiga �ndringar f�r att f� alla dina konfigurationsk�llor att hanteras av desktop-profiles. Att k�ra detta skript ska inte resultera i �ndringar av systemet som anv�ndaren ser. Se README i /usr/share/doc/desktop-profiles/ f�r mer information om detta skript eller f�r information om manuell �ndring av filen path."
-
-#. Type: note
-#. Description
-#: ../templates:18
+#: ../templates:1001
 msgid "Global gconf path file needs to be changed!"
 msgstr "Den globala gconf-filen path beh�ver �ndras!"
 
 #. Type: note
 #. Description
-#: ../templates:18
-msgid "The include directives used by desktop-profiles have changed (in response to  bug 309978, see the bug report and corresponding entry in the changelog of  version 1.4.6 of this package for details)."
-msgstr "De inkluderade direktiven som anv�nds av desktop-profiles har �ndrats (som svar p� bug 309978, se mer information i buggrapporten och liknande punkt i �ndringsloggen f�r version 1.4.6 av detta paket)."
+#: ../templates:1001
+msgid ""
+"The include directives used by desktop-profiles have changed (in response "
+"to  bug 309978, see the bug report and corresponding entry in the changelog "
+"of  version 1.4.6 of this package for details)."
+msgstr ""
+"De inkluderade direktiven som anv�nds av desktop-profiles har �ndrats (som "
+"svar p� bug 309978, se mer information i buggrapporten och liknande punkt i "
+"�ndringsloggen f�r version 1.4.6 av detta paket)."
 
 #. Type: note
 #. Description
-#: ../templates:18
+#: ../templates:1001
 msgid ""
-"To reenable gconf profiles you need to change /etc/gconf/2/path as follows:\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should be 'include \\$(ENV_MANDATORY_PATH)' and\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' should be 'include \\$(ENV_DEFAULTS_PATH)'"
+"To reenable gconf profiles you need to change /etc/gconf/2/path as follows:"
+"\\n - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should "
+"be 'include \\$(ENV_MANDATORY_PATH)' and\\n - 'include /var/cache/desktop-"
+"profiles/\\$(USER)_defaults.path' should be 'include \\$(ENV_DEFAULTS_PATH)'"
 msgstr ""
-"F�r att �teraktivera gconf-profiler beh�ver du �ndra /etc/gconf/2/path enligt f�ljande:\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' ska vara  'include \\$(ENV_MANDATORY_PATH)' och\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' ska vara  'include \\$(ENV_DEFAULTS_PATH)'"
+"F�r att �teraktivera gconf-profiler beh�ver du �ndra /etc/gconf/2/path "
+"enligt f�ljande:\n"
+" - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' ska vara  "
+"'include \\$(ENV_MANDATORY_PATH)' och\n"
+" - 'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' ska vara  "
+"'include \\$(ENV_DEFAULTS_PATH)'"
+
+#~ msgid ""
+#~ "Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
+#~ "configuration sources managed by desktop-profiles. The system wide path "
+#~ "file (/etc/gconf/2/path) needs to be changed to get such configuration "
+#~ "sources to work."
+#~ msgstr ""
+#~ "Din nuvarande gconf (allts� GNOME) konfiguration har inte m�jligheten f�r "
+#~ "anv�nda konfigurationsk�llor som hanteras av desktop-profiles. Den "
+#~ "systembreda filen path (/etc/gconf/2/path) beh�ver �ndras f�r att f� "
+#~ "konfigurationsk�llor att fungera."
+
+#~ msgid ""
+#~ "This package includes a conversion script (/usr/sbin/path2listing) that "
+#~ "will create the necessary changes to have all your configuration sources "
+#~ "managed by desktop-profiles. Running this script should not result in "
+#~ "user-visible changes to the system. See the README in /usr/share/doc/"
+#~ "desktop-profiles/ for more information on this script, or for info on "
+#~ "changing the path file manually."
+#~ msgstr ""
+#~ "Detta paket inkluderar ett konversionsskript (/usr/sbin/path2listing) som "
+#~ "kommer att skapa de n�dv�ndiga �ndringar f�r att f� alla dina "
+#~ "konfigurationsk�llor att hanteras av desktop-profiles. Att k�ra detta "
+#~ "skript ska inte resultera i �ndringar av systemet som anv�ndaren ser. Se "
+#~ "README i /usr/share/doc/desktop-profiles/ f�r mer information om detta "
+#~ "skript eller f�r information om manuell �ndring av filen path."
 
 #~ msgid "Replace the default system-wide 'path' file?"
 #~ msgstr "Byta ut standard systembreda 'path'-filen?"
+
 #~ msgid ""
 #~ "The default gconf (i.e. GNOME) setup doesn't facilitate the use of "
 #~ "profiles for certain groups only. The approach used by this package does. "
@@ -70,6 +95,7 @@ msgstr ""
 #~ "profiler f�r vissa grupper. Detta paket g�r det. F�r att f� gconf att "
 #~ "anv�nda detta paket m�ste den systembreda gconf-filen 'path' bli utbytt "
 #~ "med en som kommer fr�n detta paket."
+
 #~ msgid ""
 #~ "Doing so won't change the default behaviour of gconf but it will allow "
 #~ "the subsequent installation and activation of gconf profiles. Thus it is "
@@ -80,6 +106,7 @@ msgstr ""
 #~ "den efterf�ljande installation och aktivering av gconf-profiler. D�rf�r "
 #~ "�r det rekommenderat att du l�ter mig byta ut standard systembreda gconf-"
 #~ "filen 'path',"
+
 #~ msgid ""
 #~ "You can always do this later by running `dpkg-reconfigure desktop-"
 #~ "profiles', or by manually replacing /etc/gconf/<gconf-version>/path with /"
@@ -88,4 +115,3 @@ msgstr ""
 #~ "Du kan alltid g�ra detta senare genom att k�ra 'dpkg-reconfigure desktop-"
 #~ "profiles', eller manuellt byta ut  /etc/gconf/<gconf-version>/path med /"
 #~ "usr/share/doc/desktop-profiles/examples/path."
-
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index ee16794..3e3c781 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: cobaco at linux.be\n"
-"POT-Creation-Date: 2005-10-10 22:40+0200\n"
+"Report-Msgid-Bugs-To: cobaco at skolelinux.no\n"
+"POT-Creation-Date: 2006-10-06 11:32+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,35 +18,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates:3
-msgid ""
-"Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
-"configuration sources managed by desktop-profiles. The system wide path file "
-"(/etc/gconf/2/path) needs to be changed to get such configuration sources to "
-"work."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid ""
-"This package includes a conversion script (/usr/sbin/path2listing) that will "
-"create the necessary changes to have all your configuration sources managed "
-"by desktop-profiles. Running this script should not result in user-visible "
-"changes to the system. See the README in /usr/share/doc/desktop-profiles/ "
-"for more information on this script, or for info on changing the path file "
-"manually."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:18
+#: ../templates:1001
 msgid "Global gconf path file needs to be changed!"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates:18
+#: ../templates:1001
 msgid ""
 "The include directives used by desktop-profiles have changed (in response "
 "to  bug 309978, see the bug report and corresponding entry in the changelog "
@@ -55,11 +33,10 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates:18
+#: ../templates:1001
 msgid ""
-"To reenable gconf profiles you need to change /etc/gconf/2/path as follows:\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should be "
-"'include \\$(ENV_MANDATORY_PATH)' and\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' should be "
-"'include \\$(ENV_DEFAULTS_PATH)'"
+"To reenable gconf profiles you need to change /etc/gconf/2/path as follows:"
+"\\n - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should "
+"be 'include \\$(ENV_MANDATORY_PATH)' and\\n - 'include /var/cache/desktop-"
+"profiles/\\$(USER)_defaults.path' should be 'include \\$(ENV_DEFAULTS_PATH)'"
 msgstr ""
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 80b7e93..027a147 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -3,10 +3,10 @@
 # Clytie Siddall <clytie at riverland.net.au>, 2005.
 # 
 msgid ""
-""
-msgstr "Project-Id-Version: desktop-profiles\n"
-"Report-Msgid-Bugs-To: cobaco at linux.be\n"
-"POT-Creation-Date: 2005-10-10 22:40+0200\n"
+msgstr ""
+"Project-Id-Version: desktop-profiles\n"
+"Report-Msgid-Bugs-To: cobaco at skolelinux.no\n"
+"POT-Creation-Date: 2006-10-06 11:32+0200\n"
 "PO-Revision-Date: 2005-12-22 22:09+1030\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
@@ -16,57 +16,65 @@ msgstr "Project-Id-Version: desktop-profiles\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: LocFactoryEditor 1.5.1b\n"
 
-#.Type: note
-#.Description
-#:../templates:3
-msgid ""
-"Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
-"configuration sources managed by desktop-profiles. The system wide path file "
-"(/etc/gconf/2/path) needs to be changed to get such configuration sources to "
-"work."
-msgstr "Thiết lập GConf (tức là Gnome) của bạn không làm dễ sử dụng nguồn cấu hình nào desktop-profiles quản lý. Tập tin đường dẫn cho toàn hệ thống (</etc/gconf/2/path>) cần phải được thay đổi để cho phép nguồn cấu hình như vậy hoạt động."
-
-#.Type: note
-#.Description
-#:../templates:3
-msgid ""
-"This package includes a conversion script (/usr/sbin/path2listing) that will "
-"create the necessary changes to have all your configuration sources managed "
-"by desktop-profiles. Running this script should not result in user-visible "
-"changes to the system. See the README in /usr/share/doc/desktop-profiles/ "
-"for more information on this script, or for info on changing the path file "
-"manually."
-msgstr "Gói này bao gồm một tập lệnh chuyển đổi (</usr/sbin/path2listing>) sẽ tạo các thay đổi cần thiết để cho phép trình desktop-profiles quản lý các nguồn cấu hình của bạn. Việc chạy tập lệnh này không nên gây ra thay đổi nào người dùng thấy được. Hãy xem tập tin Đọc Đi (README) trong < /usr/share/doc/desktop-profiles/> để tìm thông tin thêm về tập lệnh này, hoặc để tìm thông tin về cách tự thay đổi tập tin đường dẫn."
-
-#.Type: note
-#.Description
-#:../templates:18
+#. Type: note
+#. Description
+#: ../templates:1001
 msgid "Global gconf path file needs to be changed!"
 msgstr "• Cần phải thay đổi tập tin đường dẫn gconf toàn cục. •"
 
-#.Type: note
-#.Description
-#:../templates:18
+#. Type: note
+#. Description
+#: ../templates:1001
 msgid ""
 "The include directives used by desktop-profiles have changed (in response "
 "to  bug 309978, see the bug report and corresponding entry in the changelog "
 "of  version 1.4.6 of this package for details)."
-msgstr "Những chỉ thị bao gồm mà desktop-profiles sử dụng đã thay đổi (để sửa Lỗi 309978, xem thông báo lỗi và mục nhập liên quan trong bản ghi thay đổi của phiên bản 1.4.6 của gói này, để tìm chi tiết)."
+msgstr ""
+"Những chỉ thị bao gồm mà desktop-profiles sử dụng đã thay đổi (để sửa Lỗi "
+"309978, xem thông báo lỗi và mục nhập liên quan trong bản ghi thay đổi của "
+"phiên bản 1.4.6 của gói này, để tìm chi tiết)."
 
-#.Type: note
-#.Description
-#:../templates:18
+#. Type: note
+#. Description
+#: ../templates:1001
 msgid ""
-"To reenable gconf profiles you need to change /etc/gconf/2/path as follows:\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should be "
-"'include \\$(ENV_MANDATORY_PATH)' and\n"
-" - 'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' should be "
-"'include \\$(ENV_DEFAULTS_PATH)'"
-msgstr "Để bật lại chạy hồ sơ GConf, bạn cần phải thay đổi tập tin đường dẫn </etc/gconf/2/path> như theo đây:\n"
+"To reenable gconf profiles you need to change /etc/gconf/2/path as follows:"
+"\\n - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should "
+"be 'include \\$(ENV_MANDATORY_PATH)' and\\n - 'include /var/cache/desktop-"
+"profiles/\\$(USER)_defaults.path' should be 'include \\$(ENV_DEFAULTS_PATH)'"
+msgstr ""
+"Để bật lại chạy hồ sơ GConf, bạn cần phải thay đổi tập tin đường dẫn </etc/"
+"gconf/2/path> như theo đây:\n"
 " •  'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' nên là "
 "'include \\$(ENV_MANDATORY_PATH)' và\n"
-" • 'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' nên là"
-"'include \\$(ENV_DEFAULTS_PATH)'"
+" • 'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' nên "
+"là'include \\$(ENV_DEFAULTS_PATH)'"
+
+#~ msgid ""
+#~ "Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
+#~ "configuration sources managed by desktop-profiles. The system wide path "
+#~ "file (/etc/gconf/2/path) needs to be changed to get such configuration "
+#~ "sources to work."
+#~ msgstr ""
+#~ "Thiết lập GConf (tức là Gnome) của bạn không làm dễ sử dụng nguồn cấu "
+#~ "hình nào desktop-profiles quản lý. Tập tin đường dẫn cho toàn hệ thống (</"
+#~ "etc/gconf/2/path>) cần phải được thay đổi để cho phép nguồn cấu hình như "
+#~ "vậy hoạt động."
+
+#~ msgid ""
+#~ "This package includes a conversion script (/usr/sbin/path2listing) that "
+#~ "will create the necessary changes to have all your configuration sources "
+#~ "managed by desktop-profiles. Running this script should not result in "
+#~ "user-visible changes to the system. See the README in /usr/share/doc/"
+#~ "desktop-profiles/ for more information on this script, or for info on "
+#~ "changing the path file manually."
+#~ msgstr ""
+#~ "Gói này bao gồm một tập lệnh chuyển đổi (</usr/sbin/path2listing>) sẽ tạo "
+#~ "các thay đổi cần thiết để cho phép trình desktop-profiles quản lý các "
+#~ "nguồn cấu hình của bạn. Việc chạy tập lệnh này không nên gây ra thay đổi "
+#~ "nào người dùng thấy được. Hãy xem tập tin Đọc Đi (README) trong < /usr/"
+#~ "share/doc/desktop-profiles/> để tìm thông tin thêm về tập lệnh này, hoặc "
+#~ "để tìm thông tin về cách tự thay đổi tập tin đường dẫn."
 
 #~ msgid ""
 #~ "Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
@@ -77,7 +85,8 @@ msgstr "Để bật lại chạy hồ sơ GConf, bạn cần phải thay đổi
 #~ "etc/gconf/<gconf-version>/path) needs to be adapted, and the metadata "
 #~ "needed by desktop-profiles for your current configuration sources needs "
 #~ "to be available."
-#~ msgstr "Thiết lập gconf (tức là GNOME) hiện thời của bạn không làm cho dễ dàng "
+#~ msgstr ""
+#~ "Thiết lập gconf (tức là GNOME) hiện thời của bạn không làm cho dễ dàng "
 #~ "dùng những nguồn cấu hình do trình desktop-profiles quản lý (hoặc vì bạn "
 #~ "chưa sửa đổi nó như cần thiết, hoặc vì bạn có cài đặt một phiên bản trước "
 #~ "1.4.6 mà dùng một tập tin đường dẫn khác). Để sửa trường hợp này, cần "
@@ -91,7 +100,8 @@ msgstr "Để bật lại chạy hồ sơ GConf, bạn cần phải thay đổi
 #~ "will allow you to manage all configuration sources through desktop-"
 #~ "profiles. The script will make backup copies of all files it touches, so "
 #~ "you can always go back to the previous situation."
-#~ msgstr "Chạy tập lệnh này nên không tạo thay đổi nào mà người dùng có thể thấy. "
+#~ msgstr ""
+#~ "Chạy tập lệnh này nên không tạo thay đổi nào mà người dùng có thể thấy. "
 #~ "Tuy nhiên, nó sẽ cho phép bạn quản lý các nguồn cấu hình thông qua trình "
 #~ "desktop-profiles. Tập lệnh này sẽ tạo bản sao của mọi tập tin mà nó xử "
 #~ "lý, thì bạn luôn có thể trở về trường hợp trước."
@@ -99,5 +109,6 @@ msgstr "Để bật lại chạy hồ sơ GConf, bạn cần phải thay đổi
 #~ msgid ""
 #~ "If you want to do the conversion manually this is off course possible, "
 #~ "see /usr/share/doc/desktop-profiles/README for more information."
-#~ msgstr "Hoặc bạn có thể tự chuyển đổi như thế. Hãy xem tập tin «/usr/share/doc/"
+#~ msgstr ""
+#~ "Hoặc bạn có thể tự chuyển đổi như thế. Hãy xem tập tin «/usr/share/doc/"
 #~ "desktop-profiles/README» để tìm thông tin thêm."
diff --git a/debian/templates b/debian/templates
index b9579fa..45b76dd 100644
--- a/debian/templates
+++ b/debian/templates
@@ -1,18 +1,3 @@
-Template: desktop-profiles/replace-gconf-system-wide-path-file
-Type: note
-_Description: Global gconf path file needs to be changed!
- Your current gconf (i.e. GNOME) setup doesn't facilitate the use of
- configuration sources managed by desktop-profiles. The system wide path file
- (/etc/gconf/2/path) needs to be changed to get such configuration sources to
- work.
- .
- This package includes a conversion script (/usr/sbin/path2listing) that will
- create the necessary changes to have all your configuration sources managed
- by desktop-profiles. Running this script should not result in user-visible
- changes to the system. See the README in /usr/share/doc/desktop-profiles/
- for more information on this script, or for info on changing the path file
- manually.
-
 Template: desktop-profiles/replace-old-vars
 Type: note
 _Description: Global gconf path file needs to be changed!
diff --git a/desktop-profiles.7 b/desktop-profiles.7
index 776dca8..473140c 100644
--- a/desktop-profiles.7
+++ b/desktop-profiles.7
@@ -19,9 +19,7 @@ Exactly how a profile is activated depends on the profile kind (you don't need t
 .IP \(bu 3
 For KDE, Freedesktop, XFCE (>= 4.2), ROX, GNUSTEP and UDE activating profiles is done by setting environment variables: KDEDIRS for KDE, XDG_CONFIG_DIRS and XDG_DATA_DIRS for both Freedesktop and XFCE, CHOICESPATH for ROX, GNUSTEP_PATHLIST for GNUSTEP (usually initialized from the various GNUSTEP_*_ROOT variables) and UDEdir for UDE. With the exception of UDEdir, which takes a single directory, each of these variables takes a precedence ordered list of root-directories (of activated profiles).
 .IP \(bu 3
-For GConf profiles two user-specific path files are generated. One containing the activated mandatory "configuration sources", one containing the default "configuration sources" that are activated. 
-.IP 
-As the default system-wide path file (/etc/gconf/<gconf-version>/path) currently doesn't include the generated path files you'll need to replace it with one that does (/usr/share/doc/desktop-profiles/examples/path is a path file which will give the same behaviour as the default gconf setup as long as no additional profiles are present).
+For GConf profiles two user-specific path files are generated. One containing the activated mandatory "configuration sources", one containing the default "configuration sources" that are activated. At the moment the default system-wide path file doesn't include these automatically, this package provides a script (/usr/sbin/path2listing) that looks at your current configuration and adapts so your configuration sources are controlled by desktop-profiles (see the man page for path2listing o [...]
 .IP NOTE:
 Environment variables will only be set if their value is different from the default value, and user-specific path files are only generated if the systemwide gconf path file will include them. This to avoid unnecessary clutter.
 .IP NOTE:
@@ -108,7 +106,7 @@ XFCE versions prior to 4.2. don't support multiple config sets.
 .B ROX 
 (through CHOICESPATH):
 .IP
-Each profile directory has one subdirectory for each app for which it provides settings. When a configuration value is needed the profile directorys are searched in order, first profile that contains the file supplies it.
+Each profile directory has one subdirectory for each app for which it provides settings. When a configuration value is needed the profile directories are searched in order, first profile that contains the file supplies it.
 .IP NOTE:
 Programs _may_ merge the files the different profiles. If the merging encounters conflicting values the one from the highest order profile is used. 
 .IP   
diff --git a/path2listing.1 b/path2listing.1
index d1896ed..c7e1450 100644
--- a/path2listing.1
+++ b/path2listing.1
@@ -19,23 +19,23 @@ In addition to generating the desktop-profiles_path2listing.listing file, this s
 
 .SH OPTIONS
 .PP
--d,--distance
+\-d,\-\-distance
 .IP
 distance between the precedence values of each successive pair of configuration sources (defaults to 50), the idea being that you leave some space to insert future sources.
 .PP
--f, --file
+\-f, \-\-file
 .IP
 path file to convert (defaults to /etc/gconf/2/path)
 .PP
--h, --help
+\-h, \-\-help
 .IP
 display the help message
 .PP
--o, --output-file
+\-o, \-\-output-file
 .IP
 file to put the generated metadata in (defaults to /etc/desktop-profiles/desktop-profiles_path2listing.listing). If this file exists a backup copy will be made prior to overwriting it.
 .PP
---no-replace-file
+\-\-no-replace-file
 .IP
 don't replace the path file we're converted with one assuming desktop-profiles manages activation
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/desktop-profiles.git



More information about the debian-edu-commits mailing list