For completeness reasons, also mentioning dpkg-divert in live-config manpage about...

diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 95b4eda..55aa7c2 100644 (file)
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-CONFIG 7 2012\-11\-25 3.0.12\-1 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 25.11.2012 3.0.12\-1 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-config\fP \- System Konfiguration Skripte
@@ -278,12 +278,12 @@ Beispielpaket und \-skript befindet sich in
 
 .SS "Entfernen von neuen Konfigurationsskripten"
 Es ist derzeit nicht möglich in einer vernünftigen Art und Weise Skripte zu
-entfernen ohne das ein lokal verändertes \fBlive\-config\fP Paket verwendet
-werden muss. Jedoch kann das selbe erreicht werden, indem bestimmte Skripte
-durch den live\-noconfig Mechanismus abgeschaltet werden, siehe oben. Um zu
-verhindern, dass die abzuschaltenden Skripte immer durch einen Boot
-Parameter angegeben werden müssen, kann eine Konfigurationsdatei verwendet
-werden, siehe oben.
+entfernen ohne das ein lokal verändertes \fBlive\-config\fP Paket oder
+dpkg\-divert verwendet werden muss. Jedoch kann das selbe erreicht werden,
+indem bestimmte Skripte durch den live\-noconfig Mechanismus abgeschaltet
+werden, siehe oben. Um zu verhindern, dass die abzuschaltenden Skripte immer
+durch einen Boot Parameter angegeben werden müssen, kann eine
+Konfigurationsdatei verwendet werden, siehe oben.
 .PP
 Die Konfigurationsdateien für das Live System selber werden am Besten in
 einem eigenen Debian Paket untergebracht. Ein Beispielpaket und

diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index f2734c1..f7672de 100644 (file)
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -158,7 +158,7 @@ Downstream projects can put their scripts into /lib/live/config and do not need
 The scripts are best put into an own debian package. A sample package containing an example script can be found in /usr/share/doc/live\-config/examples.
 
 .SS Removing existing config scripts
-It is not really possible to remove scripts itself in a sane way yet without requiring to ship a locally modified \fBlive\-config\fR package. However, the same can be achieved by disabling the respective scripts through the live\-noconfig mechanism, see above. To avoid to always need specifing disabled scripts through the boot parameter, a configuration file should be used, see above.
+It is not really possible to remove scripts itself in a sane way yet without requiring either to ship a locally modified \fBlive\-config\fR package or using dpkg-divert. However, the same can be achieved by disabling the respective scripts through the live\-noconfig mechanism, see above. To avoid to always need specifing disabled scripts through the boot parameter, a configuration file should be used, see above.
 .PP
 The configuration files for the live system itself are best put into an own debian package. A sample package containing an example configuration can be found in /usr/share/doc/live\-config/examples.
 

diff --git a/manpages/es/live-config.es.7 b/manpages/es/live-config.es.7
index d917295..3caff55 100644 (file)
--- a/manpages/es/live-config.es.7
+++ b/manpages/es/live-config.es.7
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-CONFIG 7 2012\-11\-25 3.0.12\-1 "Proyecto Debian Live"
+.TH LIVE\-CONFIG 7 25.11.2012 3.0.12\-1 "Proyecto Debian Live"
 
 .SH NOMBRE
 \fBlive\-config\fP \- Scripts de configuración del sistema
@@ -266,13 +266,12 @@ Lo ideal sería incluir los scripts en su propio paquete debian. En
 un script de ejemplo.
 
 .SS "Eliminación de los scripts de configuración existentes."
-No es realmente posible eliminar los scripts en sí de una manera sensata sin
-incluir un paquete \fBlive\-config\fP modificado localmente. Sin embargo, se
-puede obtener el mismo resultado si se desactivan los scripts
-correspondientes a través del mecanismo live\-noconfig, como se ha indicado
-anteriormente. Para evitar que siempre haga falta especificar qué scripts se
-desactivan a través del parámetro de arranque, debería usarse un fichero de
-configuración, véase más arriba.
+It is not really possible to remove scripts itself in a sane way yet without
+requiring either to ship a locally modified \fBlive\-config\fP package or using
+dpkg\-divert. However, the same can be achieved by disabling the respective
+scripts through the live\-noconfig mechanism, see above. To avoid to always
+need specifing disabled scripts through the boot parameter, a configuration
+file should be used, see above.
 .PP
 Lo ideal sería incluir los ficheros de configuración para el sistema en vivo
 dentro de un paquete debian. Se puede encontrar un paquete de muestra con un

diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index 680e4ba..bda61c4 100644 (file)
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-CONFIG 7 2012\-11\-25 3.0.12\-1 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 25.11.2012 3.0.12\-1 "Projet Debian Live"
 
 .SH NOM
 \fBlive\-config\fP \- Scripts de configuration du système
@@ -277,13 +277,12 @@ Debian. Un simple paquet contenant un script d'exemple est proposé dans
 /usr/share/doc/live\-config/examples.
 
 .SS "Enlever des scripts de configuration existants"
-Il n'est pas encore vraiment possible d'enlever sans problème les scripts
-sans avoir besoin de charger un paquet \fBlive\-config\fP modifié
-localement. Cependant, on peut réaliser une chose similaire en désactivant
-les scripts respectifs via le mécanisme live\-noconfig, comme indiqué
-ci\-dessus. Afin d'éviter d'avoir à spécifier les scripts désactivés en
-passant par le paramètre de lancement, vous devriez utiliser un fichier de
-configuration, voir ci\-dessus.
+It is not really possible to remove scripts itself in a sane way yet without
+requiring either to ship a locally modified \fBlive\-config\fP package or using
+dpkg\-divert. However, the same can be achieved by disabling the respective
+scripts through the live\-noconfig mechanism, see above. To avoid to always
+need specifing disabled scripts through the boot parameter, a configuration
+file should be used, see above.
 .PP
 Les fichiers de configuration pour le système live devront de préférence
 être inclus dans leur propre paquet debian. Un simple paquet contenant un

diff --git a/manpages/it/live-config.it.7 b/manpages/it/live-config.it.7
index f3b15aa..31abbba 100644 (file)
--- a/manpages/it/live-config.it.7
+++ b/manpages/it/live-config.it.7
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-CONFIG 7 2012\-11\-25 3.0.12\-1 "Progetto Debian Live"
+.TH LIVE\-CONFIG 7 25.11.2012 3.0.12\-1 "Progetto Debian Live"
 
 .SH NOME
 \fBlive\-config\fP \- Script di configurazione del sistema
@@ -266,13 +266,12 @@ richiamati automaticamente durante il boot.
 trovare un esempio in /usr/share/doc/live\-config/examples.
 
 .SS "Rimuovere script config esistenti"
-Non è ancora realmente possibile rimuovere gli script in un modo sensato che
-non richieda di fornire un pacchetto di \fBlive\-config\fP modificato
-localmente. Tuttavia la stessa cosa si può ottenere disabilitando i
-rispettivi script tramite il meccanismo di live\-noconfig, come spiegato
-prima. Per evitare di dover specificare ogni volta con parametri di boot gli
-script da disabilitare, usare un file di configurazione come mostrato in
-precedenza.
+It is not really possible to remove scripts itself in a sane way yet without
+requiring either to ship a locally modified \fBlive\-config\fP package or using
+dpkg\-divert. However, the same can be achieved by disabling the respective
+scripts through the live\-noconfig mechanism, see above. To avoid to always
+need specifing disabled scripts through the boot parameter, a configuration
+file should be used, see above.
 .PP
 È consigliato mettere i file di configurazione per il sistema live in un
 pacchetto debian dedicato. Si può trovare un esempio in

diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index 138590e..2a1a80c 100644 (file)
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config 3.0.12-1\n"
-"POT-Creation-Date: 2012-11-25 09:20+0100\n"
+"POT-Creation-Date: 2012-11-25 09:22+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -23,6 +23,7 @@ msgstr "LIVE-CONFIG"
 
 #. type: TH
 #: en/live-config.7:9
+#, no-wrap
 msgid "2012-11-25"
 msgstr "25.11.2012"
 
@@ -1009,19 +1010,19 @@ msgstr "Entfernen von neuen Konfigurationsskripten"
 #: en/live-config.7:162
 msgid ""
 "It is not really possible to remove scripts itself in a sane way yet without "
-"requiring to ship a locally modified B<live-config> package. However, the "
-"same can be achieved by disabling the respective scripts through the live-"
-"noconfig mechanism, see above. To avoid to always need specifing disabled "
-"scripts through the boot parameter, a configuration file should be used, see "
-"above."
+"requiring either to ship a locally modified B<live-config> package or using "
+"dpkg-divert. However, the same can be achieved by disabling the respective "
+"scripts through the live-noconfig mechanism, see above. To avoid to always "
+"need specifing disabled scripts through the boot parameter, a configuration "
+"file should be used, see above."
 msgstr ""
 "Es ist derzeit nicht möglich in einer vernünftigen Art und Weise Skripte zu "
-"entfernen ohne das ein lokal verändertes B<live-config> Paket verwendet "
-"werden muss. Jedoch kann das selbe erreicht werden, indem bestimmte Skripte "
-"durch den live-noconfig Mechanismus abgeschaltet werden, siehe oben. Um zu "
-"verhindern, dass die abzuschaltenden Skripte immer durch einen Boot "
-"Parameter angegeben werden müssen, kann eine Konfigurationsdatei verwendet "
-"werden, siehe oben."
+"entfernen ohne das ein lokal verändertes B<live-config> Paket oder dpkg-"
+"divert verwendet werden muss. Jedoch kann das selbe erreicht werden, indem "
+"bestimmte Skripte durch den live-noconfig Mechanismus abgeschaltet werden, "
+"siehe oben. Um zu verhindern, dass die abzuschaltenden Skripte immer durch "
+"einen Boot Parameter angegeben werden müssen, kann eine Konfigurationsdatei "
+"verwendet werden, siehe oben."
 
 #. type: Plain text
 #: en/live-config.7:164

diff --git a/manpages/po/es/live-config.7.po b/manpages/po/es/live-config.7.po
index dba8d21..9846227 100644 (file)
--- a/manpages/po/es/live-config.7.po
+++ b/manpages/po/es/live-config.7.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config 3.0.12-1\n"
-"POT-Creation-Date: 2012-11-25 09:20+0100\n"
+"POT-Creation-Date: 2012-11-25 09:22+0100\n"
 "PO-Revision-Date: 2012-11-23 14:17+0100\n"
 "Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
 "Language-Team: none\n"
@@ -24,6 +24,7 @@ msgstr "LIVE-CONFIG"
 
 #. type: TH
 #: en/live-config.7:9
+#, no-wrap
 msgid "2012-11-25"
 msgstr "25.11.2012"
 
@@ -993,13 +994,21 @@ msgstr "Eliminación de los scripts de configuración existentes."
 
 #. type: Plain text
 #: en/live-config.7:162
+#, fuzzy
+#| msgid ""
+#| "It is not really possible to remove scripts itself in a sane way yet "
+#| "without requiring to ship a locally modified B<live-config> package. "
+#| "However, the same can be achieved by disabling the respective scripts "
+#| "through the live-noconfig mechanism, see above. To avoid to always need "
+#| "specifing disabled scripts through the boot parameter, a configuration "
+#| "file should be used, see above."
 msgid ""
 "It is not really possible to remove scripts itself in a sane way yet without "
-"requiring to ship a locally modified B<live-config> package. However, the "
-"same can be achieved by disabling the respective scripts through the live-"
-"noconfig mechanism, see above. To avoid to always need specifing disabled "
-"scripts through the boot parameter, a configuration file should be used, see "
-"above."
+"requiring either to ship a locally modified B<live-config> package or using "
+"dpkg-divert. However, the same can be achieved by disabling the respective "
+"scripts through the live-noconfig mechanism, see above. To avoid to always "
+"need specifing disabled scripts through the boot parameter, a configuration "
+"file should be used, see above."
 msgstr ""
 "No es realmente posible eliminar los scripts en sí de una manera sensata sin "
 "incluir un paquete B<live-config> modificado localmente. Sin embargo, se "

diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index f1d0275..d833bbb 100644 (file)
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config 3.0.12-1\n"
-"POT-Creation-Date: 2012-11-25 09:20+0100\n"
+"POT-Creation-Date: 2012-11-25 09:22+0100\n"
 "PO-Revision-Date: 2012-11-23 14:27+0100\n"
 "Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
 "Language-Team: none\n"
@@ -24,6 +24,7 @@ msgstr "LIVE-CONFIG"
 
 #. type: TH
 #: en/live-config.7:9
+#, no-wrap
 msgid "2012-11-25"
 msgstr "25.11.2012"
 
@@ -1007,13 +1008,21 @@ msgstr "Enlever des scripts de configuration existants"
 
 #. type: Plain text
 #: en/live-config.7:162
+#, fuzzy
+#| msgid ""
+#| "It is not really possible to remove scripts itself in a sane way yet "
+#| "without requiring to ship a locally modified B<live-config> package. "
+#| "However, the same can be achieved by disabling the respective scripts "
+#| "through the live-noconfig mechanism, see above. To avoid to always need "
+#| "specifing disabled scripts through the boot parameter, a configuration "
+#| "file should be used, see above."
 msgid ""
 "It is not really possible to remove scripts itself in a sane way yet without "
-"requiring to ship a locally modified B<live-config> package. However, the "
-"same can be achieved by disabling the respective scripts through the live-"
-"noconfig mechanism, see above. To avoid to always need specifing disabled "
-"scripts through the boot parameter, a configuration file should be used, see "
-"above."
+"requiring either to ship a locally modified B<live-config> package or using "
+"dpkg-divert. However, the same can be achieved by disabling the respective "
+"scripts through the live-noconfig mechanism, see above. To avoid to always "
+"need specifing disabled scripts through the boot parameter, a configuration "
+"file should be used, see above."
 msgstr ""
 "Il n'est pas encore vraiment possible d'enlever sans problème les scripts "
 "sans avoir besoin de charger un paquet B<live-config> modifié localement. "

diff --git a/manpages/po/it/live-config.7.po b/manpages/po/it/live-config.7.po
index ae50b3a..f696ebd 100644 (file)
--- a/manpages/po/it/live-config.7.po
+++ b/manpages/po/it/live-config.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config 3.0.12-1\n"
-"POT-Creation-Date: 2012-11-25 09:20+0100\n"
+"POT-Creation-Date: 2012-11-25 09:22+0100\n"
 "PO-Revision-Date: 2012-08-03 17:13+0200\n"
 "Last-Translator: skizzhg <skizzhg@gmx.com>\n"
 "Language-Team: none\n"
@@ -22,6 +22,7 @@ msgstr "LIVE-CONFIG"
 
 #. type: TH
 #: en/live-config.7:9
+#, no-wrap
 msgid "2012-11-25"
 msgstr "25.11.2012"
 
@@ -993,13 +994,21 @@ msgstr "Rimuovere script config esistenti"
 
 #. type: Plain text
 #: en/live-config.7:162
+#, fuzzy
+#| msgid ""
+#| "It is not really possible to remove scripts itself in a sane way yet "
+#| "without requiring to ship a locally modified B<live-config> package. "
+#| "However, the same can be achieved by disabling the respective scripts "
+#| "through the live-noconfig mechanism, see above. To avoid to always need "
+#| "specifing disabled scripts through the boot parameter, a configuration "
+#| "file should be used, see above."
 msgid ""
 "It is not really possible to remove scripts itself in a sane way yet without "
-"requiring to ship a locally modified B<live-config> package. However, the "
-"same can be achieved by disabling the respective scripts through the live-"
-"noconfig mechanism, see above. To avoid to always need specifing disabled "
-"scripts through the boot parameter, a configuration file should be used, see "
-"above."
+"requiring either to ship a locally modified B<live-config> package or using "
+"dpkg-divert. However, the same can be achieved by disabling the respective "
+"scripts through the live-noconfig mechanism, see above. To avoid to always "
+"need specifing disabled scripts through the boot parameter, a configuration "
+"file should be used, see above."
 msgstr ""
 "Non è ancora realmente possibile rimuovere gli script in un modo sensato che "
 "non richieda di fornire un pacchetto di B<live-config> modificato "

diff --git a/manpages/po/pt_BR/live-config.7.po b/manpages/po/pt_BR/live-config.7.po
index 3e98f5a..0edf91e 100644 (file)
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config 3.0.12-1\n"
-"POT-Creation-Date: 2012-11-25 09:20+0100\n"
+"POT-Creation-Date: 2012-11-25 09:22+0100\n"
 "PO-Revision-Date: 2012-07-28 11:38-0400\n"
 "Last-Translator: Tiago Bortoletto Vaz <tiago@debian.org>\n"
 "Language-Team: none\n"
@@ -24,6 +24,7 @@ msgstr "LIVE-CONFIG"
 
 #. type: TH
 #: en/live-config.7:9
+#, no-wrap
 msgid "2012-11-25"
 msgstr "25-11-2012"
 
@@ -994,13 +995,21 @@ msgstr "Removendo scripts de configuração existentes"
 
 #. type: Plain text
 #: en/live-config.7:162
+#, fuzzy
+#| msgid ""
+#| "It is not really possible to remove scripts itself in a sane way yet "
+#| "without requiring to ship a locally modified B<live-config> package. "
+#| "However, the same can be achieved by disabling the respective scripts "
+#| "through the live-noconfig mechanism, see above. To avoid to always need "
+#| "specifing disabled scripts through the boot parameter, a configuration "
+#| "file should be used, see above."
 msgid ""
 "It is not really possible to remove scripts itself in a sane way yet without "
-"requiring to ship a locally modified B<live-config> package. However, the "
-"same can be achieved by disabling the respective scripts through the live-"
-"noconfig mechanism, see above. To avoid to always need specifing disabled "
-"scripts through the boot parameter, a configuration file should be used, see "
-"above."
+"requiring either to ship a locally modified B<live-config> package or using "
+"dpkg-divert. However, the same can be achieved by disabling the respective "
+"scripts through the live-noconfig mechanism, see above. To avoid to always "
+"need specifing disabled scripts through the boot parameter, a configuration "
+"file should be used, see above."
 msgstr ""
 "De fato ainda não é possível remover scripts de forma segura sem que seja "
 "necessário distribuir um pacote B<live-config> modificado localmente. Porém, "

diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index d13c643..54c5dc1 100644 (file)
--- a/manpages/pot/live-config.7.pot
+++ b/manpages/pot/live-config.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config VERSION\n"
-"POT-Creation-Date: 2012-11-25 09:20+0100\n"
+"POT-Creation-Date: 2012-11-25 09:22+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"
@@ -843,11 +843,11 @@ msgstr ""
 #: en/live-config.7:162
 msgid ""
 "It is not really possible to remove scripts itself in a sane way yet without "
-"requiring to ship a locally modified B<live-config> package. However, the "
-"same can be achieved by disabling the respective scripts through the live-"
-"noconfig mechanism, see above. To avoid to always need specifing disabled "
-"scripts through the boot parameter, a configuration file should be used, see "
-"above."
+"requiring either to ship a locally modified B<live-config> package or using "
+"dpkg-divert. However, the same can be achieved by disabling the respective "
+"scripts through the live-noconfig mechanism, see above. To avoid to always "
+"need specifing disabled scripts through the boot parameter, a configuration "
+"file should be used, see above."
 msgstr ""
 
 #. type: Plain text

diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index a0eb17f..e6a75e1 100644 (file)
--- a/manpages/pt_BR/live-config.pt_BR.7
+++ b/manpages/pt_BR/live-config.pt_BR.7
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-CONFIG 7 2012\-11\-25 3.0.12\-1 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 25\-11\-2012 3.0.12\-1 "Projeto Debian Live"
 
 .SH NOME
 \fBlive\-config\fP \- Scripts para Configuração do Sistema
@@ -265,13 +265,12 @@ próprio. Um pacote modelo contendo um script de exemplo pode ser encontrado
 em /usr/share/doc/live\-config/.
 
 .SS "Removendo scripts de configuração existentes"
-De fato ainda não é possível remover scripts de forma segura sem que seja
-necessário distribuir um pacote \fBlive\-config\fP modificado localmente. Porém,
-o mesmo pode ser alcançado desabilitando os scripts respectivos através do
-mecanismo live\-noconfig, como indicado acima. Para evitar que sempre seja
-necessário especificar scripts desabilitados através de parâmetros de
-inicialização, um arquivo de configuração deve ser usado. Ver detalhes
-acima.
+It is not really possible to remove scripts itself in a sane way yet without
+requiring either to ship a locally modified \fBlive\-config\fP package or using
+dpkg\-divert. However, the same can be achieved by disabling the respective
+scripts through the live\-noconfig mechanism, see above. To avoid to always
+need specifing disabled scripts through the boot parameter, a configuration
+file should be used, see above.
 .PP
 Os arquivos de configuração para o próprio sistema live devem ser
 preferencialmente colocados num pacote debian próprio. Um pacote modelo