[SCM] live-config branch, upstream, updated. upstream/3.0_b1-1-gac3b275
Daniel Baumann
daniel at debian.org
Sun Jul 29 00:18:25 UTC 2012
The following commit has been merged in the upstream branch:
commit ac3b275c7c8f1144af95beb3b937e5b56ec2c58c
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 29 02:17:53 2012 +0200
Adding upstream version 3.0~b2.
diff --git a/Makefile b/Makefile
index a7c889c..81ba2b4 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/VERSION b/VERSION
index cd57b67..fd9fab5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~b1-1
+3.0~b2-1
diff --git a/bin/boot-init.sh b/bin/boot-init.sh
index 8e98efd..ba99107 100755
--- a/bin/boot-init.sh
+++ b/bin/boot-init.sh
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -95,8 +95,6 @@ device_is_USB_flash_drive()
Eject ()
{
- # Exit if the system was booted from an ISO image rather than a physical CD
- grep -qs find_iso= /proc/cmdline && return 0
# TODO: i18n
BOOT_DEVICE="$(get_boot_device)"
@@ -143,21 +141,6 @@ Eject ()
fi
}
-# Don't prompt to eject the SD card on Babbage board, where we reuse it
-# as a quasi-boot-floppy. Technically this uses a bit of ubiquity
-# (archdetect), but since this is mostly only relevant for
-# installations, who cares ...
-if [ -x "$(which archdetect 2>/dev/null)" ]
-then
- subarch="$(archdetect)"
-
- case $subarch in
- arm*/imx51)
- return 0
- ;;
- esac
-fi
-
echo "live-boot: caching reboot files..."
prompt=1
@@ -175,7 +158,8 @@ mount -o remount,ro /live/overlay > /dev/null 2>&1
# Check if we need to eject the drive
if grep -qs "cdrom-detect/eject=false" /proc/cmdline || \
- grep -qs "noeject" /proc/cmdline
+ grep -qs "noeject" /proc/cmdline || \
+ grep -qs "find_iso" /proc/cmdline
then
return
else
diff --git a/bin/live-config-update b/bin/live-config-update
index 83ac9d0..4797648 100755
--- a/bin/live-config-update
+++ b/bin/live-config-update
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/manpages/Makefile b/manpages/Makefile
index 178ce12..6316875 100644
--- a/manpages/Makefile
+++ b/manpages/Makefile
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/manpages/bin/update-version.sh b/manpages/bin/update-version.sh
index 3a98c72..ab217ae 100755
--- a/manpages/bin/update-version.sh
+++ b/manpages/bin/update-version.sh
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 21f6e74..a10d79b 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -1,7 +1,7 @@
.\" live-config(7) - System Configuration Scripts
.\" Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
.\"
-.\" live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+.\" This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
.\" This is free software, and you are welcome to redistribute it
.\" under certain conditions; see COPYING for details.
.\"
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 24.07.2012 3.0~b1\-1 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 29.07.2012 3.0~b2\-1 "Debian Live Projekt"
.SH NAME
\fBlive\-config\fP \- System Konfiguration Skripte
@@ -109,8 +109,11 @@ angegeben wird, ermöglichen die Tools der Desktopumgebung das Wechseln unter
X11. Es ist kein Standardwert gesetzt.
.IP "\fBlive\-config.keyboard\-variants\fP=\fITASTATUR_VARIANTE1\fP,\fITASTATUR_VARIANTE2\fP ... \fITASTATUR_VARIANTEn\fP | \fBkeyboard\-variants\fP=\fITASTATUR_VARIANTE1\fP,\fITASTATUR_VARIANTE2\fP ... \fITASTATUR_VARIANTEn\fP" 4
Ermöglicht die Tastatur Variante zu bestimmen. Wenn mehr als eine Variante
-angegeben wird, ermöglichen die Tools der Desktopumgebung das Wechseln unter
-X11. Es ist kein Standardwert gesetzt.
+angegeben wird, sollte die gleiche Anzahl an Werten wie Tastatur Layouts
+angegeben werden weil diese jeweils eins zu eins zugeordnet werden. Leere
+Werte sind ebenfalls zulässig. Die Tools der Desktopumgebung ermöglichen das
+Wechseln zwischen jedem Layout und Varianten Paar unter X11. Es ist kein
+Standardwert gesetzt.
.IP "\fBlive\-config.keyboard\-options\fP=\fITASTATUR_OPTIONEN\fP | \fBkeyboard\-options\fP=\fITASTATUR_OPTIONEN\fP" 4
Ermöglicht die Tastatur Optionen zu bestimmen. Es ist kein Standardwert
gesetzt.
@@ -332,9 +335,6 @@ verhindert Hibernation.
.IP \fBgnome\-screensaver\fP 4
schaltet das Sperren des Bildschirmes während der Bildschirmschoner läuft
ab.
-.IP \fBinitramfs\-tools\fP 4
-lässt update\-initramfs auch das Live Medium aktualisieren falls Persistency
-benutzt wird.
.IP \fBkaboom\fP 4
schaltet den KDE Migration Wizard ab (squeeze und neuer).
.IP \fBkde\-services\fP 4
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 50db03c..4d879fb 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -1,12 +1,12 @@
.\" live-config(7) - System Configuration Scripts
.\" Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
.\"
-.\" live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+.\" This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
.\" This is free software, and you are welcome to redistribute it
.\" under certain conditions; see COPYING for details.
.\"
.\"
-.TH LIVE\-CONFIG 7 2012\-07\-24 3.0~b1-1 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2012\-07\-29 3.0~b2-1 "Debian Live Project"
.SH NAME
\fBlive\-config\fR \- System Configuration Scripts
@@ -63,9 +63,9 @@ Allows to change the keyboard model. There is no default value set.
.IP "\fBlive\-config.keyboard\-layouts\fR=\fIKEYBOARD_LAYOUT1\fR,\fIKEYBOARD_LAYOUT2\fR ... \fIKEYBOARD_LAYOUTn\fR | \fBkeyboard\-layouts\fR=\fIKEYBOARD_LAYOUT1\fR,\fIKEYBOARD_LAYOUT2\fR ... \fIKEYBOARD_LAYOUTn\fR" 4
Allows to change the keyboard layouts. If more than one is specified, the tools of the desktop environment will allow to switch it under X11. There is no default value set.
.IP "\fBlive\-config.keyboard\-variants\fR=\fIKEYBOARD_VARIANT1\fR,\fIKEYBOARD_VARIANT2\fR ... \fIKEYBOARD_VARIANTn\fR | \fBkeyboard\-variants\fR=\fIKEYBOARD_VARIANT1\fR,\fIKEYBOARD_VARIANT2\fR ... \fIKEYBOARD_VARIANTn\fR" 4
-Allows to change the keyboard variants. If more than one is specified, the tools of the desktop environment will allow to switch it under X11. There is no default value set.
+Allows to change the keyboard variants. If more than one is specified, the same number of values as keyboard\-layouts values should be specified as they will be matched one\-to\-one in the order specified. Blank values are allowed. The tools of the desktop environment will allow to switch between each layout and variant pair under X11. There is no default value set.
.IP "\fBlive\-config.keyboard\-options\fR=\fIKEYBOARD_OPTIONS\fR | \fBkeyboard\-options\fR=\fIKEYBOARD_OPTIONS\fR" 4
-Allows to change the keyboard options. There are no default value set.
+Allows to change the keyboard options. There is no default value set.
.IP "\fBlive\-config.sysv-rc\fR=\fISERVICE1\fR,\fISERVICE2\fR ... \fISERVICEn\fR | \fBsysv-rc\fR=\fISERVICE1\fR,\fISERVICE2\fR ... \fISERVICEn\fR" 4
Allows to disable sysv services through update-rc.d.
.IP "\fBlive\-config.x\-session\-manager=\fIX_SESSION_MANAGER\fR | \fBx\-session\-manager\fR=\fIX_SESSION_MANAGER\fR" 4
@@ -211,8 +211,6 @@ disables lock button for the screen.
disables hibernation.
.IP "\fBgnome\-screensaver\fR" 4
disables the screensaver locking the screen.
-.IP "\fBinitramfs\-tools\fR" 4
-makes update\-initramfs to also update the live media when using persistency.
.IP "\fBkaboom\fR" 4
disables KDE migration wizard (squeeze and newer).
.IP "\fBkde\-services\fR" 4
diff --git a/manpages/es/live-config.es.7 b/manpages/es/live-config.es.7
index c7baf92..6787128 100644
--- a/manpages/es/live-config.es.7
+++ b/manpages/es/live-config.es.7
@@ -1,7 +1,7 @@
.\" live-config(7) - System Configuration Scripts
.\" Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
.\"
-.\" live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+.\" This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
.\" This is free software, and you are welcome to redistribute it
.\" under certain conditions; see COPYING for details.
.\"
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 24.07.2012 3.0~b1\-1 "Proyecto Debian Live"
+.TH LIVE\-CONFIG 7 29.07.2012 3.0~b2\-1 "Proyecto Debian Live"
.SH NOMBRE
\fBlive\-config\fP \- Scripts de configuración del sistema
@@ -106,9 +106,11 @@ Permite cambiar la disposición del teclado. Si se especifica más de una, las
herramientas de escritorio permitirán cambiarlas bajo X11. No hay ningún
valor por omisión.
.IP "\fBlive\-config.keyboard\-variants\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP ... \fIKEYBOARD_VARIANTn\fP | \fBkeyboard\-variants\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP ... \fIKEYBOARD_VARIANTn\fP" 4
-Permite cambiar la disposición del teclado. Si se especifica más de una, las
-herramientas de escritorio permitirán cambiarlas bajo X11. No hay ningún
-valor por omisión.
+Permite cambiar las variantes de teclado. Si se especifica más de una, se
+deben especificar el mismo número de variantes como de distribuciones de
+teclado, ya que se corresponderan una a una en el orden especificado. Se
+pueden dejar valores en blanco. Las herramientas de escritorio permitirán
+cambiarlas bajo X11. No hay ningún valor por omisión.
.IP "\fBlive\-config.keyboard\-options\fP=\fIKEYBOARD_OPTIONS\fP | \fBkeyboard\-options\fP=\fIKEYBOARD_OPTIONS\fP" 4
Permite cambiar las opciones del teclado. No hay un valor por omisión.
.IP "\fBlive\-config.sysv\-rc\fP=\fISERVICE1\fP,\fISERVICE2\fP ... \fISERVICEn\fP | \fBsysv\-rc\fP=\fISERVICE1\fP,\fISERVICE2\fP ... \fISERVICEn\fP" 4
@@ -322,9 +324,6 @@ Desactiva el botón de bloqueo de la pantalla.
Desactiva la hibernación.
.IP \fBgnome\-screensaver\fP 4
Impide que el salvapantallas bloquee la pantalla.
-.IP \fBinitramfs\-tools\fP 4
-Posibilita que update\-initramfs actualice también los medios en vivo cuando
-se usan en modo persistente.
.IP \fBkaboom\fP 4
Desactiva el asistente de migración de KDE (Squeeze y superior).
.IP \fBkde\-services\fP 4
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index f0f6bce..33e1afc 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -1,7 +1,7 @@
.\" live-config(7) - System Configuration Scripts
.\" Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
.\"
-.\" live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+.\" This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
.\" This is free software, and you are welcome to redistribute it
.\" under certain conditions; see COPYING for details.
.\"
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 24.07.2012 3.0~b1\-1 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 29.07.2012 3.0~b2\-1 "Projet Debian Live"
.SH NOM
\fBlive\-config\fP \- Scripts de configuration du système
@@ -111,10 +111,11 @@ est spécifiée, les utilitaires de l'environnement de bureau permettront de
passer de l'une à l'autre sous X11. Aucune valeur par défaut n'est
spécifiée.
.IP "\fBlive\-config.keyboard\-variants\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP ... \fIKEYBOARD_VARIANTn\fP | \fBkeyboard\-variants\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP ... \fIKEYBOARD_VARIANTn\fP" 4
-Permet de changer la configuration du clavier. Si plus d'une configuration
-est spécifiée, les utilitaires de l'environnement de bureau permettront de
-passer de l'une à l'autre sous X11. Aucune valeur par défaut n'est
-spécifiée.
+Permet de changer la variante du clavier. Si plus d'une est spécifiée, le
+même nombre de valeurs doivent être spécifiées car elles se correspondront
+une à une dans l'ordre spécifié. On peut utiliser valeurs vides. Les outils
+de l'environnement de bureau permettront de passer de l'une à l'autre sous
+X11. Aucune valeur par défaut n'est spécifiée.
.IP "\fBlive\-config.keyboard\-options\fP=\fIOPTIONS_DU_CLAVIER\fP | \fBkeyboard\-options\fP=\fIOPTIONS_DU_CLAVIER\fP" 4
Permet de changer les options du clavier. Aucune valeur par défaut n'est
spécifiée.
@@ -335,9 +336,6 @@ désactive le bouton de verrouillage de l'écran.
désactive l'hibernation.
.IP \fBgnome\-screensaver\fP 4
désactive le verrouillage de session par l'économiseur d'écran.
-.IP \fBinitramfs\-tools\fP 4
-permet à update\-initramfs de mettre à jour le média live lorsqu'on utlise la
-persistance.
.IP \fBkaboom\fP 4
désactive l'assistant de migration de KDE (squeeze et plus récent).
.IP \fBkde\-services\fP 4
diff --git a/manpages/it/live-config.it.7 b/manpages/it/live-config.it.7
index 410eb95..d766a0b 100644
--- a/manpages/it/live-config.it.7
+++ b/manpages/it/live-config.it.7
@@ -1,7 +1,7 @@
.\" live-config(7) - System Configuration Scripts
.\" Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
.\"
-.\" live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+.\" This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
.\" This is free software, and you are welcome to redistribute it
.\" under certain conditions; see COPYING for details.
.\"
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 24.07.2012 3.0~b1\-1 "Progetto Debian Live"
+.TH LIVE\-CONFIG 7 29.07.2012 3.0~b2\-1 "Progetto Debian Live"
.SH NOME
\fBlive\-config\fP \- Script di configurazione del sistema
@@ -106,8 +106,10 @@ di uno, gli strumenti dell'ambiente desktop consentiranno di cambiarlo sotto
X11. Non è impostato alcun valore predefinito.
.IP "\fBlive\-config.keyboard\-variants\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP ... \fIKEYBOARD_VARIANTn\fP | \fBkeyboard\-variants\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP ... \fIKEYBOARD_VARIANTn\fP" 4
Allows to change the keyboard variants. If more than one is specified, the
-tools of the desktop environment will allow to switch it under X11. There is
-no default value set.
+same number of values as keyboard\-layouts values should be specified as they
+will be matched one\-to\-one in the order specified. Blank values are
+allowed. The tools of the desktop environment will allow to switch between
+each layout and variant pair under X11. There is no default value set.
.IP "\fBlive\-config.keyboard\-options\fP=\fIOPZIONI_TASTIERA\fP | \fBkeyboard\-options\fP=\fIOPZIONI_TASTIERA\fP" 4
Permette di modificare le opzioni della tastiera, non è impostato alcun
valore predefinito.
@@ -320,9 +322,6 @@ disabilita il pulsante di blocco dello schermo.
disabilita l'ibernazione.
.IP \fBgnome\-screensaver\fP 4
disabilita lo screensaver che blocca lo schermo.
-.IP \fBinitramfs\-tools\fP 4
-fa sì che update\-initramfs aggiorni anche il supporto live quando si
-utilizza la persistenza.
.IP \fBkaboom\fP 4
disabilita la procedura guidata di migrazione di KDE (squeeze e successive).
.IP \fBkde\-services\fP 4
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index eb8a9f9..b87c4df 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~b1-1\n"
-"POT-Creation-Date: 2012-07-24 18:12+0300\n"
+"Project-Id-Version: live-config 3.0~b2-1\n"
+"POT-Creation-Date: 2012-07-29 02:08+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"
@@ -24,14 +24,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-07-24"
-msgstr "24.07.2012"
+msgid "2012-07-29"
+msgstr "29.07.2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~b1-1"
-msgstr "3.0~b1-1"
+msgid "3.0~b2-1"
+msgstr "3.0~b2-1"
#. type: TH
#: en/live-config.7:9
@@ -395,12 +395,17 @@ msgstr "B<live-config.keyboard-variants>=I<TASTATUR_VARIANTE1>,I<TASTATUR_VARIAN
#: en/live-config.7:67
msgid ""
"Allows to change the keyboard variants. If more than one is specified, the "
-"tools of the desktop environment will allow to switch it under X11. There is "
-"no default value set."
+"same number of values as keyboard-layouts values should be specified as they "
+"will be matched one-to-one in the order specified. Blank values are allowed. "
+"The tools of the desktop environment will allow to switch between each "
+"layout and variant pair under X11. There is no default value set."
msgstr ""
"Ermöglicht die Tastatur Variante zu bestimmen. Wenn mehr als eine Variante "
-"angegeben wird, ermöglichen die Tools der Desktopumgebung das Wechseln unter "
-"X11. Es ist kein Standardwert gesetzt."
+"angegeben wird, sollte die gleiche Anzahl an Werten wie Tastatur Layouts "
+"angegeben werden weil diese jeweils eins zu eins zugeordnet werden. Leere "
+"Werte sind ebenfalls zulässig. Die Tools der Desktopumgebung ermöglichen das "
+"Wechseln zwischen jedem Layout und Varianten Paar unter X11. Es ist kein "
+"Standardwert gesetzt."
#. type: IP
#: en/live-config.7:67
@@ -410,7 +415,7 @@ msgstr "B<live-config.keyboard-options>=I<TASTATUR_OPTIONEN> | B<keyboard-option
#. type: Plain text
#: en/live-config.7:69
-msgid "Allows to change the keyboard options. There are no default value set."
+msgid "Allows to change the keyboard options. There is no default value set."
msgstr ""
"Ermöglicht die Tastatur Optionen zu bestimmen. Es ist kein Standardwert "
"gesetzt."
@@ -1237,13 +1242,13 @@ msgid "configures sysv-rc by disabling listed services."
msgstr "konfiguriert sysv-rc durch abschalten von angegebenen Services."
#. type: IP
-#: en/live-config.7:204 en/live-config.7:234
+#: en/live-config.7:204 en/live-config.7:232
#, no-wrap
msgid "B<login>"
msgstr "B<login>"
#. type: Plain text
-#: en/live-config.7:206 en/live-config.7:236
+#: en/live-config.7:206 en/live-config.7:234
msgid "disables lastlog."
msgstr "schaltet lastlog ab."
@@ -1295,157 +1300,143 @@ msgstr ""
#. type: IP
#: en/live-config.7:214
#, no-wrap
-msgid "B<initramfs-tools>"
-msgstr "B<initramfs-tools>"
-
-#. type: Plain text
-#: en/live-config.7:216
-msgid ""
-"makes update-initramfs to also update the live media when using persistency."
-msgstr ""
-"lässt update-initramfs auch das Live Medium aktualisieren falls Persistency "
-"benutzt wird."
-
-#. type: IP
-#: en/live-config.7:216
-#, no-wrap
msgid "B<kaboom>"
msgstr "B<kaboom>"
#. type: Plain text
-#: en/live-config.7:218
+#: en/live-config.7:216
msgid "disables KDE migration wizard (squeeze and newer)."
msgstr "schaltet den KDE Migration Wizard ab (squeeze und neuer)."
#. type: IP
-#: en/live-config.7:218
+#: en/live-config.7:216
#, no-wrap
msgid "B<kde-services>"
msgstr "B<kde-services>"
#. type: Plain text
-#: en/live-config.7:220
+#: en/live-config.7:218
msgid "disables some unwanted KDE services (squeeze and newer)."
msgstr "schaltet ein paar ungewollte KDE Services ab (squeeze und neuer)."
#. type: IP
-#: en/live-config.7:220
+#: en/live-config.7:218
#, no-wrap
msgid "B<debian-installer-launcher>"
msgstr "B<debian-installer-launcher>"
#. type: Plain text
-#: en/live-config.7:222
+#: en/live-config.7:220
msgid "adds debian-installer-launcher on users desktop."
msgstr "fügt debian-installer-launcher auf dem Benutzer Desktop hinzu."
#. type: IP
-#: en/live-config.7:222
+#: en/live-config.7:220
#, no-wrap
msgid "B<module-init-tools>"
msgstr "B<module-init-tools>"
#. type: Plain text
-#: en/live-config.7:224
+#: en/live-config.7:222
msgid "automatically load some modules on some architectures."
msgstr "lädt automatisch gewisse Module auf bestimmten Architekturen."
#. type: IP
-#: en/live-config.7:224
+#: en/live-config.7:222
#, no-wrap
msgid "B<policykit>"
msgstr "B<policykit>"
#. type: Plain text
-#: en/live-config.7:226
+#: en/live-config.7:224
msgid "grant user privilegies through policykit."
msgstr "räumt dem Benutzer Privilegien durch policykit ein."
#. type: IP
-#: en/live-config.7:226
+#: en/live-config.7:224
#, no-wrap
msgid "B<sslcert>"
msgstr "B<sslcert>"
#. type: Plain text
-#: en/live-config.7:228
+#: en/live-config.7:226
msgid "regenerating ssl snake-oil certificates."
msgstr "erneuert SSL snake-oil Zertifikate."
#. type: IP
-#: en/live-config.7:228
+#: en/live-config.7:226
#, no-wrap
msgid "B<update-notifier>"
msgstr "B<update-notifier>"
#. type: Plain text
-#: en/live-config.7:230
+#: en/live-config.7:228
msgid "disables update-notifier."
msgstr "schaltet update-notifier ab."
#. type: IP
-#: en/live-config.7:230
+#: en/live-config.7:228
#, no-wrap
msgid "B<anacron>"
msgstr "B<anacron>"
#. type: Plain text
-#: en/live-config.7:232
+#: en/live-config.7:230
msgid "disables anacron."
msgstr "schaltet anacron aus."
#. type: IP
-#: en/live-config.7:232
+#: en/live-config.7:230
#, no-wrap
msgid "B<util-linux>"
msgstr "B<util-linux>"
#. type: Plain text
-#: en/live-config.7:234
+#: en/live-config.7:232
msgid "disables util-linux' hwclock."
msgstr "schaltet hwclock von util-linux ab."
#. type: IP
-#: en/live-config.7:236
+#: en/live-config.7:234
#, no-wrap
msgid "B<xserver-xorg>"
msgstr "B<xserver-xorg>"
#. type: Plain text
-#: en/live-config.7:238
+#: en/live-config.7:236
msgid "configures xserver-xorg."
msgstr "konfiguriert xserver-xorg."
#. type: IP
-#: en/live-config.7:238
+#: en/live-config.7:236
#, no-wrap
msgid "B<ureadahead> (ubuntu only)"
msgstr "B<ureadahead> (nur Ubuntu)"
#. type: Plain text
-#: en/live-config.7:240
+#: en/live-config.7:238
msgid "disables ureadahead."
msgstr "schaltet ureadahead ab."
#. type: IP
-#: en/live-config.7:240
+#: en/live-config.7:238
#, no-wrap
msgid "B<openssh-server>"
msgstr "B<openssh-server>"
#. type: Plain text
-#: en/live-config.7:242
+#: en/live-config.7:240
msgid "recreates openssh-server host keys."
msgstr "erstellt OpenSSH-Server Host Schlüssel."
#. type: IP
-#: en/live-config.7:242
+#: en/live-config.7:240
#, no-wrap
msgid "B<hooks>"
msgstr "B<hooks>"
#. type: Plain text
-#: en/live-config.7:244
+#: en/live-config.7:242
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
@@ -1454,112 +1445,112 @@ msgstr ""
"einem HTTP/FTP Server auszuführen."
#. type: SH
-#: en/live-config.7:245
+#: en/live-config.7:243
#, no-wrap
msgid "FILES"
msgstr "DATEIEN"
#. type: IP
-#: en/live-config.7:246
+#: en/live-config.7:244
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr "B</etc/live/config.conf>"
#. type: IP
-#: en/live-config.7:247
+#: en/live-config.7:245
#, no-wrap
msgid "B</etc/live/config.d/*.conf>"
msgstr "B</etc/live/config.d/*.conf>"
#. type: IP
-#: en/live-config.7:248
+#: en/live-config.7:246
#, no-wrap
msgid "B<live/config.conf>"
msgstr "B<live/config.conf>"
#. type: IP
-#: en/live-config.7:249
+#: en/live-config.7:247
#, no-wrap
msgid "B<live/config.d/*.conf>"
msgstr "B<live/config.d/*.conf>"
#. type: IP
-#: en/live-config.7:250
+#: en/live-config.7:248
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr "B</lib/live/config.sh>"
#. type: IP
-#: en/live-config.7:251
+#: en/live-config.7:249
#, no-wrap
msgid "B</lib/live/config/>"
msgstr "B</lib/live/config/>"
#. type: IP
-#: en/live-config.7:252
+#: en/live-config.7:250
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr "B</var/lib/live/config/>"
#. type: IP
-#: en/live-config.7:253
+#: en/live-config.7:251
#, no-wrap
msgid "B</var/log/live/config.log>"
msgstr "B</var/log/live/config.log>"
#. type: IP
-#: en/live-config.7:255
+#: en/live-config.7:253
#, no-wrap
msgid "B</live/hooks/*>"
msgstr "B</live/hooks/*>"
#. type: IP
-#: en/live-config.7:256
+#: en/live-config.7:254
#, no-wrap
msgid "B<live/hooks/*>"
msgstr "B<live/hooks/*>"
#. type: IP
-#: en/live-config.7:257
+#: en/live-config.7:255
#, no-wrap
msgid "B</live/preseed/*>"
msgstr "B</live/preseed/*>"
#. type: IP
-#: en/live-config.7:258
+#: en/live-config.7:256
#, no-wrap
msgid "B<live/preseed/* >"
msgstr "B<live/preseed/* >"
#. type: SH
-#: en/live-config.7:260
+#: en/live-config.7:258
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-config.7:262
+#: en/live-config.7:260
msgid "I<live-boot>(7)"
msgstr "I<live-boot>(7)"
#. type: Plain text
-#: en/live-config.7:264
+#: en/live-config.7:262
msgid "I<live-build>(7)"
msgstr "I<live-build>(7)"
#. type: Plain text
-#: en/live-config.7:266
+#: en/live-config.7:264
msgid "I<live-tools>(7)"
msgstr "I<live-tools>(7)"
#. type: SH
-#: en/live-config.7:267
+#: en/live-config.7:265
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-config.7:269
+#: en/live-config.7:267
msgid ""
"More information about live-config and the Debian Live project can be found "
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -1570,13 +1561,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-config.7:270
+#: en/live-config.7:268
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-config.7:272
+#: en/live-config.7:270
msgid ""
"Bugs can be reported by submitting a bugreport for the live-config package "
"in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or "
@@ -1590,13 +1581,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-config.7:273
+#: en/live-config.7:271
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-config.7:274
+#: en/live-config.7:272
msgid ""
"live-config was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
msgstr ""
diff --git a/manpages/po/es/live-config.7.po b/manpages/po/es/live-config.7.po
index 342c788..c2acc0e 100644
--- a/manpages/po/es/live-config.7.po
+++ b/manpages/po/es/live-config.7.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~b1-1\n"
-"POT-Creation-Date: 2012-07-24 18:12+0300\n"
-"PO-Revision-Date: 2012-04-07 17:19+0200\n"
-"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
+"Project-Id-Version: live-config 3.0~b2-1\n"
+"POT-Creation-Date: 2012-07-29 02:08+0300\n"
+"PO-Revision-Date: 2012-07-28 22:11+0100\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
"Language: es\n"
"MIME-Version: 1.0\n"
@@ -25,14 +25,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-07-24"
-msgstr "24.07.2012"
+msgid "2012-07-29"
+msgstr "29.07.2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~b1-1"
-msgstr "3.0~b1-1"
+msgid "3.0~b2-1"
+msgstr "3.0~b2-1"
#. type: TH
#: en/live-config.7:9
@@ -390,12 +390,16 @@ msgstr "B<live-config.keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT
#: en/live-config.7:67
msgid ""
"Allows to change the keyboard variants. If more than one is specified, the "
-"tools of the desktop environment will allow to switch it under X11. There is "
-"no default value set."
+"same number of values as keyboard-layouts values should be specified as they "
+"will be matched one-to-one in the order specified. Blank values are allowed. "
+"The tools of the desktop environment will allow to switch between each "
+"layout and variant pair under X11. There is no default value set."
msgstr ""
-"Permite cambiar la disposición del teclado. Si se especifica más de una, las "
-"herramientas de escritorio permitirán cambiarlas bajo X11. No hay ningún "
-"valor por omisión."
+"Permite cambiar las variantes de teclado. Si se especifica más de una, se "
+"deben especificar el mismo número de variantes como de distribuciones de "
+"teclado, ya que se corresponderan una a una en el orden especificado. Se "
+"pueden dejar valores en blanco. Las herramientas de escritorio permitirán "
+"cambiarlas bajo X11. No hay ningún valor por omisión."
#. type: IP
#: en/live-config.7:67
@@ -405,7 +409,7 @@ msgstr "B<live-config.keyboard-options>=I<KEYBOARD_OPTIONS> | B<keyboard-options
#. type: Plain text
#: en/live-config.7:69
-msgid "Allows to change the keyboard options. There are no default value set."
+msgid "Allows to change the keyboard options. There is no default value set."
msgstr "Permite cambiar las opciones del teclado. No hay un valor por omisión."
#. type: IP
@@ -1226,13 +1230,13 @@ msgid "configures sysv-rc by disabling listed services."
msgstr "configura sysv-rc desactivando los sevicios listados."
#. type: IP
-#: en/live-config.7:204 en/live-config.7:234
+#: en/live-config.7:204 en/live-config.7:232
#, no-wrap
msgid "B<login>"
msgstr "B<login>"
#. type: Plain text
-#: en/live-config.7:206 en/live-config.7:236
+#: en/live-config.7:206 en/live-config.7:234
msgid "disables lastlog."
msgstr "Desactiva lastlog."
@@ -1283,157 +1287,143 @@ msgstr "Impide que el salvapantallas bloquee la pantalla."
#. type: IP
#: en/live-config.7:214
#, no-wrap
-msgid "B<initramfs-tools>"
-msgstr "B<initramfs-tools>"
-
-#. type: Plain text
-#: en/live-config.7:216
-msgid ""
-"makes update-initramfs to also update the live media when using persistency."
-msgstr ""
-"Posibilita que update-initramfs actualice también los medios en vivo cuando "
-"se usan en modo persistente."
-
-#. type: IP
-#: en/live-config.7:216
-#, no-wrap
msgid "B<kaboom>"
msgstr "B<kaboom>"
#. type: Plain text
-#: en/live-config.7:218
+#: en/live-config.7:216
msgid "disables KDE migration wizard (squeeze and newer)."
msgstr "Desactiva el asistente de migración de KDE (Squeeze y superior)."
#. type: IP
-#: en/live-config.7:218
+#: en/live-config.7:216
#, no-wrap
msgid "B<kde-services>"
msgstr "B<kde-services>"
#. type: Plain text
-#: en/live-config.7:220
+#: en/live-config.7:218
msgid "disables some unwanted KDE services (squeeze and newer)."
msgstr "Desactiva algunos servicios de KDE no deseados (squeeze y superior)."
#. type: IP
-#: en/live-config.7:220
+#: en/live-config.7:218
#, no-wrap
msgid "B<debian-installer-launcher>"
msgstr "B<debian-installer-launcher>"
#. type: Plain text
-#: en/live-config.7:222
+#: en/live-config.7:220
msgid "adds debian-installer-launcher on users desktop."
msgstr "añade un icono del instalador de debian en el escritorio del usuario."
#. type: IP
-#: en/live-config.7:222
+#: en/live-config.7:220
#, no-wrap
msgid "B<module-init-tools>"
msgstr "B<module-init-tools>"
#. type: Plain text
-#: en/live-config.7:224
+#: en/live-config.7:222
msgid "automatically load some modules on some architectures."
msgstr "automáticamente carga algunos módulos en algunas arquitecturas."
#. type: IP
-#: en/live-config.7:224
+#: en/live-config.7:222
#, no-wrap
msgid "B<policykit>"
msgstr "B<policykit>"
#. type: Plain text
-#: en/live-config.7:226
+#: en/live-config.7:224
msgid "grant user privilegies through policykit."
msgstr "garantiza privilegios de usuario mediante policykit."
#. type: IP
-#: en/live-config.7:226
+#: en/live-config.7:224
#, no-wrap
msgid "B<sslcert>"
msgstr "B<sslcert>"
#. type: Plain text
-#: en/live-config.7:228
+#: en/live-config.7:226
msgid "regenerating ssl snake-oil certificates."
msgstr "Regenera los certificados ssl snake-oil."
#. type: IP
-#: en/live-config.7:228
+#: en/live-config.7:226
#, no-wrap
msgid "B<update-notifier>"
msgstr "B<update-notifier>"
#. type: Plain text
-#: en/live-config.7:230
+#: en/live-config.7:228
msgid "disables update-notifier."
msgstr "Desactiva el update-notifier."
#. type: IP
-#: en/live-config.7:230
+#: en/live-config.7:228
#, no-wrap
msgid "B<anacron>"
msgstr "B<anacron>"
#. type: Plain text
-#: en/live-config.7:232
+#: en/live-config.7:230
msgid "disables anacron."
msgstr "Desactiva anacron."
#. type: IP
-#: en/live-config.7:232
+#: en/live-config.7:230
#, no-wrap
msgid "B<util-linux>"
msgstr "B<util-linux>"
#. type: Plain text
-#: en/live-config.7:234
+#: en/live-config.7:232
msgid "disables util-linux' hwclock."
msgstr "Desactiva util-linux' hwclock."
#. type: IP
-#: en/live-config.7:236
+#: en/live-config.7:234
#, no-wrap
msgid "B<xserver-xorg>"
msgstr "B<xserver-xorg>"
#. type: Plain text
-#: en/live-config.7:238
+#: en/live-config.7:236
msgid "configures xserver-xorg."
msgstr "configura xserver-xorg."
#. type: IP
-#: en/live-config.7:238
+#: en/live-config.7:236
#, no-wrap
msgid "B<ureadahead> (ubuntu only)"
msgstr "B<ureadahead> (ubuntu solamente)"
#. type: Plain text
-#: en/live-config.7:240
+#: en/live-config.7:238
msgid "disables ureadahead."
msgstr "Desactiva ureadahead."
#. type: IP
-#: en/live-config.7:240
+#: en/live-config.7:238
#, no-wrap
msgid "B<openssh-server>"
msgstr "B<openssh-server>"
#. type: Plain text
-#: en/live-config.7:242
+#: en/live-config.7:240
msgid "recreates openssh-server host keys."
msgstr "Recrea las claves del host openssh-server."
#. type: IP
-#: en/live-config.7:242
+#: en/live-config.7:240
#, no-wrap
msgid "B<hooks>"
msgstr "B<hooks>"
#. type: Plain text
-#: en/live-config.7:244
+#: en/live-config.7:242
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
@@ -1442,112 +1432,112 @@ msgstr ""
"el medio en vivo o en un servidor http/ftp."
#. type: SH
-#: en/live-config.7:245
+#: en/live-config.7:243
#, no-wrap
msgid "FILES"
msgstr "FICHEROS"
#. type: IP
-#: en/live-config.7:246
+#: en/live-config.7:244
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr "B</etc/live/config.conf>"
#. type: IP
-#: en/live-config.7:247
+#: en/live-config.7:245
#, no-wrap
msgid "B</etc/live/config.d/*.conf>"
msgstr "B</etc/live/config.d/*.conf>"
#. type: IP
-#: en/live-config.7:248
+#: en/live-config.7:246
#, no-wrap
msgid "B<live/config.conf>"
msgstr "B<live/config.conf>"
#. type: IP
-#: en/live-config.7:249
+#: en/live-config.7:247
#, no-wrap
msgid "B<live/config.d/*.conf>"
msgstr "B<live/config.d/*.conf>"
#. type: IP
-#: en/live-config.7:250
+#: en/live-config.7:248
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr "B</lib/live/config.sh>"
#. type: IP
-#: en/live-config.7:251
+#: en/live-config.7:249
#, no-wrap
msgid "B</lib/live/config/>"
msgstr "B</lib/live/config/>"
#. type: IP
-#: en/live-config.7:252
+#: en/live-config.7:250
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr "B</var/lib/live/config/>"
#. type: IP
-#: en/live-config.7:253
+#: en/live-config.7:251
#, no-wrap
msgid "B</var/log/live/config.log>"
msgstr "B</var/log/live/config.log>"
#. type: IP
-#: en/live-config.7:255
+#: en/live-config.7:253
#, no-wrap
msgid "B</live/hooks/*>"
msgstr "B</live/hooks/*>"
#. type: IP
-#: en/live-config.7:256
+#: en/live-config.7:254
#, no-wrap
msgid "B<live/hooks/*>"
msgstr "B<live/hooks/*>"
#. type: IP
-#: en/live-config.7:257
+#: en/live-config.7:255
#, no-wrap
msgid "B</live/preseed/*>"
msgstr "B</live/preseed/*>"
#. type: IP
-#: en/live-config.7:258
+#: en/live-config.7:256
#, no-wrap
msgid "B<live/preseed/* >"
msgstr "B<live/preseed/* >"
#. type: SH
-#: en/live-config.7:260
+#: en/live-config.7:258
#, no-wrap
msgid "SEE ALSO"
msgstr "VER ADEMÁS"
#. type: Plain text
-#: en/live-config.7:262
+#: en/live-config.7:260
msgid "I<live-boot>(7)"
msgstr "I<live-boot>(7)"
#. type: Plain text
-#: en/live-config.7:264
+#: en/live-config.7:262
msgid "I<live-build>(7)"
msgstr "I<live-build>(7)"
#. type: Plain text
-#: en/live-config.7:266
+#: en/live-config.7:264
msgid "I<live-tools>(7)"
msgstr "I<live-tools>(7)"
#. type: SH
-#: en/live-config.7:267
+#: en/live-config.7:265
#, no-wrap
msgid "HOMEPAGE"
msgstr "PÁGINA PRINCIPAL"
#. type: Plain text
-#: en/live-config.7:269
+#: en/live-config.7:267
msgid ""
"More information about live-config and the Debian Live project can be found "
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -1558,13 +1548,13 @@ msgstr ""
"en el manual en E<lt>I<http://live.debian.net/manual/>E<gt>."
#. type: SH
-#: en/live-config.7:270
+#: en/live-config.7:268
#, no-wrap
msgid "BUGS"
msgstr "ERRORES"
#. type: Plain text
-#: en/live-config.7:272
+#: en/live-config.7:270
msgid ""
"Bugs can be reported by submitting a bugreport for the live-config package "
"in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or "
@@ -1577,13 +1567,13 @@ msgstr ""
"Live a la dirección E<lt>I<debian-live at lists.debian.org>E<gt>."
#. type: SH
-#: en/live-config.7:273
+#: en/live-config.7:271
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-config.7:274
+#: en/live-config.7:272
msgid ""
"live-config was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
msgstr ""
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index 6f45a80..dc8902e 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~b1-1\n"
-"POT-Creation-Date: 2012-07-24 18:12+0300\n"
-"PO-Revision-Date: 2012-07-20 13:55+0200\n"
-"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
+"Project-Id-Version: live-config 3.0~b2-1\n"
+"POT-Creation-Date: 2012-07-29 02:08+0300\n"
+"PO-Revision-Date: 2012-07-28 22:13+0100\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
@@ -25,14 +25,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-07-24"
-msgstr "24.07.2012"
+msgid "2012-07-29"
+msgstr "29.07.2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~b1-1"
-msgstr "3.0~b1-1"
+msgid "3.0~b2-1"
+msgstr "3.0~b2-1"
#. type: TH
#: en/live-config.7:9
@@ -398,12 +398,16 @@ msgstr "B<live-config.keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT
#: en/live-config.7:67
msgid ""
"Allows to change the keyboard variants. If more than one is specified, the "
-"tools of the desktop environment will allow to switch it under X11. There is "
-"no default value set."
+"same number of values as keyboard-layouts values should be specified as they "
+"will be matched one-to-one in the order specified. Blank values are allowed. "
+"The tools of the desktop environment will allow to switch between each "
+"layout and variant pair under X11. There is no default value set."
msgstr ""
-"Permet de changer la configuration du clavier. Si plus d'une configuration "
-"est spécifiée, les utilitaires de l'environnement de bureau permettront de "
-"passer de l'une à l'autre sous X11. Aucune valeur par défaut n'est spécifiée."
+"Permet de changer la variante du clavier. Si plus d'une est spécifiée, le "
+"même nombre de valeurs doivent être spécifiées car elles se correspondront "
+"une à une dans l'ordre spécifié. On peut utiliser valeurs vides. Les outils "
+"de l'environnement de bureau permettront de passer de l'une à l'autre sous "
+"X11. Aucune valeur par défaut n'est spécifiée."
#. type: IP
#: en/live-config.7:67
@@ -413,7 +417,7 @@ msgstr "B<live-config.keyboard-options>=I<OPTIONS_DU_CLAVIER> | B<keyboard-optio
#. type: Plain text
#: en/live-config.7:69
-msgid "Allows to change the keyboard options. There are no default value set."
+msgid "Allows to change the keyboard options. There is no default value set."
msgstr ""
"Permet de changer les options du clavier. Aucune valeur par défaut n'est "
"spécifiée."
@@ -1241,13 +1245,13 @@ msgid "configures sysv-rc by disabling listed services."
msgstr "configure sysv-rc en désactivant les services listés."
#. type: IP
-#: en/live-config.7:204 en/live-config.7:234
+#: en/live-config.7:204 en/live-config.7:232
#, no-wrap
msgid "B<login>"
msgstr "B<login>"
#. type: Plain text
-#: en/live-config.7:206 en/live-config.7:236
+#: en/live-config.7:206 en/live-config.7:234
msgid "disables lastlog."
msgstr "désactive lastlog."
@@ -1298,159 +1302,145 @@ msgstr "désactive le verrouillage de session par l'économiseur d'écran."
#. type: IP
#: en/live-config.7:214
#, no-wrap
-msgid "B<initramfs-tools>"
-msgstr "B<initramfs-tools>"
-
-#. type: Plain text
-#: en/live-config.7:216
-msgid ""
-"makes update-initramfs to also update the live media when using persistency."
-msgstr ""
-"permet à update-initramfs de mettre à jour le média live lorsqu'on utlise la "
-"persistance."
-
-#. type: IP
-#: en/live-config.7:216
-#, no-wrap
msgid "B<kaboom>"
msgstr "B<kaboom>"
#. type: Plain text
-#: en/live-config.7:218
+#: en/live-config.7:216
msgid "disables KDE migration wizard (squeeze and newer)."
msgstr "désactive l'assistant de migration de KDE (squeeze et plus récent)."
#. type: IP
-#: en/live-config.7:218
+#: en/live-config.7:216
#, no-wrap
msgid "B<kde-services>"
msgstr "B<kde-services>"
#. type: Plain text
-#: en/live-config.7:220
+#: en/live-config.7:218
msgid "disables some unwanted KDE services (squeeze and newer)."
msgstr "désactive des services de KDE non souhaités (squeeze et plus récent)."
#. type: IP
-#: en/live-config.7:220
+#: en/live-config.7:218
#, no-wrap
msgid "B<debian-installer-launcher>"
msgstr "B<debian-installer-launcher>"
#. type: Plain text
-#: en/live-config.7:222
+#: en/live-config.7:220
msgid "adds debian-installer-launcher on users desktop."
msgstr ""
"ajoute l'installeur (debian-installer-launcher) sur le bureau des "
"utilisateurs."
#. type: IP
-#: en/live-config.7:222
+#: en/live-config.7:220
#, no-wrap
msgid "B<module-init-tools>"
msgstr "B<module-init-tools>"
#. type: Plain text
-#: en/live-config.7:224
+#: en/live-config.7:222
msgid "automatically load some modules on some architectures."
msgstr "charge automatiquement certains modules sur certaines architectures."
#. type: IP
-#: en/live-config.7:224
+#: en/live-config.7:222
#, no-wrap
msgid "B<policykit>"
msgstr "B<policykit>"
#. type: Plain text
-#: en/live-config.7:226
+#: en/live-config.7:224
msgid "grant user privilegies through policykit."
msgstr "accorde à l'utilisateur des privilèges via le policykit."
#. type: IP
-#: en/live-config.7:226
+#: en/live-config.7:224
#, no-wrap
msgid "B<sslcert>"
msgstr "B<sslcert>"
#. type: Plain text
-#: en/live-config.7:228
+#: en/live-config.7:226
msgid "regenerating ssl snake-oil certificates."
msgstr "regénère les certificats ssl."
#. type: IP
-#: en/live-config.7:228
+#: en/live-config.7:226
#, no-wrap
msgid "B<update-notifier>"
msgstr "B<update-notifier>"
#. type: Plain text
-#: en/live-config.7:230
+#: en/live-config.7:228
msgid "disables update-notifier."
msgstr "désactive update-notifier."
#. type: IP
-#: en/live-config.7:230
+#: en/live-config.7:228
#, no-wrap
msgid "B<anacron>"
msgstr "B<anacron>"
#. type: Plain text
-#: en/live-config.7:232
+#: en/live-config.7:230
msgid "disables anacron."
msgstr "désactive anacron."
#. type: IP
-#: en/live-config.7:232
+#: en/live-config.7:230
#, no-wrap
msgid "B<util-linux>"
msgstr "B<util-linux>"
#. type: Plain text
-#: en/live-config.7:234
+#: en/live-config.7:232
msgid "disables util-linux' hwclock."
msgstr "désactive util-linux' hwclock."
#. type: IP
-#: en/live-config.7:236
+#: en/live-config.7:234
#, no-wrap
msgid "B<xserver-xorg>"
msgstr "B<xserver-xorg>"
#. type: Plain text
-#: en/live-config.7:238
+#: en/live-config.7:236
msgid "configures xserver-xorg."
msgstr "configure xserver-xorg."
#. type: IP
-#: en/live-config.7:238
+#: en/live-config.7:236
#, no-wrap
msgid "B<ureadahead> (ubuntu only)"
msgstr "B<ureadahead> (seulement ubuntu)"
#. type: Plain text
-#: en/live-config.7:240
+#: en/live-config.7:238
msgid "disables ureadahead."
msgstr "désactive ureadahead."
#. type: IP
-#: en/live-config.7:240
+#: en/live-config.7:238
#, no-wrap
msgid "B<openssh-server>"
msgstr "B<openssh-server>"
#. type: Plain text
-#: en/live-config.7:242
+#: en/live-config.7:240
msgid "recreates openssh-server host keys."
msgstr "regénère les clés de l'hôte openssh-server."
#. type: IP
-#: en/live-config.7:242
+#: en/live-config.7:240
#, no-wrap
msgid "B<hooks>"
msgstr "B<hooks>"
#. type: Plain text
-#: en/live-config.7:244
+#: en/live-config.7:242
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
@@ -1459,112 +1449,112 @@ msgstr ""
"live, ou sur un serveur http/ftp."
#. type: SH
-#: en/live-config.7:245
+#: en/live-config.7:243
#, no-wrap
msgid "FILES"
msgstr "FICHIERS"
#. type: IP
-#: en/live-config.7:246
+#: en/live-config.7:244
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr "B</etc/live/config.conf>"
#. type: IP
-#: en/live-config.7:247
+#: en/live-config.7:245
#, no-wrap
msgid "B</etc/live/config.d/*.conf>"
msgstr "B</etc/live/config.d/*.conf>"
#. type: IP
-#: en/live-config.7:248
+#: en/live-config.7:246
#, no-wrap
msgid "B<live/config.conf>"
msgstr "B<live/config.conf>"
#. type: IP
-#: en/live-config.7:249
+#: en/live-config.7:247
#, no-wrap
msgid "B<live/config.d/*.conf>"
msgstr "B<live/config.d/*.conf>"
#. type: IP
-#: en/live-config.7:250
+#: en/live-config.7:248
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr "B</lib/live/config.sh>"
#. type: IP
-#: en/live-config.7:251
+#: en/live-config.7:249
#, no-wrap
msgid "B</lib/live/config/>"
msgstr "B</lib/live/config/>"
#. type: IP
-#: en/live-config.7:252
+#: en/live-config.7:250
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr "B</var/lib/live/config/>"
#. type: IP
-#: en/live-config.7:253
+#: en/live-config.7:251
#, no-wrap
msgid "B</var/log/live/config.log>"
msgstr "B</var/log/live/config.log>"
#. type: IP
-#: en/live-config.7:255
+#: en/live-config.7:253
#, no-wrap
msgid "B</live/hooks/*>"
msgstr "B</live/hooks/*>"
#. type: IP
-#: en/live-config.7:256
+#: en/live-config.7:254
#, no-wrap
msgid "B<live/hooks/*>"
msgstr "B<live/hooks/*>"
#. type: IP
-#: en/live-config.7:257
+#: en/live-config.7:255
#, no-wrap
msgid "B</live/preseed/*>"
msgstr "B</live/preseed/*>"
#. type: IP
-#: en/live-config.7:258
+#: en/live-config.7:256
#, no-wrap
msgid "B<live/preseed/* >"
msgstr "B<live/preseed/* >"
#. type: SH
-#: en/live-config.7:260
+#: en/live-config.7:258
#, no-wrap
msgid "SEE ALSO"
msgstr "VOIR AUSSI"
#. type: Plain text
-#: en/live-config.7:262
+#: en/live-config.7:260
msgid "I<live-boot>(7)"
msgstr "I<live-boot>(7)"
#. type: Plain text
-#: en/live-config.7:264
+#: en/live-config.7:262
msgid "I<live-build>(7)"
msgstr "I<live-build>(7)"
#. type: Plain text
-#: en/live-config.7:266
+#: en/live-config.7:264
msgid "I<live-tools>(7)"
msgstr "I<live-tools>(7)"
#. type: SH
-#: en/live-config.7:267
+#: en/live-config.7:265
#, no-wrap
msgid "HOMEPAGE"
msgstr "PAGE D'ACCUEIL"
#. type: Plain text
-#: en/live-config.7:269
+#: en/live-config.7:267
msgid ""
"More information about live-config and the Debian Live project can be found "
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -1575,13 +1565,13 @@ msgstr ""
"sur E<lt>I<http://live.debian.net/manual/>E<gt>."
#. type: SH
-#: en/live-config.7:270
+#: en/live-config.7:268
#, no-wrap
msgid "BUGS"
msgstr "BUGS"
#. type: Plain text
-#: en/live-config.7:272
+#: en/live-config.7:270
msgid ""
"Bugs can be reported by submitting a bugreport for the live-config package "
"in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or "
@@ -1594,13 +1584,13 @@ msgstr ""
"E<lt>I<debian-live at lists.debian.org>E<gt>"
#. type: SH
-#: en/live-config.7:273
+#: en/live-config.7:271
#, no-wrap
msgid "AUTHOR"
msgstr "AUTEUR"
#. type: Plain text
-#: en/live-config.7:274
+#: en/live-config.7:272
msgid ""
"live-config was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
msgstr ""
diff --git a/manpages/po/it/live-config.7.po b/manpages/po/it/live-config.7.po
index 49d01ea..842ca1c 100644
--- a/manpages/po/it/live-config.7.po
+++ b/manpages/po/it/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~b1-1\n"
-"POT-Creation-Date: 2012-07-24 18:12+0300\n"
+"Project-Id-Version: live-config 3.0~b2-1\n"
+"POT-Creation-Date: 2012-07-29 02:08+0300\n"
"PO-Revision-Date: 2011-12-06 08:01+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-07-24"
-msgstr "24.07.2012"
+msgid "2012-07-29"
+msgstr "29.07.2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~b1-1"
-msgstr "3.0~b1-1"
+msgid "3.0~b2-1"
+msgstr "3.0~b2-1"
#. type: TH
#: en/live-config.7:9
@@ -386,8 +386,10 @@ msgstr "B<live-config.keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT
#| "is no default value set."
msgid ""
"Allows to change the keyboard variants. If more than one is specified, the "
-"tools of the desktop environment will allow to switch it under X11. There is "
-"no default value set."
+"same number of values as keyboard-layouts values should be specified as they "
+"will be matched one-to-one in the order specified. Blank values are allowed. "
+"The tools of the desktop environment will allow to switch between each "
+"layout and variant pair under X11. There is no default value set."
msgstr ""
"Permette di modificare i layout della tastiera. Se ne viene specificato più "
"di uno, gli strumenti dell'ambiente desktop consentiranno di cambiarlo sotto "
@@ -401,7 +403,7 @@ msgstr "B<live-config.keyboard-options>=I<OPZIONI_TASTIERA> | B<keyboard-options
#. type: Plain text
#: en/live-config.7:69
-msgid "Allows to change the keyboard options. There are no default value set."
+msgid "Allows to change the keyboard options. There is no default value set."
msgstr ""
"Permette di modificare le opzioni della tastiera, non è impostato alcun "
"valore predefinito."
@@ -1224,13 +1226,13 @@ msgid "configures sysv-rc by disabling listed services."
msgstr "configura sysv-rc disabilitando i servizi elencati."
#. type: IP
-#: en/live-config.7:204 en/live-config.7:234
+#: en/live-config.7:204 en/live-config.7:232
#, no-wrap
msgid "B<login>"
msgstr "B<login>"
#. type: Plain text
-#: en/live-config.7:206 en/live-config.7:236
+#: en/live-config.7:206 en/live-config.7:234
msgid "disables lastlog."
msgstr "disabilita lastlog."
@@ -1281,158 +1283,144 @@ msgstr "disabilita lo screensaver che blocca lo schermo."
#. type: IP
#: en/live-config.7:214
#, no-wrap
-msgid "B<initramfs-tools>"
-msgstr "B<initramfs-tools>"
-
-#. type: Plain text
-#: en/live-config.7:216
-msgid ""
-"makes update-initramfs to also update the live media when using persistency."
-msgstr ""
-"fa sì che update-initramfs aggiorni anche il supporto live quando si "
-"utilizza la persistenza."
-
-#. type: IP
-#: en/live-config.7:216
-#, no-wrap
msgid "B<kaboom>"
msgstr "B<kaboom>"
#. type: Plain text
-#: en/live-config.7:218
+#: en/live-config.7:216
msgid "disables KDE migration wizard (squeeze and newer)."
msgstr ""
"disabilita la procedura guidata di migrazione di KDE (squeeze e successive)."
#. type: IP
-#: en/live-config.7:218
+#: en/live-config.7:216
#, no-wrap
msgid "B<kde-services>"
msgstr "B<kde-services>"
#. type: Plain text
-#: en/live-config.7:220
+#: en/live-config.7:218
msgid "disables some unwanted KDE services (squeeze and newer)."
msgstr "disabilita i servizi di KDE non voluti (squeeze e successive)."
#. type: IP
-#: en/live-config.7:220
+#: en/live-config.7:218
#, no-wrap
msgid "B<debian-installer-launcher>"
msgstr "B<debian-installer-launcher>"
#. type: Plain text
-#: en/live-config.7:222
+#: en/live-config.7:220
msgid "adds debian-installer-launcher on users desktop."
msgstr "aggiunge debian-installer-launcher sul desktop dell'utente."
#. type: IP
-#: en/live-config.7:222
+#: en/live-config.7:220
#, no-wrap
msgid "B<module-init-tools>"
msgstr "B<module-init-tools>"
#. type: Plain text
-#: en/live-config.7:224
+#: en/live-config.7:222
msgid "automatically load some modules on some architectures."
msgstr "carica automaticamente alcuni moduli su certe architetture."
#. type: IP
-#: en/live-config.7:224
+#: en/live-config.7:222
#, no-wrap
msgid "B<policykit>"
msgstr "B<policykit>"
#. type: Plain text
-#: en/live-config.7:226
+#: en/live-config.7:224
msgid "grant user privilegies through policykit."
msgstr "concede i privilegi per l'utente tramite policykit."
#. type: IP
-#: en/live-config.7:226
+#: en/live-config.7:224
#, no-wrap
msgid "B<sslcert>"
msgstr "B<sslcert>"
#. type: Plain text
-#: en/live-config.7:228
+#: en/live-config.7:226
msgid "regenerating ssl snake-oil certificates."
msgstr "rigenera certificati ssl snake-oil."
#. type: IP
-#: en/live-config.7:228
+#: en/live-config.7:226
#, no-wrap
msgid "B<update-notifier>"
msgstr "B<update-notifier>"
#. type: Plain text
-#: en/live-config.7:230
+#: en/live-config.7:228
msgid "disables update-notifier."
msgstr "disabilita update-notifier."
#. type: IP
-#: en/live-config.7:230
+#: en/live-config.7:228
#, no-wrap
msgid "B<anacron>"
msgstr "B<anacron>"
#. type: Plain text
-#: en/live-config.7:232
+#: en/live-config.7:230
msgid "disables anacron."
msgstr "disabilita anacron."
#. type: IP
-#: en/live-config.7:232
+#: en/live-config.7:230
#, no-wrap
msgid "B<util-linux>"
msgstr "B<util-linux>"
#. type: Plain text
-#: en/live-config.7:234
+#: en/live-config.7:232
msgid "disables util-linux' hwclock."
msgstr "disabilita hwclock."
#. type: IP
-#: en/live-config.7:236
+#: en/live-config.7:234
#, no-wrap
msgid "B<xserver-xorg>"
msgstr "B<xserver-xorg>"
#. type: Plain text
-#: en/live-config.7:238
+#: en/live-config.7:236
msgid "configures xserver-xorg."
msgstr "configura xserver-xorg."
#. type: IP
-#: en/live-config.7:238
+#: en/live-config.7:236
#, no-wrap
msgid "B<ureadahead> (ubuntu only)"
msgstr "B<ureadahead> (solo ubuntu)"
#. type: Plain text
-#: en/live-config.7:240
+#: en/live-config.7:238
msgid "disables ureadahead."
msgstr "disabilita ureadahead."
#. type: IP
-#: en/live-config.7:240
+#: en/live-config.7:238
#, no-wrap
msgid "B<openssh-server>"
msgstr "B<openssh-server>"
#. type: Plain text
-#: en/live-config.7:242
+#: en/live-config.7:240
msgid "recreates openssh-server host keys."
msgstr "ricrea le chiavi di openssh-server."
#. type: IP
-#: en/live-config.7:242
+#: en/live-config.7:240
#, no-wrap
msgid "B<hooks>"
msgstr "B<hooks>"
#. type: Plain text
-#: en/live-config.7:244
+#: en/live-config.7:242
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
@@ -1441,112 +1429,112 @@ msgstr ""
"live o su un server http/ftp."
#. type: SH
-#: en/live-config.7:245
+#: en/live-config.7:243
#, no-wrap
msgid "FILES"
msgstr "FILE"
#. type: IP
-#: en/live-config.7:246
+#: en/live-config.7:244
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr "B</etc/live/config.conf>"
#. type: IP
-#: en/live-config.7:247
+#: en/live-config.7:245
#, no-wrap
msgid "B</etc/live/config.d/*.conf>"
msgstr "B</etc/live/config.d/*.conf>"
#. type: IP
-#: en/live-config.7:248
+#: en/live-config.7:246
#, no-wrap
msgid "B<live/config.conf>"
msgstr "B<live/config.conf>"
#. type: IP
-#: en/live-config.7:249
+#: en/live-config.7:247
#, no-wrap
msgid "B<live/config.d/*.conf>"
msgstr "B<live/config.d/*.conf>"
#. type: IP
-#: en/live-config.7:250
+#: en/live-config.7:248
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr "B</lib/live/config.sh>"
#. type: IP
-#: en/live-config.7:251
+#: en/live-config.7:249
#, no-wrap
msgid "B</lib/live/config/>"
msgstr "B</lib/live/config/>"
#. type: IP
-#: en/live-config.7:252
+#: en/live-config.7:250
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr "B</var/lib/live/config/>"
#. type: IP
-#: en/live-config.7:253
+#: en/live-config.7:251
#, no-wrap
msgid "B</var/log/live/config.log>"
msgstr "B</var/log/live/config.log>"
#. type: IP
-#: en/live-config.7:255
+#: en/live-config.7:253
#, no-wrap
msgid "B</live/hooks/*>"
msgstr "B</live/hooks/*>"
#. type: IP
-#: en/live-config.7:256
+#: en/live-config.7:254
#, no-wrap
msgid "B<live/hooks/*>"
msgstr "B<live/hooks/*>"
#. type: IP
-#: en/live-config.7:257
+#: en/live-config.7:255
#, no-wrap
msgid "B</live/preseed/*>"
msgstr "B</live/preseed/*>"
#. type: IP
-#: en/live-config.7:258
+#: en/live-config.7:256
#, no-wrap
msgid "B<live/preseed/* >"
msgstr "B<live/preseed/* >"
#. type: SH
-#: en/live-config.7:260
+#: en/live-config.7:258
#, no-wrap
msgid "SEE ALSO"
msgstr "VEDERE ANCHE"
#. type: Plain text
-#: en/live-config.7:262
+#: en/live-config.7:260
msgid "I<live-boot>(7)"
msgstr "I<live-boot>(7)"
#. type: Plain text
-#: en/live-config.7:264
+#: en/live-config.7:262
msgid "I<live-build>(7)"
msgstr "I<live-build>(7)"
#. type: Plain text
-#: en/live-config.7:266
+#: en/live-config.7:264
msgid "I<live-tools>(7)"
msgstr "I<live-tools>(7)"
#. type: SH
-#: en/live-config.7:267
+#: en/live-config.7:265
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-config.7:269
+#: en/live-config.7:267
msgid ""
"More information about live-config and the Debian Live project can be found "
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -1557,13 +1545,13 @@ msgstr ""
"all'indirizzo E<lt>I<http://live.debian.net/manual/>E<gt>."
#. type: SH
-#: en/live-config.7:270
+#: en/live-config.7:268
#, no-wrap
msgid "BUGS"
msgstr "BUG"
#. type: Plain text
-#: en/live-config.7:272
+#: en/live-config.7:270
msgid ""
"Bugs can be reported by submitting a bugreport for the live-config package "
"in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or "
@@ -1576,13 +1564,13 @@ msgstr ""
"E<lt>I<debian-live at lists.debian.org>E<gt>."
#. type: SH
-#: en/live-config.7:273
+#: en/live-config.7:271
#, no-wrap
msgid "AUTHOR"
msgstr "AUTORE"
#. type: Plain text
-#: en/live-config.7:274
+#: en/live-config.7:272
msgid ""
"live-config was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
msgstr ""
diff --git a/manpages/po/pt_BR/live-config.7.po b/manpages/po/pt_BR/live-config.7.po
index 1f5aedf..09a8a91 100644
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -5,15 +5,16 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~b1-1\n"
-"POT-Creation-Date: 2012-07-24 18:12+0300\n"
-"PO-Revision-Date: 2012-07-08 11:30-0600\n"
+"Project-Id-Version: live-config 3.0~b2-1\n"
+"POT-Creation-Date: 2012-07-29 02:08+0300\n"
+"PO-Revision-Date: 2012-07-28 11:38-0400\n"
"Last-Translator: Tiago Bortoletto Vaz <tiago at debian.org>\n"
-"Language-Team: none\n"
+"Language-Team: Brazilian Portuguese <>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: TH
#: en/live-config.7:9
@@ -24,14 +25,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-07-24"
-msgstr "24-07-2012"
+msgid "2012-07-29"
+msgstr "29-07-2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~b1-1"
-msgstr "3.0~b1-1"
+msgid "3.0~b2-1"
+msgstr "3.0~b2-1"
#. type: TH
#: en/live-config.7:9
@@ -367,7 +368,7 @@ msgstr "Permite configurar o modelo do teclado. Não há valor padrão definido.
#: en/live-config.7:63
#, no-wrap
msgid "B<live-config.keyboard-layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn> | B<keyboard-layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
-msgstr "B<live-config.keyboard-layouts>=I<LAYOUT1_DO_TECLADO>,I<LAYOUT2_DO_TECLADO> ... I<LAYOUTn_DO_TECLADO> | B<keyboard-layouts>=I<LAYOUT1_DO_TECLADO>,I<LAYOUT2_DO_TECLADO> ... I<LAYOUTn_DO_TECLADO>"
+msgstr "B<live-config.keyboard-layouts>=I<LEIAUTE1_DO_TECLADO>,I<LEIAUTE2_DO_TECLADO> ... I<LEIAUTEn_DO_TECLADO> | B<keyboard-layouts>=I<LEIAUTE1_DO_TECLADO>,I<LEIAUTE2_DO_TECLADO> ... I<LEIAUTEn_DO_TECLADO>"
#. type: Plain text
#: en/live-config.7:65
@@ -376,7 +377,7 @@ msgid ""
"tools of the desktop environment will allow to switch it under X11. There is "
"no default value set."
msgstr ""
-"Permite configurar layouts de teclado. Se mais de um layout for "
+"Permite configurar leiautes de teclado. Se mais de um leiaute for "
"especificado, as ferramentas do ambiente desktop possibilitarão a troca "
"entre eles no X11. Não há valor padrão definido."
@@ -384,23 +385,22 @@ msgstr ""
#: en/live-config.7:65
#, no-wrap
msgid "B<live-config.keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn> | B<keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
-msgstr "B<live-config.keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn> | B<keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
+msgstr "B<live-config.keyboard-variants>=I<VARIANTE1_DO_TECLADO>,I<VARIANTE2_DO_TECLADO> ... I<VARIANTEn_DO_TECLADO> | B<keyboard-variants>=I<VARIANTE1_DO_TECLADO>,I<VARIANTE2_DO_TECLADO> ... I<VARIANTEn_DO_TECLADO>"
#. type: Plain text
#: en/live-config.7:67
-#, fuzzy
-#| msgid ""
-#| "Allows to change the keyboard layouts. If more than one is specified, the "
-#| "tools of the desktop environment will allow to switch it under X11. There "
-#| "is no default value set."
msgid ""
"Allows to change the keyboard variants. If more than one is specified, the "
-"tools of the desktop environment will allow to switch it under X11. There is "
-"no default value set."
+"same number of values as keyboard-layouts values should be specified as they "
+"will be matched one-to-one in the order specified. Blank values are allowed. "
+"The tools of the desktop environment will allow to switch between each "
+"layout and variant pair under X11. There is no default value set."
msgstr ""
-"Permite configurar layouts de teclado. Se mais de um layout for "
-"especificado, as ferramentas do ambiente desktop possibilitarão a troca "
-"entre eles no X11. Não há valor padrão definido."
+"Permite configurar as variantes de teclado. Se mais de uma for especificada, "
+"um mesmo número de valores para leiautes deve ser definido, uma vez que "
+"estes serão combinados um a um na ordem especificada. Valores em branco são "
+"permitidos. As ferramentas do ambiente de trabalho possibilitarão a troca "
+"entre cada par leiaute/variante no X11. Não há valor padrão definido."
#. type: IP
#: en/live-config.7:67
@@ -410,7 +410,7 @@ msgstr "B<live-config.keyboard-options>=I<OPÇÕES_DE_TECLADO> | B<keyboard-opti
#. type: Plain text
#: en/live-config.7:69
-msgid "Allows to change the keyboard options. There are no default value set."
+msgid "Allows to change the keyboard options. There is no default value set."
msgstr "Permite configurar as opções de teclado. Não há valor padrão definido."
#. type: IP
@@ -422,7 +422,7 @@ msgstr "B<live-config.sysv-rc>=I<SERVIÇO1>,I<SERVIÇO2> ... I<SERVIÇOn> | B<sy
#. type: Plain text
#: en/live-config.7:71
msgid "Allows to disable sysv services through update-rc.d."
-msgstr "Permite desabilitar serviços sysv através do update-rc.d."
+msgstr "Permite desabilitar serviços sysv via update-rc.d."
#. type: IP
#: en/live-config.7:71
@@ -445,7 +445,7 @@ msgstr "B<live-config.xorg-driver>=I<DRIVER_DO_XORG> | B<xorg-driver>=I<DRIVER_D
#. type: Plain text
#: en/live-config.7:75
msgid "Allows to set xorg driver instead of autodetecting it."
-msgstr "Permite definir o driver do xorg ao invés de auto-detectá-lo."
+msgstr "Permite definir o driver do xorg em vez de detectá-lo automaticamente."
#. type: IP
#: en/live-config.7:75
@@ -458,8 +458,8 @@ msgstr "B<live-config.xorg-resolution>=I<RESOLUÇÃO_DO_XORG> | B<xorg-resolutio
msgid ""
"Allows to set xorg resolution instead of autodetecting it, e.g. 1024x768."
msgstr ""
-"Permite definir a resolução do xorg ao invés de auto-detectá-la, por "
-"exemplo, 1024x768."
+"Permite definir a resolução do xorg em vez de detectá-la automaticamente, "
+"por exemplo, 1024x768."
#. type: IP
#: en/live-config.7:77
@@ -482,8 +482,8 @@ msgstr ""
"precisam ser acessíveis por wget (http, ftp ou file://), que os arquivos são "
"executados no diretório /tmp do sistema de arquivos em execução, e que os "
"arquivos precisam que suas dependências, se houverem, estejam instaladas. "
-"Por exemplo, se um script python deve ser executado, python deve estar "
-"instalado no sistema. Alguns hooks para alguns casos de uso comuns estão "
+"Por exemplo, se um script python necessita ser executado, python deve estar "
+"instalado no sistema. Alguns hooks para casos de uso comuns estão "
"disponíveis em /usr/share/doc/live-config/examples/hooks/ e E<lt>I<http://"
"live.debian.net/other/hooks>E<gt>."
@@ -835,7 +835,7 @@ msgstr ""
#: en/live-config.7:137
#, no-wrap
msgid "B<LIVE_KEYBOARD_LAYOUTS>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
-msgstr "B<LIVE_KEYBOARD_LAYOUTS>=I<LAYOUT1_DE_TECLADO>,I<LAYOUT2_DE_TECLADO> ... I<LAYOUTn_DE_TECLADO>"
+msgstr "B<LIVE_KEYBOARD_LAYOUTS>=I<LEIAUTE1_DE_TECLADO>,I<LEIAUTE2_DE_TECLADO> ... I<LEIAUTEn_DE_TECLADO>"
#. type: Plain text
#: en/live-config.7:139
@@ -845,30 +845,25 @@ msgid ""
"parameter."
msgstr ""
"Esta variável é equivalente ao parâmetro 'B<live-config.keyboard-"
-"layouts>=I<LAYOUT1_DE_TECLADO>,I<LAYOUT2_DE_TECLADO> ... "
-"I<LAYOUTn_DE_TECLADO>'."
+"variants>=I<LEIAUTE1_DE_TECLADO>,I<LEIAUTE2_DE_TECLADO> ... "
+"I<LEIAUTEn_DE_TECLADO>'."
#. type: IP
#: en/live-config.7:139
#, no-wrap
msgid "B<LIVE_KEYBOARD_VARIANTS>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
-msgstr "B<LIVE_KEYBOARD_VARIANTS>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
+msgstr "B<LIVE_KEYBOARD_VARIANTS>=I<VARIANTE1_DE_TECLADO>,I<VARIANTE2_DE_TECLADO> ... I<VARIANTEn_DE_TECLADO>"
#. type: Plain text
#: en/live-config.7:141
-#, fuzzy
-#| msgid ""
-#| "This variable equals the 'B<live-config.keyboard-"
-#| "layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>' "
-#| "parameter."
msgid ""
"This variable equals the 'B<live-config.keyboard-"
"variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... "
"I<KEYBOARD_VARIANTn>' parameter."
msgstr ""
"Esta variável é equivalente ao parâmetro 'B<live-config.keyboard-"
-"layouts>=I<LAYOUT1_DE_TECLADO>,I<LAYOUT2_DE_TECLADO> ... "
-"I<LAYOUTn_DE_TECLADO>'."
+"variants>=I<VARIANTE1_DE_TECLADO>,I<VARIANTE2_DE_TECLADO> ... "
+"I<VARIANTEn_DE_TECLADO>'."
#. type: IP
#: en/live-config.7:141
@@ -1239,13 +1234,13 @@ msgid "configures sysv-rc by disabling listed services."
msgstr "configura sysv-rc desabilitando serviços listados."
#. type: IP
-#: en/live-config.7:204 en/live-config.7:234
+#: en/live-config.7:204 en/live-config.7:232
#, no-wrap
msgid "B<login>"
msgstr "B<login>"
#. type: Plain text
-#: en/live-config.7:206 en/live-config.7:236
+#: en/live-config.7:206 en/live-config.7:234
msgid "disables lastlog."
msgstr "desabilita lastlog."
@@ -1291,165 +1286,151 @@ msgstr "B<gnome-screensaver>"
#. type: Plain text
#: en/live-config.7:214
msgid "disables the screensaver locking the screen."
-msgstr "desabilita o bloqueio de tela do screensaver."
+msgstr "desabilita o bloqueio de tela pelo screensaver."
#. type: IP
#: en/live-config.7:214
#, no-wrap
-msgid "B<initramfs-tools>"
-msgstr "B<initramfs-tools>"
-
-#. type: Plain text
-#: en/live-config.7:216
-msgid ""
-"makes update-initramfs to also update the live media when using persistency."
-msgstr ""
-"faz com que o update-initramfs também atualize a mídia live quando "
-"persistência for usada."
-
-#. type: IP
-#: en/live-config.7:216
-#, no-wrap
msgid "B<kaboom>"
msgstr "B<kaboom>"
#. type: Plain text
-#: en/live-config.7:218
+#: en/live-config.7:216
msgid "disables KDE migration wizard (squeeze and newer)."
msgstr "desabilita o assitente de migração do KDE."
#. type: IP
-#: en/live-config.7:218
+#: en/live-config.7:216
#, no-wrap
msgid "B<kde-services>"
msgstr "B<kde-services>"
#. type: Plain text
-#: en/live-config.7:220
+#: en/live-config.7:218
msgid "disables some unwanted KDE services (squeeze and newer)."
msgstr ""
"desabilita alguns serviços do KDE não desejados (squeeze e mais recentes)."
#. type: IP
-#: en/live-config.7:220
+#: en/live-config.7:218
#, no-wrap
msgid "B<debian-installer-launcher>"
msgstr "B<debian-installer-launcher>"
#. type: Plain text
-#: en/live-config.7:222
+#: en/live-config.7:220
msgid "adds debian-installer-launcher on users desktop."
msgstr ""
"adiciona o instalador (debian-installer-launcher) na área de trabalho dos "
"usuários."
#. type: IP
-#: en/live-config.7:222
+#: en/live-config.7:220
#, no-wrap
msgid "B<module-init-tools>"
msgstr "B<module-init-tools>"
#. type: Plain text
-#: en/live-config.7:224
+#: en/live-config.7:222
msgid "automatically load some modules on some architectures."
msgstr "carrega alguns módulos automaticamente em algumas arquiteturas."
#. type: IP
-#: en/live-config.7:224
+#: en/live-config.7:222
#, no-wrap
msgid "B<policykit>"
msgstr "B<policykit>"
#. type: Plain text
-#: en/live-config.7:226
+#: en/live-config.7:224
msgid "grant user privilegies through policykit."
msgstr "concede privilégios de usuário através de policykit."
#. type: IP
-#: en/live-config.7:226
+#: en/live-config.7:224
#, no-wrap
msgid "B<sslcert>"
msgstr "B<sslcert>"
#. type: Plain text
-#: en/live-config.7:228
+#: en/live-config.7:226
msgid "regenerating ssl snake-oil certificates."
-msgstr "gera novos certificados ssl."
+msgstr "gera novos certificados ssl snake-oil."
#. type: IP
-#: en/live-config.7:228
+#: en/live-config.7:226
#, no-wrap
msgid "B<update-notifier>"
msgstr "B<update-notifier>"
#. type: Plain text
-#: en/live-config.7:230
+#: en/live-config.7:228
msgid "disables update-notifier."
msgstr "desabilita update-notifier."
#. type: IP
-#: en/live-config.7:230
+#: en/live-config.7:228
#, no-wrap
msgid "B<anacron>"
msgstr "B<anacron>"
#. type: Plain text
-#: en/live-config.7:232
+#: en/live-config.7:230
msgid "disables anacron."
msgstr "desabilita anacron."
#. type: IP
-#: en/live-config.7:232
+#: en/live-config.7:230
#, no-wrap
msgid "B<util-linux>"
msgstr "B<util-linux>"
#. type: Plain text
-#: en/live-config.7:234
+#: en/live-config.7:232
msgid "disables util-linux' hwclock."
-msgstr "desabilita o relógio de hardware do util-linux."
+msgstr "desabilita o hwclock do util-linux"
#. type: IP
-#: en/live-config.7:236
+#: en/live-config.7:234
#, no-wrap
msgid "B<xserver-xorg>"
msgstr "B<xserver-xorg>"
#. type: Plain text
-#: en/live-config.7:238
+#: en/live-config.7:236
msgid "configures xserver-xorg."
msgstr "configura o xserver-xorg."
#. type: IP
-#: en/live-config.7:238
+#: en/live-config.7:236
#, no-wrap
msgid "B<ureadahead> (ubuntu only)"
msgstr "B<ureadahead> (apenas ubuntu)"
#. type: Plain text
-#: en/live-config.7:240
+#: en/live-config.7:238
msgid "disables ureadahead."
msgstr "desabilita ureadahead."
#. type: IP
-#: en/live-config.7:240
+#: en/live-config.7:238
#, no-wrap
msgid "B<openssh-server>"
msgstr "B<openssh-server>"
#. type: Plain text
-#: en/live-config.7:242
+#: en/live-config.7:240
msgid "recreates openssh-server host keys."
-msgstr "recriar chaves do servidor openssh"
+msgstr "recria chaves do servidor openssh"
#. type: IP
-#: en/live-config.7:242
+#: en/live-config.7:240
#, no-wrap
msgid "B<hooks>"
msgstr "B<hooks>"
#. type: Plain text
-#: en/live-config.7:244
+#: en/live-config.7:242
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
@@ -1458,112 +1439,112 @@ msgstr ""
"mídia live ou um servidor http/ftp."
#. type: SH
-#: en/live-config.7:245
+#: en/live-config.7:243
#, no-wrap
msgid "FILES"
msgstr "ARQUIVOS"
#. type: IP
-#: en/live-config.7:246
+#: en/live-config.7:244
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr "B</etc/live/config.conf>"
#. type: IP
-#: en/live-config.7:247
+#: en/live-config.7:245
#, no-wrap
msgid "B</etc/live/config.d/*.conf>"
msgstr "B</etc/live/config.d/*.conf>"
#. type: IP
-#: en/live-config.7:248
+#: en/live-config.7:246
#, no-wrap
msgid "B<live/config.conf>"
msgstr "B<live/config.conf>"
#. type: IP
-#: en/live-config.7:249
+#: en/live-config.7:247
#, no-wrap
msgid "B<live/config.d/*.conf>"
msgstr "B<live/config.d/*.conf>"
#. type: IP
-#: en/live-config.7:250
+#: en/live-config.7:248
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr "B</lib/live/config.sh>"
#. type: IP
-#: en/live-config.7:251
+#: en/live-config.7:249
#, no-wrap
msgid "B</lib/live/config/>"
msgstr "B</lib/live/config/>"
#. type: IP
-#: en/live-config.7:252
+#: en/live-config.7:250
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr "B</var/lib/live/config/>"
#. type: IP
-#: en/live-config.7:253
+#: en/live-config.7:251
#, no-wrap
msgid "B</var/log/live/config.log>"
msgstr "B</var/log/live/config.log>"
#. type: IP
-#: en/live-config.7:255
+#: en/live-config.7:253
#, no-wrap
msgid "B</live/hooks/*>"
msgstr "B</live/hooks/*>"
#. type: IP
-#: en/live-config.7:256
+#: en/live-config.7:254
#, no-wrap
msgid "B<live/hooks/*>"
msgstr "B<live/hooks/*>"
#. type: IP
-#: en/live-config.7:257
+#: en/live-config.7:255
#, no-wrap
msgid "B</live/preseed/*>"
msgstr "B</live/preseed/*>"
#. type: IP
-#: en/live-config.7:258
+#: en/live-config.7:256
#, no-wrap
msgid "B<live/preseed/* >"
msgstr "B<live/preseed/* >"
#. type: SH
-#: en/live-config.7:260
+#: en/live-config.7:258
#, no-wrap
msgid "SEE ALSO"
msgstr "VER TAMBÉM"
#. type: Plain text
-#: en/live-config.7:262
+#: en/live-config.7:260
msgid "I<live-boot>(7)"
msgstr "I<live-boot>(7)"
#. type: Plain text
-#: en/live-config.7:264
+#: en/live-config.7:262
msgid "I<live-build>(7)"
msgstr "I<live-build>(7)"
#. type: Plain text
-#: en/live-config.7:266
+#: en/live-config.7:264
msgid "I<live-tools>(7)"
msgstr "I<live-tools>(7)"
#. type: SH
-#: en/live-config.7:267
+#: en/live-config.7:265
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-config.7:269
+#: en/live-config.7:267
msgid ""
"More information about live-config and the Debian Live project can be found "
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -1574,32 +1555,32 @@ msgstr ""
"disponível em E<lt>I<http://live.debian.net/manual/>E<gt>."
#. type: SH
-#: en/live-config.7:270
+#: en/live-config.7:268
#, no-wrap
msgid "BUGS"
msgstr "BUGS"
#. type: Plain text
-#: en/live-config.7:272
+#: en/live-config.7:270
msgid ""
"Bugs can be reported by submitting a bugreport for the live-config package "
"in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or "
"by writing a mail to the Debian Live mailing list at E<lt>I<debian-"
"live at lists.debian.org>E<gt>."
msgstr ""
-"Bugs podem ser relatados através da submissão de um reporte de bug para o "
+"Bugs podem ser reportados através da submissão de um relatório de bug para o "
"pacote live-config através do Debian Bug Tracking System em E<lt>I<http://"
"bugs.debian.org/>E<gt> ou enviando um email para a lista de discussão Debian "
"Live em E<lt>I<debian-live at lists.debian.org>E<gt>."
#. type: SH
-#: en/live-config.7:273
+#: en/live-config.7:271
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-config.7:274
+#: en/live-config.7:272
msgid ""
"live-config was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
msgstr ""
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 88fbeab..829f0f7 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: 2012-07-24 18:12+0300\n"
+"POT-Creation-Date: 2012-07-29 02:08+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"
@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-07-24"
+msgid "2012-07-29"
msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~b1-1"
+msgid "3.0~b2-1"
msgstr ""
#. type: TH
@@ -334,8 +334,10 @@ msgstr ""
#: en/live-config.7:67
msgid ""
"Allows to change the keyboard variants. If more than one is specified, the "
-"tools of the desktop environment will allow to switch it under X11. There is "
-"no default value set."
+"same number of values as keyboard-layouts values should be specified as they "
+"will be matched one-to-one in the order specified. Blank values are allowed. "
+"The tools of the desktop environment will allow to switch between each "
+"layout and variant pair under X11. There is no default value set."
msgstr ""
#. type: IP
@@ -346,7 +348,7 @@ msgstr ""
#. type: Plain text
#: en/live-config.7:69
-msgid "Allows to change the keyboard options. There are no default value set."
+msgid "Allows to change the keyboard options. There is no default value set."
msgstr ""
#. type: IP
@@ -1066,13 +1068,13 @@ msgid "configures sysv-rc by disabling listed services."
msgstr ""
#. type: IP
-#: en/live-config.7:204 en/live-config.7:234
+#: en/live-config.7:204 en/live-config.7:232
#, no-wrap
msgid "B<login>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:206 en/live-config.7:236
+#: en/live-config.7:206 en/live-config.7:234
msgid "disables lastlog."
msgstr ""
@@ -1123,267 +1125,255 @@ msgstr ""
#. type: IP
#: en/live-config.7:214
#, no-wrap
-msgid "B<initramfs-tools>"
-msgstr ""
-
-#. type: Plain text
-#: en/live-config.7:216
-msgid ""
-"makes update-initramfs to also update the live media when using persistency."
-msgstr ""
-
-#. type: IP
-#: en/live-config.7:216
-#, no-wrap
msgid "B<kaboom>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:218
+#: en/live-config.7:216
msgid "disables KDE migration wizard (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:218
+#: en/live-config.7:216
#, no-wrap
msgid "B<kde-services>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:220
+#: en/live-config.7:218
msgid "disables some unwanted KDE services (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:220
+#: en/live-config.7:218
#, no-wrap
msgid "B<debian-installer-launcher>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:222
+#: en/live-config.7:220
msgid "adds debian-installer-launcher on users desktop."
msgstr ""
#. type: IP
-#: en/live-config.7:222
+#: en/live-config.7:220
#, no-wrap
msgid "B<module-init-tools>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:224
+#: en/live-config.7:222
msgid "automatically load some modules on some architectures."
msgstr ""
#. type: IP
-#: en/live-config.7:224
+#: en/live-config.7:222
#, no-wrap
msgid "B<policykit>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:226
+#: en/live-config.7:224
msgid "grant user privilegies through policykit."
msgstr ""
#. type: IP
-#: en/live-config.7:226
+#: en/live-config.7:224
#, no-wrap
msgid "B<sslcert>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:228
+#: en/live-config.7:226
msgid "regenerating ssl snake-oil certificates."
msgstr ""
#. type: IP
-#: en/live-config.7:228
+#: en/live-config.7:226
#, no-wrap
msgid "B<update-notifier>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:230
+#: en/live-config.7:228
msgid "disables update-notifier."
msgstr ""
#. type: IP
-#: en/live-config.7:230
+#: en/live-config.7:228
#, no-wrap
msgid "B<anacron>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:232
+#: en/live-config.7:230
msgid "disables anacron."
msgstr ""
#. type: IP
-#: en/live-config.7:232
+#: en/live-config.7:230
#, no-wrap
msgid "B<util-linux>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:234
+#: en/live-config.7:232
msgid "disables util-linux' hwclock."
msgstr ""
#. type: IP
-#: en/live-config.7:236
+#: en/live-config.7:234
#, no-wrap
msgid "B<xserver-xorg>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:238
+#: en/live-config.7:236
msgid "configures xserver-xorg."
msgstr ""
#. type: IP
-#: en/live-config.7:238
+#: en/live-config.7:236
#, no-wrap
msgid "B<ureadahead> (ubuntu only)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:240
+#: en/live-config.7:238
msgid "disables ureadahead."
msgstr ""
#. type: IP
-#: en/live-config.7:240
+#: en/live-config.7:238
#, no-wrap
msgid "B<openssh-server>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:242
+#: en/live-config.7:240
msgid "recreates openssh-server host keys."
msgstr ""
#. type: IP
-#: en/live-config.7:242
+#: en/live-config.7:240
#, no-wrap
msgid "B<hooks>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:244
+#: en/live-config.7:242
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
msgstr ""
#. type: SH
-#: en/live-config.7:245
+#: en/live-config.7:243
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/live-config.7:246
+#: en/live-config.7:244
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:247
+#: en/live-config.7:245
#, no-wrap
msgid "B</etc/live/config.d/*.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:248
+#: en/live-config.7:246
#, no-wrap
msgid "B<live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:249
+#: en/live-config.7:247
#, no-wrap
msgid "B<live/config.d/*.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:250
+#: en/live-config.7:248
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr ""
#. type: IP
-#: en/live-config.7:251
+#: en/live-config.7:249
#, no-wrap
msgid "B</lib/live/config/>"
msgstr ""
#. type: IP
-#: en/live-config.7:252
+#: en/live-config.7:250
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr ""
#. type: IP
-#: en/live-config.7:253
+#: en/live-config.7:251
#, no-wrap
msgid "B</var/log/live/config.log>"
msgstr ""
#. type: IP
-#: en/live-config.7:255
+#: en/live-config.7:253
#, no-wrap
msgid "B</live/hooks/*>"
msgstr ""
#. type: IP
-#: en/live-config.7:256
+#: en/live-config.7:254
#, no-wrap
msgid "B<live/hooks/*>"
msgstr ""
#. type: IP
-#: en/live-config.7:257
+#: en/live-config.7:255
#, no-wrap
msgid "B</live/preseed/*>"
msgstr ""
#. type: IP
-#: en/live-config.7:258
+#: en/live-config.7:256
#, no-wrap
msgid "B<live/preseed/* >"
msgstr ""
#. type: SH
-#: en/live-config.7:260
+#: en/live-config.7:258
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-config.7:262
+#: en/live-config.7:260
msgid "I<live-boot>(7)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:264
+#: en/live-config.7:262
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:266
+#: en/live-config.7:264
msgid "I<live-tools>(7)"
msgstr ""
#. type: SH
-#: en/live-config.7:267
+#: en/live-config.7:265
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-config.7:269
+#: en/live-config.7:267
msgid ""
"More information about live-config and the Debian Live project can be found "
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -1391,13 +1381,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:270
+#: en/live-config.7:268
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-config.7:272
+#: en/live-config.7:270
msgid ""
"Bugs can be reported by submitting a bugreport for the live-config package "
"in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or "
@@ -1406,13 +1396,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:273
+#: en/live-config.7:271
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-config.7:274
+#: en/live-config.7:272
msgid ""
"live-config was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
msgstr ""
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 9c7fd99..a718705 100644
--- a/manpages/pt_BR/live-config.pt_BR.7
+++ b/manpages/pt_BR/live-config.pt_BR.7
@@ -1,7 +1,7 @@
.\" live-config(7) - System Configuration Scripts
.\" Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
.\"
-.\" live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+.\" This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
.\" This is free software, and you are welcome to redistribute it
.\" under certain conditions; see COPYING for details.
.\"
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 24\-07\-2012 3.0~b1\-1 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 29\-07\-2012 3.0~b2\-1 "Projeto Debian Live"
.SH NOME
\fBlive\-config\fP \- Scripts para Configuração do Sistema
@@ -100,34 +100,36 @@ Permite definir se o sistema deve assumir que o relógio do hardware está
configurado para UTC ou não. O padrão é 'yes'.
.IP "\fBlive\-config.keyboard\-model\fP=\fIMODELO_DO_TECLADO\fP | \fBkeyboard\-model\fP=\fIMODELO_DO_TECLADO\fP" 4
Permite configurar o modelo do teclado. Não há valor padrão definido.
-.IP "\fBlive\-config.keyboard\-layouts\fP=\fILAYOUT1_DO_TECLADO\fP,\fILAYOUT2_DO_TECLADO\fP ... \fILAYOUTn_DO_TECLADO\fP | \fBkeyboard\-layouts\fP=\fILAYOUT1_DO_TECLADO\fP,\fILAYOUT2_DO_TECLADO\fP ... \fILAYOUTn_DO_TECLADO\fP" 4
-Permite configurar layouts de teclado. Se mais de um layout for
+.IP "\fBlive\-config.keyboard\-layouts\fP=\fILEIAUTE1_DO_TECLADO\fP,\fILEIAUTE2_DO_TECLADO\fP ... \fILEIAUTEn_DO_TECLADO\fP | \fBkeyboard\-layouts\fP=\fILEIAUTE1_DO_TECLADO\fP,\fILEIAUTE2_DO_TECLADO\fP ... \fILEIAUTEn_DO_TECLADO\fP" 4
+Permite configurar leiautes de teclado. Se mais de um leiaute for
especificado, as ferramentas do ambiente desktop possibilitarão a troca
entre eles no X11. Não há valor padrão definido.
-.IP "\fBlive\-config.keyboard\-variants\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP ... \fIKEYBOARD_VARIANTn\fP | \fBkeyboard\-variants\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP ... \fIKEYBOARD_VARIANTn\fP" 4
-Allows to change the keyboard variants. If more than one is specified, the
-tools of the desktop environment will allow to switch it under X11. There is
-no default value set.
+.IP "\fBlive\-config.keyboard\-variants\fP=\fIVARIANTE1_DO_TECLADO\fP,\fIVARIANTE2_DO_TECLADO\fP ... \fIVARIANTEn_DO_TECLADO\fP | \fBkeyboard\-variants\fP=\fIVARIANTE1_DO_TECLADO\fP,\fIVARIANTE2_DO_TECLADO\fP ... \fIVARIANTEn_DO_TECLADO\fP" 4
+Permite configurar as variantes de teclado. Se mais de uma for especificada,
+um mesmo número de valores para leiautes deve ser definido, uma vez que
+estes serão combinados um a um na ordem especificada. Valores em branco são
+permitidos. As ferramentas do ambiente de trabalho possibilitarão a troca
+entre cada par leiaute/variante no X11. Não há valor padrão definido.
.IP "\fBlive\-config.keyboard\-options\fP=\fIOPÇÕES_DE_TECLADO\fP | \fBkeyboard\-options\fP=\fIOPÇÕES_DE_TECLADO\fP" 4
Permite configurar as opções de teclado. Não há valor padrão definido.
.IP "\fBlive\-config.sysv\-rc\fP=\fISERVIÇO1\fP,\fISERVIÇO2\fP ... \fISERVIÇOn\fP | \fBsysv\-rc\fP=\fISERVIÇO1\fP,\fISERVIÇO2\fP ... \fISERVIÇOn\fP" 4
-Permite desabilitar serviços sysv através do update\-rc.d.
+Permite desabilitar serviços sysv via update\-rc.d.
.IP "\fBlive\-config.x\-session\-manager=\fP\fIGERENCIADOR_DE_SESSÕES_DO_X\fP | \fBx\-session\-manager\fP=\fIGERENCIADOR_DE_SESSÕES_DO_X\fP" 4
Permite definir o gerenciador de sessões do X através do
update\-alternatives.
.IP "\fBlive\-config.xorg\-driver\fP=\fIDRIVER_DO_XORG\fP | \fBxorg\-driver\fP=\fIDRIVER_DO_XORG\fP" 4
-Permite definir o driver do xorg ao invés de auto\-detectá\-lo.
+Permite definir o driver do xorg em vez de detectá\-lo automaticamente.
.IP "\fBlive\-config.xorg\-resolution\fP=\fIRESOLUÇÃO_DO_XORG\fP | \fBxorg\-resolution\fP=\fIRESOLUÇÃO_DO_XORG\fP" 4
-Permite definir a resolução do xorg ao invés de auto\-detectá\-la, por
-exemplo, 1024x768.
+Permite definir a resolução do xorg em vez de detectá\-la automaticamente,
+por exemplo, 1024x768.
.IP "\fBlive\-config.hooks\fP=filesystem|medium|\fIURL1\fP|\fIURL2\fP| ... |\fIURLn\fP | \fBhooks\fP=medium|filesystem|\fIURL1\fP|\fIURL2\fP| ... |\fIURLn\fP" 4
Permite obter e executar um ou mais arquivos arbitrários. Note que as URLs
precisam ser acessíveis por wget (http, ftp ou file://), que os arquivos são
executados no diretório /tmp do sistema de arquivos em execução, e que os
arquivos precisam que suas dependências, se houverem, estejam
-instaladas. Por exemplo, se um script python deve ser executado, python deve
-estar instalado no sistema. Alguns hooks para alguns casos de uso comuns
-estão disponíveis em /usr/share/doc/live\-config/examples/hooks/ e
+instaladas. Por exemplo, se um script python necessita ser executado, python
+deve estar instalado no sistema. Alguns hooks para casos de uso comuns estão
+disponíveis em /usr/share/doc/live\-config/examples/hooks/ e
<\fIhttp://live.debian.net/other/hooks\fP>.
.br
Se o arquivo estiver na mídia live, ele pode ser obtido através de
@@ -222,14 +224,14 @@ Esta variável é equivalente ao parâmetro '\fBlive\-config.utc\fP=\fByes\fP|no
.IP \fBLIVE_KEYBOARD_MODEL\fP=\fIMODELO_DE_TECLADO\fP 4
Esta variável é equivalente ao parâmetro
\&'\fBlive\-config.keyboard\-model\fP=\fIMODELO_DE_TECLADO\fP'.
-.IP "\fBLIVE_KEYBOARD_LAYOUTS\fP=\fILAYOUT1_DE_TECLADO\fP,\fILAYOUT2_DE_TECLADO\fP ... \fILAYOUTn_DE_TECLADO\fP" 4
+.IP "\fBLIVE_KEYBOARD_LAYOUTS\fP=\fILEIAUTE1_DE_TECLADO\fP,\fILEIAUTE2_DE_TECLADO\fP ... \fILEIAUTEn_DE_TECLADO\fP" 4
Esta variável é equivalente ao parâmetro
-\&'\fBlive\-config.keyboard\-layouts\fP=\fILAYOUT1_DE_TECLADO\fP,\fILAYOUT2_DE_TECLADO\fP
-\&... \fILAYOUTn_DE_TECLADO\fP'.
-.IP "\fBLIVE_KEYBOARD_VARIANTS\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP ... \fIKEYBOARD_VARIANTn\fP" 4
-This variable equals the
-\&'\fBlive\-config.keyboard\-variants\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP
-\&... \fIKEYBOARD_VARIANTn\fP' parameter.
+\&'\fBlive\-config.keyboard\-variants\fP=\fILEIAUTE1_DE_TECLADO\fP,\fILEIAUTE2_DE_TECLADO\fP
+\&... \fILEIAUTEn_DE_TECLADO\fP'.
+.IP "\fBLIVE_KEYBOARD_VARIANTS\fP=\fIVARIANTE1_DE_TECLADO\fP,\fIVARIANTE2_DE_TECLADO\fP ... \fIVARIANTEn_DE_TECLADO\fP" 4
+Esta variável é equivalente ao parâmetro
+\&'\fBlive\-config.keyboard\-variants\fP=\fIVARIANTE1_DE_TECLADO\fP,\fIVARIANTE2_DE_TECLADO\fP
+\&... \fIVARIANTEn_DE_TECLADO\fP'.
.IP \fBLIVE_KEYBOARD_OPTIONS\fP=\fIOPÇÕES_DE_TECLADO\fP 4
Esta variável é equivalente ao parâmetro
\&'\fBlive\-config.keyboard\-options\fP=\fIOPÇÕES_DE_TECLADO\fP'.
@@ -322,10 +324,7 @@ desabilita botão de trava para a tela.
.IP \fBgnome\-power\-manager\fP 4
desabilita hibernação.
.IP \fBgnome\-screensaver\fP 4
-desabilita o bloqueio de tela do screensaver.
-.IP \fBinitramfs\-tools\fP 4
-faz com que o update\-initramfs também atualize a mídia live quando
-persistência for usada.
+desabilita o bloqueio de tela pelo screensaver.
.IP \fBkaboom\fP 4
desabilita o assitente de migração do KDE.
.IP \fBkde\-services\fP 4
@@ -338,13 +337,13 @@ carrega alguns módulos automaticamente em algumas arquiteturas.
.IP \fBpolicykit\fP 4
concede privilégios de usuário através de policykit.
.IP \fBsslcert\fP 4
-gera novos certificados ssl.
+gera novos certificados ssl snake\-oil.
.IP \fBupdate\-notifier\fP 4
desabilita update\-notifier.
.IP \fBanacron\fP 4
desabilita anacron.
.IP \fButil\-linux\fP 4
-desabilita o relógio de hardware do util\-linux.
+desabilita o hwclock do util\-linux
.IP \fBlogin\fP 4
desabilita lastlog.
.IP \fBxserver\-xorg\fP 4
@@ -352,7 +351,7 @@ configura o xserver\-xorg.
.IP "\fBureadahead\fP (apenas ubuntu)" 4
desabilita ureadahead.
.IP \fBopenssh\-server\fP 4
-recriar chaves do servidor openssh
+recria chaves do servidor openssh
.IP \fBhooks\fP 4
permite executar comandos arbitrários a partir de um script localizado na
mídia live ou um servidor http/ftp.
@@ -385,7 +384,7 @@ encontradas na página <\fIhttp://live.debian.net/\fP> e no manual
disponível em <\fIhttp://live.debian.net/manual/\fP>.
.SH BUGS
-Bugs podem ser relatados através da submissão de um reporte de bug para o
+Bugs podem ser reportados através da submissão de um relatório de bug para o
pacote live\-config através do Debian Bug Tracking System em
<\fIhttp://bugs.debian.org/\fP> ou enviando um email para a lista de
discussão Debian Live em <\fIdebian\-live at lists.debian.org\fP>.
diff --git a/scripts/config/0010-debconf b/scripts/config/0010-debconf
index bcd5399..051be41 100755
--- a/scripts/config/0010-debconf
+++ b/scripts/config/0010-debconf
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/0020-hostname b/scripts/config/0020-hostname
index 2bbf68e..11b7a11 100755
--- a/scripts/config/0020-hostname
+++ b/scripts/config/0020-hostname
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/0030-user-setup b/scripts/config/0030-user-setup
index f43e882..43d3db5 100755
--- a/scripts/config/0030-user-setup
+++ b/scripts/config/0030-user-setup
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/0040-sudo b/scripts/config/0040-sudo
index 7796911..36f9dee 100755
--- a/scripts/config/0040-sudo
+++ b/scripts/config/0040-sudo
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/0050-locales b/scripts/config/0050-locales
index 3ea820e..faa8bce 100755
--- a/scripts/config/0050-locales
+++ b/scripts/config/0050-locales
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/0060-locales-all b/scripts/config/0060-locales-all
index 4f21338..9b84cbd 100755
--- a/scripts/config/0060-locales-all
+++ b/scripts/config/0060-locales-all
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/0070-tzdata b/scripts/config/0070-tzdata
index e261605..e4f9443 100755
--- a/scripts/config/0070-tzdata
+++ b/scripts/config/0070-tzdata
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/0080-gdm b/scripts/config/0080-gdm
index 1a184c3..d7481b5 100755
--- a/scripts/config/0080-gdm
+++ b/scripts/config/0080-gdm
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/0090-gdm3 b/scripts/config/0090-gdm3
index af8612f..dc3df61 100755
--- a/scripts/config/0090-gdm3
+++ b/scripts/config/0090-gdm3
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/0100-kdm b/scripts/config/0100-kdm
index 384205e..6b68afc 100755
--- a/scripts/config/0100-kdm
+++ b/scripts/config/0100-kdm
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/0110-lightdm b/scripts/config/0110-lightdm
index 96f9172..4d01ed5 100755
--- a/scripts/config/0110-lightdm
+++ b/scripts/config/0110-lightdm
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/0120-lxdm b/scripts/config/0120-lxdm
index 82a4628..8131afa 100755
--- a/scripts/config/0120-lxdm
+++ b/scripts/config/0120-lxdm
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/0130-nodm b/scripts/config/0130-nodm
index c05eb83..f7fec66 100755
--- a/scripts/config/0130-nodm
+++ b/scripts/config/0130-nodm
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/0140-slim b/scripts/config/0140-slim
index 8df250c..4804beb 100755
--- a/scripts/config/0140-slim
+++ b/scripts/config/0140-slim
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/0150-xinit b/scripts/config/0150-xinit
index 9460cab..c169632 100755
--- a/scripts/config/0150-xinit
+++ b/scripts/config/0150-xinit
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/0160-keyboard-configuration b/scripts/config/0160-keyboard-configuration
index bc7da48..4fb2816 100755
--- a/scripts/config/0160-keyboard-configuration
+++ b/scripts/config/0160-keyboard-configuration
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/0170-sysvinit b/scripts/config/0170-sysvinit
index a9569c9..419b9e5 100755
--- a/scripts/config/0170-sysvinit
+++ b/scripts/config/0170-sysvinit
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/0180-sysv-rc b/scripts/config/0180-sysv-rc
index 325e24a..2e43d28 100755
--- a/scripts/config/0180-sysv-rc
+++ b/scripts/config/0180-sysv-rc
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/0190-upstart b/scripts/config/0190-upstart
index 919f580..b21ae62 100755
--- a/scripts/config/0190-upstart
+++ b/scripts/config/0190-upstart
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/1010-apport b/scripts/config/1010-apport
index 3563181..659ed60 100755
--- a/scripts/config/1010-apport
+++ b/scripts/config/1010-apport
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/1020-gnome-panel-data b/scripts/config/1020-gnome-panel-data
index 3742603..0aa0b5d 100755
--- a/scripts/config/1020-gnome-panel-data
+++ b/scripts/config/1020-gnome-panel-data
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/1030-gnome-power-manager b/scripts/config/1030-gnome-power-manager
index 5b44597..dc2884a 100755
--- a/scripts/config/1030-gnome-power-manager
+++ b/scripts/config/1030-gnome-power-manager
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/1040-gnome-screensaver b/scripts/config/1040-gnome-screensaver
index e4ec0f1..d30a523 100755
--- a/scripts/config/1040-gnome-screensaver
+++ b/scripts/config/1040-gnome-screensaver
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/1050-initramfs-tools b/scripts/config/1050-initramfs-tools
deleted file mode 100755
index d1e8d09..0000000
--- a/scripts/config/1050-initramfs-tools
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
-##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-Initramfs_tools ()
-{
- # Checking if package is installed or already configured
- if [ ! -e /var/lib/dpkg/info/initramfs-tools.list ] || \
- [ -e /var/lib/live/config/initramfs-tools ]
- then
- return
- fi
-
- echo -n " initramfs-tools"
-
- Configure_update_initramfs
-}
-
-Configure_update_initramfs ()
-{
- # Checking if apckage is already configured differently
- if [ -e /usr/sbin/update-initramfs.debian ]
- then
- return
- fi
-
- # Possibly disabling update-initramfs (useless on a live CD)
-
- # Diverting /usr/sbin/update-initramfs
- dpkg-divert --quiet --package live-config --add --rename --divert /usr/sbin/update-initramfs.debian /usr/sbin/update-initramfs
-
- # rw is guaranteed to be first.
- if [ -w /cdrom ] && grep -q ' /cdrom rw[, ]' /proc/self/mountinfo
- then
- # live-media is writable
-
-cat > /usr/sbin/update-initramfs << 'EOF'
-#!/bin/sh
-
-# Updating initramfs
-update-initramfs.debian "${@}"
-
-if [ -e /initrd.img ]
-then
- _DIRECTORY=""
-else
- _DIRECTORY="/boot"
-fi
-
-# Copying kernel and initrd to live media
-if [ -e /cdrom/live/initrd.lz ]
-then
- zcat "${_DIRECTORY}/initrd.img" | lzma -9c > /cdrom/live/initrd.lz.new
- mv /cdrom/live/initrd.lz.new /cdrom/live/initrd.lz
-else
- cp "${_DIRECTORY}/initrd.img" /cdrom/live/initrd.gz.new
- mv /cdrom/live/initrd.gz.new /cdrom/live/initrd.gz
-fi
-
-cp "${_DIRECTORY}/vmlinuz" /cdrom/live/vmlinuz.new
-mv /cdrom/live/vmlinuz.new /cdrom/live/vmlinuz
-EOF
-
- else
- # live-media is read-only
-
-cat > /usr/sbin/update-initramfs << EOF
-#!/bin/sh
-
-echo "I: update-initramfs is disabled (live system is running on read-only media)."
-EOF
-
-fi
-
- chmod 0755 /usr/sbin/update-initramfs
-
- # Creating state file
- touch /var/lib/live/config/initramfs-tools
-}
-
-Initramfs_tools
diff --git a/scripts/config/1060-kaboom b/scripts/config/1050-kaboom
similarity index 91%
rename from scripts/config/1060-kaboom
rename to scripts/config/1050-kaboom
index 89d090e..3ffd05c 100755
--- a/scripts/config/1060-kaboom
+++ b/scripts/config/1050-kaboom
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/1070-kde-services b/scripts/config/1060-kde-services
similarity index 96%
rename from scripts/config/1070-kde-services
rename to scripts/config/1060-kde-services
index 9751d15..199fd6a 100755
--- a/scripts/config/1070-kde-services
+++ b/scripts/config/1060-kde-services
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/1080-debian-installer-launcher b/scripts/config/1070-debian-installer-launcher
similarity index 95%
rename from scripts/config/1080-debian-installer-launcher
rename to scripts/config/1070-debian-installer-launcher
index fd237fc..eedddfd 100755
--- a/scripts/config/1080-debian-installer-launcher
+++ b/scripts/config/1070-debian-installer-launcher
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/1090-module-init-tools b/scripts/config/1080-module-init-tools
similarity index 92%
rename from scripts/config/1090-module-init-tools
rename to scripts/config/1080-module-init-tools
index c987e28..d53ad35 100755
--- a/scripts/config/1090-module-init-tools
+++ b/scripts/config/1080-module-init-tools
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/1100-policykit b/scripts/config/1090-policykit
similarity index 96%
rename from scripts/config/1100-policykit
rename to scripts/config/1090-policykit
index 0726123..89c9a6d 100755
--- a/scripts/config/1100-policykit
+++ b/scripts/config/1090-policykit
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/1110-sslcert b/scripts/config/1100-sslcert
similarity index 88%
rename from scripts/config/1110-sslcert
rename to scripts/config/1100-sslcert
index fa1df44..afc2275 100755
--- a/scripts/config/1110-sslcert
+++ b/scripts/config/1100-sslcert
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/1120-update-notifier b/scripts/config/1110-update-notifier
similarity index 94%
rename from scripts/config/1120-update-notifier
rename to scripts/config/1110-update-notifier
index 0d352e5..8b0ebb9 100755
--- a/scripts/config/1120-update-notifier
+++ b/scripts/config/1110-update-notifier
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/1130-anacron b/scripts/config/1120-anacron
similarity index 91%
rename from scripts/config/1130-anacron
rename to scripts/config/1120-anacron
index 22fa99b..98aa1d0 100755
--- a/scripts/config/1130-anacron
+++ b/scripts/config/1120-anacron
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/1140-util-linux b/scripts/config/1130-util-linux
similarity index 88%
rename from scripts/config/1140-util-linux
rename to scripts/config/1130-util-linux
index d767347..3c604de 100755
--- a/scripts/config/1140-util-linux
+++ b/scripts/config/1130-util-linux
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/1150-login b/scripts/config/1140-login
similarity index 89%
rename from scripts/config/1150-login
rename to scripts/config/1140-login
index cbc157f..21362e5 100755
--- a/scripts/config/1150-login
+++ b/scripts/config/1140-login
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/1160-xserver-xorg b/scripts/config/1150-xserver-xorg
similarity index 97%
rename from scripts/config/1160-xserver-xorg
rename to scripts/config/1150-xserver-xorg
index 01fde3a..94fcc03 100755
--- a/scripts/config/1160-xserver-xorg
+++ b/scripts/config/1150-xserver-xorg
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/1170-ureadahead b/scripts/config/1160-ureadahead
similarity index 89%
rename from scripts/config/1170-ureadahead
rename to scripts/config/1160-ureadahead
index 8d6f083..af983f2 100755
--- a/scripts/config/1170-ureadahead
+++ b/scripts/config/1160-ureadahead
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/1180-openssh-server b/scripts/config/1170-openssh-server
similarity index 92%
rename from scripts/config/1180-openssh-server
rename to scripts/config/1170-openssh-server
index f6d253a..318ada1 100755
--- a/scripts/config/1180-openssh-server
+++ b/scripts/config/1170-openssh-server
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git a/scripts/config/9990-hooks b/scripts/config/9990-hooks
index e177430..d0b6e18 100755
--- a/scripts/config/9990-hooks
+++ b/scripts/config/9990-hooks
@@ -3,7 +3,7 @@
## live-config(7) - System Configuration Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
--
live-config
More information about the debian-live-changes
mailing list