slitaz-pizza rev 23

Make pot and msgmerge
author Christophe Lincoln <pankso@slitaz.org>
date Mon Mar 26 23:22:55 2012 +0200 (2012-03-26)
parents 95d29e67a5b2
children 823238a1a570
files Makefile po/fr.po po/pizza.pot web/pizza.cgi
line diff
     1.1 --- a/Makefile	Mon Mar 26 23:10:56 2012 +0200
     1.2 +++ b/Makefile	Mon Mar 26 23:22:55 2012 +0200
     1.3 @@ -12,7 +12,7 @@
     1.4  
     1.5  pot:
     1.6  	xgettext -o po/pizza.pot -L Shell --package-name="SliTaz Pizza" \
     1.7 -		./web/pizza.cgi
     1.8 +		./web/pizza.cgi ./web/pkgs.cgi
     1.9  
    1.10  msgmerge:
    1.11  	@for l in $(LINGUAS); do \
     2.1 --- a/po/fr.po	Mon Mar 26 23:10:56 2012 +0200
     2.2 +++ b/po/fr.po	Mon Mar 26 23:22:55 2012 +0200
     2.3 @@ -7,7 +7,7 @@
     2.4  msgstr ""
     2.5  "Project-Id-Version: SliTaz Pizza\n"
     2.6  "Report-Msgid-Bugs-To: \n"
     2.7 -"POT-Creation-Date: 2012-03-26 14:23+0200\n"
     2.8 +"POT-Creation-Date: 2012-03-26 23:22+0200\n"
     2.9  "PO-Revision-Date: 2012-03-26 14:37+0100\n"
    2.10  "Last-Translator: Christophe Lincoln <pankso@slitaz.org>\n"
    2.11  "Language-Team: French\n"
    2.12 @@ -28,7 +28,8 @@
    2.13  "\tand if anything goes wrong."
    2.14  msgstr ""
    2.15  "Veuillez choisir le nom de votre distribution et la version sur laquelle\n"
    2.16 -"\tvous voulez vous baser. Nous avons besoin de votre adresse email pour vous\n"
    2.17 +"\tvous voulez vous baser. Nous avons besoin de votre adresse email pour "
    2.18 +"vous\n"
    2.19  "\tavertir quant votre ISO a été construite ou en cas de problèmes."
    2.20  
    2.21  #: web/pizza.cgi:77
    2.22 @@ -63,7 +64,7 @@
    2.23  msgid "Default SliTaz desktop"
    2.24  msgstr "Le bureau Slitaz"
    2.25  
    2.26 -#: web/pizza.cgi:110
    2.27 +#: web/pizza.cgi:110 web/pkgs.cgi:152
    2.28  msgid "Continue"
    2.29  msgstr "Continuer"
    2.30  
    2.31 @@ -71,83 +72,124 @@
    2.32  msgid "Generate"
    2.33  msgstr "Générer"
    2.34  
    2.35 -#: web/pizza.cgi:146
    2.36 +#: web/pizza.cgi:127
    2.37 +msgid ""
    2.38 +"Last chance to stop process or start over. Next step will pack\n"
    2.39 +"your flavor and add it to the build queue. Here you can also add a note to\n"
    2.40 +"your receipt flavor, this will be displayed on your flavor ID page and \n"
    2.41 +"can be used to give more info to other users and SliTaz developers."
    2.42 +msgstr ""
    2.43 +
    2.44 +#: web/pizza.cgi:147
    2.45  msgid "Cancel"
    2.46  msgstr "Annuler"
    2.47  
    2.48 -#: web/pizza.cgi:149
    2.49 +#: web/pizza.cgi:150
    2.50  msgid "Build flavor"
    2.51  msgstr "Construire la saveur"
    2.52  
    2.53 -#: web/pizza.cgi:160
    2.54 +#: web/pizza.cgi:157
    2.55 +msgid "Removing temporary files for:"
    2.56 +msgstr ""
    2.57 +
    2.58 +#: web/pizza.cgi:161
    2.59  msgid "Start over"
    2.60  msgstr "Recommencer"
    2.61  
    2.62 -#: web/pizza.cgi:176
    2.63 +#: web/pizza.cgi:177
    2.64  msgid "Packing:"
    2.65  msgstr "Empaquetage de:"
    2.66  
    2.67 -#: web/pizza.cgi:209
    2.68 +#: web/pizza.cgi:210
    2.69  msgid "Your ISO will be built on next Pizza Bot run"
    2.70  msgstr "Votre ISO sera construite à la prochaine exécution du Bot Pizza"
    2.71  
    2.72 -#: web/pizza.cgi:211
    2.73 +#: web/pizza.cgi:212
    2.74  #, sh-format
    2.75  msgid "There is $inqueue flavors in queue"
    2.76  msgstr "Il y a $inqueue saveurs dans la queu"
    2.77  
    2.78 -#: web/pizza.cgi:219
    2.79 +#: web/pizza.cgi:220
    2.80  msgid "Download tarball: "
    2.81  msgstr "Télécharger une archive:"
    2.82  
    2.83 -#: web/pizza.cgi:226
    2.84 +#: web/pizza.cgi:227
    2.85  msgid "Status"
    2.86  msgstr "Status"
    2.87  
    2.88 -#: web/pizza.cgi:247
    2.89 +#: web/pizza.cgi:248
    2.90  msgid "Download ISO:"
    2.91  msgstr "Télécharger l'ISO:"
    2.92  
    2.93 -#: web/pizza.cgi:251
    2.94 +#: web/pizza.cgi:252
    2.95  msgid "Flavor is building or still in the build queue"
    2.96  msgstr "La saveur est en construction ou toujours dans la liste d'attente"
    2.97  
    2.98 -#: web/pizza.cgi:259
    2.99 +#: web/pizza.cgi:260
   2.100  msgid "Status for:"
   2.101  msgstr "Status por:"
   2.102  
   2.103 -#: web/pizza.cgi:261
   2.104 +#: web/pizza.cgi:262
   2.105  msgid "Flavor description:"
   2.106  msgstr "Description:"
   2.107  
   2.108 -#: web/pizza.cgi:276
   2.109 +#: web/pizza.cgi:277
   2.110  msgid "Download tarball:"
   2.111  msgstr "Télécharger une archive:"
   2.112  
   2.113 -#: web/pizza.cgi:299
   2.114 +#: web/pizza.cgi:300
   2.115  msgid "Help"
   2.116  msgstr "Aide"
   2.117  
   2.118 -#: web/pizza.cgi:320
   2.119 -#: web/pizza.cgi:369
   2.120 +#: web/pizza.cgi:321 web/pizza.cgi:370
   2.121  msgid "Activity"
   2.122  msgstr "Activité"
   2.123  
   2.124 -#: web/pizza.cgi:337
   2.125 +#: web/pizza.cgi:338
   2.126  msgid "Welcome"
   2.127  msgstr "Bienvenue"
   2.128  
   2.129 -#: web/pizza.cgi:350
   2.130 +#: web/pizza.cgi:341
   2.131 +msgid ""
   2.132 +"SliTaz Pizza lets you create your own SliTaz ISO flavor \n"
   2.133 +"online. The ISO image can be burnt on a cdrom or installed on USB media. \n"
   2.134 +"Please read the SliTaz Pizza <a href=?help>Help</a> before starting \n"
   2.135 +"a new flavor."
   2.136 +msgstr ""
   2.137 +
   2.138 +#: web/pizza.cgi:351
   2.139  msgid "Create a new flavor"
   2.140  msgstr "Créer une nouvelle saveur"
   2.141  
   2.142 -#: web/pizza.cgi:354
   2.143 +#: web/pizza.cgi:355
   2.144  msgid "Latest builds"
   2.145  msgstr "Dernière cuissons"
   2.146  
   2.147 -#: web/pizza.cgi:373
   2.148 +#: web/pizza.cgi:374
   2.149  msgid "More activity"
   2.150  msgstr "Plus d'activité"
   2.151  
   2.152 +#: web/pkgs.cgi:105
   2.153 +msgid "Creating receipt and packages list"
   2.154 +msgstr ""
   2.155 +
   2.156 +#: web/pkgs.cgi:137
   2.157 +msgid "Remove package(s)"
   2.158 +msgstr ""
   2.159 +
   2.160 +#: web/pkgs.cgi:144
   2.161 +msgid "Add package(s)"
   2.162 +msgstr ""
   2.163 +
   2.164 +#: web/pkgs.cgi:159
   2.165 +msgid ""
   2.166 +"Here you can add or remove some packages from your flavor. You\n"
   2.167 +"can also search for packages name and description to find a package name"
   2.168 +msgstr ""
   2.169 +
   2.170 +#: web/pkgs.cgi:165
   2.171 +msgid "Search"
   2.172 +msgstr ""
   2.173 +
   2.174  #~ msgid "Short desc"
   2.175  #~ msgstr "Petite desc"
     3.1 --- a/po/pizza.pot	Mon Mar 26 23:10:56 2012 +0200
     3.2 +++ b/po/pizza.pot	Mon Mar 26 23:22:55 2012 +0200
     3.3 @@ -8,7 +8,7 @@
     3.4  msgstr ""
     3.5  "Project-Id-Version: SliTaz Pizza\n"
     3.6  "Report-Msgid-Bugs-To: \n"
     3.7 -"POT-Creation-Date: 2012-03-26 23:09+0200\n"
     3.8 +"POT-Creation-Date: 2012-03-26 23:22+0200\n"
     3.9  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    3.10  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    3.11  "Language-Team: LANGUAGE <LL@li.org>\n"
    3.12 @@ -60,7 +60,7 @@
    3.13  msgid "Default SliTaz desktop"
    3.14  msgstr ""
    3.15  
    3.16 -#: web/pizza.cgi:110
    3.17 +#: web/pizza.cgi:110 web/pkgs.cgi:152
    3.18  msgid "Continue"
    3.19  msgstr ""
    3.20  
    3.21 @@ -68,79 +68,121 @@
    3.22  msgid "Generate"
    3.23  msgstr ""
    3.24  
    3.25 -#: web/pizza.cgi:146
    3.26 +#: web/pizza.cgi:127
    3.27 +msgid ""
    3.28 +"Last chance to stop process or start over. Next step will pack\n"
    3.29 +"your flavor and add it to the build queue. Here you can also add a note to\n"
    3.30 +"your receipt flavor, this will be displayed on your flavor ID page and \n"
    3.31 +"can be used to give more info to other users and SliTaz developers."
    3.32 +msgstr ""
    3.33 +
    3.34 +#: web/pizza.cgi:147
    3.35  msgid "Cancel"
    3.36  msgstr ""
    3.37  
    3.38 -#: web/pizza.cgi:149
    3.39 +#: web/pizza.cgi:150
    3.40  msgid "Build flavor"
    3.41  msgstr ""
    3.42  
    3.43 -#: web/pizza.cgi:160
    3.44 +#: web/pizza.cgi:157
    3.45 +msgid "Removing temporary files for:"
    3.46 +msgstr ""
    3.47 +
    3.48 +#: web/pizza.cgi:161
    3.49  msgid "Start over"
    3.50  msgstr ""
    3.51  
    3.52 -#: web/pizza.cgi:176
    3.53 +#: web/pizza.cgi:177
    3.54  msgid "Packing:"
    3.55  msgstr ""
    3.56  
    3.57 -#: web/pizza.cgi:209
    3.58 +#: web/pizza.cgi:210
    3.59  msgid "Your ISO will be built on next Pizza Bot run"
    3.60  msgstr ""
    3.61  
    3.62 -#: web/pizza.cgi:211
    3.63 +#: web/pizza.cgi:212
    3.64  #, sh-format
    3.65  msgid "There is $inqueue flavors in queue"
    3.66  msgstr ""
    3.67  
    3.68 -#: web/pizza.cgi:219
    3.69 +#: web/pizza.cgi:220
    3.70  msgid "Download tarball: "
    3.71  msgstr ""
    3.72  
    3.73 -#: web/pizza.cgi:226
    3.74 +#: web/pizza.cgi:227
    3.75  msgid "Status"
    3.76  msgstr ""
    3.77  
    3.78 -#: web/pizza.cgi:247
    3.79 +#: web/pizza.cgi:248
    3.80  msgid "Download ISO:"
    3.81  msgstr ""
    3.82  
    3.83 -#: web/pizza.cgi:251
    3.84 +#: web/pizza.cgi:252
    3.85  msgid "Flavor is building or still in the build queue"
    3.86  msgstr ""
    3.87  
    3.88 -#: web/pizza.cgi:259
    3.89 +#: web/pizza.cgi:260
    3.90  msgid "Status for:"
    3.91  msgstr ""
    3.92  
    3.93 -#: web/pizza.cgi:261
    3.94 +#: web/pizza.cgi:262
    3.95  msgid "Flavor description:"
    3.96  msgstr ""
    3.97  
    3.98 -#: web/pizza.cgi:276
    3.99 +#: web/pizza.cgi:277
   3.100  msgid "Download tarball:"
   3.101  msgstr ""
   3.102  
   3.103 -#: web/pizza.cgi:299
   3.104 +#: web/pizza.cgi:300
   3.105  msgid "Help"
   3.106  msgstr ""
   3.107  
   3.108 -#: web/pizza.cgi:320 web/pizza.cgi:369
   3.109 +#: web/pizza.cgi:321 web/pizza.cgi:370
   3.110  msgid "Activity"
   3.111  msgstr ""
   3.112  
   3.113 -#: web/pizza.cgi:337
   3.114 +#: web/pizza.cgi:338
   3.115  msgid "Welcome"
   3.116  msgstr ""
   3.117  
   3.118 -#: web/pizza.cgi:350
   3.119 +#: web/pizza.cgi:341
   3.120 +msgid ""
   3.121 +"SliTaz Pizza lets you create your own SliTaz ISO flavor \n"
   3.122 +"online. The ISO image can be burnt on a cdrom or installed on USB media. \n"
   3.123 +"Please read the SliTaz Pizza <a href=?help>Help</a> before starting \n"
   3.124 +"a new flavor."
   3.125 +msgstr ""
   3.126 +
   3.127 +#: web/pizza.cgi:351
   3.128  msgid "Create a new flavor"
   3.129  msgstr ""
   3.130  
   3.131 -#: web/pizza.cgi:354
   3.132 +#: web/pizza.cgi:355
   3.133  msgid "Latest builds"
   3.134  msgstr ""
   3.135  
   3.136 -#: web/pizza.cgi:373
   3.137 +#: web/pizza.cgi:374
   3.138  msgid "More activity"
   3.139  msgstr ""
   3.140 +
   3.141 +#: web/pkgs.cgi:105
   3.142 +msgid "Creating receipt and packages list"
   3.143 +msgstr ""
   3.144 +
   3.145 +#: web/pkgs.cgi:137
   3.146 +msgid "Remove package(s)"
   3.147 +msgstr ""
   3.148 +
   3.149 +#: web/pkgs.cgi:144
   3.150 +msgid "Add package(s)"
   3.151 +msgstr ""
   3.152 +
   3.153 +#: web/pkgs.cgi:159
   3.154 +msgid ""
   3.155 +"Here you can add or remove some packages from your flavor. You\n"
   3.156 +"can also search for packages name and description to find a package name"
   3.157 +msgstr ""
   3.158 +
   3.159 +#: web/pkgs.cgi:165
   3.160 +msgid "Search"
   3.161 +msgstr ""
     4.1 --- a/web/pizza.cgi	Mon Mar 26 23:10:56 2012 +0200
     4.2 +++ b/web/pizza.cgi	Mon Mar 26 23:22:55 2012 +0200
     4.3 @@ -124,11 +124,12 @@
     4.4  		cat << EOT
     4.5  <h2>$(gettext "Generate")</h2>
     4.6  <p>
     4.7 -	Last chance to stop process or start over. Next step will pack your
     4.8 -	flavor and add it to the build queue. Here you can also add a note to
     4.9 -	your receipt flavor, this will be displayed on your flavor ID page
    4.10 -	and can be used to give more info to other users and SliTaz developers.
    4.11 +$(gettext "Last chance to stop process or start over. Next step will pack
    4.12 +your flavor and add it to the build queue. Here you can also add a note to
    4.13 +your receipt flavor, this will be displayed on your flavor ID page and 
    4.14 +can be used to give more info to other users and SliTaz developers.")
    4.15  </p>
    4.16 +
    4.17  <pre>
    4.18  Uniq ID    : $id
    4.19  Flavor     : $FLAVOR
    4.20 @@ -153,7 +154,7 @@
    4.21  		;;
    4.22  	*\ cancel\ *)
    4.23  		id="$(GET id)"
    4.24 -		echo "<p>Removing temporary files for: $id</p>" 
    4.25 +		echo "<p>$(gettext "Removing temporary files for:") $id</p>" 
    4.26  		[ -d "$tmpdir/slitaz-$id" ] && rm -rf $tmpdir/slitaz-$id/
    4.27  		cat << EOT
    4.28  <form method="get" action="./">
    4.29 @@ -337,10 +338,10 @@
    4.30  <h2>$(gettext "Welcome")</h2>
    4.31  <form method="get" action="./">
    4.32  <p>
    4.33 -	SliTaz Pizza lets you create your own SliTaz ISO flavor online. The
    4.34 -	ISO image can be burnt on a cdrom or installed on USB media. 
    4.35 -	Please read the SliTaz Pizza 
    4.36 -	<a href="?help">Help</a> before starting a new flavor.
    4.37 +$(gettext "SliTaz Pizza lets you create your own SliTaz ISO flavor 
    4.38 +online. The ISO image can be burnt on a cdrom or installed on USB media. 
    4.39 +Please read the SliTaz Pizza <a href="?help">Help</a> before starting 
    4.40 +a new flavor.")
    4.41  </p>
    4.42  <pre>
    4.43  Flavors: $inqueue in queue - $builds builds - $pubiso public