tazpkg rev 903

Tiny edits
author Aleksej Bobylev <al.bobylev@gmail.com>
date Wed Mar 30 01:52:24 2016 +0300 (2016-03-30)
parents 3523b642eb1a
children c4b60ed5b81c
files doc/tazpkg.en.html doc/tazpkg.es.html doc/tazpkg.fr.html oldstuff/tazpkgbox po/fr.po tazpanel/pkgs.cgi
line diff
     1.1 --- a/doc/tazpkg.en.html	Sun Mar 27 06:04:45 2016 -0300
     1.2 +++ b/doc/tazpkg.en.html	Wed Mar 30 01:52:24 2016 +0300
     1.3 @@ -100,7 +100,7 @@
     1.4  	<li><tt><a href="file:///var/lib/tazpkg/mirrors" target="_blank">mirrors</a></tt>: list of URLs
     1.5  		of available repository mirrors.
     1.6  		<x-details>Note the difference between URLs from these two files; you should append URL from
     1.7 -		this file by <tt>packages/<em>cooking</em>/</tt> (for <tt><em>cooking</em></tt>-based Slitaz
     1.8 +		this file by <tt>packages/<em>cooking</em>/</tt> (for <tt><em>cooking</em></tt>-based SliTaz
     1.9  		version).</x-details></li>
    1.10  	<li><tt><a href="file:///var/lib/tazpkg/packages.list" target="_blank">packages.list</a></tt>
    1.11  		(deprecated): list of package names with version numbers available in the repository.</li>
     2.1 --- a/doc/tazpkg.es.html	Sun Mar 27 06:04:45 2016 -0300
     2.2 +++ b/doc/tazpkg.es.html	Wed Mar 30 01:52:24 2016 +0300
     2.3 @@ -107,7 +107,7 @@
     2.4  	<li><tt><a href="file:///var/lib/tazpkg/mirrors" target="_blank">mirrors</a></tt>: list of URLs
     2.5  		of available repository mirrors.
     2.6  		<x-details>Note the difference between URLs from these two files; you should append URL from
     2.7 -		this file by <tt>packages/<em>cooking</em>/</tt> (for <tt><em>cooking</em></tt>-based Slitaz
     2.8 +		this file by <tt>packages/<em>cooking</em>/</tt> (for <tt><em>cooking</em></tt>-based SliTaz
     2.9  		version).</x-details></li>
    2.10  	<li><tt><a href="file:///var/lib/tazpkg/packages.list" target="_blank">packages.list</a></tt>
    2.11  		(deprecated): list of package names with version numbers available in the repository.</li>
    2.12 @@ -825,7 +825,7 @@
    2.13  
    2.14  <article id="convert"><h3>convert</h3>
    2.15  
    2.16 -<p>Convierte los paquetes en paquetes Slitaz (<tt>.tazpkg</tt>) (<tt>convert</tt> o
    2.17 +<p>Convierte los paquetes en paquetes SliTaz (<tt>.tazpkg</tt>) (<tt>convert</tt> o
    2.18  <tt>-c</tt>).</p>
    2.19  
    2.20  <p>Supported packages formats:</p>
     3.1 --- a/doc/tazpkg.fr.html	Sun Mar 27 06:04:45 2016 -0300
     3.2 +++ b/doc/tazpkg.fr.html	Wed Mar 30 01:52:24 2016 +0300
     3.3 @@ -477,7 +477,7 @@
     3.4            <tt>c</tt>, <tt>cat</tt> ou <tt>categories</tt>), les paquets d'une
     3.5            catégorie (en indiquant son nom anglais ou français), ou les paquets
     3.6            bloqués (option <tt>b</tt> ou <tt>blocked</tt>). Utilisez la
     3.7 -          commande <tt><a href="file:///home/tux/Files/Slitaz/tazpkg/tazpkg/doc/tazpkg.en.html#search">search</a></tt>
     3.8 +          commande <tt><a href="#search">search</a></tt>
     3.9            pour avoir une liste des paquets correspondant à un nom.</p>
    3.10          <pre>$ tazpkg list
    3.11  $ tazpkg list cat
    3.12 @@ -826,7 +826,7 @@
    3.13        </article>
    3.14  
    3.15        <article id="convert"><h3>convert, -c</h3>
    3.16 -        <p>Convertit un paquet tiers en paquet Slitaz (<tt>*.tazpkg</tt>).</p>
    3.17 +        <p>Convertit un paquet tiers en paquet SliTaz (<tt>*.tazpkg</tt>).</p>
    3.18          <p>Formats de paquet supportés&nbsp;:</p>
    3.19          <ul>
    3.20            <li><a href="https://packages.debian.org/search"
     4.1 --- a/oldstuff/tazpkgbox	Sun Mar 27 06:04:45 2016 -0300
     4.2 +++ b/oldstuff/tazpkgbox	Wed Mar 30 01:52:24 2016 +0300
     4.3 @@ -82,7 +82,7 @@
     4.4  		<text wrap="false">
     4.5  			<label>"
     4.6  Tazpkgbox est une interface graphique au gestionnaire de paquet
     4.7 -de Slitaz aka Tazpkg. Simple et facile à utiliser, vous pouvez
     4.8 +de SliTaz aka Tazpkg. Simple et facile à utiliser, vous pouvez
     4.9  installer, télécharger ou supprimer des paquets en double-cliquant
    4.10  sur sa ligne. La fonction de recherche permet de facilement trouver
    4.11  et installer des logiciels ou fichiers."
    4.12 @@ -113,7 +113,7 @@
    4.13  	<frame English>
    4.14  		<text wrap=\"false\">
    4.15  			<label>\"
    4.16 -An ISO image with all $(cat /etc/slitaz-release) packages is available on Slitaz mirrors.
    4.17 +An ISO image with all $(cat /etc/slitaz-release) packages is available on SliTaz mirrors.
    4.18  You can burn it onto a DVD or install it on an USB key and each
    4.19  package becomes installable without an Internet connection.\"
    4.20  			</label>
    4.21 @@ -124,7 +124,7 @@
    4.22  		<text wrap=\"false\">
    4.23  			<label>\"
    4.24  Une image ISO installable sur clé USB ou gravable sur DVD est
    4.25 -disponible sur les mirroirs Slitaz. Elle contient tous les paquets
    4.26 +disponible sur les mirroirs SliTaz. Elle contient tous les paquets
    4.27  de la version $(cat /etc/slitaz-release) pour pouvoir installer des paquets sans
    4.28  connexion Internet.\"
    4.29  			</label>
    4.30 @@ -487,7 +487,7 @@
    4.31  				</button>
    4.32  			</hbox>
    4.33  		</frame>
    4.34 -		<frame Filesystem link (to install packages as a soft link from another mounted Slitaz)>
    4.35 +		<frame Filesystem link (to install packages as a soft link from another mounted SliTaz)>
    4.36  			<hbox>
    4.37  				<entry>
    4.38  					<input>readlink /var/lib/tazpkg/fslink</input>
     5.1 --- a/po/fr.po	Sun Mar 27 06:04:45 2016 -0300
     5.2 +++ b/po/fr.po	Wed Mar 30 01:52:24 2016 +0300
     5.3 @@ -37,7 +37,7 @@
     5.4  
     5.5  #: tazpkg:150
     5.6  msgid "Please specify a release name on the command line."
     5.7 -msgstr "Veuillez spécifier une version de Slitaz sur la ligne de commandes."
     5.8 +msgstr "Veuillez spécifier une version de SliTaz sur la ligne de commandes."
     5.9  
    5.10  #: tazpkg:153
    5.11  msgid "Unable to find file \"%s\""
     6.1 --- a/tazpanel/pkgs.cgi	Sun Mar 27 06:04:45 2016 -0300
     6.2 +++ b/tazpanel/pkgs.cgi	Wed Mar 30 01:52:24 2016 +0300
     6.3 @@ -1241,28 +1241,29 @@
     6.4  			if [ $i != $PKGS_DB/mirrors ]; then
     6.5  				echo "<h4>$(_ 'Repository: %s' "$(repo_name $(dirname $i))")</h4>"
     6.6  			fi
     6.7 +			awk -vdm="$default_mirror/" -vd="$(_ 'Delete')" -vi="$i" '
     6.8 +			BEGIN {
     6.9 +				printf "<form class=\"wide\">";
    6.10 +				printf "<input type=\"hidden\" name=\"admin\" value=\"select-mirror\"/>";
    6.11 +				printf "<table class=\"wide zebra\">";
    6.12 +			}
    6.13 +			{
    6.14 +				printf "<tr><td>";
    6.15 +				printf "<input type=\"radio\" name=\"mirror\" id=\"%s\" value=\"%s\" onchange=\"this.form.submit()\"", $0, $0;
    6.16 +				if ($0 == dm)
    6.17 +					printf " checked=\"checked\"";
    6.18 +				printf ">";
    6.19 +				printf "<label for=\"%s\"><code>%s</code></label></td>", $0, $0;
    6.20 +				printf "<td><a data-img=\"@web@\"    href=\"$0\" target=\"_blank\"></a></td>";
    6.21 +				printf "<td><a data-img=\"@remove@\" href=\"?admin=rm-mirror&amp;mirror=%s&amp;file=%s\" title=\"%s\"></a></td>", $0, i, d;
    6.22 +				printf "</tr>";
    6.23 +			}
    6.24 +			END {
    6.25 +				printf "</table></form>";
    6.26 +			}
    6.27 +			' < $i
    6.28  			cat <<EOT
    6.29  	<form class="wide">
    6.30 -		<input type="hidden" name="admin" value="select-mirror"/>
    6.31 -		<table class="wide zebra">
    6.32 -EOT
    6.33 -			while read line; do
    6.34 -				cat <<EOT
    6.35 -			<tr>
    6.36 -				<td>
    6.37 -					<input type="radio" name="mirror" id="$line" value="$line" onchange="this.form.submit()"
    6.38 -					$([ "$line" == "$default_mirror/" ] && echo -n 'checked="checked"')>
    6.39 -					<label for="$line"><code>$line</code></label></td>
    6.40 -				<td><a data-img="@web@"    href="$line" target="_blank"></a></td>
    6.41 -				<td><a data-img="@remove@" href="?admin=rm-mirror&amp;mirror=$line&amp;file=$i" title="$(_ 'Delete')"></a></td>
    6.42 -			</tr>
    6.43 -EOT
    6.44 -			done < $i
    6.45 -			cat <<EOT
    6.46 -		</table>
    6.47 -	</form>
    6.48 -
    6.49 -	<form class="wide">
    6.50  		<footer>
    6.51  			<input type="hidden" name="file" value="$i" />
    6.52  			<input type="text" name="mirror" size="40" />