tazpkg diff pkgs.cgi @ rev 707
Finish translation converting; now strongly need to re-check translations using original files from translators.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sat Dec 13 16:31:09 2014 +0200 (2014-12-13) |
| parents | 1d7f3c9ce99c |
| children |
line diff
1.1 --- a/pkgs.cgi Thu Dec 04 01:41:59 2014 +0200 1.2 +++ b/pkgs.cgi Sat Dec 13 16:31:09 2014 +0200 1.3 @@ -6,24 +6,28 @@ 1.4 # its own code for some tasks. Please KISS, it is important and keep speed 1.5 # in mind. Thanks, Pankso. 1.6 # 1.7 -# (C) 2011-2013 SliTaz GNU/Linux - BSD License 1.8 +# (C) 2011-2014 SliTaz GNU/Linux - BSD License 1.9 # 1.10 1.11 +. /lib/libtaz.sh 1.12 . lib/libtazpanel 1.13 get_config 1.14 header 1.15 1.16 + 1.17 # xHTML 5 header with special side bar for categories. 1.18 -TITLE=$(TEXTDOMAIN='tazpkg'; gettext 'TazPanel - Packages') 1.19 +TITLE=$(TEXTDOMAIN='tazpkg'; _ 'TazPanel - Packages') 1.20 xhtml_header | sed 's/id="content"/id="content-sidebar"/' 1.21 1.22 export TEXTDOMAIN='tazpkg' 1.23 1.24 + 1.25 pkg_info_link() 1.26 { 1.27 echo "$SCRIPT_NAME?info=$1" | sed 's/+/%2B/g' 1.28 } 1.29 1.30 + 1.31 i18n_desc() { 1.32 # Display localized short description 1.33 if [ -e "$PKGS_DB/packages-desc.$LANG" ]; then 1.34 @@ -32,7 +36,9 @@ 1.35 fi 1.36 } 1.37 1.38 + 1.39 # We need packages information for list and search 1.40 + 1.41 parse_packages_desc() { 1.42 IFS="|" 1.43 cut -f 1,2,3,5 -d "|" | while read PACKAGE VERSION SHORT_DESC WEB_SITE 1.44 @@ -54,50 +60,54 @@ 1.45 unset IFS 1.46 } 1.47 1.48 + 1.49 # Display a full summary of packages stats 1.50 + 1.51 packages_summary() { 1.52 cat << EOT 1.53 <table class="zebra outbox"> 1.54 <tbody> 1.55 -<tr><td>$(gettext 'Last recharge:')</td> 1.56 +<tr><td>$(_ 'Last recharge:')</td> 1.57 EOT 1.58 stat=$(stat -c %y $PKGS_DB/packages.list | \ 1.59 sed 's/\(:..\):.*/\1/' | awk '{print $1}') 1.60 mtime=$(find $PKGS_DB/packages.list -mtime +10) 1.61 echo -n "<td>$stat " 1.62 if [ "$mtime" ]; then 1.63 - gettext '(Older than 10 days)'; echo 1.64 + _ '(Older than 10 days)' 1.65 else 1.66 - gettext '(Not older than 10 days)'; echo 1.67 + _ '(Not older than 10 days)' 1.68 fi 1.69 cat << EOT 1.70 </td></tr> 1.71 -<tr><td>$(gettext 'Installed packages:')</td> 1.72 +<tr><td>$(_ 'Installed packages:')</td> 1.73 <td>$(ls $INSTALLED | wc -l)</td></tr> 1.74 -<tr><td>$(gettext 'Mirrored packages:')</td> 1.75 +<tr><td>$(_ 'Mirrored packages:')</td> 1.76 <td>$(cat $PKGS_DB/packages.list | wc -l)</td></tr> 1.77 -<tr><td>$(gettext 'Upgradeable packages:')</td> 1.78 +<tr><td>$(_ 'Upgradeable packages:')</td> 1.79 <td>$(cat $PKGS_DB/packages.up | wc -l)</td></tr> 1.80 -<tr><td>$(gettext 'Installed files:')</td> 1.81 +<tr><td>$(_ 'Installed files:')</td> 1.82 <td>$(cat $INSTALLED/*/files.list | wc -l)</td></tr> 1.83 -<tr><td>$(gettext 'Blocked packages:')</td> 1.84 +<tr><td>$(_ 'Blocked packages:')</td> 1.85 <td>$(cat $PKGS_DB/blocked-packages.list | wc -l)</td></tr> 1.86 </tbody> 1.87 </table> 1.88 EOT 1.89 } 1.90 1.91 + 1.92 # Parse mirrors list to be able to have an icon and remove link 1.93 + 1.94 list_mirrors() { 1.95 while read line 1.96 do 1.97 cat << EOT 1.98 <li> 1.99 <a href="$SCRIPT_NAME?admin=rm-mirror=$line&file=$(httpd -e $1)"> 1.100 - <img src="$IMAGES/clear.png" title="$(gettext 'Delete')" /> 1.101 + <img src="$IMAGES/clear.png" title="$(_ 'Delete')" /> 1.102 </a> 1.103 <a href="$SCRIPT_NAME?admin=select-mirror&mirror=$line"> 1.104 - <img src="$IMAGES/start.png" title="$(gettext 'Use as default')" /> 1.105 + <img src="$IMAGES/start.png" title="$(_ 'Use as default')" /> 1.106 </a> 1.107 <a href="$line">$line</a> 1.108 </li> 1.109 @@ -105,21 +115,27 @@ 1.110 done < $1 1.111 } 1.112 1.113 + 1.114 # Parse repositories list to be able to have an icon and remove link 1.115 + 1.116 list_repos() { 1.117 ls $PKGS_DB/undigest 2> /dev/null | while read repo ; do 1.118 cat <<EOT 1.119 <li><a href="$SCRIPT_NAME?admin=rm-repo=$repo"> 1.120 - <img src="$IMAGES/clear.png">$repo</a></li> 1.121 + <img src="$IMAGES/clear.png">$repo</a></li> 1.122 EOT 1.123 done 1.124 } 1.125 1.126 + 1.127 + 1.128 # 1.129 # xHTML functions 1.130 # 1.131 1.132 + 1.133 # ENTER will search but user may search for a button, so put one. 1.134 + 1.135 search_form() { 1.136 [ -n "$repo" ] || repo="$(GET repo)" 1.137 [ -n "$repo" ] || repo=Any 1.138 @@ -130,7 +146,7 @@ 1.139 <input type="text" name="search" size="20"> 1.140 <input type="submit" value="$(gettext 'Search')"> 1.141 <input class="radius" type="submit" name="files" 1.142 - value="$(gettext 'Files')"> 1.143 + value="$(_n 'Files')"> 1.144 <input type="hidden" name="repo" value="$repo" /> 1.145 </p> 1.146 </form> 1.147 @@ -138,85 +154,99 @@ 1.148 EOT 1.149 } 1.150 1.151 + 1.152 table_head() { 1.153 cat << EOT 1.154 <thead> 1.155 <tr> 1.156 - <td>$(gettext 'Name')</td> 1.157 - <td>$(gettext 'Version')</td> 1.158 - <td>$(gettext 'Description')</td> 1.159 - <td>$(gettext 'Web')</td> 1.160 + <td>$(_ 'Name')</td> 1.161 + <td>$(_ 'Version')</td> 1.162 + <td>$(_ 'Description')</td> 1.163 + <td>$(_ 'Web')</td> 1.164 </tr> 1.165 </thead> 1.166 EOT 1.167 } 1.168 1.169 + 1.170 sidebar() { 1.171 [ -n "$repo" ] || repo=Public 1.172 cat << EOT 1.173 <div id="sidebar"> 1.174 - <h4>$(gettext 'Categories')</h4> 1.175 - <a class="active_base-system" href="$SCRIPT_NAME?cat=base-system&repo=$repo">$(gettext 'base-system')</a> 1.176 - <a class="active_x-window" href="$SCRIPT_NAME?cat=x-window&repo=$repo">$(gettext 'x-window')</a> 1.177 - <a class="active_utilities" href="$SCRIPT_NAME?cat=utilities&repo=$repo">$(gettext 'utilities')</a> 1.178 - <a class="active_network" href="$SCRIPT_NAME?cat=network&repo=$repo">$(gettext 'network')</a> 1.179 - <a class="active_games" href="$SCRIPT_NAME?cat=games&repo=$repo">$(gettext 'games')</a> 1.180 - <a class="active_graphics" href="$SCRIPT_NAME?cat=graphics&repo=$repo">$(gettext 'graphics')</a> 1.181 - <a class="active_office" href="$SCRIPT_NAME?cat=office&repo=$repo">$(gettext 'office')</a> 1.182 - <a class="active_multimedia" href="$SCRIPT_NAME?cat=multimedia&repo=$repo">$(gettext 'multimedia')</a> 1.183 - <a class="active_development" href="$SCRIPT_NAME?cat=development&repo=$repo">$(gettext 'development')</a> 1.184 - <a class="active_system-tools" href="$SCRIPT_NAME?cat=system-tools&repo=$repo">$(gettext 'system-tools')</a> 1.185 - <a class="active_security" href="$SCRIPT_NAME?cat=security&repo=$repo">$(gettext 'security')</a> 1.186 - <a class="active_misc" href="$SCRIPT_NAME?cat=misc&repo=$repo">$(gettext 'misc')</a> 1.187 - <a class="active_meta" href="$SCRIPT_NAME?cat=meta&repo=$repo">$(gettext 'meta')</a> 1.188 - <a class="active_non-free" href="$SCRIPT_NAME?cat=non-free&repo=$repo">$(gettext 'non-free')</a> 1.189 - <a class="active_all" href="$SCRIPT_NAME?cat=all&repo=$repo">$(gettext 'all')</a> 1.190 - <a class="active_extra" href="$SCRIPT_NAME?cat=extra&repo=$repo">$(gettext 'extra')</a> 1.191 + <h4>$(_ 'Categories')</h4> 1.192 + <a class="active_base-system" href="$SCRIPT_NAME?cat=base-system&repo=$repo" >$(_ 'base-system')</a> 1.193 + <a class="active_x-window" href="$SCRIPT_NAME?cat=x-window&repo=$repo" >$(_ 'x-window')</a> 1.194 + <a class="active_utilities" href="$SCRIPT_NAME?cat=utilities&repo=$repo" >$(_ 'utilities')</a> 1.195 + <a class="active_network" href="$SCRIPT_NAME?cat=network&repo=$repo" >$(_ 'network')</a> 1.196 + <a class="active_games" href="$SCRIPT_NAME?cat=games&repo=$repo" >$(_ 'games')</a> 1.197 + <a class="active_graphics" href="$SCRIPT_NAME?cat=graphics&repo=$repo" >$(_ 'graphics')</a> 1.198 + <a class="active_office" href="$SCRIPT_NAME?cat=office&repo=$repo" >$(_ 'office')</a> 1.199 + <a class="active_multimedia" href="$SCRIPT_NAME?cat=multimedia&repo=$repo" >$(_ 'multimedia')</a> 1.200 + <a class="active_development" href="$SCRIPT_NAME?cat=development&repo=$repo" >$(_ 'development')</a> 1.201 + <a class="active_system-tools" href="$SCRIPT_NAME?cat=system-tools&repo=$repo">$(_ 'system-tools')</a> 1.202 + <a class="active_security" href="$SCRIPT_NAME?cat=security&repo=$repo" >$(_ 'security')</a> 1.203 + <a class="active_misc" href="$SCRIPT_NAME?cat=misc&repo=$repo" >$(_ 'misc')</a> 1.204 + <a class="active_meta" href="$SCRIPT_NAME?cat=meta&repo=$repo" >$(_ 'meta')</a> 1.205 + <a class="active_non-free" href="$SCRIPT_NAME?cat=non-free&repo=$repo" >$(_ 'non-free')</a> 1.206 + <a class="active_all" href="$SCRIPT_NAME?cat=all&repo=$repo" >$(_ 'all')</a> 1.207 + <a class="active_extra" href="$SCRIPT_NAME?cat=extra&repo=$repo" >$(_ 'extra')</a> 1.208 EOT 1.209 1.210 if [ -d $PKGS_DB/undigest ]; then 1.211 [ -n "$category" ] || category="base-system" 1.212 cat << EOT 1.213 - <h4>$(gettext 'Repositories')</h4> 1.214 - <a class="repo_Public" href="$SCRIPT_NAME?repo=Public&cat=$category">$(gettext 'Public')</a> 1.215 + <h4>$(_ 'Repositories')</h4> 1.216 + <a class="repo_Public" href="$SCRIPT_NAME?repo=Public&cat=$category">$(_ 'Public')</a> 1.217 EOT 1.218 + 1.219 for i in $(ls $PKGS_DB/undigest); do 1.220 cat << EOT 1.221 <a class="repo_$i" href="$SCRIPT_NAME?repo=$i&cat=$category">$i</a> 1.222 EOT 1.223 done 1.224 + 1.225 cat << EOT 1.226 - <a class="repo_Any" href="$SCRIPT_NAME?repo=Any&cat=$category">$(gettext 'Any')</a> 1.227 + <a class="repo_Any" href="$SCRIPT_NAME?repo=Any&cat=$category">$(_ 'Any')</a> 1.228 EOT 1.229 fi 1.230 echo "</div>" 1.231 } 1.232 1.233 + 1.234 repo_list() { 1.235 if [ -n "$(ls $PKGS_DB/undigest/ 2> /dev/null)" ]; then 1.236 case "$repo" in 1.237 - Public) ;; 1.238 - ""|Any) for i in $PKGS_DB/undigest/* ; do 1.239 - [ -d "$i" ] && echo "$i$1" 1.240 - done ;; 1.241 - *) echo "$PKGS_DB/undigest/$repo$1" 1.242 - return ;; 1.243 + Public) 1.244 + ;; 1.245 + ""|Any) 1.246 + for i in $PKGS_DB/undigest/* ; do 1.247 + [ -d "$i" ] && echo "$i$1" 1.248 + done ;; 1.249 + *) 1.250 + echo "$PKGS_DB/undigest/$repo$1" 1.251 + return ;; 1.252 esac 1.253 fi 1.254 echo "$PKGS_DB$1" 1.255 } 1.256 1.257 + 1.258 repo_name() { 1.259 case "$1" in 1.260 - $PKGS_DB) echo "Public" ;; 1.261 - $PKGS_DB/undigest/*) echo ${1#$PKGS_DB/undigest/} ;; 1.262 + $PKGS_DB) 1.263 + echo "Public" ;; 1.264 + $PKGS_DB/undigest/*) 1.265 + echo ${1#$PKGS_DB/undigest/} ;; 1.266 esac 1.267 } 1.268 1.269 + 1.270 + 1.271 # 1.272 # Commands 1.273 # 1.274 1.275 + 1.276 case " $(GET) " in 1.277 *\ list\ *) 1.278 # 1.279 @@ -226,22 +256,22 @@ 1.280 cd $INSTALLED 1.281 search_form 1.282 sidebar 1.283 - LOADING_MSG="$(gettext 'Listing packages...')" 1.284 + LOADING_MSG="$(_ 'Listing packages...')" 1.285 loading_msg 1.286 cat << EOT 1.287 -<h2>$(gettext 'My packages')</h2> 1.288 +<h2>$(_ 'My packages')</h2> 1.289 <form method='get' action='$SCRIPT_NAME'> 1.290 <input type="hidden" name="do" value="Remove" /> 1.291 <div id="actions"> 1.292 <div class="float-left"> 1.293 - $(gettext 'Selection:') 1.294 - <input type="submit" value="$(gettext 'Remove')" /> 1.295 + $(_ 'Selection:') 1.296 + <input type="submit" value="$(_ 'Remove')" /> 1.297 </div> 1.298 <div class="float-right"> 1.299 <a class="button" href="$SCRIPT_NAME?recharge"> 1.300 - <img src="$IMAGES/recharge.png" />$(gettext 'Recharge list')</a> 1.301 + <img src="$IMAGES/recharge.png" />$(_ 'Recharge list')</a> 1.302 <a class="button" href='$SCRIPT_NAME?up'> 1.303 - <img src="$IMAGES/update.png" />$(gettext 'Check upgrades')</a> 1.304 + <img src="$IMAGES/update.png" />$(_ 'Check upgrades')</a> 1.305 </div> 1.306 </div> 1.307 EOT 1.308 @@ -250,8 +280,7 @@ 1.309 $(table_head) 1.310 <tbody> 1.311 EOT 1.312 - for pkg in * 1.313 - do 1.314 + for pkg in *; do 1.315 . $pkg/receipt 1.316 echo '<tr>' 1.317 # Use default tazpkg icon since all packages displayed are 1.318 @@ -278,6 +307,7 @@ 1.319 EOT 1.320 ;; 1.321 1.322 + 1.323 *\ linkable\ *) 1.324 # 1.325 # List linkable packages. 1.326 @@ -285,23 +315,23 @@ 1.327 cd $INSTALLED 1.328 search_form 1.329 sidebar 1.330 - LOADING_MSG=$(gettext 'Listing linkable packages...') 1.331 + LOADING_MSG=$(_ 'Listing linkable packages...') 1.332 loading_msg 1.333 cat << EOT 1.334 -<h2>$(gettext 'Linkable packages')</h2> 1.335 +<h2>$(_ 'Linkable packages')</h2> 1.336 1.337 <form method='get' action='$SCRIPT_NAME'> 1.338 <input type="hidden" name="do" value="Link" /> 1.339 <div id="actions"> 1.340 <div class="float-left"> 1.341 - $(gettext 'Selection:') 1.342 - <input type="submit" value="$(gettext 'Link')" /> 1.343 + $(_ 'Selection:') 1.344 + <input type="submit" value="$(_ 'Link')" /> 1.345 </div> 1.346 <div class="float-right"> 1.347 <a class="button" href="$SCRIPT_NAME?recharge"> 1.348 - <img src="$IMAGES/recharge.png" />$(gettext 'Recharge list')</a> 1.349 + <img src="$IMAGES/recharge.png" />$(_ 'Recharge list')</a> 1.350 <a class="button" href="$SCRIPT_NAME?up"> 1.351 - <img src="$IMAGES/update.png" />$(gettext 'Check upgrades')</a> 1.352 + <img src="$IMAGES/update.png" />$(_ 'Check upgrades')</a> 1.353 </div> 1.354 </div> 1.355 EOT 1.356 @@ -311,8 +341,7 @@ 1.357 <tbody> 1.358 EOT 1.359 target=$(readlink $PKGS_DB/fslink) 1.360 - for pkg in $(ls $target/$INSTALLED) 1.361 - do 1.362 + for pkg in $(ls $target/$INSTALLED); do 1.363 [ -s $pkg/receipt ] && continue 1.364 . $target/$INSTALLED/$pkg/receipt 1.365 i18n_desc 1.366 @@ -350,26 +379,26 @@ 1.367 [ "$grep_category" == "all" ] && grep_category=".*" 1.368 search_form 1.369 sidebar | sed "s/active_$category/active/;s/repo_$repo/active/" 1.370 - LOADING_MSG="$(gettext 'Listing packages...')" 1.371 + LOADING_MSG="$(_ 'Listing packages...')" 1.372 loading_msg 1.373 cat << EOT 1.374 -<h2>$(eval_gettext 'Category: $category')</h2> 1.375 +<h2>$(_ 'Category: %s' $category)</h2> 1.376 1.377 <form method='get' action='$SCRIPT_NAME'> 1.378 <div id="actions"> 1.379 <div class="float-left"> 1.380 - $(gettext 'Selection:') 1.381 + $(_ 'Selection:') 1.382 <input type="submit" name="do" value="Install" /> 1.383 <input type="submit" name="do" value="Remove" /> 1.384 <input type="hidden" name="repo" value="$repo" /> 1.385 </div> 1.386 <div class="float-right"> 1.387 <a class="button" href="$SCRIPT_NAME?recharge"> 1.388 - <img src="$IMAGES/recharge.png" />$(gettext 'Recharge list')</a> 1.389 + <img src="$IMAGES/recharge.png" />$(_ 'Recharge list')</a> 1.390 <a class="button" href="$SCRIPT_NAME?up"> 1.391 - <img src="$IMAGES/update.png" />$(gettext 'Check upgrades')</a> 1.392 + <img src="$IMAGES/update.png" />$(_ 'Check upgrades')</a> 1.393 <a class="button" href='$SCRIPT_NAME?list'> 1.394 - <img src="$IMAGES/tazpkg.png" />$(gettext 'My packages')</a> 1.395 + <img src="$IMAGES/tazpkg.png" />$(_ 'My packages')</a> 1.396 </div> 1.397 </div> 1.398 EOT 1.399 @@ -377,7 +406,7 @@ 1.400 if [ "$repo" != "Public" ]; then 1.401 Repo_Name="$(repo_name $i)" 1.402 cat << EOT 1.403 -<h3>$(eval_gettext 'Repository: $Repo_Name')</h3> 1.404 +<h3>$(_ 'Repository: %s' $Repo_Name)</h3> 1.405 EOT 1.406 fi 1.407 cat << EOT 1.408 @@ -408,25 +437,25 @@ 1.409 cd $PKGS_DB 1.410 search_form 1.411 sidebar | sed "s/repo_$repo/active/" 1.412 - LOADING_MSG="$(gettext 'Searching packages...')" 1.413 + LOADING_MSG="$(_ 'Searching packages...')" 1.414 loading_msg 1.415 cat << EOT 1.416 -<h2>$(gettext 'Search packages')</h2> 1.417 +<h2>$(_ 'Search packages')</h2> 1.418 <form method="get" action="$SCRIPT_NAME"> 1.419 <div id="actions"> 1.420 <div class="float-left"> 1.421 - $(gettext 'Selection:') 1.422 + $(_ 'Selection:') 1.423 <input type="submit" name="do" value="Install" /> 1.424 <input type="submit" name="do" value="Remove" /> 1.425 - <a href="`cat $PANEL/lib/checkbox.js`">$(gettext 'Toogle all')</a> 1.426 + <a href="$(cat $PANEL/lib/checkbox.js)">$(_ 'Toogle all')</a> 1.427 </div> 1.428 <div class="float-right"> 1.429 <a class="button" href="$SCRIPT_NAME?recharge"> 1.430 - <img src="$IMAGES/recharge.png" />$(gettext 'Recharge list')</a> 1.431 + <img src="$IMAGES/recharge.png" />$(_ 'Recharge list')</a> 1.432 <a class="button" href="$SCRIPT_NAME?up"> 1.433 - <img src="$IMAGES/update.png" />$(gettext 'Check upgrades')</a> 1.434 + <img src="$IMAGES/update.png" />$(_ 'Check upgrades')</a> 1.435 <a class="button" href='$SCRIPT_NAME?list'> 1.436 - <img src="$IMAGES/tazpkg.png" />$(gettext 'My packages')</a> 1.437 + <img src="$IMAGES/tazpkg.png" />$(_ 'My packages')</a> 1.438 </div> 1.439 </div> 1.440 <input type="hidden" name="repo" value="$repo" /> 1.441 @@ -437,8 +466,8 @@ 1.442 cat <<EOT 1.443 <thead> 1.444 <tr> 1.445 - <td>$(gettext 'Package')</td> 1.446 - <td>$(gettext 'File')</td> 1.447 + <td>$(_ 'Package')</td> 1.448 + <td>$(_ 'File')</td> 1.449 </tr> 1.450 <thead> 1.451 <tbody> 1.452 @@ -479,33 +508,32 @@ 1.453 # 1.454 search_form 1.455 sidebar 1.456 - LOADING_MSG="$(gettext 'Recharging lists...')" 1.457 + LOADING_MSG="$(_ 'Recharging lists...')" 1.458 loading_msg 1.459 cat << EOT 1.460 -<h2>$(gettext 'Recharge')</h2> 1.461 +<h2>$(_ 'Recharge')</h2> 1.462 1.463 <form method='get' action='$SCRIPT_NAME'> 1.464 <div id="actions"> 1.465 <div class="float-left"> 1.466 - <p>$(gettext 'Recharge checks for new or updated packages')</p> 1.467 + <p>$(_ 'Recharge checks for new or updated packages')</p> 1.468 </div> 1.469 <div class="float-right"> 1.470 <a class="button" href='$SCRIPT_NAME?up'> 1.471 - <img src="$IMAGES/update.png" />$(gettext 'Check upgrades')</a> 1.472 + <img src="$IMAGES/update.png" />$(_ 'Check upgrades')</a> 1.473 <a class="button" href='$SCRIPT_NAME?list'> 1.474 - <img src="$IMAGES/tazpkg.png" />$(gettext 'My packages')</a> 1.475 + <img src="$IMAGES/tazpkg.png" />$(_ 'My packages')</a> 1.476 </div> 1.477 </div> 1.478 <div class="wrapper"> 1.479 <pre> 1.480 EOT 1.481 - echo $(gettext 'Recharging packages list') | log 1.482 + echo $(_ 'Recharging packages list') | log 1.483 tazpkg recharge | filter_taztools_msgs 1.484 cat << EOT 1.485 </pre> 1.486 </div> 1.487 -<p>$(gettext "Packages lists are up-to-date. You should check for upgrades \ 1.488 -now.")</p> 1.489 +<p>$(_ 'Packages lists are up-to-date. You should check for upgrades now.')</p> 1.490 EOT 1.491 ;; 1.492 1.493 @@ -517,24 +545,24 @@ 1.494 cd $PKGS_DB 1.495 search_form 1.496 sidebar 1.497 - LOADING_MSG="$(gettext 'Checking for upgrades...')" 1.498 + LOADING_MSG="$(_ 'Checking for upgrades...')" 1.499 loading_msg 1.500 cat << EOT 1.501 -<h2>$(gettext 'Up packages')</h2> 1.502 +<h2>$(_ 'Up packages')</h2> 1.503 1.504 <form method="get" action="$SCRIPT_NAME"> 1.505 <div id="actions"> 1.506 <div class="float-left"> 1.507 - $(gettext 'Selection:') 1.508 + $(_ 'Selection:') 1.509 <input type="submit" name="do" value="Install" /> 1.510 <input type="submit" name="do" value="Remove" /> 1.511 - <a href="$(cat $PANEL/lib/checkbox.js)">$(gettext 'Toogle all')</a> 1.512 + <a href="$(cat $PANEL/lib/checkbox.js)">$(_ 'Toogle all')</a> 1.513 </div> 1.514 <div class="float-right"> 1.515 <a class="button" href="$SCRIPT_NAME?recharge"> 1.516 - <img src="$IMAGES/recharge.png" />$(gettext 'Recharge list')</a> 1.517 + <img src="$IMAGES/recharge.png" />$(_ 'Recharge list')</a> 1.518 <a class="button" href="$SCRIPT_NAME?list"> 1.519 - <img src="$IMAGES/tazpkg.png" />$(gettext 'My packages')</a> 1.520 + <img src="$IMAGES/tazpkg.png" />$(_ 'My packages')</a> 1.521 </div> 1.522 </div> 1.523 EOT 1.524 @@ -589,23 +617,22 @@ 1.525 <form method="get" action="$SCRIPT_NAME"> 1.526 <div id="actions"> 1.527 <div class="float-left"> 1.528 - <p>$(gettext 'Performing tasks on packages')</p> 1.529 + <p>$(_ 'Performing tasks on packages')</p> 1.530 </div> 1.531 <div class="float-right"> 1.532 <p> 1.533 <a class="button" href="$SCRIPT_NAME?list"> 1.534 - <img src="$IMAGES/tazpkg.png" />$(gettext 'My packages')</a> 1.535 + <img src="$IMAGES/tazpkg.png" />$(_ 'My packages')</a> 1.536 </p> 1.537 </div> 1.538 </div> 1.539 <div class="box"> 1.540 -$(eval_gettext 'Executing $cmd for: $pkgs') 1.541 +$(_ 'Executing %s for: %s' $cmd $pkgs) 1.542 </div> 1.543 EOT 1.544 - for pkg in $pkgs 1.545 - do 1.546 + for pkg in $pkgs; do 1.547 echo '<pre>' 1.548 - echo $(gettext 'y') | tazpkg $cmd $pkg $opt 2>/dev/null | filter_taztools_msgs 1.549 + echo $(_n 'y') | tazpkg $cmd $pkg $opt 2>/dev/null | filter_taztools_msgs 1.550 echo '</pre>' 1.551 done ;; 1.552 1.553 @@ -619,16 +646,15 @@ 1.554 sidebar 1.555 if [ -d $INSTALLED/$pkg ]; then 1.556 . $INSTALLED/$pkg/receipt 1.557 - files=`cat $INSTALLED/$pkg/files.list | wc -l` 1.558 + files=$(cat $INSTALLED/$pkg/files.list | wc -l) 1.559 action="Remove" 1.560 - action_i18n=$(gettext 'Remove') 1.561 + action_i18n=$(_ 'Remove') 1.562 else 1.563 cd $PKGS_DB 1.564 - LOADING_MSG=$(gettext 'Getting package info...') 1.565 + LOADING_MSG=$(_ 'Getting package info...') 1.566 loading_msg 1.567 IFS='|' 1.568 - set -- $(grep -hs "^$pkg |" packages.desc \ 1.569 - undigest/*/packages.desc) 1.570 + set -- $(grep -hs "^$pkg |" packages.desc undigest/*/packages.desc) 1.571 unset IFS 1.572 PACKAGE=$1 1.573 VERSION="$(echo $2)" 1.574 @@ -636,11 +662,11 @@ 1.575 CATEGORY="$(echo $4)" 1.576 WEB_SITE="$(echo $5)" 1.577 action="Install" 1.578 - action_i18n=$(gettext 'Install') 1.579 + action_i18n=$(_ 'Install') 1.580 temp="$(echo $pkg | sed 's/get-//g')" 1.581 fi 1.582 cat << EOT 1.583 -<h2>$(eval_gettext 'Package $PACKAGE')</h2> 1.584 +<h2>$(_ 'Package %s' $PACKAGE)</h2> 1.585 1.586 <div id="actions"> 1.587 <div class="float-left"> 1.588 @@ -648,7 +674,7 @@ 1.589 EOT 1.590 if [ "$temp" != "$pkg" -a "$action" == "Install" ]; then 1.591 temp="$(echo $pkg | sed 's/get-//g')" 1.592 - echo "<a class='button' href='$SCRIPT_NAME?do=Install&$temp'>$(gettext 'Install (Non Free)')</a>" 1.593 + echo "<a class='button' href='$SCRIPT_NAME?do=Install&$temp'>$(_ 'Install (Non Free)')</a>" 1.594 else 1.595 echo "<a class='button' href='$SCRIPT_NAME?do=$action&$pkg'>$action_i18n</a>" 1.596 fi 1.597 @@ -656,15 +682,15 @@ 1.598 if [ -d $INSTALLED/$pkg ]; then 1.599 if grep -qs "^$pkg$" $PKGS_DB/blocked-packages.list; then 1.600 cat << EOT 1.601 - <a class="button" href="$SCRIPT_NAME?do=Unblock&$pkg">$(gettext 'Unblock')</a> 1.602 + <a class="button" href="$SCRIPT_NAME?do=Unblock&$pkg">$(_ 'Unblock')</a> 1.603 EOT 1.604 else 1.605 cat << EOT 1.606 - <a class="button" href='$SCRIPT_NAME?do=Block&$pkg'>$(gettext 'Block')</a> 1.607 + <a class="button" href='$SCRIPT_NAME?do=Block&$pkg'>$(_ 'Block')</a> 1.608 EOT 1.609 fi 1.610 cat << EOT 1.611 - <a class="button" href='$SCRIPT_NAME?do=Repack&$pkg'>$(gettext 'Repack')</a> 1.612 + <a class="button" href='$SCRIPT_NAME?do=Repack&$pkg'>$(_ 'Repack')</a> 1.613 EOT 1.614 fi 1.615 i18n_desc 1.616 @@ -674,55 +700,55 @@ 1.617 <div class="float-right"> 1.618 <p> 1.619 <a class="button" href='$SCRIPT_NAME?list'> 1.620 - <img src="$IMAGES/tazpkg.png" />$(gettext 'My packages')</a> 1.621 + <img src="$IMAGES/tazpkg.png" />$(_ 'My packages')</a> 1.622 </p> 1.623 </div> 1.624 </div> 1.625 <table class="zebra outbox"> 1.626 <tbody> 1.627 - <tr><td>$(gettext 'Name:')</td><td>$PACKAGE</td></tr> 1.628 - <tr><td>$(gettext 'Version:')</td><td>$VERSION</td></tr> 1.629 - <tr><td>$(gettext 'Description:')</td><td>$SHORT_DESC</td></tr> 1.630 - <tr><td>$(gettext 'Category:')</td><td>$CATEGORY</td></tr> 1.631 + <tr><td><b>$(_ 'Name')</b></td><td>$PACKAGE</td></tr> 1.632 + <tr><td><b>$(_ 'Version')</b></td><td>$VERSION</td></tr> 1.633 + <tr><td><b>$(_ 'Description')</b></td><td>$SHORT_DESC</td></tr> 1.634 + <tr><td><b>$(_ 'Category')</b></td><td>$CATEGORY</td></tr> 1.635 EOT 1.636 if [ -d $INSTALLED/$pkg ]; then 1.637 cat << EOT 1.638 - <tr><td>$(gettext 'Maintainer:')</td><td>$MAINTAINER</td></tr> 1.639 - <tr><td>$(gettext 'Website:')</td><td><a href="$WEB_SITE">$WEB_SITE</a></td></tr> 1.640 - <tr><td>$(gettext 'Sizes:')</td><td>$PACKED_SIZE/$UNPACKED_SIZE</td></tr> 1.641 + <tr><td><b>$(_ 'Maintainer')</b></td><td>$MAINTAINER</td></tr> 1.642 + <tr><td><b>$(_ 'Website')</b></td><td><a href="$WEB_SITE">$WEB_SITE</a></td></tr> 1.643 + <tr><td><b>$(_ 'Sizes')</b></td><td>$PACKED_SIZE/$UNPACKED_SIZE</td></tr> 1.644 EOT 1.645 if [ -n "$DEPENDS" ]; then 1.646 - echo "<tr><td>$(gettext 'Depends:')</td><td>" 1.647 + echo "<tr><td><b>$(_ 'Depends')</b></td><td>" 1.648 for i in $DEPENDS; do 1.649 echo -n "<a href="$(pkg_info_link $i)">$i</a> " 1.650 done 1.651 echo "</td></tr>" 1.652 fi 1.653 if [ -n "$SUGGESTED" ]; then 1.654 - echo "<tr><td>$(gettext 'Suggested:')</td><td>" 1.655 + echo "<tr><td><b>$(_ 'Suggested')</b></td><td>" 1.656 for i in $SUGGESTED; do 1.657 echo -n "<a href="$(pkg_info_link $i)">$i</a> " 1.658 done 1.659 echo "</td></tr>" 1.660 fi 1.661 - [ -n "$TAGS" ] && echo "<tr><td>$(gettext 'Tags:')</td><td>$TAGS</td></tr>" 1.662 + [ -n "$TAGS" ] && echo "<tr><td><b>$(_ 'Tags')</b></td><td>$TAGS</td></tr>" 1.663 I_FILES=$(cat $INSTALLED/$pkg/files.list | wc -l) 1.664 cat << EOT 1.665 </tbody> 1.666 </table> 1.667 1.668 -<p>$(eval_gettext 'Installed files: $I_FILES')</p> 1.669 +<p>$(_ 'Installed files: %s' $I_FILES)</p> 1.670 1.671 <pre>$(cat $INSTALLED/$pkg/files.list)</pre> 1.672 EOT 1.673 else 1.674 cat << EOT 1.675 -<tr><td>$(gettext 'Website:')</td><td><a href="$WEB_SITE">$WEB_SITE</a></td></tr> 1.676 -<tr><td>$(gettext 'Sizes:')</td><td>$(grep -hsA 3 ^$pkg$ packages.txt undigest/*/packages.txt | \ 1.677 +<tr><td><b>$(_ 'Website')</b></td><td><a href="$WEB_SITE">$WEB_SITE</a></td></tr> 1.678 +<tr><td><b>$(_ 'Sizes')</b></td><td>$(grep -hsA 3 ^$pkg$ packages.txt undigest/*/packages.txt | \ 1.679 tail -n 1 | sed 's/ *//')</td></tr> 1.680 </table> 1.681 1.682 -<p>$(gettext 'Installed files:')</p> 1.683 +<p>$(_ 'Installed files:')</p> 1.684 1.685 <pre> 1.686 `unlzma -c files.list.lzma undigest/*/files.list.lzma 2> /dev/null | \ 1.687 @@ -752,7 +778,7 @@ 1.688 mirror=${cmd#rm-mirror=} 1.689 sed -i -e "s@$mirror@@" -e '/^$/d' $(GET file) ;; 1.690 select-mirror*) 1.691 - release=`cat /etc/slitaz-release` 1.692 + release=$(cat /etc/slitaz-release) 1.693 mirror="$(GET mirror)packages/$release/" 1.694 tazpkg setup-mirror $mirror | log 1.695 ;; 1.696 @@ -770,41 +796,41 @@ 1.697 repository=${cmd#rm-repo=} 1.698 rm -rf $PKGS_DB/undigest/$repository ;; 1.699 esac 1.700 - [ "$cmd" == "$(gettext 'Set link')" ] && 1.701 + [ "$cmd" == "$(_n 'Set link')" ] && 1.702 [ -d "$(GET link)/$INSTALLED" ] && 1.703 ln -fs $(GET link) $PKGS_DB/fslink 1.704 - [ "$cmd" == "$(gettext 'Remove link')" ] && 1.705 + [ "$cmd" == "$(_n 'Remove link')" ] && 1.706 rm -f $PKGS_DB/fslink 1.707 - cache_files=`find /var/cache/tazpkg -name *.tazpkg | wc -l` 1.708 - cache_size=`du -sh /var/cache/tazpkg` 1.709 + cache_files=$(find /var/cache/tazpkg -name *.tazpkg | wc -l) 1.710 + cache_size=$(du -sh /var/cache/tazpkg | cut -f1 | sed 's|\.0||') 1.711 sidebar 1.712 cat << EOT 1.713 -<h2>$(gettext 'Administration')</h2> 1.714 +<h2>$(_ 'Administration')</h2> 1.715 <div> 1.716 - <p>$(gettext 'TazPkg administration and settings')</p> 1.717 + <p>$(_ 'TazPkg administration and settings')</p> 1.718 </div> 1.719 <div id="actions"> 1.720 <a class="button" href='$SCRIPT_NAME?admin=&action=saveconf'> 1.721 - <img src="$IMAGES/tazpkg.png" />$(gettext 'Save configuration')</a> 1.722 + <img src="$IMAGES/tazpkg.png" />$(_ 'Save configuration')</a> 1.723 <a class="button" href='$SCRIPT_NAME?admin=&action=listconf'> 1.724 - <img src="$IMAGES/edit.png" />$(gettext 'List configuration files')</a> 1.725 + <img src="$IMAGES/edit.png" />$(_ 'List configuration files')</a> 1.726 <a class="button" href='$SCRIPT_NAME?admin=&action=quickcheck'> 1.727 - <img src="$IMAGES/recharge.png" />$(gettext 'Quick check')</a> 1.728 + <img src="$IMAGES/recharge.png" />$(_ 'Quick check')</a> 1.729 <a class="button" href='$SCRIPT_NAME?admin=&action=fullcheck'> 1.730 - <img src="$IMAGES/recharge.png" />$(gettext 'Full check')</a> 1.731 + <img src="$IMAGES/recharge.png" />$(_ 'Full check')</a> 1.732 </div> 1.733 EOT 1.734 case "$(GET action)" in 1.735 saveconf) 1.736 - LOADING_MSG=$(gettext 'Creating the package...') 1.737 + LOADING_MSG=$(_ 'Creating the package...') 1.738 loading_msg 1.739 echo "<pre>" 1.740 cd $HOME 1.741 tazpkg repack-config | filter_taztools_msgs 1.742 - echo -n "$(gettext 'Path:') " && ls $HOME/config-*.tazpkg 1.743 + echo -n "$(_ 'Path:') "; ls $HOME/config-*.tazpkg 1.744 echo "</pre>" ;; 1.745 listconf) 1.746 - echo "<h4>$(gettext 'Configuration files')</h4>" 1.747 + echo "<h4>$(_ 'Configuration files')</h4>" 1.748 echo "<ul>" 1.749 tazpkg list-config | while read file; do 1.750 [ "${file:0:1}" == "/" ] || continue 1.751 @@ -817,43 +843,43 @@ 1.752 echo "</ul>" 1.753 echo "</pre>" ;; 1.754 quickcheck) 1.755 - LOADING_MSG=$(gettext 'Checking packages consistency...') 1.756 + LOADING_MSG=$(_ 'Checking packages consistency...') 1.757 loading_msg 1.758 echo "<pre>" 1.759 tazpkg check 1.760 echo "</pre>" ;; 1.761 fullcheck) 1.762 - LOADING_MSG=$(gettext 'Full packages check...') 1.763 + LOADING_MSG=$(_ 'Full packages check...') 1.764 loading_msg 1.765 echo "<pre>" 1.766 tazpkg check --full 1.767 echo "</pre>" ;; 1.768 esac 1.769 cat << EOT 1.770 -<h3>$(gettext 'Packages cache')</h3> 1.771 +<h3>$(_ 'Packages cache')</h3> 1.772 1.773 <div> 1.774 <form method="get" action="$SCRIPT_NAME"> 1.775 <p> 1.776 - $(eval_gettext 'Packages in the cache: $cache_files ($cache_size)') 1.777 + $(_ 'Packages in the cache: %s (%s)' $cache_files $cache_size) 1.778 <input type="hidden" name="admin" value="clean" /> 1.779 <input type="submit" value="Clean" /> 1.780 </p> 1.781 </form> 1.782 </div> 1.783 1.784 -<h3>$(gettext 'Default mirror')</h3> 1.785 +<h3>$(_ 'Default mirror')</h3> 1.786 1.787 <pre>$(cat /var/lib/tazpkg/mirror)</pre> 1.788 1.789 -<h3>$(gettext 'Current mirror list')</h3> 1.790 +<h3>$(_ 'Current mirror list')</h3> 1.791 EOT 1.792 for i in $PKGS_DB/mirrors $PKGS_DB/undigest/*/mirrors; do 1.793 [ -s $i ] || continue 1.794 echo '<div class="box">' 1.795 if [ $i != $PKGS_DB/mirrors ]; then 1.796 Repo_Name="$(repo_name $(dirname $i))" 1.797 - echo "<h4>$(eval_gettext 'Repository: $Repo_Name')</h4>" 1.798 + echo "<h4>$(_ 'Repository: %s' $Repo_Name)</h4>" 1.799 fi 1.800 echo "<ul>" 1.801 list_mirrors $i 1.802 @@ -870,7 +896,7 @@ 1.803 </form> 1.804 EOT 1.805 done 1.806 - echo "<h3>$(gettext 'Private repositories')</h3>" 1.807 + echo "<h3>$(_ 'Private repositories')</h3>" 1.808 [ -n "$(ls $PKGS_DB/undigest 2> /dev/null)" ] && cat << EOT 1.809 <div class="box"> 1.810 <ul> 1.811 @@ -882,16 +908,16 @@ 1.812 <form method="get" action="$SCRIPT_NAME"> 1.813 <p> 1.814 <input type="hidden" name="admin" value="add-repo" /> 1.815 - $(gettext 'Name') <input type="text" name="repository" size="10"> 1.816 - $(gettext 'mirror') 1.817 + $(_ 'Name') <input type="text" name="repository" size="10"> 1.818 + $(_ 'mirror') 1.819 <input type="text" name="mirror" value="http://" size="50"> 1.820 <input type="submit" value="Add repository" /> 1.821 </p> 1.822 </form> 1.823 1.824 -<h3>$(gettext 'Link to another SliTaz installation')</h3> 1.825 +<h3>$(_ 'Link to another SliTaz installation')</h3> 1.826 1.827 -<p>$(gettext "This link points to the root of another SliTaz installation. \ 1.828 +<p>$(_ "This link points to the root of another SliTaz installation. \ 1.829 You will be able to install packages using soft links to it.")</p> 1.830 1.831 <form method="get" action="$SCRIPT_NAME"> 1.832 @@ -899,32 +925,32 @@ 1.833 <input type="hidden" name="admin" value="add-link" /> 1.834 <input type="text" name="link" 1.835 value="$(readlink $PKGS_DB/fslink 2> /dev/null)" size="50"> 1.836 - <input type="submit" name="admin" value="$(gettext 'Set link')" /> 1.837 - <input type="submit" name="admin" value="$(gettext 'Remove link')" /> 1.838 + <input type="submit" name="admin" value="$(_ 'Set link')" /> 1.839 + <input type="submit" name="admin" value="$(_ 'Remove link')" /> 1.840 </p> 1.841 </form> 1.842 EOT 1.843 version=$(cat /etc/slitaz-release) 1.844 cat << EOT 1.845 1.846 -<h3 id="dvd">$(gettext 'SliTaz packages DVD')</h3> 1.847 +<h3 id="dvd">$(_ 'SliTaz packages DVD')</h3> 1.848 1.849 -<p>$(eval_gettext 'A bootable DVD image of all available packages for the 1.850 -$version version is generated every day. It also contains a copy of the 1.851 -website and can be used without an internet connection. This image can be 1.852 -installed on a DVD or a USB key.')</p> 1.853 +<p>$(_ "A bootable DVD image of all available packages for the %s version is \ 1.854 +generated every day. It also contains a copy of the website and can be used \ 1.855 +without an internet connection. This image can be installed on a DVD or a USB \ 1.856 +key." $version)</p> 1.857 1.858 <div> 1.859 <form method="post" action='$SCRIPT_NAME?admin&action=dvdimage#dvd'> 1.860 <p> 1.861 <a class="button" 1.862 href='http://mirror.slitaz.org/iso/$version/packages-$version.iso'> 1.863 - <img src="$IMAGES/tazpkg.png" />$(gettext 'Download DVD image')</a> 1.864 + <img src="$IMAGES/tazpkg.png" />$(_ 'Download DVD image')</a> 1.865 <a class="button" href='$SCRIPT_NAME?admin&action=dvdusbkey#dvd'> 1.866 - <img src="$IMAGES/tazpkg.png" />$(gettext 'Install from DVD/USB key')</a> 1.867 + <img src="$IMAGES/tazpkg.png" />$(_ 'Install from DVD/USB key')</a> 1.868 </p> 1.869 <div class="box"> 1.870 - $(gettext 'Install from ISO image:') 1.871 + $(_ 'Install from ISO image:') 1.872 <input type="text" name="dvdimage" size="40" value="/root/packages-$version.iso"> 1.873 </div> 1.874 </form> 1.875 @@ -936,7 +962,7 @@ 1.876 echo "<pre>" 1.877 mount -t iso9660 -o loop,ro $dev /mnt/packages && 1.878 /mnt/packages/install.sh && 1.879 - echo "$dev is installed on /mnt/packages" 1.880 + _ '%s is installed on /mnt/packages' $dev 1.881 echo "</pre>" 1.882 fi 1.883 if [ "$(GET action)" == "dvdusbkey" ]; then 1.884 @@ -948,7 +974,7 @@ 1.885 echo "<pre>" 1.886 mount -t iso9660 -o ro $dev /mnt/packages && 1.887 /mnt/packages/install.sh && 1.888 - echo "$dev is installed on /mnt/packages" 1.889 + _ '%s is installed on /mnt/packages' $dev 1.890 echo "</pre>" 1.891 break 1.892 done 1.893 @@ -963,35 +989,35 @@ 1.894 [ -n "$(GET block)" ] && tazpkg block $(GET block) 1.895 [ -n "$(GET unblock)" ] && tazpkg unblock $(GET unblock) 1.896 cat << EOT 1.897 -<h2>$(gettext 'Summary')</h2> 1.898 +<h2>$(_ 'Summary')</h2> 1.899 1.900 <div id="actions"> 1.901 <a class="button" href="$SCRIPT_NAME?list"> 1.902 - <img src="$IMAGES/tazpkg.png" />$(gettext 'My packages')</a> 1.903 + <img src="$IMAGES/tazpkg.png" />$(_ 'My packages')</a> 1.904 EOT 1.905 fslink=$(readlink $PKGS_DB/fslink) 1.906 [ -n "$fslink" -a -d "$fslink/$INSTALLED" ] && 1.907 cat << EOT 1.908 <a class="button" href="$SCRIPT_NAME?linkable"> 1.909 - <img src="$IMAGES/tazpkg.png" />$(gettext 'Linkable packages')</a> 1.910 + <img src="$IMAGES/tazpkg.png" />$(_ 'Linkable packages')</a> 1.911 EOT 1.912 cat << EOT 1.913 <a class="button" href="$SCRIPT_NAME?recharge"> 1.914 - <img src="$IMAGES/recharge.png" />$(gettext 'Recharge list')</a> 1.915 + <img src="$IMAGES/recharge.png" />$(_ 'Recharge list')</a> 1.916 <a class="button" href="$SCRIPT_NAME?up"> 1.917 - <img src="$IMAGES/update.png" />$(gettext 'Check upgrades')</a> 1.918 + <img src="$IMAGES/update.png" />$(_ 'Check upgrades')</a> 1.919 <a class="button" href="$SCRIPT_NAME?admin"> 1.920 - <img src="$IMAGES/edit.png" />$(gettext 'Administration')</a> 1.921 + <img src="$IMAGES/edit.png" />$(_ 'Administration')</a> 1.922 </div> 1.923 1.924 $(packages_summary) 1.925 1.926 1.927 -<h3>$(gettext 'Latest log entries')</h3> 1.928 +<h3>$(_ 'Latest log entries')</h3> 1.929 1.930 <pre> 1.931 -`tail -n 5 /var/log/tazpkg.log | fgrep "-" | \ 1.932 - awk '{print $1, $2, $3, $4, $5, $6, $7}'` 1.933 +$(tail -n 5 /var/log/slitaz/tazpkg.log | fgrep "-" | \ 1.934 + awk '{print $1, $2, $3, $4, $5, $6, $7}') 1.935 </pre> 1.936 EOT 1.937 ;;