[SCM] live-config branch, debian-next, updated. debian/3.0_a25-1-2-g15b975a

Mon Aug 22 21:14:05 UTC 2011

The following commit has been merged in the debian-next branch:
commit 15b975a429029521fc2acf3ed647c86a15b33f32
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Aug 22 23:14:43 2011 +0200

    Improving spelling in live-config manpage.

diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 876a397..1fc1d5f 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -96,7 +96,7 @@ Enables debug output in live\-config.
 .PP
 Configuration files can be placed either in the root filesystem itself (/etc/live/config.conf, /etc/live/config.d/), or on the live media (live/config.conf, live/config.d/). If both places are used for a certain option, the ones from the live media take precedence over the ones from the root filesystem.
 .PP
-Although the configuration files placed in the conf.d directories do not require a particular name or suffix, it's suggest for consistency to either use 'vendor.conf' or 'project.conf' as a naming scheme (whereas 'vendor' or 'project' is replaced with the actual name, resulting in a filename like 'debian\-eeepc.conf').
+Although the configuration files placed in the conf.d directories do not require a particular name or suffix, it is suggested for consistency reasons to either use 'vendor.conf' or 'project.conf' as a naming scheme (whereas 'vendor' or 'project' is replaced with the actual name, resulting in a filename like 'debian\-eeepc.conf').
 .PP
 The actual content of the configuration files consists of one or more of the following variables.
 
@@ -137,12 +137,12 @@ This variable equals the '\fBlive\-config.hooks\fR=filesystem|medium|\fIURL1\fR|
 \fBlive\-config\fR can be easily customized for downstream projects or local usage.
 
 .SS Adding new config scripts
-Downstream projects can put their scripts into /lib/live/config and don't need to do anything else, the scripts will be called automatically during boot.
+Downstream projects can put their scripts into /lib/live/config and do not need to do anything else, the scripts will be called automatically during boot.
 .PP
 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's 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 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.
 .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/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index bdc2032..94de11a 100644
--- 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~a25\n"
-"POT-Creation-Date: 2011-08-22 18:18+0300\n"
+"POT-Creation-Date: 2011-08-22 23:12+0300\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -585,10 +585,10 @@ msgstr ""
 #: en/live-config.7:100
 msgid ""
 "Although the configuration files placed in the conf.d directories do not "
-"require a particular name or suffix, it's suggest for consistency to either "
-"use 'vendor.conf' or 'project.conf' as a naming scheme (whereas 'vendor' or "
-"'project' is replaced with the actual name, resulting in a filename like "
-"'debian-eeepc.conf')."
+"require a particular name or suffix, it is suggested for consistency reasons "
+"to either use 'vendor.conf' or 'project.conf' as a naming scheme (whereas "
+"'vendor' or 'project' is replaced with the actual name, resulting in a "
+"filename like 'debian-eeepc.conf')."
 msgstr ""
 "Obwohl die Konfigurationsdateien welche in die conf.d Verzeichnisse abgelegt "
 "werden können keinen bestimmten Namen oder Endung brauchen, ist es aus "
@@ -864,7 +864,7 @@ msgstr "Hinzufügen von neuen Konfigurationsskripten"
 #. type: Plain text
 #: en/live-config.7:141
 msgid ""
-"Downstream projects can put their scripts into /lib/live/config and don't "
+"Downstream projects can put their scripts into /lib/live/config and do not "
 "need to do anything else, the scripts will be called automatically during "
 "boot."
 msgstr ""
@@ -892,7 +892,7 @@ msgstr "Entfernen von neuen Konfigurationsskripten"
 #. type: Plain text
 #: en/live-config.7:146
 msgid ""
-"It's not really possible to remove scripts itself in a sane way yet without "
+"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 "
diff --git a/manpages/po/es/live-config.7.po b/manpages/po/es/live-config.7.po
index b8c849c..816e8a4 100644
--- 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~a25\n"
-"POT-Creation-Date: 2011-08-22 18:18+0300\n"
+"POT-Creation-Date: 2011-08-22 23:12+0300\n"
 "PO-Revision-Date: 2011-05-07 19:51+0100\n"
 "Last-Translator: José Luis Zabalza <jlz.3008 at gmail.com> and Carlos Zuferri "
 "\"chals\" <chals at altorricon.com>\n"
@@ -582,10 +582,10 @@ msgstr ""
 #: en/live-config.7:100
 msgid ""
 "Although the configuration files placed in the conf.d directories do not "
-"require a particular name or suffix, it's suggest for consistency to either "
-"use 'vendor.conf' or 'project.conf' as a naming scheme (whereas 'vendor' or "
-"'project' is replaced with the actual name, resulting in a filename like "
-"'debian-eeepc.conf')."
+"require a particular name or suffix, it is suggested for consistency reasons "
+"to either use 'vendor.conf' or 'project.conf' as a naming scheme (whereas "
+"'vendor' or 'project' is replaced with the actual name, resulting in a "
+"filename like 'debian-eeepc.conf')."
 msgstr ""
 "Aunque los ficheros de configuración situados en los directorios conf.d no "
 "requieren un nombre o sufijo en concreto, se sugiere por unificación usar "
@@ -855,7 +855,7 @@ msgstr "Añadiendo nuevos scripts de configuración"
 #. type: Plain text
 #: en/live-config.7:141
 msgid ""
-"Downstream projects can put their scripts into /lib/live/config and don't "
+"Downstream projects can put their scripts into /lib/live/config and do not "
 "need to do anything else, the scripts will be called automatically during "
 "boot."
 msgstr ""
@@ -883,7 +883,7 @@ msgstr "Eliminación de los scripts de configuración existentes."
 #. type: Plain text
 #: en/live-config.7:146
 msgid ""
-"It's not really possible to remove scripts itself in a sane way yet without "
+"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 "
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index 20166e4..44b5550 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config 3.0~a25\n"
-"POT-Creation-Date: 2011-08-22 18:18+0300\n"
+"POT-Creation-Date: 2011-08-22 23:12+0300\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Thierry Lépicier <thierry.lepicier at free.fr>\n"
 "Language-Team: none\n"
@@ -587,10 +587,10 @@ msgstr ""
 #: en/live-config.7:100
 msgid ""
 "Although the configuration files placed in the conf.d directories do not "
-"require a particular name or suffix, it's suggest for consistency to either "
-"use 'vendor.conf' or 'project.conf' as a naming scheme (whereas 'vendor' or "
-"'project' is replaced with the actual name, resulting in a filename like "
-"'debian-eeepc.conf')."
+"require a particular name or suffix, it is suggested for consistency reasons "
+"to either use 'vendor.conf' or 'project.conf' as a naming scheme (whereas "
+"'vendor' or 'project' is replaced with the actual name, resulting in a "
+"filename like 'debian-eeepc.conf')."
 msgstr ""
 "Bien que les fichiers de configuration placés dans les répertoires conf.d ne "
 "requièrent pas de nom ou suffixe particulier, il est suggéré, par souci de "
@@ -863,7 +863,7 @@ msgstr "Ajout de nouveaux scripts de configuration"
 #. type: Plain text
 #: en/live-config.7:141
 msgid ""
-"Downstream projects can put their scripts into /lib/live/config and don't "
+"Downstream projects can put their scripts into /lib/live/config and do not "
 "need to do anything else, the scripts will be called automatically during "
 "boot."
 msgstr ""
@@ -891,7 +891,7 @@ msgstr "Enlever des scripts de configuration existant"
 #. type: Plain text
 #: en/live-config.7:146
 msgid ""
-"It's not really possible to remove scripts itself in a sane way yet without "
+"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 "
diff --git a/manpages/po/it/live-config.7.po b/manpages/po/it/live-config.7.po
index e1f28bc..b6cf765 100644
--- 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~a25\n"
-"POT-Creation-Date: 2011-08-22 18:18+0300\n"
+"POT-Creation-Date: 2011-08-22 23:12+0300\n"
 "PO-Revision-Date: 2011-01-20 22:31+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -577,10 +577,10 @@ msgstr ""
 #: en/live-config.7:100
 msgid ""
 "Although the configuration files placed in the conf.d directories do not "
-"require a particular name or suffix, it's suggest for consistency to either "
-"use 'vendor.conf' or 'project.conf' as a naming scheme (whereas 'vendor' or "
-"'project' is replaced with the actual name, resulting in a filename like "
-"'debian-eeepc.conf')."
+"require a particular name or suffix, it is suggested for consistency reasons "
+"to either use 'vendor.conf' or 'project.conf' as a naming scheme (whereas "
+"'vendor' or 'project' is replaced with the actual name, resulting in a "
+"filename like 'debian-eeepc.conf')."
 msgstr ""
 "Anche se i file di configurazione messi nelle directory conf.d non "
 "richiedono un nome o suffisso particolari, per coerenza è suggerito di usare "
@@ -854,7 +854,7 @@ msgstr "Aggiungere nuovi script config"
 #. type: Plain text
 #: en/live-config.7:141
 msgid ""
-"Downstream projects can put their scripts into /lib/live/config and don't "
+"Downstream projects can put their scripts into /lib/live/config and do not "
 "need to do anything else, the scripts will be called automatically during "
 "boot."
 msgstr ""
@@ -881,7 +881,7 @@ msgstr "Rimuovere script config esistenti"
 #. type: Plain text
 #: en/live-config.7:146
 msgid ""
-"It's not really possible to remove scripts itself in a sane way yet without "
+"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 "
diff --git a/manpages/po/pt_BR/live-config.7.po b/manpages/po/pt_BR/live-config.7.po
index 7ce185a..75575a5 100644
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config 3.0~a25\n"
-"POT-Creation-Date: 2011-08-22 18:18+0300\n"
+"POT-Creation-Date: 2011-08-22 23:12+0300\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Tassia Camoes Araujo <tassia at gmail.com>\n"
 "Language-Team: none\n"
@@ -572,10 +572,10 @@ msgstr ""
 #: en/live-config.7:100
 msgid ""
 "Although the configuration files placed in the conf.d directories do not "
-"require a particular name or suffix, it's suggest for consistency to either "
-"use 'vendor.conf' or 'project.conf' as a naming scheme (whereas 'vendor' or "
-"'project' is replaced with the actual name, resulting in a filename like "
-"'debian-eeepc.conf')."
+"require a particular name or suffix, it is suggested for consistency reasons "
+"to either use 'vendor.conf' or 'project.conf' as a naming scheme (whereas "
+"'vendor' or 'project' is replaced with the actual name, resulting in a "
+"filename like 'debian-eeepc.conf')."
 msgstr ""
 "Apesar de os arquivos de configuração localizados nos diretórios conf.d não "
 "necessitarem de um nome ou sufixo particular, por uma questão de "
@@ -850,7 +850,7 @@ msgstr "Adicionando novos scripts de configuração"
 #. type: Plain text
 #: en/live-config.7:141
 msgid ""
-"Downstream projects can put their scripts into /lib/live/config and don't "
+"Downstream projects can put their scripts into /lib/live/config and do not "
 "need to do anything else, the scripts will be called automatically during "
 "boot."
 msgstr ""
@@ -878,7 +878,7 @@ msgstr "Removendo scripts de configuração existentes"
 #. type: Plain text
 #: en/live-config.7:146
 msgid ""
-"It's not really possible to remove scripts itself in a sane way yet without "
+"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 "
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 2753b0b..e1de0c6 100644
--- 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: 2011-08-22 18:18+0300\n"
+"POT-Creation-Date: 2011-08-22 23:12+0300\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"
@@ -496,10 +496,10 @@ msgstr ""
 #: en/live-config.7:100
 msgid ""
 "Although the configuration files placed in the conf.d directories do not "
-"require a particular name or suffix, it's suggest for consistency to either "
-"use 'vendor.conf' or 'project.conf' as a naming scheme (whereas 'vendor' or "
-"'project' is replaced with the actual name, resulting in a filename like "
-"'debian-eeepc.conf')."
+"require a particular name or suffix, it is suggested for consistency reasons "
+"to either use 'vendor.conf' or 'project.conf' as a naming scheme (whereas "
+"'vendor' or 'project' is replaced with the actual name, resulting in a "
+"filename like 'debian-eeepc.conf')."
 msgstr ""
 
 #. type: Plain text
@@ -735,7 +735,7 @@ msgstr ""
 #. type: Plain text
 #: en/live-config.7:141
 msgid ""
-"Downstream projects can put their scripts into /lib/live/config and don't "
+"Downstream projects can put their scripts into /lib/live/config and do not "
 "need to do anything else, the scripts will be called automatically during "
 "boot."
 msgstr ""
@@ -757,7 +757,7 @@ msgstr ""
 #. type: Plain text
 #: en/live-config.7:146
 msgid ""
-"It's not really possible to remove scripts itself in a sane way yet without "
+"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 "

-- 
live-config

