[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-driver/debian (23 files)

Steve Kowalik stevenk@haydn.debian.org
Tue, 31 Aug 2004 21:16:44 -0600


    Date: Tuesday, August 31, 2004 @ 21:16:44
  Author: stevenk
    Path: /cvsroot/pkg-alsa/debian/alsa-driver/debian

Modified: alsa-base.conf alsa-base.config alsa-base.dirs alsa-base.init
          alsa-base.postinst alsa-base.templates alsa-modules.postinst
          alsa-modules.postrm changelog po/ca.po po/cs.po po/da.po
          po/de.po po/es.po po/fr.po po/ja.po po/nb.po po/nl.po
          po/pt_BR.po po/ru.po po/sv.po po/templates.pot po/tr.po

- Update the changelog, due to Thomas Hood playing in our playground.
- Rename 'autosave always' to 'always autosave', since having 'autosave
  always' and 'never autosave' will apparently confuse people.
- Change the default value of alsactl_store_on_shutdown to 'always autosave'.
  Also rewrite the comment to list the 3 settings, and what the 3 settings
  do. Also change the postinst to only run alsactl store if the value is
  'always autosave'. 
- Go through /etc/default/alsa in alsa-base's .config and db_set before
  db_input.
- Stop using /var/lib/alsa-base in alsa-modules, and don't create the
  directory in alsa-base.


-----------------------+
 alsa-base.conf        |    9 ++++++---
 alsa-base.config      |    6 ++++++
 alsa-base.dirs        |    1 -
 alsa-base.init        |    2 +-
 alsa-base.postinst    |    2 +-
 alsa-base.templates   |    4 ++--
 alsa-modules.postinst |   35 -----------------------------------
 alsa-modules.postrm   |   16 ----------------
 changelog             |   14 +++++++++++---
 po/ca.po              |   12 ++++++++----
 po/cs.po              |   12 ++++++++----
 po/da.po              |   12 ++++++++----
 po/de.po              |    6 +++---
 po/es.po              |   33 +++++++++++++++++++--------------
 po/fr.po              |   12 ++++++++----
 po/ja.po              |   12 ++++++++----
 po/nb.po              |    6 +++---
 po/nl.po              |   16 ++++++++++------
 po/pt_BR.po           |   12 ++++++++----
 po/ru.po              |    6 +++---
 po/sv.po              |    6 +++---
 po/templates.pot      |    6 +++---
 po/tr.po              |    6 +++---
 23 files changed, 122 insertions(+), 124 deletions(-)


Index: debian/alsa-driver/debian/alsa-base.conf
diff -u debian/alsa-driver/debian/alsa-base.conf:1.5 debian/alsa-driver/debian/alsa-base.conf:1.6
--- debian/alsa-driver/debian/alsa-base.conf:1.5	Sun Aug 29 18:19:23 2004
+++ debian/alsa-driver/debian/alsa-base.conf	Tue Aug 31 21:16:40 2004
@@ -2,9 +2,12 @@
 # Don't edit this file directly! Use dpkg-reconfigure alsa-base to change 
 # the values in this file.
 
-# Set as false if you don't want the init script running
-# 'alsactl store' on shutdown.
-alsactl_store_on_shutdown=true
+# alsactl_store_on_shutdown is used to determine when alsactl store will be
+# run. If the setting is 'autosave always', the mixer settings will be saved
+# shutdown. If the setting is 'autosave once at next shutdown', the mixer
+# settings will be saved on the next shutdown, and never again. If the setting
+# is 'never autosave', the settings will never be saved.
+alsactl_store_on_shutdown="always autosave"
 
 # runlevels_save is used to determine in which runlevels (and from which
 # runlevels) mixer settings will be saved. The default value of '[2-5]' will
Index: debian/alsa-driver/debian/alsa-base.config
diff -u debian/alsa-driver/debian/alsa-base.config:1.39 debian/alsa-driver/debian/alsa-base.config:1.40
--- debian/alsa-driver/debian/alsa-base.config:1.39	Tue Apr 20 15:34:26 2004
+++ debian/alsa-driver/debian/alsa-base.config	Tue Aug 31 21:16:40 2004
@@ -11,6 +11,12 @@
   fi
 done
 
+if [ -f /etc/default/alsa ]; then
+    ALSASTORE=$(grep alsactl_store_on_shutdown /etc/default/alsa 2>/dev/null)
+    ALSASTORE=$(echo $ALSASTORE | cut -d= -f2)
+    db_set alsa-base/alsactl_store_on_shutdown $ALSASTORE || true
+fi
+
 db_input low alsa-base/alsactl_store_on_shutdown || true
 db_go
 
Index: debian/alsa-driver/debian/alsa-base.dirs
diff -u debian/alsa-driver/debian/alsa-base.dirs:1.3 debian/alsa-driver/debian/alsa-base.dirs:1.4
--- debian/alsa-driver/debian/alsa-base.dirs:1.3	Tue Apr 20 15:34:26 2004
+++ debian/alsa-driver/debian/alsa-base.dirs	Tue Aug 31 21:16:40 2004
@@ -1,5 +1,4 @@
 usr/share/alsa-base
-var/lib/alsa-base
 etc/hotplug/blacklist.d
 etc/modutils
 etc/modprobe.d
Index: debian/alsa-driver/debian/alsa-base.init
diff -u debian/alsa-driver/debian/alsa-base.init:1.47 debian/alsa-driver/debian/alsa-base.init:1.48
--- debian/alsa-driver/debian/alsa-base.init:1.47	Sun Aug 29 18:19:23 2004
+++ debian/alsa-driver/debian/alsa-base.init	Tue Aug 31 21:16:40 2004
@@ -11,7 +11,7 @@
 fi
 
 # Default settings
-alsactl_store_on_shutdown="autosave always"
+alsactl_store_on_shutdown="always autosave"
 runlevels_save='[2-5]'
 
 [ -e /etc/default/alsa ] && . /etc/default/alsa
Index: debian/alsa-driver/debian/alsa-base.postinst
diff -u debian/alsa-driver/debian/alsa-base.postinst:1.38 debian/alsa-driver/debian/alsa-base.postinst:1.39
--- debian/alsa-driver/debian/alsa-base.postinst:1.38	Wed Apr 28 06:17:59 2004
+++ debian/alsa-driver/debian/alsa-base.postinst	Tue Aug 31 21:16:41 2004
@@ -49,7 +49,7 @@
 	;;
 esac
 
-if [ -z "$alsactl_store_on_shutdown" -o "$alsactl_store_on_shutdown" = 'true' ]; then
+if [ -z "$alsactl_store_on_shutdown" -o "$alsactl_store_on_shutdown" = 'autosave always' -o "$alsactl_store_on_shutdown" = 'always autosave' ]; then
     alsactl store >/dev/null 2>&1 || true
 fi
 
Index: debian/alsa-driver/debian/alsa-base.templates
diff -u debian/alsa-driver/debian/alsa-base.templates:1.8 debian/alsa-driver/debian/alsa-base.templates:1.9
--- debian/alsa-driver/debian/alsa-base.templates:1.8	Tue Apr 20 15:34:26 2004
+++ debian/alsa-driver/debian/alsa-base.templates	Tue Aug 31 21:16:41 2004
@@ -1,7 +1,7 @@
 Template: alsa-base/alsactl_store_on_shutdown
 Type: select
-_Choices: autosave always, autosave once at next shutdown, never autosave
-_Default: autosave always
+_Choices: always autosave, autosave once at next shutdown, never autosave
+_Default: always autosave
 _Description: Save mixer settings across reboots?
  Should the ALSA init script store your mixer settings on shutdown? This 
  option is for people who change their mixer settings, and want to keep their
Index: debian/alsa-driver/debian/alsa-modules.postinst
diff -u debian/alsa-driver/debian/alsa-modules.postinst:1.6 debian/alsa-driver/debian/alsa-modules.postinst:1.7
--- debian/alsa-driver/debian/alsa-modules.postinst:1.6	Tue Mar 16 16:28:18 2004
+++ debian/alsa-driver/debian/alsa-modules.postinst	Tue Aug 31 21:16:41 2004
@@ -2,42 +2,7 @@
 
 set -e
 
-modulesdb=/var/lib/alsa-base/modules/_MAJORVERSION_
-
-case "$1" in
-	configure)
-		if [ ! -f "$modulesdb" ]; then
-	   	    echo "alsa-modules-_KVERS_" > "$modulesdb"
-		elif ! grep -Eq "^alsa-modules-_KVERS_$" "$modulesdb"; then
-	  	    echo "alsa-modules-_KVERS_" >> "$modulesdb"
-		fi 
-		;;
-	abort-upgrade|abort-remove|abort-deconfigure)
-		exit 0
-	;;
-	*)
-		echo "postinst called with unknown argument: $1" >&2
-		exit 0
-	;;
-esac
-
 depmod -a -F /boot/System.map-_KVERS_ _KVERS_ || :
-
-if [ -s /etc/alsa/modutils/_MAJORVERSION_ ]; then
-	echo "Configuration file for ALSA _MAJORVERSION_ exists."
-	if [ $(uname -r) = "_KVERS_" ]; then
-		echo "Attempting to start."
-		echo
-		invoke-rc.d alsa restart
-	fi
-else
-	echo "No configuration file found for ALSA _MAJORVERSION_."
-	egfile="/usr/share/alsa-base/modules-snippet.conf"
-	if [ -f "$egfile" ]; then
-		echo "Copying example file to /etc/alsa/modutils/_MAJORVERSION_."
-		cp "$egfile" /etc/alsa/modutils/_MAJORVERSION_
-	fi
-fi
 
 exit 0
 
Index: debian/alsa-driver/debian/alsa-modules.postrm
diff -u debian/alsa-driver/debian/alsa-modules.postrm:1.3 debian/alsa-driver/debian/alsa-modules.postrm:1.4
--- debian/alsa-driver/debian/alsa-modules.postrm:1.3	Tue Apr 15 18:57:53 2003
+++ debian/alsa-driver/debian/alsa-modules.postrm	Tue Aug 31 21:16:41 2004
@@ -2,25 +2,9 @@
 
 set -e
 
-modulesdb=/var/lib/alsa-base/modules/_MAJORVERSION_
-
 if [ "$1" = "remove" ]; then
 	if [ $(uname -r) = "_KVERS_" ]; then
 		invoke-rc.d alsa stop
-	fi
-fi
-
-if [ "$1" = "purge" ]; then
-	if [ -f "$modulesdb" ]; then
-    	grep -v alsa-modules-_KVERS_ "$modulesdb" > "$modulesdb.bak" || true
-    	mv "$modulesdb.bak" "$modulesdb"
-    	if [ ! -s "$modulesdb" ]; then
-			rm -rf /var/lib/alsa-base/modules
-		fi
-	fi
-
-	if [ -f /etc/alsa/modutils/_MAJORVERSION_ -a ! -f "$modulesdb" ]; then
-		rm /etc/alsa/modutils/_MAJORVERSION_
 	fi
 fi
 
Index: debian/alsa-driver/debian/changelog
diff -u debian/alsa-driver/debian/changelog:1.264 debian/alsa-driver/debian/changelog:1.265
--- debian/alsa-driver/debian/changelog:1.264	Mon Aug 30 02:18:58 2004
+++ debian/alsa-driver/debian/changelog	Tue Aug 31 21:16:41 2004
@@ -2,11 +2,19 @@
 
   * New upstream release.
   * Steve Kowalik:
-    - Note that /etc/default/alsa is overwritten by debconf in the file
-      itself. (Closes: #268041)
     - Sleep for five seconds before running alsactl restore.
       (Closes: #268221)
     - Fix up patches #4, #9, #10 and #15 to apply cleanly.
+    - Rename 'autosave always' to 'always autosave'. Both settings will be
+      honoured. (Closes: #269196)
+    - Change the default value of alsactl_store_on_shutdown to
+      'always autosave'. Also rewrite the comment to list the 3 settings,
+      and what the 3 settings do. Also change the postinst to only run 
+      alsactl store if the value is 'always autosave'. (Closes: #269214)
+    - Honour changes made to /etc/default/alsa in alsa-base's config
+      script. (Closes: #261924, #268041)
+    - Stop using /var/lib/alsa-base in alsa-modules, and don't create the
+      directory in alsa-base. (Closes: #269211)
     - Include a bunch of new cards in alsa-source's debconf prompting:
       + atiixp-modem: PCI: ATI IXP 150/200/250 Modem
       + cs46xx-new-dsp: Cirrus Logic (Sound Fusion) New DSP support
@@ -24,7 +32,7 @@
     - Update Catalan Debconf translation.
   * Unreleased.
 
- -- Steve Kowalik <stevenk@debian.org>  Mon, 30 Aug 2004 11:28:54 +1000
+ -- Steve Kowalik <stevenk@debian.org>  Wed,  1 Sep 2004 13:07:24 +1000
 
 alsa-driver (1.0.5a-3) unstable; urgency=low
 
Index: debian/alsa-driver/debian/po/ca.po
diff -u debian/alsa-driver/debian/po/ca.po:1.19 debian/alsa-driver/debian/po/ca.po:1.20
--- debian/alsa-driver/debian/po/ca.po:1.19	Mon Aug 30 02:18:59 2004
+++ debian/alsa-driver/debian/po/ca.po	Tue Aug 31 21:16:41 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: alsa-driver 1.0.6a-1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-23 21:25+1000\n"
+"POT-Creation-Date: 2004-09-01 13:13+1000\n"
 "PO-Revision-Date: 2004-08-30 08:45+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -17,7 +17,8 @@
 #. Type: select
 #. Choices
 #: ../alsa-base.templates:3
-msgid "autosave always, autosave once at next shutdown, never autosave"
+#, fuzzy
+msgid "always autosave, autosave once at next shutdown, never autosave"
 msgstr ""
 "desa automàticament sempre, desa automàticament una vegada en el següent "
 "reinici, no deses mai automàticament"
@@ -25,8 +26,8 @@
 #. Type: select
 #. Default
 #: ../alsa-base.templates:4
-msgid "autosave always"
-msgstr "desa automàticament sempre"
+msgid "always autosave"
+msgstr ""
 
 #. Type: select
 #. Description
@@ -103,6 +104,9 @@
 "llista. Cada selecció té el mateix nom que els arguments de l'opció del "
 "script de configuració «--with-cards-». La següent és una llista de "
 "descripcions curtes de les opcions per a mostrar què signifiquen."
+
+#~ msgid "autosave always"
+#~ msgstr "desa automàticament sempre"
 
 #~ msgid "forcibly-unload-driver, stop-procs, none"
 #~ msgstr "força-la-descàrrega-del-driver, atura-els-processos, cap"
Index: debian/alsa-driver/debian/po/cs.po
diff -u debian/alsa-driver/debian/po/cs.po:1.5 debian/alsa-driver/debian/po/cs.po:1.6
--- debian/alsa-driver/debian/po/cs.po:1.5	Mon Aug 23 05:44:09 2004
+++ debian/alsa-driver/debian/po/cs.po	Tue Aug 31 21:16:41 2004
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: alsa-drivers\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-23 21:25+1000\n"
+"POT-Creation-Date: 2004-09-01 13:13+1000\n"
 "PO-Revision-Date: 2004-05-29 17:11+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <provoz@debian.cz>\n"
@@ -26,14 +26,15 @@
 #. Type: select
 #. Choices
 #: ../alsa-base.templates:3
-msgid "autosave always, autosave once at next shutdown, never autosave"
+#, fuzzy
+msgid "always autosave, autosave once at next shutdown, never autosave"
 msgstr "ukládat v¾dy, ulo¾it pøi pøí¹tím ukonèení, nikdy neukládat"
 
 #. Type: select
 #. Default
 #: ../alsa-base.templates:4
-msgid "autosave always"
-msgstr "ukládat v¾dy"
+msgid "always autosave"
+msgstr ""
 
 #. Type: select
 #. Description
@@ -108,6 +109,9 @@
 "Mù¾ete si vybrat, pro které karty se mají sestavit ovladaèe. Ka¾dá polo¾ka "
 "je shodná s parametrem '--with-cards' konfiguraèního skriptu. Následující "
 "seznam obsahuje krátké popisy voleb."
+
+#~ msgid "autosave always"
+#~ msgstr "ukládat v¾dy"
 
 #~ msgid "forcibly-unload-driver, stop-procs, none"
 #~ msgstr "vyhodit-ovladaè-silou, zastavit-procesy, nic"
Index: debian/alsa-driver/debian/po/da.po
diff -u debian/alsa-driver/debian/po/da.po:1.2 debian/alsa-driver/debian/po/da.po:1.3
--- debian/alsa-driver/debian/po/da.po:1.2	Mon Aug 23 05:44:09 2004
+++ debian/alsa-driver/debian/po/da.po	Tue Aug 31 21:16:41 2004
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: alsa-driver 1.0.4-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-23 21:25+1000\n"
+"POT-Creation-Date: 2004-09-01 13:13+1000\n"
 "PO-Revision-Date: 2004-06-08 21:29+0200\n"
 "Last-Translator: Michael Kristensen <michael@wtf.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -27,15 +27,16 @@
 #. Type: select
 #. Choices
 #: ../alsa-base.templates:3
-msgid "autosave always, autosave once at next shutdown, never autosave"
+#, fuzzy
+msgid "always autosave, autosave once at next shutdown, never autosave"
 msgstr ""
 "gem altid automatisk, gem én gang ved næste nedlukning, gem aldrig automatisk"
 
 #. Type: select
 #. Default
 #: ../alsa-base.templates:4
-msgid "autosave always"
-msgstr "gem altid automatisk"
+msgid "always autosave"
+msgstr ""
 
 #. Type: select
 #. Description
@@ -110,3 +111,6 @@
 "udvælgning svarer til et navn fra indstillingen '--with-cards' fra "
 "konfigurationsskriptet. Det følgende er en liste med korte beskrivelser af "
 "hvad de betyder."
+
+#~ msgid "autosave always"
+#~ msgstr "gem altid automatisk"
Index: debian/alsa-driver/debian/po/de.po
diff -u debian/alsa-driver/debian/po/de.po:1.15 debian/alsa-driver/debian/po/de.po:1.16
--- debian/alsa-driver/debian/po/de.po:1.15	Mon Aug 23 05:44:09 2004
+++ debian/alsa-driver/debian/po/de.po	Tue Aug 31 21:16:41 2004
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: alsa-driver\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-23 21:25+1000\n"
+"POT-Creation-Date: 2004-09-01 13:13+1000\n"
 "PO-Revision-Date: 2003-12-06 19:20+0100\n"
 "Last-Translator: Patrick Willam <patrick@patrick-willam.de>\n"
 "Language-Team: skolelinux-germany <devel@skolelinux.no>\n"
@@ -26,13 +26,13 @@
 #. Type: select
 #. Choices
 #: ../alsa-base.templates:3
-msgid "autosave always, autosave once at next shutdown, never autosave"
+msgid "always autosave, autosave once at next shutdown, never autosave"
 msgstr ""
 
 #. Type: select
 #. Default
 #: ../alsa-base.templates:4
-msgid "autosave always"
+msgid "always autosave"
 msgstr ""
 
 #. Type: select
Index: debian/alsa-driver/debian/po/es.po
diff -u debian/alsa-driver/debian/po/es.po:1.14 debian/alsa-driver/debian/po/es.po:1.15
--- debian/alsa-driver/debian/po/es.po:1.14	Sun Aug 29 18:19:24 2004
+++ debian/alsa-driver/debian/po/es.po	Tue Aug 31 21:16:41 2004
@@ -25,13 +25,12 @@
 #   /usr/share/doc/po-debconf/README-trans
 #   o http://www.debian.org/intl/l10n/po-debconf/README-trans
 #
-
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: alsa-driver 1.0.5a-1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-21 23:08+1000\n"
+"POT-Creation-Date: 2004-09-01 13:13+1000\n"
 "PO-Revision-Date: 2004-08-16 20:45+0200\n"
 "Last-Translator: Carlos Galisteo <cgalisteo@k-rolus.net>\n"
 "Language-Team: Debian l10n spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -42,7 +41,8 @@
 #. Type: select
 #. Choices
 #: ../alsa-base.templates:3
-msgid "autosave always, autosave once at next shutdown, never autosave"
+#, fuzzy
+msgid "always autosave, autosave once at next shutdown, never autosave"
 msgstr ""
 "guardar automáticamente siempre, guardar automáticamente sólo en el próximo "
 "apagado, no guardar nunca"
@@ -50,8 +50,8 @@
 #. Type: select
 #. Default
 #: ../alsa-base.templates:4
-msgid "autosave always"
-msgstr "guardar automáticamente siempre"
+msgid "always autosave"
+msgstr ""
 
 #. Type: select
 #. Description
@@ -68,10 +68,10 @@
 "changes across reboots. If enabled, the init script will run \"alsactl store"
 "\" on shutdown."
 msgstr ""
-"¿Debe el script de inicio de ALSA guardar sus configuraciones del mezclador al "
-"apagar? Esta opción es para personas que cambian las configuraciones del "
-"mezclador y quieren mantener sus cambios después de reiniciar. Si se habilita, "
-"el script de inicio ejecutará \"alsactl store \" al apagar. "
+"¿Debe el script de inicio de ALSA guardar sus configuraciones del mezclador "
+"al apagar? Esta opción es para personas que cambian las configuraciones del "
+"mezclador y quieren mantener sus cambios después de reiniciar. Si se "
+"habilita, el script de inicio ejecutará \"alsactl store \" al apagar. "
 
 #. Type: boolean
 #. Description
@@ -99,7 +99,8 @@
 #. Description
 #: ../alsa-source.templates:11
 msgid "Accept if you want to build ALSA driver with debugging code."
-msgstr "Acepte si quiere construir el controlador ALSA con código de depuración."
+msgstr ""
+"Acepte si quiere construir el controlador ALSA con código de depuración."
 
 #. Type: multiselect
 #. Choices
@@ -116,12 +117,16 @@
 #. Type: multiselect
 #. Description
 #: ../alsa-source.templates:17
+#, fuzzy
 msgid ""
 "You can choose cards to be built by selecting cards you want. Each selection "
-"is a same name to a option of configure script '--with-cards'. The following "
-"list are short descriptions of the options to show what they mean."
+"is a same name to an option of configure script '--with-cards'. The "
+"following list are short descriptions of the options to show what they mean."
 msgstr ""
 "Puede elegir las tarjetas a las que dar soporte seleccionando las que desee. "
 "Cada selección tiene el nombre correspondiente de la opción <<--with-cards>> "
-"del script de configuración. La siguiente lista contiene descripciones cortas "
-"de las opciones para mostrar qué significan."
+"del script de configuración. La siguiente lista contiene descripciones "
+"cortas de las opciones para mostrar qué significan."
+
+#~ msgid "autosave always"
+#~ msgstr "guardar automáticamente siempre"
Index: debian/alsa-driver/debian/po/fr.po
diff -u debian/alsa-driver/debian/po/fr.po:1.21 debian/alsa-driver/debian/po/fr.po:1.22
--- debian/alsa-driver/debian/po/fr.po:1.21	Wed Aug 25 04:48:03 2004
+++ debian/alsa-driver/debian/po/fr.po	Tue Aug 31 21:16:41 2004
@@ -19,7 +19,7 @@
 msgstr ""
 "Project-Id-Version: alsa-driver 0.9.4-1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-23 21:25+1000\n"
+"POT-Creation-Date: 2004-09-01 13:13+1000\n"
 "PO-Revision-Date: 2004-08-25 09:57+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -32,7 +32,8 @@
 #. Type: select
 #. Choices
 #: ../alsa-base.templates:3
-msgid "autosave always, autosave once at next shutdown, never autosave"
+#, fuzzy
+msgid "always autosave, autosave once at next shutdown, never autosave"
 msgstr ""
 "Toujours enregistrer automatiquement, Enregistrer une seule fois au prochain "
 "arrêt, Ne jamais enregistrer"
@@ -40,8 +41,8 @@
 #. Type: select
 #. Default
 #: ../alsa-base.templates:4
-msgid "autosave always"
-msgstr "Toujours enregistrer automatiquement"
+msgid "always autosave"
+msgstr ""
 
 #. Type: select
 #. Description
@@ -119,3 +120,6 @@
 "correspond à l'option correspondante du paramètre « --with-cards » du script "
 "de configuration. La liste affichée donne une courte description de ces "
 "options pour montrer leur signification."
+
+#~ msgid "autosave always"
+#~ msgstr "Toujours enregistrer automatiquement"
Index: debian/alsa-driver/debian/po/ja.po
diff -u debian/alsa-driver/debian/po/ja.po:1.17 debian/alsa-driver/debian/po/ja.po:1.18
--- debian/alsa-driver/debian/po/ja.po:1.17	Mon Aug 23 05:44:09 2004
+++ debian/alsa-driver/debian/po/ja.po	Tue Aug 31 21:16:41 2004
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: alsa 1.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-23 21:25+1000\n"
+"POT-Creation-Date: 2004-09-01 13:13+1000\n"
 "PO-Revision-Date: 2004-04-29 10:57+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -14,14 +14,15 @@
 #. Type: select
 #. Choices
 #: ../alsa-base.templates:3
-msgid "autosave always, autosave once at next shutdown, never autosave"
+#, fuzzy
+msgid "always autosave, autosave once at next shutdown, never autosave"
 msgstr "¾ï¤Ë¼«Æ°Êݸ, ¼¡²ó¤Î½ªÎ»»þ¤Ë°ìÅÙÊݸ, ¼«Æ°Êݸ¤·¤Ê¤¤"
 
 #. Type: select
 #. Default
 #: ../alsa-base.templates:4
-msgid "autosave always"
-msgstr "autosave always"
+msgid "always autosave"
+msgstr ""
 
 #. Type: select
 #. Description
@@ -97,3 +98,6 @@
 "»È¤¤¤¿¤¤¥«¡¼¥É¤òÁªÂò¤·¤Æ¹½ÃÛ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤½¤ì¤¾¤ì¤ÎÁªÂò»è¤Ï configure "
 "¥¹¥¯¥ê¥×¥È¤Î¥ª¥×¥·¥ç¥ó¡Ö--with-cards¡×¤Ë»ØÄꤹ¤ë¤â¤Î¤ÈƱ¤¸Ì¾Á°¤Ç¤¹¡£¼¡¤Î¥ê¥¹"
 "¥È¤Ï¥ª¥×¥·¥ç¥ó¤Î³Æ°ÕÌ£¤Ë¤Ä¤¤¤Æ¤Îû¤¤ÀâÌÀ¤Ç¤¹¡£"
+
+#~ msgid "autosave always"
+#~ msgstr "autosave always"
Index: debian/alsa-driver/debian/po/nb.po
diff -u debian/alsa-driver/debian/po/nb.po:1.3 debian/alsa-driver/debian/po/nb.po:1.4
--- debian/alsa-driver/debian/po/nb.po:1.3	Mon Aug 23 05:44:09 2004
+++ debian/alsa-driver/debian/po/nb.po	Tue Aug 31 21:16:41 2004
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-23 21:25+1000\n"
+"POT-Creation-Date: 2004-09-01 13:13+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,13 +27,13 @@
 #. Type: select
 #. Choices
 #: ../alsa-base.templates:3
-msgid "autosave always, autosave once at next shutdown, never autosave"
+msgid "always autosave, autosave once at next shutdown, never autosave"
 msgstr ""
 
 #. Type: select
 #. Default
 #: ../alsa-base.templates:4
-msgid "autosave always"
+msgid "always autosave"
 msgstr ""
 
 #. Type: select
Index: debian/alsa-driver/debian/po/nl.po
diff -u debian/alsa-driver/debian/po/nl.po:1.18 debian/alsa-driver/debian/po/nl.po:1.19
--- debian/alsa-driver/debian/po/nl.po:1.18	Mon Aug 23 05:44:09 2004
+++ debian/alsa-driver/debian/po/nl.po	Tue Aug 31 21:16:41 2004
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: alsa-driver\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-23 21:25+1000\n"
+"POT-Creation-Date: 2004-09-01 13:13+1000\n"
 "PO-Revision-Date: 2004-07-04 15:05-0500\n"
 "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -28,18 +28,17 @@
 #. Type: select
 #. Choices
 #: ../alsa-base.templates:3
-msgid "autosave always, autosave once at next shutdown, never autosave"
+#, fuzzy
+msgid "always autosave, autosave once at next shutdown, never autosave"
 msgstr ""
 "altijd automatisch opslaan, bij eerstvolgende afsluiten automatisch opslaan, "
 "nooit automatisch opslaan"
 
-#  Type: select
-#  Default
 #. Type: select
 #. Default
 #: ../alsa-base.templates:4
-msgid "autosave always"
-msgstr "altijd automatisch opslaan"
+msgid "always autosave"
+msgstr ""
 
 #. Type: select
 #. Description
@@ -122,3 +121,8 @@
 "U kunt hier de kaarten die u wenst selecteren. Elke selectie is een waarde "
 "van de  '--with-cards' optie van het configuratiescript.  De volgende lijst "
 "van korte beschrijvingen maakt duidelijk wat de waarden betekenen."
+
+#  Type: select
+#  Default
+#~ msgid "autosave always"
+#~ msgstr "altijd automatisch opslaan"
Index: debian/alsa-driver/debian/po/pt_BR.po
diff -u debian/alsa-driver/debian/po/pt_BR.po:1.16 debian/alsa-driver/debian/po/pt_BR.po:1.17
--- debian/alsa-driver/debian/po/pt_BR.po:1.16	Mon Aug 23 05:44:09 2004
+++ debian/alsa-driver/debian/po/pt_BR.po	Tue Aug 31 21:16:41 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: alsa-driver\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-23 21:25+1000\n"
+"POT-Creation-Date: 2004-09-01 13:13+1000\n"
 "PO-Revision-Date: 2004-O7-31 21:49-0300\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -17,15 +17,16 @@
 #. Type: select
 #. Choices
 #: ../alsa-base.templates:3
-msgid "autosave always, autosave once at next shutdown, never autosave"
+#, fuzzy
+msgid "always autosave, autosave once at next shutdown, never autosave"
 msgstr ""
 "sempre autosalvar, autosalvar uma única vez no desligamento, nunca autosalvar"
 
 #. Type: select
 #. Default
 #: ../alsa-base.templates:4
-msgid "autosave always"
-msgstr "sempre autosalvar"
+msgid "always autosave"
+msgstr ""
 
 #. Type: select
 #. Description
@@ -103,6 +104,9 @@
 "você deseja. Cada seleção é o mesmo nome de uma opção do script de "
 "configuração '--with-cards'. A lista a seguir contém descrições curtas das "
 "opções que exibem o que as mesmas significam."
+
+#~ msgid "autosave always"
+#~ msgstr "sempre autosalvar"
 
 #, fuzzy
 #~ msgid ""
Index: debian/alsa-driver/debian/po/ru.po
diff -u debian/alsa-driver/debian/po/ru.po:1.13 debian/alsa-driver/debian/po/ru.po:1.14
--- debian/alsa-driver/debian/po/ru.po:1.13	Mon Aug 23 05:44:09 2004
+++ debian/alsa-driver/debian/po/ru.po	Tue Aug 31 21:16:41 2004
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-23 21:25+1000\n"
+"POT-Creation-Date: 2004-09-01 13:13+1000\n"
 "PO-Revision-Date: 2003-02-12 13:19:00+0001\n"
 "Last-Translator: Serge Winitzki <winitzki@yahoo.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -27,13 +27,13 @@
 #. Type: select
 #. Choices
 #: ../alsa-base.templates:3
-msgid "autosave always, autosave once at next shutdown, never autosave"
+msgid "always autosave, autosave once at next shutdown, never autosave"
 msgstr ""
 
 #. Type: select
 #. Default
 #: ../alsa-base.templates:4
-msgid "autosave always"
+msgid "always autosave"
 msgstr ""
 
 #. Type: select
Index: debian/alsa-driver/debian/po/sv.po
diff -u debian/alsa-driver/debian/po/sv.po:1.13 debian/alsa-driver/debian/po/sv.po:1.14
--- debian/alsa-driver/debian/po/sv.po:1.13	Mon Aug 23 05:44:09 2004
+++ debian/alsa-driver/debian/po/sv.po	Tue Aug 31 21:16:41 2004
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-23 21:25+1000\n"
+"POT-Creation-Date: 2004-09-01 13:13+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,13 +27,13 @@
 #. Type: select
 #. Choices
 #: ../alsa-base.templates:3
-msgid "autosave always, autosave once at next shutdown, never autosave"
+msgid "always autosave, autosave once at next shutdown, never autosave"
 msgstr ""
 
 #. Type: select
 #. Default
 #: ../alsa-base.templates:4
-msgid "autosave always"
+msgid "always autosave"
 msgstr ""
 
 #. Type: select
Index: debian/alsa-driver/debian/po/templates.pot
diff -u debian/alsa-driver/debian/po/templates.pot:1.14 debian/alsa-driver/debian/po/templates.pot:1.15
--- debian/alsa-driver/debian/po/templates.pot:1.14	Mon Aug 23 05:44:09 2004
+++ debian/alsa-driver/debian/po/templates.pot	Tue Aug 31 21:16:41 2004
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-23 21:25+1000\n"
+"POT-Creation-Date: 2004-09-01 13:13+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,13 +27,13 @@
 #. Type: select
 #. Choices
 #: ../alsa-base.templates:3
-msgid "autosave always, autosave once at next shutdown, never autosave"
+msgid "always autosave, autosave once at next shutdown, never autosave"
 msgstr ""
 
 #. Type: select
 #. Default
 #: ../alsa-base.templates:4
-msgid "autosave always"
+msgid "always autosave"
 msgstr ""
 
 #. Type: select
Index: debian/alsa-driver/debian/po/tr.po
diff -u debian/alsa-driver/debian/po/tr.po:1.2 debian/alsa-driver/debian/po/tr.po:1.3
--- debian/alsa-driver/debian/po/tr.po:1.2	Mon Aug 23 05:44:09 2004
+++ debian/alsa-driver/debian/po/tr.po	Tue Aug 31 21:16:42 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: alsa-driver\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-23 21:25+1000\n"
+"POT-Creation-Date: 2004-09-01 13:13+1000\n"
 "PO-Revision-Date: 2004-04-27 06:39+0300\n"
 "Last-Translator: Recai OktaÅŸ <roktas@omu.edu.tr>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -18,13 +18,13 @@
 #. Type: select
 #. Choices
 #: ../alsa-base.templates:3
-msgid "autosave always, autosave once at next shutdown, never autosave"
+msgid "always autosave, autosave once at next shutdown, never autosave"
 msgstr ""
 
 #. Type: select
 #. Default
 #: ../alsa-base.templates:4
-msgid "autosave always"
+msgid "always autosave"
 msgstr ""
 
 #. Type: select