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

Re: cvs commit to debian-installer/tools/languagechooser/debian/po by pere

On Wed, May 07, 2003 at 12:10:44AM +0200, Petter Reinholdtsen wrote:
[...]
> I believe it is better to keep the translated texts separate, to make
> it easier to adjust the list of available languages without loosing
> the translated texts.

Here is a new patch; it has not been well tested, but the generated
debian/templates file looks fine.  When applied, you can remove the
whole debian/po directory and Build-Depends: po-debconf.

Denis

Index: Makefile
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/languagechooser/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	7 Apr 2003 21:41:33 -0000	1.9
+++ Makefile	6 May 2003 22:21:02 -0000
@@ -1,8 +1,17 @@
+
 all: debian/templates check-scripts
 
 debian/templates: Makefile debian/templates.in languagelist
-	languagenames=`grep -v "^#" languagelist | cut -d\; -f1 | tr "\n" "," | sed 's/,/, /g' | sed "s/, $$//g"`; \
-	sed "s/@languagenames@/$$languagenames/" < debian/templates.in > $@
+	languagenames=`grep -v "^#" languagelist | cut -d\; -f1 | tr "\n" "," | sed "s/,$$//g"`; \
+	save_IFS=$$IFS; IFS=','; \
+	for l in $$languagenames; do \
+	  msg=`grep "^$${l}: " languagelist.l10n | sed -e "s/^$${l}: //"`;\
+	  if [ -n "$$msg" ]; then nativemessages=$$nativemessages", "$$msg; else { echo Missing $$l in languagelist.l10n; exit 2;} fi; \
+	done; \
+	IFS=$$save_IFS; \
+	languagenames=`echo $$languagenames | sed -e 's/^,//' -e 's/,/, /g'`; \
+	nativemessages=`echo $$nativemessages | sed -e 's/^, //'`; \
+	sed -e "s/@languagenames@/$$languagenames/" -e "s/@nativemessages@/$$nativemessages/" < debian/templates.in > $@
 
 check-scripts:
 	if [ -x /bin/ash ] ; then SH=ash ; else SH=dash; fi ; \
Index: debian/templates.in
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/languagechooser/debian/templates.in,v
retrieving revision 1.3
diff -u -r1.3 templates.in
--- debian/templates.in	7 Apr 2003 15:51:40 -0000	1.3
+++ debian/templates.in	6 May 2003 22:21:02 -0000
@@ -1,8 +1,9 @@
 Template: languagechooser/language-name
 Type: select
-__Choices: @languagenames@
+Choices: @languagenames@
+Choices-en.UTF-8: @nativemessages@
 Default: English (USA)
-_Description: Choose The Language
+Description: Choose The Language
  Please select which language you would like to use.  This affects the
  translation, the default locale, location and keyboard layout.
 
Index: languagelist.l10n
--- /dev/null	2002-12-31 00:55:08.000000000 +0100
+++ languagelist.l10n	2003-05-07 00:11:10.000000000 +0200
@@ -0,0 +1,41 @@
+Catalan: Trieu açò i premeu Retorn per a continuar en català.
+Chinese (Simplified): æ?¨é??æ?©äº?ç®?ä½?中æ??ã??请æ?? Enter é?®ç»§ç»­å®?è£?
+Chinese (Traditional): é?¸æ??æ­¤é ?並æ?? Enter å?³å?¯ä»¥ç¹?é«?中æ??ç¹¼çº?å®?è£?ã??
+Croatian: Odaberite ovo i pritisnite Enter kako bi nastavili na hrvatskom
+Czech: Volite tento a stisknete Enter k pokraÄ?ování Ä?esky
+Danish: Vælg dette for at fortsætte på dansk.
+Dutch (Belgium): Kies dit om in het Nederlands verder te gaan. (België)
+Dutch (The Netherlands): Kies dit om in het Nederlands verder te gaan. (Nederland)
+English (Australia): Choose this to proceed in English (Australia)
+English (India): Choose this to proceed in English (India)
+English (USA): Choose this to proceed in English (USA)
+English (United Kingdom): Choose this to proceed in English (United Kingdom)
+Esperanto: lektu Ä?i tion kaj premu ENEN por daÅ­rigi en Esperanto.
+Finnish: Valitse tämän jatkamaan suomeksi
+French (Belgium): Sélectionnez ceci pour continuer en français (Belgique)
+French (Canada): Sélectionnez ceci pour continuer en français (Canada)
+French (France): Sélectionnez ceci pour continuer en français (France)
+French (Luxembourg): Sélectionnez ceci pour continuer en français (Luxembourg)
+French (Switzerland): Sélectionnez ceci pour continuer en français (Suisse)
+Galician: Escolla isto e prema Enter para seguir en galego.
+German (Germany): Dies auswählen um auf Deutsch fortzufahre (Deutschland)
+German (Belgium): Dies auswählen um auf Deutsch fortzufahre (Belgien)
+Hebrew: Choose this to proceed in Hebrew
+Hungarian: A magyart választottad.  Nyomd meg az Entert a folytatáshoz
+Irish: Tóg seo agus thit Enter a lean as Gaeilge
+Iselandic: Choose this to proceed in Iselandic
+Italian: Si selezioni questa riga e si prema INVIO per l'italiano
+Japanese: æ?¥æ?¬èª?ã?§è¨­å®?ã??è¡?ã??ã?«ã?¯ã?¨ã?³ã?¿ã?¼ã??æ?¼ã??ã?¦ã??ã? ã??ã??
+Korean: í??êµ­ì?´ë¥¼ ì? í??í??ì?¨ì?µë??ë?¤.  ê³?ì??í??려면 ì??í?°ë¥¼ ë??르ì?¸ì??
+Latvian: IzvÄ?laties Å¡o lai turpinÄ?tu Latviski
+Northern Saami (Norway): Vállje dán jos áiggot joatkit sámegillii (Norga)
+Norwegian Bokmaal: Velg denne for å fortsette med norsk bokmål
+Norwegian Nynorsk: Velg denne for å fortsette med norsk nynorsk
+Polish: PodÅ?wietl tÄ? pozycjÄ? i wciÅ?nij enter aby wybraÄ? jÄ?zyk polski
+Portuguese (Brazil): Você selecionou o idioma Português- pressione Enter (Brasil)
+Portuguese (Portugal): Você selecionou o idioma Português- pressione Enter (Portugal)
+Russian: длÑ? Ñ?Ñ?Ñ?ановки на Ñ?Ñ?Ñ?Ñ?ком Ñ?зÑ?ке нажмиÑ?е клавиÑ?Ñ? Enter
+Spanish (Spain): Elija esta opción y pulse enter para continuar en español (España)
+Swedish (Finland): Välj det här för att fortsätta på svenska (Finland)
+Swedish (Sweden): Välj det här för att fortsätta på svenska (Sverige)
+Turkish: Türkçeyi seçtiniz. Devam etmek için ENTER'a basın.
Reply to: