# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1459291944 -10800
# Node ID 1c61f24884407c67ccddda49c3685a7d458a7658
# Parent  3523b642eb1a913746ac7af541117897820c8f70
Tiny edits

diff -r 3523b642eb1a -r 1c61f2488440 doc/tazpkg.en.html
--- a/doc/tazpkg.en.html	Sun Mar 27 06:04:45 2016 -0300
+++ b/doc/tazpkg.en.html	Wed Mar 30 01:52:24 2016 +0300
@@ -100,7 +100,7 @@
 	<li><tt><a href="file:///var/lib/tazpkg/mirrors" target="_blank">mirrors</a></tt>: list of URLs
 		of available repository mirrors.
 		<x-details>Note the difference between URLs from these two files; you should append URL from
-		this file by <tt>packages/<em>cooking</em>/</tt> (for <tt><em>cooking</em></tt>-based Slitaz
+		this file by <tt>packages/<em>cooking</em>/</tt> (for <tt><em>cooking</em></tt>-based SliTaz
 		version).</x-details></li>
 	<li><tt><a href="file:///var/lib/tazpkg/packages.list" target="_blank">packages.list</a></tt>
 		(deprecated): list of package names with version numbers available in the repository.</li>
diff -r 3523b642eb1a -r 1c61f2488440 doc/tazpkg.es.html
--- a/doc/tazpkg.es.html	Sun Mar 27 06:04:45 2016 -0300
+++ b/doc/tazpkg.es.html	Wed Mar 30 01:52:24 2016 +0300
@@ -107,7 +107,7 @@
 	<li><tt><a href="file:///var/lib/tazpkg/mirrors" target="_blank">mirrors</a></tt>: list of URLs
 		of available repository mirrors.
 		<x-details>Note the difference between URLs from these two files; you should append URL from
-		this file by <tt>packages/<em>cooking</em>/</tt> (for <tt><em>cooking</em></tt>-based Slitaz
+		this file by <tt>packages/<em>cooking</em>/</tt> (for <tt><em>cooking</em></tt>-based SliTaz
 		version).</x-details></li>
 	<li><tt><a href="file:///var/lib/tazpkg/packages.list" target="_blank">packages.list</a></tt>
 		(deprecated): list of package names with version numbers available in the repository.</li>
@@ -825,7 +825,7 @@
 
 <article id="convert"><h3>convert</h3>
 
-<p>Convierte los paquetes en paquetes Slitaz (<tt>.tazpkg</tt>) (<tt>convert</tt> o
+<p>Convierte los paquetes en paquetes SliTaz (<tt>.tazpkg</tt>) (<tt>convert</tt> o
 <tt>-c</tt>).</p>
 
 <p>Supported packages formats:</p>
diff -r 3523b642eb1a -r 1c61f2488440 doc/tazpkg.fr.html
--- a/doc/tazpkg.fr.html	Sun Mar 27 06:04:45 2016 -0300
+++ b/doc/tazpkg.fr.html	Wed Mar 30 01:52:24 2016 +0300
@@ -477,7 +477,7 @@
           <tt>c</tt>, <tt>cat</tt> ou <tt>categories</tt>), les paquets d'une
           catégorie (en indiquant son nom anglais ou français), ou les paquets
           bloqués (option <tt>b</tt> ou <tt>blocked</tt>). Utilisez la
-          commande <tt><a href="file:///home/tux/Files/Slitaz/tazpkg/tazpkg/doc/tazpkg.en.html#search">search</a></tt>
+          commande <tt><a href="#search">search</a></tt>
           pour avoir une liste des paquets correspondant à un nom.</p>
         <pre>$ tazpkg list
 $ tazpkg list cat
@@ -826,7 +826,7 @@
       </article>
 
       <article id="convert"><h3>convert, -c</h3>
-        <p>Convertit un paquet tiers en paquet Slitaz (<tt>*.tazpkg</tt>).</p>
+        <p>Convertit un paquet tiers en paquet SliTaz (<tt>*.tazpkg</tt>).</p>
         <p>Formats de paquet supportés&nbsp;:</p>
         <ul>
           <li><a href="https://packages.debian.org/search"
diff -r 3523b642eb1a -r 1c61f2488440 oldstuff/tazpkgbox
--- a/oldstuff/tazpkgbox	Sun Mar 27 06:04:45 2016 -0300
+++ b/oldstuff/tazpkgbox	Wed Mar 30 01:52:24 2016 +0300
@@ -82,7 +82,7 @@
 		<text wrap="false">
 			<label>"
 Tazpkgbox est une interface graphique au gestionnaire de paquet
-de Slitaz aka Tazpkg. Simple et facile à utiliser, vous pouvez
+de SliTaz aka Tazpkg. Simple et facile à utiliser, vous pouvez
 installer, télécharger ou supprimer des paquets en double-cliquant
 sur sa ligne. La fonction de recherche permet de facilement trouver
 et installer des logiciels ou fichiers."
@@ -113,7 +113,7 @@
 	<frame English>
 		<text wrap=\"false\">
 			<label>\"
-An ISO image with all $(cat /etc/slitaz-release) packages is available on Slitaz mirrors.
+An ISO image with all $(cat /etc/slitaz-release) packages is available on SliTaz mirrors.
 You can burn it onto a DVD or install it on an USB key and each
 package becomes installable without an Internet connection.\"
 			</label>
@@ -124,7 +124,7 @@
 		<text wrap=\"false\">
 			<label>\"
 Une image ISO installable sur clé USB ou gravable sur DVD est
-disponible sur les mirroirs Slitaz. Elle contient tous les paquets
+disponible sur les mirroirs SliTaz. Elle contient tous les paquets
 de la version $(cat /etc/slitaz-release) pour pouvoir installer des paquets sans
 connexion Internet.\"
 			</label>
@@ -487,7 +487,7 @@
 				</button>
 			</hbox>
 		</frame>
-		<frame Filesystem link (to install packages as a soft link from another mounted Slitaz)>
+		<frame Filesystem link (to install packages as a soft link from another mounted SliTaz)>
 			<hbox>
 				<entry>
 					<input>readlink /var/lib/tazpkg/fslink</input>
diff -r 3523b642eb1a -r 1c61f2488440 po/fr.po
--- a/po/fr.po	Sun Mar 27 06:04:45 2016 -0300
+++ b/po/fr.po	Wed Mar 30 01:52:24 2016 +0300
@@ -37,7 +37,7 @@
 
 #: tazpkg:150
 msgid "Please specify a release name on the command line."
-msgstr "Veuillez spécifier une version de Slitaz sur la ligne de commandes."
+msgstr "Veuillez spécifier une version de SliTaz sur la ligne de commandes."
 
 #: tazpkg:153
 msgid "Unable to find file \"%s\""
diff -r 3523b642eb1a -r 1c61f2488440 tazpanel/pkgs.cgi
--- a/tazpanel/pkgs.cgi	Sun Mar 27 06:04:45 2016 -0300
+++ b/tazpanel/pkgs.cgi	Wed Mar 30 01:52:24 2016 +0300
@@ -1241,28 +1241,29 @@
 			if [ $i != $PKGS_DB/mirrors ]; then
 				echo "<h4>$(_ 'Repository: %s' "$(repo_name $(dirname $i))")</h4>"
 			fi
+			awk -vdm="$default_mirror/" -vd="$(_ 'Delete')" -vi="$i" '
+			BEGIN {
+				printf "<form class=\"wide\">";
+				printf "<input type=\"hidden\" name=\"admin\" value=\"select-mirror\"/>";
+				printf "<table class=\"wide zebra\">";
+			}
+			{
+				printf "<tr><td>";
+				printf "<input type=\"radio\" name=\"mirror\" id=\"%s\" value=\"%s\" onchange=\"this.form.submit()\"", $0, $0;
+				if ($0 == dm)
+					printf " checked=\"checked\"";
+				printf ">";
+				printf "<label for=\"%s\"><code>%s</code></label></td>", $0, $0;
+				printf "<td><a data-img=\"@web@\"    href=\"$0\" target=\"_blank\"></a></td>";
+				printf "<td><a data-img=\"@remove@\" href=\"?admin=rm-mirror&amp;mirror=%s&amp;file=%s\" title=\"%s\"></a></td>", $0, i, d;
+				printf "</tr>";
+			}
+			END {
+				printf "</table></form>";
+			}
+			' < $i
 			cat <<EOT
 	<form class="wide">
-		<input type="hidden" name="admin" value="select-mirror"/>
-		<table class="wide zebra">
-EOT
-			while read line; do
-				cat <<EOT
-			<tr>
-				<td>
-					<input type="radio" name="mirror" id="$line" value="$line" onchange="this.form.submit()"
-					$([ "$line" == "$default_mirror/" ] && echo -n 'checked="checked"')>
-					<label for="$line"><code>$line</code></label></td>
-				<td><a data-img="@web@"    href="$line" target="_blank"></a></td>
-				<td><a data-img="@remove@" href="?admin=rm-mirror&amp;mirror=$line&amp;file=$i" title="$(_ 'Delete')"></a></td>
-			</tr>
-EOT
-			done < $i
-			cat <<EOT
-		</table>
-	</form>
-
-	<form class="wide">
 		<footer>
 			<input type="hidden" name="file" value="$i" />
 			<input type="text" name="mirror" size="40" />