[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#273384: [#273384] kbd-chooser: Is not run again after backing out



I've created a new patch that removes the use of translated values.

I've tested it on my laptop (i386) in both default and expert installations.
Note: I've only tested kbd-chooserin a mini-iso, not a full install.

The basic idea is to use the template names instead of the template 
descriptions for architecture selection.
I had to create an en.po to be able to display the English descriptions in 
the arch selection list.

In /var/lib/cdebconf/questions.dat this results in (for 'en'):
Name: console-tools/archs
Template: console-tools/archs
Value: at
Owners: d-i
Variables:
 choices = at, usb
 choices-trans = PC-style (AT or PS/2 connector) keyboard, USB keyboard

The only strange thing I noticed while testing was that in an expert 
installation the translated description would also be shown if I had not 
yet added a "translation" for ${choices} for a language.
I think this can be explained because I _had_ added the 'en' translation and 
'en' is included as a backup value in the LANGUAGES envvar for most 
languages.

So, the only situation where the values in 'choices' would be shown, is if a 
translator would translate ${choices} to ${choices} instead of 
${choices-trans}. I'm not sure how best to guard against that.
Maybe do a 'sed "s/msgstr \"${choices}\"/msgstr \"${choices-trans}\"/" for 
all .po files in the build scripts?

Cheers,
FJP

P.S. I don't know any C really, so it's entirely possible that my patch 
could be cleaned up somewhat :-)

Index: kbd-chooser.c
===================================================================
--- kbd-chooser.c	(revision 22274)
+++ kbd-chooser.c	(working copy)
@@ -441,43 +441,6 @@
 	}
 }
 
-/**
- * @brief Get translated contents of a given template.
- * based on code from main-menu. 
- * TODO: merge into the cdebconf library someday
- */
-char *
-translated_template_get(char *template)
-{
-	int ret = 0;
-	static char *languages = NULL;
-	char *colon, *lang;
-	struct debconfclient *client = mydebconf_get();
-	
-	if (!languages) {
-		 ret = debconf_get(client,"debian-installer/language");
-		 if (client->value && (ret != 10))
-			 languages = strdup(client->value);
-	}
-	lang = strdup (languages);
-	while  (lang) {
-		char field[128];
-		
-		colon = strchr (lang, ':');
-		if (colon)
-			*colon = '\0';
-		snprintf(field, sizeof (field), "Description-%s.UTF-8", lang);
-		if (!debconf_metaget(client, template, field))  {
-			free (lang);
-			return (strdup(client->value));
-		}
-		lang = (colon) ? colon + 1 : NULL;
-	}
-	// Description must exist.
-	debconf_metaget(client, template, "Description");
-	free(lang);
-        return strdup(client->value);
-}
 
 /**
  * @brief discover what subarchitecture we have
@@ -508,6 +471,7 @@
 	static kbd_t *keyboards = NULL, *p = NULL;
 	char buf[25];
 	const char *subarch = subarch_get();
+	struct debconfclient *client = mydebconf_get ();
 
 	if (keyboards != NULL)
 		return keyboards;
@@ -545,22 +509,23 @@
 		di_error (": No keyboards found\n");
 		exit (6);
 	}
-	// translate the keyboard names
+	// Get the (translated) keyboard names
 	for (p = keyboards; p != NULL; p = p->next) {
 		sprintf(buf, "kbd-chooser/kbd/%s", p->name);
-		p->description = translated_template_get(buf);
+		debconf_metaget(client, buf, "Description");
+		p->description = strdup(client->value);
 	}
 	return keyboards;
 }
 
 /**
- * @brief translate localised keyboard name back to kbd. arch name
+ * @brief determine kbd. arch name based on keyboard type 
  */
 char *keyboard_parse (char *reply)
 {
 	kbd_t *kb;
 	for (kb = keyboards_get(); kb != NULL; kb = kb->next) {
-		if (!strcmp (reply, kb->description))
+		if (!strcmp (reply, kb->name))
 			break;
 	}
 	return (kb) ? kb->name : "none";
@@ -626,8 +591,8 @@
 keyboard_select (void)
 {
 	kbd_t *kp = NULL, *preferred = NULL;
-	char buf[LINESIZE], *s = NULL, *none = NULL;
-	int choices = 0, first_entry = 1;
+	char buf_s[LINESIZE], buf_t[LINESIZE], *s = NULL, *t = NULL, *none_descr = NULL;
+	int choices = 0, first_entry_s = 1, first_entry_t = 1;
 	sercon_state sercon;
 	sercon_state umlcon;
 	struct debconfclient *client = mydebconf_get ();
@@ -638,7 +603,7 @@
 	 * of keyboards present.
 	 */
 
-	s = buf;
+	s = buf_s; t = buf_t;
 	// Add the keyboards to debconf
 	for (kp = keyboards_get (); kp != NULL; kp = kp->next) {
 		di_info ("keyboard type %s: present: %s \n", kp->name,
@@ -646,7 +611,8 @@
 			(kp->present == TRUE ? "true: " : "false" ));
 		if (kp->present != FALSE) {
 			choices++;
-			s = insert_description (s,  kp->description, &first_entry);
+			s = insert_description (s, kp->name, &first_entry_s);
+			t = insert_description (t, kp->description, &first_entry_t);
 			if (strcmp (PREFERRED_KBD, kp->name) == 0) {
 				if ((preferred == NULL) || (preferred->present == UNKNOWN)
 				    || (kp->present == TRUE))
@@ -660,23 +626,27 @@
 	}
 	sercon = check_if_serial_console();
 	umlcon = check_if_uml_console();
-	none = translated_template_get ("kbd-chooser/no-keyboard");
+	debconf_metaget(client, "kbd-chooser/no-keyboard", "Description");
+	none_descr = strdup(client->value);
 	if (sercon == SERIAL_PRESENT || umlcon == SERIAL_PRESENT) {
 		choices++;
-		s = insert_description (s, none, &first_entry);
-		mydebconf_default_set ("console-tools/archs", none);
+		s = insert_description (s, "none", &first_entry_s);
+		t = insert_description (t, none_descr, &first_entry_t);
+		mydebconf_default_set ("console-tools/archs", "none");
 	} else {
 		if (((preferred == NULL) || (preferred->present == UNKNOWN))
 		    && (sercon == SERIAL_UNKNOWN)) {
 			di_info ("Can't tell if kbd present; add no keyboard option\n");
-			s = insert_description (s, none, &first_entry);
 			choices++;
+			s = insert_description (s, "none", &first_entry_s);
+			t = insert_description (t, none_descr, &first_entry_t);
 		}
 		mydebconf_default_set ("console-tools/archs",  
-				      preferred ? preferred->description : none);
+				      preferred ? preferred->name : "none");
 	}
-	debconf_subst (client, "console-tools/archs", "choices", buf);
-	free(none);
+	debconf_subst (client, "console-tools/archs", "choices", buf_s);
+	debconf_subst (client, "console-tools/archs", "choices-trans", buf_t);
+	free(none_descr);
 	return ((sercon == SERIAL_PRESENT) || 
 		(preferred && preferred->present == TRUE)) ? "low" : "medium";
 }
Index: debian/templates-in
===================================================================
--- debian/templates-in	(revision 22274)
+++ debian/templates-in	(working copy)
@@ -5,7 +5,7 @@
 
 Template: console-tools/archs
 Type: select
-Choices: ${choices}
+_Choices: ${choices}
 _Description: Type of keyboard:
  Please choose the type of keyboard to configure.
 
Index: debian/po/bs.po
===================================================================
--- debian/po/bs.po	(revision 22274)
+++ debian/po/bs.po	(working copy)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-08-29 09:47+0200\n"
 "Last-Translator:  Safir Å eÄ?eroviÄ? <sapphire@linux.org.ba>\n"
 "Language-Team:  Bosnian <lokal@lugbih.org>\n"
@@ -27,6 +27,12 @@
 msgstr "Izaberite raspored tipki"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/cs.po
===================================================================
--- debian/po/cs.po	(revision 22274)
+++ debian/po/cs.po	(working copy)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-04 09:20+0200\n"
 "Last-Translator:  Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team:  Czech <provoz@debian.cz>\n"
@@ -27,6 +27,12 @@
 msgstr "Vybrat rozložení klávesnice"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/pt_BR.po
===================================================================
--- debian/po/pt_BR.po	(revision 22274)
+++ debian/po/pt_BR.po	(working copy)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-17 12:20-0300\n"
 "Last-Translator:  André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team:  Debia-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -27,6 +27,12 @@
 msgstr "Selecione um layout de teclado"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/es.po
===================================================================
--- debian/po/es.po	(revision 22274)
+++ debian/po/es.po	(working copy)
@@ -37,7 +37,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-09 21:23+0200\n"
 "Last-Translator:  Javier Fernandez-Sanguino Peña <jfs@debian.org>\n"
 "Language-Team:  Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -53,6 +53,12 @@
 msgstr "Elija la distribución del teclado"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/ko.po
===================================================================
--- debian/po/ko.po	(revision 22274)
+++ debian/po/ko.po	(working copy)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-04 09:09+0200\n"
 "Last-Translator:  Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team:  Korean <cwryu@debian.org>\n"
@@ -27,6 +27,12 @@
 msgstr "í?¤ë³´ë?? ë ?ì?´ì??ì??ì?? ì? í??í??ì?­ì??ì?¤"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/eu.po
===================================================================
--- debian/po/eu.po	(revision 22274)
+++ debian/po/eu.po	(working copy)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-01 21:04+0200\n"
 "Last-Translator: Piarres Beobide Egaña <pi@beobide.net>\n"
 "Language-Team: Euskara <librezale@librezale.org>\n"
@@ -30,6 +30,12 @@
 msgstr "Aukeratu teklatu diseinua"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/cy.po
===================================================================
--- debian/po/cy.po	(revision 22274)
+++ debian/po/cy.po	(working copy)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-08-27 17:13+0200\n"
 "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
 "Language-Team: Welsh <daf@muse.19inch.net>\n"
@@ -27,6 +27,12 @@
 msgstr "Dewis cynllun bysellfwrdd"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/hu.po
===================================================================
--- debian/po/hu.po	(revision 22274)
+++ debian/po/hu.po	(working copy)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: kbd-chooser\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-04-08 00:34+0200\n"
 "Last-Translator: VER�K István <vi@fsf.hu>\n"
 "Language-Team: Debian Hungarian Localization Team <debian-l10n-"
@@ -31,6 +31,12 @@
 msgstr "Válasszon ki egy billentyűzetkiosztást"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/sk.po
===================================================================
--- debian/po/sk.po	(revision 22274)
+++ debian/po/sk.po	(working copy)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-08-30 16:22+0200\n"
 "Last-Translator:  Peter KLFMANiK Mann <Peter.Mann@tuke.sk>\n"
 "Language-Team:  Slovak <sk-i18n@lists.linux.sk>\n"
@@ -27,6 +27,12 @@
 msgstr "Výber rozloženia klávesnice"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/uk.po
===================================================================
--- debian/po/uk.po	(revision 22274)
+++ debian/po/uk.po	(working copy)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: kbd-chooser-templates_uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-07-22 19:15+0300\n"
 "Last-Translator: Eugeniy Meshcheryakov <eugen@univ.kiev.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -36,6 +36,12 @@
 msgstr "Ð?ибÑ?аÑ?и Ñ?озкладкÑ? клавÑ?аÑ?Ñ?Ñ?и"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/ro.po
===================================================================
--- debian/po/ro.po	(revision 22274)
+++ debian/po/ro.po	(working copy)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-04-19 20:11+0300\n"
 "Last-Translator:  Eddy Petrisor <eddy_petrisor@yahoo.com>\n"
 "Language-Team: Debian L10n Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -27,6 +27,12 @@
 msgstr "AlegeÅ£i o configuraÅ£ie (layout) de tastaturÄ?"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/templates.pot
===================================================================
--- debian/po/templates.pot	(revision 22274)
+++ debian/po/templates.pot	(working copy)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\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"
@@ -32,6 +32,12 @@
 msgstr ""
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr ""
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/sq.po
===================================================================
--- debian/po/sq.po	(revision 22274)
+++ debian/po/sq.po	(working copy)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: kbd-chooser 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-04-08 01:36+0200\n"
 "Last-Translator: Elian Myftiu <elian@lycos.com>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
@@ -30,6 +30,12 @@
 msgstr "Zgjidh një tastierë"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/ru.po
===================================================================
--- debian/po/ru.po	(revision 22274)
+++ debian/po/ru.po	(working copy)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-14 13:35+0200\n"
 "Last-Translator: Russian L10N Team <debian-l10n-russian@lists.debian.org>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -35,6 +35,12 @@
 msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?аÑ?кладкÑ? клавиаÑ?Ñ?Ñ?Ñ?"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/id.po
===================================================================
--- debian/po/id.po	(revision 22274)
+++ debian/po/id.po	(working copy)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-04-18 18:13+0700\n"
 "Last-Translator:  Parlin Imanuel Toh <parlin@ui.edu>\n"
 "Language-Team:  Debian L10n Indonesia <debian-l10n-id@gurame.fisika.ui.ac."
@@ -28,6 +28,12 @@
 msgstr "Pilih layout keyboard"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/nb.po
===================================================================
--- debian/po/nb.po	(revision 22274)
+++ debian/po/nb.po	(working copy)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-24 17:18+0200\n"
 "Last-Translator: Axel Bojer <axelb@skolelinux.no>\n"
 "Language-Team: Norsk Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -34,6 +34,12 @@
 msgstr "Velg et tastaturoppsett"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/el.po
===================================================================
--- debian/po/el.po	(revision 22274)
+++ debian/po/el.po	(working copy)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-16 01:19EEST\n"
 "Last-Translator: Greek Translation Team <debian-l10n-greek@lists.debian."
 "org>\n"
@@ -39,6 +39,12 @@
 msgstr "Î?Ï?ιλέξÏ?ε μια διάÏ?αξη Ï?ληκÏ?Ï?ολογίοÏ?"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/en.po
===================================================================
--- debian/po/en.po	(revision 0)
+++ debian/po/en.po	(revision 0)
@@ -0,0 +1,150 @@
+# translation for English
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+#    Developers do not need to manually edit POT or PO files.
+# Frans Pop <aragorn@tiscali.nl>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: en\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
+"PO-Revision-Date: 2004-09-28 20:42+0200\n"
+"Last-Translator: Frans Pop <aragorn@tiscali.nl>\n"
+"Language-Team: Debian Installer <debian-boot@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3.1\n"
+
+#. Type: text
+#. Description
+#. Main menu item
+#: ../templates-in:4
+msgid "Select a keyboard layout"
+msgstr "Select a keyboard layout"
+
+#. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
+#. Description
+#: ../templates-in:9
+msgid "Type of keyboard:"
+msgstr "Type of keyboard:"
+
+#. Type: select
+#. Description
+#: ../templates-in:9
+msgid "Please choose the type of keyboard to configure."
+msgstr "Please choose the type of keyboard to configure."
+
+#. Type: text
+#. Description
+#: ../templates-in:24
+msgid "No keyboard to configure"
+msgstr "No keyboard to configure"
+
+#. Type: text
+#. Description
+#. Prebaseconfig progress bar item
+#: ../templates-in:29
+msgid "Configuring keyboard ..."
+msgstr "Configuring keyboard ..."
+
+#. Type: text
+#. Description
+#: ../keyboard-at.templates:3
+msgid "PC-style (AT or PS-2 connector) keyboard"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../keyboard-atari.templates:3
+msgid "Atari keyboard"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../keyboard-amiga.templates:3
+msgid "Amiga keyboard"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../keyboard-acorn.templates:3
+#, fuzzy
+msgid "Acorn keyboard"
+msgstr "Type of keyboard:"
+
+#. Type: text
+#. Description
+#: ../keyboard-mac.templates:3
+#, fuzzy
+msgid "Mac keyboard"
+msgstr "Type of keyboard:"
+
+#. Type: text
+#. Description
+#: ../keyboard-sparc.templates:3
+#, fuzzy
+msgid "Sun keyboard"
+msgstr "Type of keyboard:"
+
+#. Type: text
+#. Description
+#: ../keyboard-usb.templates:3
+#, fuzzy
+msgid "USB keyboard"
+msgstr "Type of keyboard:"
+
+#. Type: text
+#. Description
+#: ../keyboard-dec.templates:3
+#, fuzzy
+msgid "DEC keyboard"
+msgstr "Type of keyboard:"
+
+#. Type: text
+#. Description
+#: ../keyboard-hil.templates:3
+#, fuzzy
+msgid "HP HIL keyboard"
+msgstr "Type of keyboard:"
+
+#~ msgid "PC-STYLE"
+#~ msgstr "PC-style (AT or PS-2 connector) keyboard"
+
+#~ msgid "ATARI"
+#~ msgstr "Atari keyboard"
+
+#~ msgid "AMIGA"
+#~ msgstr "Amiga keyboard"
+
+#~ msgid "ACORN"
+#~ msgstr "Acorn keyboard"
+
+#~ msgid "MAC"
+#~ msgstr "Mac keyboard"
+
+#~ msgid "SUN"
+#~ msgstr "Sun keyboard"
+
+#~ msgid "USB"
+#~ msgstr "USB keyboard"
+
+#~ msgid "DEC"
+#~ msgstr "DEC keyboard"
+
+#~ msgid "HP-HIL"
+#~ msgstr "HP HIL keyboard"
Index: debian/po/ar.po
===================================================================
--- debian/po/ar.po	(revision 22274)
+++ debian/po/ar.po	(working copy)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer_packages_po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-08-31 22:05+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabeyes <support@arabeyes.org>\n"
@@ -30,6 +30,12 @@
 msgstr "اختر تÙ?زÙ?عة Ù?Ù?حة Ù?Ù?اتÙ?Ø­"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/gl.po
===================================================================
--- debian/po/gl.po	(revision 22274)
+++ debian/po/gl.po	(working copy)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer_packages_kbd-chooser_gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-04-08 02:02+0200\n"
 "Last-Translator: Héctor Fernández López <trorrr@yahoo.es>\n"
 "Language-Team: Proxecto Trasno <trasno@ceu.fi.udc.es>\n"
@@ -30,6 +30,12 @@
 msgstr "Elixa a distribución do teclado"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/fr.po
===================================================================
--- debian/po/fr.po	(revision 22274)
+++ debian/po/fr.po	(working copy)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-12 12:58+0200\n"
 "Last-Translator: French Team <debian-l10n-french@lists.debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -35,6 +35,12 @@
 msgstr "Choisir la disposition du clavier"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/nl.po
===================================================================
--- debian/po/nl.po	(revision 22274)
+++ debian/po/nl.po	(working copy)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: kbd-chooser\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-04-12 14:57+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -34,6 +34,12 @@
 msgstr "De toetsenbordindeling kiezen"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/hr.po
===================================================================
--- debian/po/hr.po	(revision 22274)
+++ debian/po/hr.po	(working copy)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: Debian-installer 1st-stage master file HR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-05 19:41+0200\n"
 "Last-Translator: Krunoslav Gernhard <kruno@linux.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -28,6 +28,12 @@
 msgstr "Izaberi tipkovnicu"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/nn.po
===================================================================
--- debian/po/nn.po	(revision 22274)
+++ debian/po/nn.po	(working copy)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-04 19:18+0200\n"
 "Last-Translator: HÃ¥vard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -32,6 +32,12 @@
 msgstr "Vel eit tastaturoppsett"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/pl.po
===================================================================
--- debian/po/pl.po	(revision 22274)
+++ debian/po/pl.po	(working copy)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-03 21:14+0200\n"
 "Last-Translator: Bartosz Fenski <fenio@o2.pl>\n"
 "Language-Team: Polish <pddp@debian.linux.org.pl>\n"
@@ -28,6 +28,12 @@
 msgstr "Wybierz uk³ad klawiatury"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/it.po
===================================================================
--- debian/po/it.po	(revision 22274)
+++ debian/po/it.po	(working copy)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: kbd-chooser 0.49\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-04-15 20:50+0200\n"
 "Last-Translator: Davide Viti <zinosat@tiscali.it>\n"
 "Language-Team: debian italian translators <debian-l10n-italian@lists.debian."
@@ -22,6 +22,12 @@
 msgstr "Seleziona il layout della tastiera"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/sl.po
===================================================================
--- debian/po/sl.po	(revision 22274)
+++ debian/po/sl.po	(working copy)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-07 00:17+0100\n"
 "Last-Translator: Jure Ä?uhalev <gandalf@owca.info>\n"
 "Language-Team:  LANGUAGE <LL@li.org>\n"
@@ -27,6 +27,12 @@
 msgstr "Izberite postavitev tipkovnice"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/lt.po
===================================================================
--- debian/po/lt.po	(revision 22274)
+++ debian/po/lt.po	(working copy)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: lt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-22 20:35+0300\n"
 "Last-Translator: KÄ?stutis BiliÅ«nas\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -29,6 +29,12 @@
 msgstr "KlaviatÅ«ros iÅ¡dÄ?stymo pasirinkimas"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/lv.po
===================================================================
--- debian/po/lv.po	(revision 22274)
+++ debian/po/lv.po	(working copy)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-08-28 22:23+0200\n"
 "Last-Translator: Aigars Mahinovs <aigarius@debian.org>\n"
 "Language-Team: Latvian\n"
@@ -27,6 +27,12 @@
 msgstr "IzvÄ?lieties klaviatÅ«ras izklÄ?jumu"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/pt.po
===================================================================
--- debian/po/pt.po	(revision 22274)
+++ debian/po/pt.po	(working copy)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: kbd-chooser 0.49\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-04-08 14:19+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -30,6 +30,12 @@
 msgstr "Selecione a disposição do teclado"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/ca.po
===================================================================
--- debian/po/ca.po	(revision 22274)
+++ debian/po/ca.po	(working copy)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-04 11:35+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -28,6 +28,12 @@
 msgstr "Selecciona una disposició de teclat"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/da.po
===================================================================
--- debian/po/da.po	(revision 22274)
+++ debian/po/da.po	(working copy)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-04 16:11+0200\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -30,6 +30,12 @@
 msgstr "Vælg en tastaturudlægning"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/tr.po
===================================================================
--- debian/po/tr.po	(revision 22274)
+++ debian/po/tr.po	(working copy)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-04 00:55+0300\n"
 "Last-Translator: Recai OktaÅ? <roktas@omu.edu.tr>\n"
 "Language-Team: Debian L10n Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -34,6 +34,12 @@
 msgstr "Bir klavye düzeni seçin"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/fa.po
===================================================================
--- debian/po/fa.po	(revision 22274)
+++ debian/po/fa.po	(working copy)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-06-19 16:10+0430\n"
 "Last-Translator:  Arash Bijanzadeh <a.bijanzadeh@linuxiran.org>\n"
 "Language-Team:  Farsi <fa@li.org>\n"
@@ -27,6 +27,12 @@
 msgstr "Ù?Ø·Ù?ا Û?Ú© طرح صÙ?Ø­Ù?â??Ú©Ù?Û?د اÙ?تخاب Ú©Ù?Û?د"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/sv.po
===================================================================
--- debian/po/sv.po	(revision 22274)
+++ debian/po/sv.po	(working copy)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-19 18:25+0200\n"
 "Last-Translator: Per Olofsson <pelle@dsv.su.se>\n"
 "Language-Team: Swedish <debian-boot@lists.debian.org>\n"
@@ -27,6 +27,12 @@
 msgstr "Välj en tangentbordslayout"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/bg.po
===================================================================
--- debian/po/bg.po	(revision 22274)
+++ debian/po/bg.po	(working copy)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-23 11:56+0300\n"
 "Last-Translator:  Ognyan Kulev <ogi@fmi.uni-sofia.bg>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -29,6 +29,12 @@
 msgstr "Ð?збиÑ?ане на клавиаÑ?Ñ?Ñ?на подÑ?едба"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/de.po
===================================================================
--- debian/po/de.po	(revision 22274)
+++ debian/po/de.po	(working copy)
@@ -19,7 +19,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-11 13:27GMT\n"
 "Last-Translator: Dennis Stampfer <seppy@debian.org>\n"
 "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -36,6 +36,12 @@
 msgstr "Wählen Sie Ihre Tastaturbelegung aus"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/ja.po
===================================================================
--- debian/po/ja.po	(revision 22274)
+++ debian/po/ja.po	(working copy)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-08-28 17:03+0900\n"
 "Last-Translator:  Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian L10n Japanese <debian-l10n-japanese@lists.debian.org>\n"
@@ -27,6 +27,12 @@
 msgstr "ã?­ã?¼ã??ã?¼ã??é??ç½®ã?®é?¸æ??"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/zh_TW.po
===================================================================
--- debian/po/zh_TW.po	(revision 22274)
+++ debian/po/zh_TW.po	(working copy)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-04-12 23:59+0800\n"
 "Last-Translator:  Tetralet <tetralet@pchome.com.tw>\n"
 "Language-Team: Chinese Traditional <tetralet@pchome.com.tw>\n"
@@ -27,6 +27,12 @@
 msgstr "é?¸æ??é?µç?¤æ??å??æ?¹å¼?"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/he.po
===================================================================
--- debian/po/he.po	(revision 22274)
+++ debian/po/he.po	(working copy)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-04 17:03+0300\n"
 "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
 "Language-Team: Debian L10n Hebrew <en@li.org>\n"
@@ -29,6 +29,12 @@
 msgstr "×?×?×?רת פר×?סת ×?ק×?×?ת"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/fi.po
===================================================================
--- debian/po/fi.po	(revision 22274)
+++ debian/po/fi.po	(working copy)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-06 20:22+0300\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -30,6 +30,12 @@
 msgstr "Valitse näppäimistöasettelu"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"
Index: debian/po/zh_CN.po
===================================================================
--- debian/po/zh_CN.po	(revision 22274)
+++ debian/po/zh_CN.po	(working copy)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 09:32+0200\n"
+"POT-Creation-Date: 2004-09-29 16:03+0200\n"
 "PO-Revision-Date: 2004-09-04 20:06+0200\n"
 "Last-Translator:  Carlos Z.F. Liu <carlos_liu@yahoo.com>\n"
 "Language-Team:  Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -27,6 +27,12 @@
 msgstr "é??æ?©é?®ç??å¸?å±?"
 
 #. Type: select
+#. Choices
+#: ../templates-in:8
+msgid "${choices}"
+msgstr "${choices-trans}"
+
+#. Type: select
 #. Description
 #: ../templates-in:9
 msgid "Type of keyboard:"

Reply to: