tazpanel rev 443
Use short gettext commands; use $HTTP_HOST in redirection URL (for localhost 127.0.0.1:82 works too; for local network connection URL like 192.168.1.10:82 works).
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Wed Apr 08 15:32:20 2015 +0300 (2015-04-08) |
| parents | ee21700899cc |
| children | 4224c82f9b05 |
| files | Makefile boot.cgi data/httpd.conf hardware.cgi help.cgi index.cgi lib/libtazpanel network.cgi po/el.po po/es.po po/fr.po po/pl.po po/pt_BR.po po/ru.po po/sv.po po/tazpanel.pot po/zh_CN.po settings.cgi styles/default/footer.html styles/default/header.html tazpanel |
line diff
1.1 --- a/Makefile Wed Apr 08 10:20:10 2015 +0200 1.2 +++ b/Makefile Wed Apr 08 15:32:20 2015 +0300 1.3 @@ -13,7 +13,7 @@ 1.4 # i18n 1.5 1.6 pot: 1.7 - xgettext -o po/tazpanel.pot -L Shell \ 1.8 + xgettext -o po/tazpanel.pot -L Shell -k_ -k_n -k_p:1,2 \ 1.9 --package-name="TazPanel" \ 1.10 --package-version="$(VERSION)" \ 1.11 ./tazpanel ./index.cgi ./network.cgi ./boot.cgi \
2.1 --- a/boot.cgi Wed Apr 08 10:20:10 2015 +0200 2.2 +++ b/boot.cgi Wed Apr 08 15:32:20 2015 +0300 2.3 @@ -13,7 +13,7 @@ 2.4 get_config 2.5 header 2.6 2.7 -TITLE=$(gettext 'TazPanel - Boot') 2.8 +TITLE=$(_ 'TazPanel - Boot') 2.9 2.10 2.11 # Print last 40 lines of given file with "more" link 2.12 @@ -24,7 +24,7 @@ 2.13 *) tail -n40;; 2.14 esac 2.15 [ $(wc -l < $1) -gt 40 ] && cat <<EOT 2.16 -<hr/><a data-icon="view" href="index.cgi?file=$1">$(gettext 'Show more...')</a> 2.17 +<hr/><a data-icon="view" href="index.cgi?file=$1">$(_ 'Show more...')</a> 2.18 EOT 2.19 } 2.20 2.21 @@ -53,13 +53,13 @@ 2.22 esac 2.23 xhtml_header 2.24 cat <<EOT 2.25 -<h2>$(gettext 'Boot log files')</h2> 2.26 +<h2>$(_ 'Boot log files')</h2> 2.27 2.28 <ul id="tabs"> 2.29 - <li$actkernel><a href="?log=kernel">$(gettext 'Kernel messages')</a></li> 2.30 - <li$actboot ><a href="?log=boot" >$(gettext 'Boot scripts' )</a></li> 2.31 - <li$actxlog ><a href="?log=xlog" >$(gettext 'X server' )</a></li> 2.32 - <li$actslim ><a href="?log=slim" >$(gettext 'X session' )</a></li> 2.33 + <li$actkernel><a href="?log=kernel">$(_ 'Kernel messages')</a></li> 2.34 + <li$actboot ><a href="?log=boot" >$(_ 'Boot scripts' )</a></li> 2.35 + <li$actxlog ><a href="?log=xlog" >$(_ 'X server' )</a></li> 2.36 + <li$actslim ><a href="?log=slim" >$(_ 'X session' )</a></li> 2.37 </ul> 2.38 2.39 <section> 2.40 @@ -81,9 +81,9 @@ 2.41 xhtml_header 2.42 2.43 cat <<EOT 2.44 -<h2>$(gettext 'Manage daemons')</h2> 2.45 +<h2>$(_ 'Manage daemons')</h2> 2.46 2.47 -<p>$(gettext 'Check, start and stop daemons on SliTaz')</p> 2.48 +<p>$(_ 'Check, start and stop daemons on SliTaz')</p> 2.49 EOT 2.50 daemon=$(GET daemons) 2.51 case "$daemon" in 2.52 @@ -107,12 +107,12 @@ 2.53 <table class="zebra wide daemons"> 2.54 <thead> 2.55 <tr> 2.56 - <td>$(gettext 'Name')</td> 2.57 - <td>$(gettext 'Description')</td> 2.58 - <td>$(gettext 'Configuration')</td> 2.59 - <td>$(gettext 'Status')</td> 2.60 - <td>$(gettext 'Action')</td> 2.61 - <td>$(gettext 'PID')</td> 2.62 + <td>$(_ 'Name')</td> 2.63 + <td>$(_ 'Description')</td> 2.64 + <td>$(_ 'Configuration')</td> 2.65 + <td>$(_ 'Status')</td> 2.66 + <td>$(_ 'Action')</td> 2.67 + <td>$(_ 'PID')</td> 2.68 </tr> 2.69 </thead> 2.70 <tbody> 2.71 @@ -135,32 +135,32 @@ 2.72 [ -n "$(which $name)" ] && cfg="man|help|$cfg" 2.73 case "$name" in 2.74 firewall) 2.75 - gettext 'SliTaz Firewall with iptable rules' ;; 2.76 + _ 'SliTaz Firewall with iptable rules' ;; 2.77 httpd) 2.78 - gettext 'Small and fast web server with CGI support' ;; 2.79 + _ 'Small and fast web server with CGI support' ;; 2.80 ntpd) 2.81 - gettext 'Network time protocol daemon' ;; 2.82 + _ 'Network time protocol daemon' ;; 2.83 ftpd) 2.84 cfg="man|help|edit::/etc/inetd.conf" 2.85 - gettext 'Anonymous FTP server' ;; 2.86 + _ 'Anonymous FTP server' ;; 2.87 udhcpd) 2.88 - gettext 'Busybox DHCP server' ;; 2.89 + _ 'Busybox DHCP server' ;; 2.90 syslogd|klogd) 2.91 - gettext 'Linux Kernel log daemon' ;; 2.92 + _ 'Linux Kernel log daemon' ;; 2.93 crond) 2.94 # FIXME crontab 2.95 - gettext 'Execute scheduled commands' ;; 2.96 + _ 'Execute scheduled commands' ;; 2.97 dnsd) 2.98 cfg="man|help|edit|options::-d" 2.99 - gettext 'Small static DNS server daemon' ;; 2.100 + _ 'Small static DNS server daemon' ;; 2.101 tftpd) 2.102 cfg="man|help|edit::/etc/inetd.conf" 2.103 - gettext 'Transfer a file on tftp request' ;; 2.104 + _ 'Transfer a file on tftp request' ;; 2.105 inetd) 2.106 - gettext 'Listen for network connections and launch programs' ;; 2.107 + _ 'Listen for network connections and launch programs' ;; 2.108 zcip) 2.109 cfg="man|help|edit:Script:/etc/zcip.script|options::eth0 /etc/zcip.script" 2.110 - gettext 'Manage a ZeroConf IPv4 link-local address' ;; 2.111 + _ 'Manage a ZeroConf IPv4 link-local address' ;; 2.112 *) 2.113 # Description from receipt 2.114 [ -d "$LOCALSTATE/installed/$name" ] && pkg=$name 2.115 @@ -229,8 +229,8 @@ 2.116 echo "</td>" 2.117 if [ "$pid" ]; then 2.118 cat <<EOT 2.119 -<td><span title="$(gettext 'Started')" data-img="on"></span></td> 2.120 -<td><a href="?daemons=stop=$name" title="$(gettext 'Stop')" data-img="stop"></a></td> 2.121 +<td><span title="$(_ 'Started')" data-img="on"></span></td> 2.122 +<td><a href="?daemons=stop=$name" title="$(_ 'Stop')" data-img="stop"></a></td> 2.123 <td> 2.124 EOT 2.125 for i in $pid; do 2.126 @@ -240,8 +240,8 @@ 2.127 done 2.128 else 2.129 cat <<EOT 2.130 -<td><span title="$(gettext 'Stopped')" data-img="off"></span></td> 2.131 -<td><a href="?daemons=start=$name" title="$(gettext 'Start')" data-img="start"></a></td> 2.132 +<td><span title="$(_ 'Stopped')" data-img="off"></span></td> 2.133 +<td><a href="?daemons=start=$name" title="$(_ 'Start')" data-img="start"></a></td> 2.134 <td>----- 2.135 EOT 2.136 fi 2.137 @@ -267,44 +267,44 @@ 2.138 splash=$(cat $GRUBMENU | grep ^splashimage | cut -d' ' -f2) 2.139 xhtml_header 2.140 cat <<EOT 2.141 -<h2>$(gettext 'GRUB Boot loader')</h2> 2.142 +<h2>$(_ 'GRUB Boot loader')</h2> 2.143 2.144 -<p>$(gettext 'The first application started when the computer powers on')</p> 2.145 +<p>$(_ 'The first application started when the computer powers on')</p> 2.146 2.147 <form class="wide"> 2.148 <section> 2.149 <div> 2.150 <input type="hidden" name="grub"/> 2.151 <table> 2.152 - <tr><td>$(gettext 'Default entry:')</td> 2.153 + <tr><td>$(_ 'Default entry:')</td> 2.154 <td><input type="text" name="default" value="${default##*=}"/></td></tr> 2.155 - <tr><td>$(gettext 'Timeout:')</td> 2.156 + <tr><td>$(_ 'Timeout:')</td> 2.157 <td><input type="text" name="timeout" value="${timeout##*=}"/></td></tr> 2.158 - <tr><td>$(gettext 'Splash image:')</td> 2.159 + <tr><td>$(_ 'Splash image:')</td> 2.160 <td><input type="text" name="splash" value="${splash##*=}" size="40"/></td></tr> 2.161 </table> 2.162 </div> 2.163 <footer> 2.164 - <button type="submit" data-icon="ok">$(gettext 'Change')</button> 2.165 + <button type="submit" data-icon="ok">$(_ 'Change')</button> 2.166 </footer> 2.167 </section> 2.168 </form> 2.169 2.170 <form action="index.cgi"> 2.171 <input type="hidden" name="file" value="$GRUBMENU"/> 2.172 - <button data-icon="text">$(gettext 'View or edit menu.lst')</button> 2.173 + <button data-icon="text">$(_ 'View or edit menu.lst')</button> 2.174 </form> 2.175 2.176 2.177 <section> 2.178 - <header>$(gettext 'Boot entries')</header> 2.179 + <header>$(_ 'Boot entries')</header> 2.180 <div> 2.181 EOT 2.182 2.183 2.184 menu=$(tail -q -n +$(grep -n ^title $GRUBMENU | head -n1 | cut -d: -f1) $GRUBMENU | \ 2.185 sed -e "s|^$||g" | \ 2.186 - sed -e "s|^title|</pre></div>\n</section>\n\n<section>\n\t<header>$(gettext 'Entry') #</header>\n<div><pre style=\"white-space:pre-wrap\">\0|g" | \ 2.187 + sed -e "s|^title|</pre></div>\n</section>\n\n<section>\n\t<header>$(_ 'Entry') #</header>\n<div><pre style=\"white-space:pre-wrap\">\0|g" | \ 2.188 sed '/^[ \t]*$/d' | \ 2.189 tail -q -n +2)"</pre>" 2.190 2.191 @@ -325,7 +325,7 @@ 2.192 [ -f "/boot/gpxe" ] && cat <<EOT 2.193 <section> 2.194 <header>gPXE</header> 2.195 - <div>$(gettext 'Web boot is available with gPXE')</div> 2.196 + <div>$(_ 'Web boot is available with gPXE')</div> 2.197 </section> 2.198 EOT 2.199 ;; 2.200 @@ -338,48 +338,48 @@ 2.201 . /etc/rcS.conf 2.202 xhtml_header 2.203 cat <<EOT 2.204 -<h2>$(gettext 'Boot & Start services')</h2> 2.205 +<h2>$(_ 'Boot & Start services')</h2> 2.206 2.207 -<p>$(gettext 'Everything that happens before user login')</p> 2.208 +<p>$(_ 'Everything that happens before user login')</p> 2.209 2.210 <form> 2.211 - <button name="log" data-icon="logs" >$(gettext 'Boot logs' )</button> 2.212 - <button name="daemons" data-icon="daemons" data-root>$(gettext 'Manage daemons')</button> 2.213 + <button name="log" data-icon="logs" >$(_ 'Boot logs')</button> 2.214 + <button name="daemons" data-icon="daemons" data-root>$(_ 'Manage daemons')</button> 2.215 EOT 2.216 [ -w /boot/grub/menu.lst ] && cat <<EOT 2.217 - <button name="grub" data-icon="grub" >$(gettext 'Boot loader' )</button> 2.218 + <button name="grub" data-icon="grub" >$(_ 'Boot loader')</button> 2.219 EOT 2.220 cat <<EOT 2.221 </form> 2.222 2.223 2.224 <section> 2.225 - <header>$(gettext 'Configuration files')</header> 2.226 + <header>$(_ 'Configuration files')</header> 2.227 <form action="index.cgi" class="wide"> 2.228 <table> 2.229 - <tr><td>$(gettext 'Main configuration file:') <b>rcS.conf</b></td> 2.230 - <td><button name="file" value="/etc/rcS.conf" data-icon="view">$(gettext 'View')</button></td></tr> 2.231 - <tr><td>$(gettext 'Login manager settings:') <b>slim.conf</b></td> 2.232 - <td><button name="file" value="/etc/slim.conf" data-icon="view">$(gettext 'View')</button></td></tr> 2.233 + <tr><td>$(_ 'Main configuration file:') <b>rcS.conf</b></td> 2.234 + <td><button name="file" value="/etc/rcS.conf" data-icon="view">$(_ 'View')</button></td></tr> 2.235 + <tr><td>$(_ 'Login manager settings:') <b>slim.conf</b></td> 2.236 + <td><button name="file" value="/etc/slim.conf" data-icon="view">$(_ 'View')</button></td></tr> 2.237 </table> 2.238 </form> 2.239 </section> 2.240 2.241 2.242 <section style="overflow-x: auto"> 2.243 - <header>$(gettext 'Kernel cmdline')</header> 2.244 + <header>$(_ 'Kernel cmdline')</header> 2.245 <pre>$(cat /proc/cmdline)</pre> 2.246 </section> 2.247 2.248 2.249 <section> 2.250 <header> 2.251 - $(gettext 'Local startup commands') 2.252 + $(_ 'Local startup commands') 2.253 <form action="index.cgi"> 2.254 <input type="hidden" name="file" value="/etc/init.d/local.sh"/> 2.255 EOT 2.256 [ -w /etc/init.d/local.sh ] && cat <<EOT 2.257 - <button name="action" value="edit" data-icon="edit">$(gettext 'Edit')</button> 2.258 + <button name="action" value="edit" data-icon="edit">$(_ 'Edit')</button> 2.259 EOT 2.260 cat <<EOT 2.261 </form>
3.1 --- a/data/httpd.conf Wed Apr 08 10:20:10 2015 +0200 3.2 +++ b/data/httpd.conf Wed Apr 08 15:32:20 2015 +0300 3.3 @@ -16,3 +16,4 @@ 3.4 *.cgi:/bin/sh 3.5 # Additional MIME types 3.6 .js:text/javascript 3.7 +.ttf:application/x-font-ttf
4.1 --- a/hardware.cgi Wed Apr 08 10:20:10 2015 +0200 4.2 +++ b/hardware.cgi Wed Apr 08 15:32:20 2015 +0300 4.3 @@ -10,7 +10,7 @@ 4.4 get_config 4.5 header 4.6 4.7 -TITLE=$(gettext 'TazPanel - Hardware') 4.8 +TITLE=$(_ 'TazPanel - Hardware') 4.9 4.10 # Call an optional module 4.11 lib() { 4.12 @@ -32,10 +32,10 @@ 4.13 <table class="wide zebra"> 4.14 <thead> 4.15 <tr> 4.16 - <td>$(gettext 'Bus')</td> 4.17 - <td>$(gettext 'Device')</td> 4.18 - <td>$(gettext 'ID')</td> 4.19 - <td>$(gettext 'Name')</td> 4.20 + <td>$(_ 'Bus')</td> 4.21 + <td>$(_ 'Device')</td> 4.22 + <td>$(_ 'ID')</td> 4.23 + <td>$(_ 'Name')</td> 4.24 </tr> 4.25 </thead> 4.26 <tbody> 4.27 @@ -87,8 +87,8 @@ 4.28 # TODO: Add button to detect webcam, etc. Like in tazhw box. 4.29 xhtml_header 4.30 cat <<EOT 4.31 -<h2>$(gettext 'Detect hardware')</h2> 4.32 -<p>$(gettext 'Detect PCI and USB hardware')</p> 4.33 +<h2>$(_ 'Detect hardware')</h2> 4.34 +<p>$(_ 'Detect PCI and USB hardware')</p> 4.35 4.36 <section> 4.37 <pre>$(tazhw detect-pci | sed 's|^>|\>|g')</pre> 4.38 @@ -101,13 +101,12 @@ 4.39 *\ modules\ *|*\ modinfo\ *) 4.40 xhtml_header 4.41 cat <<EOT 4.42 -<h2>$(gettext 'Kernel modules')</h2> 4.43 +<h2>$(_ 'Kernel modules')</h2> 4.44 +<p>$(_ 'Manage, search or get information about the Linux kernel modules')</p> 4.45 4.46 -<form id="actions"> 4.47 +<form> 4.48 <input type="hidden" name="modules"/> 4.49 - $(gettext 'Manage, search or get information about the Linux kernel modules') 4.50 - 4.51 - <input type="search" name="search" class="float-right" placeholder="$(gettext 'Modules search')" results="5" autosave="modsearch" autocomplete="on"/> 4.52 + <input type="search" name="search" class="float-right" placeholder="$(_ 'Modules search')" results="5" autosave="modsearch" autocomplete="on"/> 4.53 </form> 4.54 EOT 4.55 # Request may be modinfo output that we want in the page itself 4.56 @@ -115,7 +114,7 @@ 4.57 if [ -n "$get_modinfo" ]; then 4.58 cat <<EOT 4.59 <section> 4.60 - <header>$(eval_gettext 'Detailed information for module: $get_modinfo')</header> 4.61 + <header>$(_ 'Detailed information for module: %s' $get_modinfo)</header> 4.62 4.63 EOT 4.64 modinfo $get_modinfo | awk 'BEGIN{print "<table class=\"wide zebra\">"} 4.65 @@ -135,13 +134,13 @@ 4.66 fi 4.67 get_search="$(GET search)" 4.68 if [ -n "$get_search" ]; then 4.69 - eval_gettext 'Matching result(s) for: $get_search' 4.70 + _ 'Matching result(s) for: %s' $get_search 4.71 echo '<pre>' 4.72 modprobe -l | grep "$(GET search)" | while read line 4.73 do 4.74 name=$(basename $line) 4.75 mod=${name%.ko.gz} 4.76 - echo "$(gettext 'Module:') <a href='?modinfo=$mod'>$mod</a>" 4.77 + echo "$(_ 'Module:') <a href='?modinfo=$mod'>$mod</a>" 4.78 done 4.79 echo '</pre>' 4.80 fi 4.81 @@ -150,11 +149,11 @@ 4.82 <table class="zebra"> 4.83 <thead> 4.84 <tr> 4.85 - <td>$(gettext 'Module')</td> 4.86 - <td>$(gettext 'Description')</td> 4.87 - <td>$(gettext 'Size')</td> 4.88 - <td>$(gettext 'Used')</td> 4.89 - <td>$(gettext 'by')</td> 4.90 + <td>$(_ 'Module')</td> 4.91 + <td>$(_ 'Description')</td> 4.92 + <td>$(_ 'Size')</td> 4.93 + <td>$(_ 'Used')</td> 4.94 + <td>$(_ 'by')</td> 4.95 </tr> 4.96 <thead> 4.97 <tbody> 4.98 @@ -178,9 +177,9 @@ 4.99 xhtml_header 4.100 vidpid="$(GET lsusb)" 4.101 cat <<EOT 4.102 -<h2>$(eval_gettext 'Information for USB Device $vidpid')</h2> 4.103 +<h2>$(_ 'Information for USB Device %s' $vidpid)</h2> 4.104 4.105 -<p>$(gettext 'Detailed information about specified device.')</p> 4.106 +<p>$(_ 'Detailed information about specified device.')</p> 4.107 4.108 <section>$(lsusb_table)</section> 4.109 EOT 4.110 @@ -196,9 +195,9 @@ 4.111 xhtml_header 4.112 slot="$(GET lspci)" 4.113 cat <<EOT 4.114 -<h2>$(eval_gettext 'Information for PCI Device $slot')</h2> 4.115 +<h2>$(_ 'Information for PCI Device %s' $slot)</h2> 4.116 4.117 -<p>$(gettext 'Detailed information about specified device.')</p> 4.118 +<p>$(_ 'Detailed information about specified device.')</p> 4.119 4.120 <section>$(lspci_table)</section> 4.121 EOT 4.122 @@ -219,13 +218,13 @@ 4.123 # 4.124 xhtml_header 4.125 cat <<EOT 4.126 -<h2>$(gettext 'Drivers & Devices')</h2> 4.127 -<p>$(gettext 'Manage your computer hardware')</p> 4.128 +<h2>$(_ 'Drivers & Devices')</h2> 4.129 +<p>$(_ 'Manage your computer hardware')</p> 4.130 4.131 <form><!-- 4.132 - --><button name="modules" data-icon="modules">$(gettext 'Kernel modules')</button><!-- 4.133 - --><button name="detect" data-icon="detect" data-root>$(gettext 'Detect PCI/USB')</button><!-- 4.134 - --><button name="tazx" data-icon="tazx" data-root>$(gettext 'Auto-install Xorg video driver')</button><!-- 4.135 + --><button name="modules" data-icon="modules">$(_ 'Kernel modules')</button><!-- 4.136 + --><button name="detect" data-icon="detect" data-root>$(_ 'Detect PCI/USB')</button><!-- 4.137 + --><button name="tazx" data-icon="tazx" data-root>$(_ 'Auto-install Xorg video driver')</button><!-- 4.138 --></form> 4.139 4.140 EOT 4.141 @@ -235,7 +234,7 @@ 4.142 if [ -n "$(ls /proc/acpi/battery/*/info 2>/dev/null)" ]; then 4.143 cat <<EOT 4.144 <section> 4.145 - <header>$(gettext 'Battery')</header> 4.146 + <header>$(_ 'Battery')</header> 4.147 <div> 4.148 <table class="wide"> 4.149 EOT 4.150 @@ -252,10 +251,10 @@ 4.151 rempct=$(( $remain * 100 / $full )) 4.152 cat <<EOT 4.153 <tr> 4.154 - <td><span data-icon="battery">$(gettext 'Battery')</span> 4.155 + <td><span data-icon="battery">$(_ 'Battery')</span> 4.156 $(grep "^battery type" $dev/info | sed 's/.*: *//') 4.157 $(grep "^design capacity:" $dev/info | sed 's/.*: *//') </td> 4.158 - <td>$(gettext 'health') $(( (100*$full)/$design))%</td> 4.159 + <td>$(_ 'health') $(( (100*$full)/$design))%</td> 4.160 <td class="meter"><meter min="0" max="$full" value="$remain" low="$low" 4.161 high="$warning" optimum="$full"></meter> 4.162 <span> 4.163 @@ -264,13 +263,13 @@ 4.164 "discharging") 4.165 remtime=$(( $remain * 60 / $rate )) 4.166 remtimef=$(printf "%d:%02d" $(($remtime/60)) $(($remtime%60))) 4.167 - eval_gettext 'Discharging $rempct% - $remtimef' ;; 4.168 + _ 'Discharging %d%% - %s' $rempct $remtimef ;; 4.169 "charging") 4.170 remtime=$(( ($full - $remain) * 60 / $rate )) 4.171 remtimef=$(printf "%d:%02d" $(($remtime/60)) $(($remtime%60))) 4.172 - eval_gettext 'Charging $rempct% - $remtimef' ;; 4.173 + eval_gettext 'Charging %d%% - %s' $rempct $remtimef ;; 4.174 "charged") 4.175 - gettext 'Charged 100%' ;; 4.176 + _ 'Charged 100%' ;; 4.177 esac 4.178 cat <<EOT 4.179 4.180 @@ -289,7 +288,7 @@ 4.181 4.182 # Thermal sensors 4.183 if [ -n "$(ls /sys/devices/virtual/thermal/*/temp 2>/dev/null)" ]; then 4.184 - echo "<p><span data-icon=\"temperature\">$(gettext 'Temperature:')</span>" 4.185 + echo "<p><span data-icon=\"temperature\">$(_ 'Temperature:')</span>" 4.186 for temp in /sys/devices/virtual/thermal/*/temp; do 4.187 awk '{ print $1/1000 "℃" }' < $temp 4.188 done 4.189 @@ -304,7 +303,7 @@ 4.190 name=$(echo $dev | sed 's|.*/backlight/\([^/]*\).*|\1|') 4.191 cat <<EOT 4.192 <input type="hidden" name="dev" value="$name"/> 4.193 -<span data-icon="brightness">$(gettext 'Brightness')</span> \ 4.194 +<span data-icon="brightness">$(_ 'Brightness')</span> \ 4.195 $(sed 's/.*\.//;s/_*$//' < /sys/devices/virtual/backlight/$name/device/path): 4.196 <select name="brightness" onchange="submit();"> 4.197 EOT 4.198 @@ -324,7 +323,7 @@ 4.199 cat <<EOT 4.200 <section> 4.201 <form action="#mount" class="wide"> 4.202 - <header id="disk">$(gettext 'Filesystem usage statistics')</header> 4.203 + <header id="disk">$(_ 'Filesystem usage statistics')</header> 4.204 <div> 4.205 <pre>$(disk_info)</pre> 4.206 </div> 4.207 @@ -444,8 +443,8 @@ 4.208 4.209 <footer> 4.210 <button type="submit">mount / umount</button> - 4.211 - $(gettext 'new mount point:') <input type="text" name="mountpoint" value="/media/usbdisk"/> - 4.212 - <input type="checkbox" name="readonly" id="ro"><label for="ro"> $(gettext 'read-only')</label> 4.213 + $(_ 'new mount point:') <input type="text" name="mountpoint" value="/media/usbdisk"/> - 4.214 + <input type="checkbox" name="readonly" id="ro"><label for="ro"> $(_ 'read-only')</label> 4.215 </footer> 4.216 EOT 4.217 cat <<EOT 4.218 @@ -460,12 +459,12 @@ 4.219 cat <<EOT 4.220 <section> 4.221 <header> 4.222 - $(gettext 'Filesystems table') 4.223 + $(_ 'Filesystems table') 4.224 EOT 4.225 [ -w /etc/fstab ] && cat <<EOT 4.226 <form action="index.cgi"> 4.227 <input type="hidden" name="file" value="/etc/fstab"/> 4.228 - <button name="action" value="edit" data-icon="edit">$(gettext 'Edit')</button> 4.229 + <button name="action" value="edit" data-icon="edit">$(_ 'Edit')</button> 4.230 </form> 4.231 EOT 4.232 cat <<EOT 4.233 @@ -473,12 +472,12 @@ 4.234 <table class="wide zebra center"> 4.235 <thead> 4.236 <tr> 4.237 - <td>$(gettext 'Disk')</td> 4.238 - <td>$(gettext 'Mount point')</td> 4.239 - <td>$(gettext 'Type')</td> 4.240 - <td>$(gettext 'Options')</td> 4.241 - <td>$(gettext 'Freq')</td> 4.242 - <td>$(gettext 'Pass')</td> 4.243 + <td>$(_ 'Disk')</td> 4.244 + <td>$(_ 'Mount point')</td> 4.245 + <td>$(_ 'Type')</td> 4.246 + <td>$(_ 'Options')</td> 4.247 + <td>$(_ 'Freq')</td> 4.248 + <td>$(_ 'Pass')</td> 4.249 </tr> 4.250 </thead> 4.251 <tbody> 4.252 @@ -500,17 +499,17 @@ 4.253 # 4.254 cat <<EOT 4.255 <section> 4.256 - <header>$(gettext 'Loop devices')</header> 4.257 + <header>$(_ 'Loop devices')</header> 4.258 4.259 <form action="#loop" class="wide"> 4.260 <div class="scroll"> 4.261 <table id="loop" class="wide zebra scroll"> 4.262 <thead> 4.263 <tr> 4.264 - <td>$(gettext 'Device')</td> 4.265 - <td>$(gettext 'Backing file')</td> 4.266 - <td>$(gettext 'Access')</td> 4.267 - <td>$(gettext 'Offset')</td> 4.268 + <td>$(_ 'Device')</td> 4.269 + <td>$(_ 'Backing file')</td> 4.270 + <td>$(_ 'Access')</td> 4.271 + <td>$(_ 'Offset')</td> 4.272 </tr> 4.273 </thead> 4.274 <tbody> 4.275 @@ -518,8 +517,8 @@ 4.276 for devloop in $(ls /dev/*loop[0-9]*); do 4.277 loop="${devloop#/dev/}" 4.278 case "$(cat /sys/block/$loop/ro 2>/dev/null)" in 4.279 - 0) ro="$(gettext "read/write")" ;; 4.280 - 1) ro="$(gettext "read only")" ;; 4.281 + 0) ro="$(_ "read/write")" ;; 4.282 + 1) ro="$(_ "read only")" ;; 4.283 *) ro="" ;; 4.284 esac 4.285 set -- $(losetup | grep ^$devloop:) ${ro// / } 4.286 @@ -538,10 +537,10 @@ 4.287 $(lib crypto input) 4.288 4.289 <footer> 4.290 - <button type="submit" data-icon="ok">$(gettext 'Setup')</button> - 4.291 - $(gettext 'new backing file:') <input type="text" name="backingfile"/> - 4.292 - $(gettext 'offset in bytes:') <input type="text" name="offset" value="0" size="8"/> - 4.293 - <input type="checkbox" name="readonly" id="ro"/><label for="ro">$(gettext 'read only')</label> 4.294 + <button type="submit" data-icon="ok">$(_ 'Setup')</button> - 4.295 + $(_ 'new backing file:') <input type="text" name="backingfile"/> - 4.296 + $(_ 'offset in bytes:') <input type="text" name="offset" value="0" size="8"/> - 4.297 + <input type="checkbox" name="readonly" id="ro"/><label for="ro">$(_ 'read only')</label> 4.298 </footer> 4.299 </form> 4.300 </section> 4.301 @@ -558,16 +557,16 @@ 4.302 4.303 cat <<EOT 4.304 <section> 4.305 - <header>$(gettext 'System memory')</header> 4.306 + <header>$(_ 'System memory')</header> 4.307 4.308 <div class="sysmem"><!-- 4.309 - --><span class="sysmem_used" style="width: ${mem_used}%" title="$(gettext 'Used')" ><span>${mem_used}%</span></span><!-- 4.310 + --><span class="sysmem_used" style="width: ${mem_used}%" title="$(_ 'Used')" ><span>${mem_used}%</span></span><!-- 4.311 EOT 4.312 [ $mem_buff != 0 ] && cat <<EOT 4.313 - --><span class="sysmem_buff" style="width: ${mem_buff}%" title="$(gettext 'Buffers')"><span>${mem_buff}%</span></span><!-- 4.314 + --><span class="sysmem_buff" style="width: ${mem_buff}%" title="$(_ 'Buffers')"><span>${mem_buff}%</span></span><!-- 4.315 EOT 4.316 cat <<EOT 4.317 - --><span class="sysmem_free" style="width: ${mem_free}%" title="$(gettext 'Free')" ><span>${mem_free}%</span></span><!-- 4.318 + --><span class="sysmem_free" style="width: ${mem_free}%" title="$(_ 'Free')" ><span>${mem_free}%</span></span><!-- 4.319 --></div> 4.320 4.321 <table class="wide zebra center">
5.1 --- a/help.cgi Wed Apr 08 10:20:10 2015 +0200 5.2 +++ b/help.cgi Wed Apr 08 15:32:20 2015 +0300 5.3 @@ -17,7 +17,7 @@ 5.4 cat <<EOT 5.5 <form class="search"><!-- 5.6 --><input type="search" name="manual" results="5" autosave="pkgsearch" autocomplete="on"><!-- 5.7 - --><button type="submit">$(gettext 'Manual')</button><!-- 5.8 + --><button type="submit">$(_ 'Manual')</button><!-- 5.9 --></form> 5.10 EOT 5.11 } 5.12 @@ -25,7 +25,7 @@ 5.13 5.14 # Cat translated help content 5.15 5.16 -TITLE=$(gettext 'TazPanel - Help & Doc') 5.17 +TITLE=$(_ 'TazPanel - Help & Doc') 5.18 5.19 xhtml_header 5.20 search_form
6.1 --- a/index.cgi Wed Apr 08 10:20:10 2015 +0200 6.2 +++ b/index.cgi Wed Apr 08 15:32:20 2015 +0300 6.3 @@ -85,7 +85,7 @@ 6.4 *\ exec\ *) 6.5 # Execute command and display its result in a terminal-like window 6.6 6.7 - header; TITLE=$(gettext 'TazPanel - exec'); xhtml_header 6.8 + header; TITLE=$(_ 'TazPanel - exec'); xhtml_header 6.9 6.10 exec="$(GET exec)" 6.11 font="${TERM_FONT:-monospace}" 6.12 @@ -117,7 +117,7 @@ 6.13 *.html) 6.14 cat $file; exit 0 ;; 6.15 *) 6.16 - TITLE=$(gettext 'TazPanel - File'); xhtml_header ;; 6.17 + TITLE=$(_ 'TazPanel - File'); xhtml_header ;; 6.18 esac 6.19 6.20 case "$action" in 6.21 @@ -127,8 +127,8 @@ 6.22 <header> 6.23 <span data-icon="edit">$file</span> 6.24 <form id="editform" method="post" action="?file=$file" class="nogap"> 6.25 - <button data-icon="save">$(gettext 'Save')</button> 6.26 - <button name="action" value="diff" data-icon="diff">$(gettext 'Differences')</button> 6.27 + <button data-icon="save">$(_ 'Save')</button> 6.28 + <button name="action" value="diff" data-icon="diff">$(_ 'Differences')</button> 6.29 </form> 6.30 </header> 6.31 <textarea form="editform" name="content" class="wide" rows="30" autofocus>$(cat $file | htmlize)</textarea> 6.32 @@ -146,7 +146,7 @@ 6.33 <form method="post" action="?file=$file" class="nogap"> 6.34 <input type="hidden" name="var" value="$(GET var)"> 6.35 <input type="text" name="content" value="${data:-$(GET default)}"> 6.36 - <button type="submit" data-icon="save">$(gettext 'Save')</button> 6.37 + <button type="submit" data-icon="save">$(_ 'Save')</button> 6.38 </form> 6.39 </section> 6.40 EOT 6.41 @@ -180,7 +180,7 @@ 6.42 [ -w "$file" ] && cat <<EOT 6.43 <form> 6.44 <input type="hidden" name="file" value="$file"/> 6.45 - <button name="action" value="edit" data-icon="edit">$(gettext 'Edit')</button><!-- 6.46 + <button name="action" value="edit" data-icon="edit">$(_ 'Edit')</button><!-- 6.47 -->$(file_is_modified $file button) 6.48 </form> 6.49 EOT 6.50 @@ -216,7 +216,7 @@ 6.51 *\ terminal\ *|*\ cmd\ *) 6.52 # Cmdline terminal 6.53 6.54 - header; TITLE=$(gettext 'TazPanel - Terminal'); xhtml_header 6.55 + header; TITLE=$(_ 'TazPanel - Terminal'); xhtml_header 6.56 6.57 user="$REMOTE_USER" 6.58 HOME="$(awk -F: -vu=$user '$1==u{print $6}' /etc/passwd)" 6.59 @@ -237,14 +237,14 @@ 6.60 cat <<EOT 6.61 <section> 6.62 <header> 6.63 - $(gettext 'History') 6.64 - <form><button name="terminal" data-icon="terminal">$(gettext 'Back')</button></form> 6.65 + $(_ 'History') 6.66 + <form><button name="terminal" data-icon="terminal">$(_ 'Back')</button></form> 6.67 </header> 6.68 <form> 6.69 <input type="hidden" name="path" value="$path"/> 6.70 <pre class="term $palette" style="font-family: '$font'"> 6.71 EOT 6.72 - htmlize < $historyfile | awk -vrun="$(gettext 'run')" -vpath="$path" ' 6.73 + htmlize < $historyfile | awk -vrun="$(_ 'run')" -vpath="$path" ' 6.74 BEGIN { num=1 } 6.75 { 6.76 printf("%3d ", num); 6.77 @@ -259,7 +259,7 @@ 6.78 cat <<EOT 6.79 </pre> 6.80 <footer> 6.81 - <button name="rmhistory" data-icon="remove">$(gettext 'Clear')</button> 6.82 + <button name="rmhistory" data-icon="remove">$(_ 'Clear')</button> 6.83 </footer> 6.84 </form> 6.85 </section> 6.86 @@ -283,13 +283,13 @@ 6.87 6.88 case "$cmd" in 6.89 usage|help) 6.90 - gettext 'Small non-interactive terminal emulator.'; echo 6.91 - gettext 'Run any command at your own risk, avoid interactive commands (nano, mc, ...)'; echo 6.92 + _ 'Small non-interactive terminal emulator.'; echo 6.93 + _ 'Run any command at your own risk, avoid interactive commands (%s)' "nano, mc, ..."; echo 6.94 ;; 6.95 wget*) 6.96 dl=/var/cache/downloads 6.97 [ ! -d "$dl" ] && mkdir -p $dl 6.98 - eval_gettext 'Downloading to: $dl'; echo 6.99 + _ 'Downloading to: %s' $dl; echo 6.100 cd $dl; $cmd 2>&1 ;; 6.101 cd|cd\ *) 6.102 path="${cmd#cd}"; path="${path:-$HOME}"; 6.103 @@ -298,10 +298,10 @@ 6.104 $cmd -w80 --color=always 2>&1 | filter_taztools_msgs ;; 6.105 cat) 6.106 # Cmd must be used with an arg. 6.107 - eval_gettext '$cmd needs an argument' ;; 6.108 - mc|nano) 6.109 + _ '%s needs an argument' "$cmd" ;; 6.110 + mc|nano|su) 6.111 # List of restricted (interactive) commands 6.112 - eval_gettext "Please, don't run interactive command \"$cmd\""; echo; echo ;; 6.113 + _ "Please, don't run interactive command \"%s\"" "$cmd"; echo; echo ;; 6.114 *) 6.115 unset HTTP_REFERER # for fooling /lib/libtaz.sh formatting utils (<hr> in the terminal is so-so) 6.116 export DISPLAY=:0.0 # for run X applications 6.117 @@ -319,8 +319,8 @@ 6.118 </section> 6.119 6.120 <form> 6.121 - <button name="termsettings" data-icon="settings">$(gettext 'Settings')</button> 6.122 - <button name="cmd" value="history" data-icon="history">$(gettext 'History')</button> 6.123 + <button name="termsettings" data-icon="settings">$(_ 'Settings')</button> 6.124 + <button name="cmd" value="history" data-icon="history">$(_ 'History')</button> 6.125 </form> 6.126 6.127 <script type="text/javascript"> 6.128 @@ -368,7 +368,7 @@ 6.129 6.130 *\ termsettings\ *) 6.131 # Terminal settings 6.132 - TITLE=$(gettext 'TazPanel - Terminal'); header; xhtml_header; 6.133 + TITLE=$(_ 'TazPanel - Terminal'); header; xhtml_header; 6.134 user="$REMOTE_USER" 6.135 font="$(GET font)"; font="${font:-$TERM_FONT}" 6.136 palette="$(GET palette)"; palette="${palette:-$TERM_PALETTE}" 6.137 @@ -389,9 +389,9 @@ 6.138 cat <<EOT 6.139 <section> 6.140 <header> 6.141 - $(gettext 'Terminal settings') 6.142 + $(_ 'Terminal settings') 6.143 <form> 6.144 - <button name="terminal" data-icon="terminal">$(gettext 'Terminal')</button> 6.145 + <button name="terminal" data-icon="terminal">$(_ 'Terminal')</button> 6.146 </form> 6.147 </header> 6.148 <pre class="term $pal" style="height: auto; font-family: '$font'"> 6.149 @@ -410,21 +410,21 @@ 6.150 </pre> 6.151 <footer> 6.152 <form class="wide"> 6.153 - $(gettext 'Font:') 6.154 + $(_ 'Font:') 6.155 <select name="font"> 6.156 - <option value="">$(gettext 'Default')</option> 6.157 + <option value="">$(_ 'Default')</option> 6.158 $(fc-list :spacing=mono:lang=en family | sed '/\.pcf/d;/,/d;s|\\-|-|g' | sort -u | \ 6.159 awk -vfont="$font" '{ 6.160 printf("<option value=\"%s\"%s>%s</option>\n", $0, ($0 == font)?" selected":"", $0) 6.161 }') 6.162 </select> 6.163 - $(gettext 'Palette:') 6.164 + $(_ 'Palette:') 6.165 <select name="palette"> 6.166 $(echo -e 'Tango\nLinux\nXterm\nRxvt\nEcho' | awk -vpal="$palette" '{ 6.167 printf("<option value=\"%s\"%s>%s</option>\n", $0, ($0 == pal)?" selected":"", $0) 6.168 }') 6.169 </select> 6.170 - <button name="termsettings" data-icon="ok">$(gettext 'Apply')</button> 6.171 + <button name="termsettings" data-icon="ok">$(_ 'Apply')</button> 6.172 </form> 6.173 </footer> 6.174 </section> 6.175 @@ -434,21 +434,21 @@ 6.176 6.177 6.178 *\ top\ *) 6.179 - TITLE=$(gettext 'TazPanel - Process activity'); header; xhtml_header 6.180 + header; TITLE=$(_ 'TazPanel - Process activity'); xhtml_header 6.181 6.182 r=$(GET refresh) 6.183 cat <<EOT 6.184 <form> 6.185 - <p>$(gettext 'Refresh:') 6.186 + <p>$(_ 'Refresh:') 6.187 <input type="hidden" name="top"/> 6.188 <input type="radio" name="refresh" value="1" id="r1" $([ "$r" == 1 ] && echo checked) onchange="this.form.submit()"/> 6.189 - <label for="r1">$(gettext '1s' )</label> 6.190 + <label for="r1">$(_ '1s' )</label> 6.191 <input type="radio" name="refresh" value="5" id="r2" $([ "$r" == 5 ] && echo checked) onchange="this.form.submit()"/> 6.192 - <label for="r2">$(gettext '5s' )</label> 6.193 + <label for="r2">$(_ '5s' )</label> 6.194 <input type="radio" name="refresh" value="10" id="r3" $([ "$r" == 10 ] && echo checked) onchange="this.form.submit()"/> 6.195 - <label for="r3">$(gettext '10s' )</label> 6.196 + <label for="r3">$(_ '10s' )</label> 6.197 <input type="radio" name="refresh" value="" id="r4" $([ -z "$r" ] && echo checked) onchange="this.form.submit()"/> 6.198 - <label for="r4">$(gettext 'none')</label> 6.199 + <label for="r4">$(_ 'none')</label> 6.200 </p> 6.201 </form> 6.202 EOT 6.203 @@ -462,10 +462,10 @@ 6.204 6.205 6.206 *\ debug\ *) 6.207 - TITLE=$(gettext 'TazPanel - Debug'); header; xhtml_header 6.208 + header; TITLE=$(_ 'TazPanel - Debug'); xhtml_header 6.209 6.210 cat <<EOT 6.211 -<h2>$(gettext 'HTTP Environment')</h2> 6.212 +<h2>$(_ 'HTTP Environment')</h2> 6.213 6.214 <section> 6.215 <div> 6.216 @@ -477,7 +477,7 @@ 6.217 6.218 6.219 *\ report\ *) 6.220 - TITLE=$(gettext 'TazPanel - System report'); header; xhtml_header 6.221 + header; TITLE=$(_ 'TazPanel - System report'); xhtml_header 6.222 6.223 [ -d /var/cache/slitaz ] || mkdir -p /var/cache/slitaz 6.224 output=/var/cache/slitaz/sys-report.html 6.225 @@ -485,17 +485,17 @@ 6.226 cat <<EOT 6.227 6.228 <section> 6.229 - <header>$(eval_gettext 'Reporting to: $output')</header> 6.230 + <header>$(_ 'Reporting to: %s' "$output")</header> 6.231 <table class="wide zebra"> 6.232 <tbody> 6.233 - <tr><td>$(gettext 'Creating report header...')</td> 6.234 + <tr><td>$(_ 'Creating report header...')</td> 6.235 EOT 6.236 cat > $output <<EOT 6.237 <!DOCTYPE html> 6.238 <html xmlns="http://www.w3.org/1999/xhtml"> 6.239 <head> 6.240 <meta charset="utf-8"/> 6.241 - <title>$(gettext 'SliTaz system report')</title> 6.242 + <title>$(_ 'SliTaz system report')</title> 6.243 <style type="text/css"> 6.244 body { padding: 20px 60px; font-size: 13px; } 6.245 h1, h2 { color: #444; } 6.246 @@ -509,11 +509,11 @@ 6.247 EOT 6.248 cat <<EOT 6.249 $(ok_status_t) 6.250 - <tr><td>$(gettext 'Creating system summary...')</td> 6.251 + <tr><td>$(_ 'Creating system summary...')</td> 6.252 EOT 6.253 cat >> $output <<EOT 6.254 -<h1>$(gettext 'SliTaz system report')</h1> 6.255 -$(gettext 'Date:') $(date) 6.256 +<h1>$(_ 'SliTaz system report')</h1> 6.257 +$(_ 'Date:') $(date) 6.258 <pre> 6.259 uptime : $(uptime) 6.260 cmdline : $(cat /proc/cmdline) 6.261 @@ -524,7 +524,7 @@ 6.262 EOT 6.263 cat <<EOT 6.264 $(ok_status_t) 6.265 - <tr><td>$(gettext 'Getting hardware info...')</td> 6.266 + <tr><td>$(_ 'Getting hardware info...')</td> 6.267 EOT 6.268 cat >> $output <<EOT 6.269 <h2>free</h2> 6.270 @@ -542,7 +542,7 @@ 6.271 EOT 6.272 cat <<EOT 6.273 $(ok_status_t) 6.274 - <tr><td>$(gettext 'Getting networking info...')</td> 6.275 + <tr><td>$(_ 'Getting networking info...')</td> 6.276 EOT 6.277 cat >> $output <<EOT 6.278 <h2>ifconfig -a</h2> 6.279 @@ -556,7 +556,7 @@ 6.280 EOT 6.281 cat <<EOT 6.282 $(ok_status_t) 6.283 - <tr><td>$(gettext 'Getting filesystems info...')</td> 6.284 + <tr><td>$(_ 'Getting filesystems info...')</td> 6.285 EOT 6.286 cat >> $output <<EOT 6.287 <h2>blkid</h2> 6.288 @@ -576,18 +576,18 @@ 6.289 EOT 6.290 cat <<EOT 6.291 $(ok_status_t) 6.292 - <tr><td>$(gettext 'Getting boot logs...')</td> 6.293 + <tr><td>$(_ 'Getting boot logs...')</td> 6.294 EOT 6.295 cat >> $output <<EOT 6.296 -<h2>$(gettext 'Kernel messages')</h2> 6.297 +<h2>$(_ 'Kernel messages')</h2> 6.298 <pre>$(cat /var/log/dmesg.log)</pre> 6.299 6.300 -<h2>$(gettext 'Boot scripts')</h2> 6.301 +<h2>$(_ 'Boot scripts')</h2> 6.302 <pre>$(cat /var/log/boot.log | filter_taztools_msgs)</pre> 6.303 EOT 6.304 cat <<EOT 6.305 $(ok_status_t) 6.306 - <tr><td>$(gettext 'Creating report footer...')</td> 6.307 + <tr><td>$(_ 'Creating report footer...')</td> 6.308 EOT 6.309 cat cat >> $output <<EOT 6.310 </body> 6.311 @@ -598,12 +598,12 @@ 6.312 </tbody> 6.313 </table> 6.314 <footer> 6.315 - <form><button name="file" value="$output" data-icon="view">$(gettext 'View report')</button></form> 6.316 + <form><button name="file" value="$output" data-icon="view">$(_ 'View')</button></form> 6.317 </footer> 6.318 </section> 6.319 6.320 6.321 - $(msg tip "$(gettext 'This report can be attached with a bug report on:') 6.322 + $(msg tip "$(_ 'This report can be attached with a bug report on:') 6.323 <a href="http://bugs.slitaz.org/" target="_blank">bugs.slitaz.org</a></p>") 6.324 EOT 6.325 ;; 6.326 @@ -619,28 +619,28 @@ 6.327 hostname=$(hostname) 6.328 6.329 cat <<EOT 6.330 -<h2>$(eval_gettext 'Host: $hostname')</h2> 6.331 -<p>$(gettext 'SliTaz administration and configuration Panel')<p> 6.332 +<h2>$(_ 'Host: %s' $hostname)</h2> 6.333 +<p>$(_ 'SliTaz administration and configuration Panel')<p> 6.334 6.335 <form class="nogap"><!-- 6.336 - --><button name="terminal" data-icon="terminal">$(gettext 'Terminal' )</button><!-- 6.337 - --><button name="top" data-icon="proc" >$(gettext 'Process activity')</button><!-- 6.338 - --><button name="report" data-icon="report" data-root>$(gettext 'Create a report' )</button><!-- 6.339 + --><button name="terminal" data-icon="terminal">$(_ 'Terminal')</button><!-- 6.340 + --><button name="top" data-icon="proc" >$(_ 'Process activity')</button><!-- 6.341 + --><button name="report" data-icon="report" data-root>$(_ 'Create a report')</button><!-- 6.342 --></form> 6.343 6.344 <section> 6.345 - <header>$(gettext 'Summary')</header> 6.346 + <header>$(_ 'Summary')</header> 6.347 <table> 6.348 - <tr><td>$(gettext 'Uptime:')</td> 6.349 + <tr><td>$(_ 'Uptime:')</td> 6.350 <td id="uptime">$(uptime | sed 's|\([0-9.:][0-9.:]*\)|<b>\1</b>|g')</td> 6.351 </tr> 6.352 - <tr><td>$(gettext 'Memory in Mb:')</td> 6.353 + <tr><td>$(_ 'Memory in Mb:')</td> 6.354 <td>$(free -m | grep Mem: | \ 6.355 awk -vline="$(gettext 'Total: %d, Used: %d, Free: %d')" \ 6.356 '{ printf(line, $2, $3, $4) }' | \ 6.357 sed 's|\([0-9][0-9]*\)|<b>\1</b>|g')</td> 6.358 </tr> 6.359 - <tr><td>$(gettext 'Linux kernel:')</td> 6.360 + <tr><td>$(_ 'Linux kernel:')</td> 6.361 <td>$(uname -r)</td> 6.362 </tr> 6.363 </table> 6.364 @@ -649,9 +649,9 @@ 6.365 6.366 <section> 6.367 <header> 6.368 - $(gettext 'Network status') 6.369 + $(_ 'Network status') 6.370 <form action="network.cgi"> 6.371 - <button data-icon="wifi">$(gettext 'Network')</button> 6.372 + <button data-icon="wifi">$(_ 'Network')</button> 6.373 </form> 6.374 </header> 6.375 $(list_network_interfaces) 6.376 @@ -660,9 +660,9 @@ 6.377 6.378 <section> 6.379 <header> 6.380 - $(gettext 'Filesystem usage statistics') 6.381 + $(_ 'Filesystem usage statistics') 6.382 <form action="hardware.cgi"> 6.383 - <button data-icon="hdd">$(gettext 'Disks')</button> 6.384 + <button data-icon="hdd">$(_ 'Disks')</button> 6.385 </form> 6.386 </header> 6.387 <table class="wide zebra center"> 6.388 @@ -694,9 +694,9 @@ 6.389 6.390 <section> 6.391 <header> 6.392 - $(gettext 'Panel Activity') 6.393 + $(_ 'Panel Activity') 6.394 <form> 6.395 - <button name="file" value="$LOG_FILE" data-icon="view">$(gettext 'View')</button> 6.396 + <button name="file" value="$LOG_FILE" data-icon="view">$(_ 'View')</button> 6.397 </form> 6.398 </header> 6.399 <div>
7.1 --- a/lib/libtazpanel Wed Apr 08 10:20:10 2015 +0200 7.2 +++ b/lib/libtazpanel Wed Apr 08 15:32:20 2015 +0300 7.3 @@ -134,9 +134,9 @@ 7.4 if ifconfig | grep -A1 $1 | grep -q inet; then 7.5 ip=$(ifconfig | grep -A1 $1 | grep inet | awk '{ print $2 }' | cut -d: -f2) 7.6 cat <<EOT 7.7 - <td>$(gettext 'connected')</td> 7.8 + <td>$(_ 'connected')</td> 7.9 <td>$ip</td> 7.10 - <td><a data-icon="scan" href='network.cgi?scan=$ip&back=network.cgi'>$(gettext 'Scan')</a></td> 7.11 + <td><a data-icon="scan" href='network.cgi?scan=$ip&back=network.cgi'>$(_ 'Scan')</a></td> 7.12 EOT 7.13 else 7.14 echo "<td>----</td><td>----</td><td></td>" 7.15 @@ -151,11 +151,11 @@ 7.16 <table class="wide zebra center"> 7.17 <thead> 7.18 <tr> 7.19 - <td>$(gettext 'Interface')</td> 7.20 - <td>$(gettext 'Name')</td> 7.21 - <td>$(gettext 'Status')</td> 7.22 - <td>$(gettext 'IP Address')</td> 7.23 - <td>$(gettext 'Scan ports')</td> 7.24 + <td>$(_ 'Interface')</td> 7.25 + <td>$(_ 'Name')</td> 7.26 + <td>$(_ 'Status')</td> 7.27 + <td>$(_ 'IP Address')</td> 7.28 + <td>$(_ 'Scan ports')</td> 7.29 </tr> 7.30 </thead> 7.31 <tbody> 7.32 @@ -279,13 +279,13 @@ 7.33 cat <<EOT 7.34 <thead> 7.35 <tr> 7.36 - <td>$(gettext 'Disk')</td> 7.37 - <td>$(gettext 'Label')</td> 7.38 - <td>$(gettext 'Type')</td> 7.39 - <td>$(gettext 'Size')</td> 7.40 - <td>$(gettext 'Available')</td> 7.41 - <td>$(gettext 'Used')</td> 7.42 - <td>$(gettext 'Mount point')</td> 7.43 + <td>$(_ 'Disk')</td> 7.44 + <td>$(_ 'Label')</td> 7.45 + <td>$(_ 'Type')</td> 7.46 + <td>$(_ 'Size')</td> 7.47 + <td>$(_ 'Available')</td> 7.48 + <td>$(_ 'Used')</td> 7.49 + <td>$(_ 'Mount point')</td> 7.50 <td>UUID</td> 7.51 </tr> 7.52 </thead> 7.53 @@ -331,7 +331,7 @@ 7.54 # Show "Back" button 7.55 7.56 back_button() { 7.57 - local URL="$1" default_caption="$(gettext 'Back')" 7.58 + local URL="$1" default_caption="$(_ 'Back')" 7.59 local caption="${2:-$default_caption}" icon="${3:-back}" 7.60 7.61 if [ -n "$1" ]; then
8.1 --- a/network.cgi Wed Apr 08 10:20:10 2015 +0200 8.2 +++ b/network.cgi Wed Apr 08 15:32:20 2015 +0300 8.3 @@ -12,7 +12,7 @@ 8.4 get_config 8.5 header 8.6 8.7 -TITLE=$(gettext 'TazPanel - Network') 8.8 +TITLE=$(_ 'TazPanel - Network') 8.9 8.10 8.11 # Start a Wi-Fi connection 8.12 @@ -138,7 +138,7 @@ 8.13 connect_wifi ;; 8.14 *\ host\ *) 8.15 get_hostname="$(GET host)" 8.16 - echo $(eval_gettext 'Changed hostname: $get_hostname') | log 8.17 + echo $(_ 'Changed hostname: %s' $get_hostname) | log 8.18 echo "$get_hostname" > /etc/hostname ;; 8.19 esac 8.20 8.21 @@ -161,13 +161,13 @@ 8.22 # Scan open ports 8.23 scan=$(GET scan); back=$(GET back) 8.24 xhtml_header 8.25 - LOADING_MSG=$(gettext 'Scanning open ports...'); loading_msg 8.26 + LOADING_MSG=$(_ 'Scanning open ports...'); loading_msg 8.27 8.28 cat <<EOT 8.29 <section> 8.30 <header> 8.31 - $(eval_gettext 'Port scanning for $scan') 8.32 - $(back_button "$back" "$(gettext 'Network')" "") 8.33 + $(_ 'Port scanning for %s' $scan) 8.34 + $(back_button "$back" "$(_ 'Network')" "") 8.35 </header> 8.36 <pre>$(pscan -b $scan)</pre> 8.37 </section> 8.38 @@ -194,19 +194,19 @@ 8.39 fi 8.40 8.41 cat <<EOT 8.42 -<h2>$(gettext 'Ethernet connection')</h2> 8.43 +<h2>$(_ 'Ethernet connection')</h2> 8.44 EOT 8.45 [ -w /etc/network.conf ] && cat <<EOT 8.46 -<p>$(gettext "Here you can configure a wired connection using DHCP to \ 8.47 +<p>$(_ "Here you can configure a wired connection using DHCP to \ 8.48 automatically get a random IP or configure a static/fixed IP")</p> 8.49 8.50 <section> 8.51 - <header>$(gettext 'Configuration')</header> 8.52 + <header>$(_ 'Configuration')</header> 8.53 <form id="conf"> 8.54 <input type="hidden" name="eth"/> 8.55 <div> 8.56 <table> 8.57 - <tr><td>$(gettext 'Interface')</td> 8.58 + <tr><td>$(_ 'Interface')</td> 8.59 <td><select name="iface" value="$INTERFACE" style="width:100%"> 8.60 $(cd /sys/class/net; ls -1 | awk -viface="$INTERFACE" '{ 8.61 sel = ($0 == iface) ? " selected":"" 8.62 @@ -214,28 +214,28 @@ 8.63 }') 8.64 </select></td> 8.65 </tr> 8.66 - <tr><td>$(gettext 'Static IP')</td> 8.67 + <tr><td>$(_ 'Static IP')</td> 8.68 <td><label><input type="checkbox" name="staticip" id="staticip" $use_static/> 8.69 - $(gettext 'Use static IP')</td> 8.70 + $(_ 'Use static IP')</td> 8.71 </tr> 8.72 - <tr id="st1"><td>$(gettext 'IP address')</td> 8.73 + <tr id="st1"><td>$(_ 'IP address')</td> 8.74 <td><input type="text" name="ip" value="$IP" $PAR/></td> 8.75 </tr> 8.76 - <tr id="st2"><td>$(gettext 'Netmask')</td> 8.77 + <tr id="st2"><td>$(_ 'Netmask')</td> 8.78 <td><input type="text" name="netmask" value="$NETMASK" $PAR/></td> 8.79 </tr> 8.80 - <tr id="st3"><td>$(gettext 'Gateway')</td> 8.81 + <tr id="st3"><td>$(_ 'Gateway')</td> 8.82 <td><input type="text" name="gateway" value="$GATEWAY" $PAR/></td> 8.83 </tr> 8.84 - <tr id="st4"><td>$(gettext 'DNS server')</td> 8.85 + <tr id="st4"><td>$(_ 'DNS server')</td> 8.86 <td><input type="text" name="dns" value="$DNS_SERVER" $PAR/></td> 8.87 </tr> 8.88 </table> 8.89 </div> 8.90 </form> 8.91 <footer><!-- 8.92 - --><button form="conf" type="submit" name="start_eth" data-icon="start" $start_disabled>$(gettext 'Start' )</button><!-- 8.93 - --><button form="conf" type="submit" name="stop" data-icon="stop" $stop_disabled >$(gettext 'Stop' )</button><!-- 8.94 + --><button form="conf" type="submit" name="start_eth" data-icon="start" $start_disabled>$(_ 'Start' )</button><!-- 8.95 + --><button form="conf" type="submit" name="stop" data-icon="stop" $stop_disabled >$(_ 'Stop' )</button><!-- 8.96 --></footer> 8.97 </section> 8.98 8.99 @@ -254,17 +254,17 @@ 8.100 cat <<EOT 8.101 <section> 8.102 <header> 8.103 - $(gettext 'Configuration file') 8.104 + $(_ 'Configuration file') 8.105 EOT 8.106 [ -w /etc/network.conf ] && cat <<EOT 8.107 <form action="index.cgi"> 8.108 <input type="hidden" name="file" value="/etc/network.conf"/> 8.109 - <button name="action" value="edit" data-icon="edit">$(gettext 'Edit')</button> 8.110 + <button name="action" value="edit" data-icon="edit">$(_ 'Edit')</button> 8.111 </form> 8.112 EOT 8.113 cat <<EOT 8.114 </header> 8.115 - <div>$(gettext "These values are the ethernet settings in the main /etc/network.conf configuration file")</div> 8.116 + <div>$(_ "These values are the ethernet settings in the main /etc/network.conf configuration file")</div> 8.117 <pre>$(awk '{if($1 !~ "WIFI" && $1 !~ "#" && $1 != ""){print $0}}' /etc/network.conf | syntax_highlighter conf)</pre> 8.118 </section> 8.119 EOT 8.120 @@ -276,17 +276,17 @@ 8.121 # Catch ESSIDs and format output. 8.122 # We get the list of networks by Cell and without spaces. 8.123 8.124 - HIDDEN="$(gettext '(hidden)')" 8.125 + HIDDEN="$(_ '(hidden)')" 8.126 8.127 cat <<EOT 8.128 <table class="wide center zebra"> 8.129 <thead> 8.130 <tr> 8.131 - <td>$(gettext 'Name')</td> 8.132 - <td>$(gettext 'Signal level')</td> 8.133 - <td>$(gettext 'Channel')</td> 8.134 - <td>$(gettext 'Encryption')</td> 8.135 - <td>$(gettext 'Status')</td> 8.136 + <td>$(_ 'Name')</td> 8.137 + <td>$(_ 'Signal level')</td> 8.138 + <td>$(_ 'Channel')</td> 8.139 + <td>$(_ 'Encryption')</td> 8.140 + <td>$(_ 'Status')</td> 8.141 </tr> 8.142 </thead> 8.143 <tbody> 8.144 @@ -337,7 +337,7 @@ 8.145 fi 8.146 else 8.147 WIFI_KEY_TYPE='NONE' 8.148 - ENC_SIMPLE="$(gettext 'None')"; ENC_ICON='seclo' # low 8.149 + ENC_SIMPLE="$(_ 'None')"; ENC_ICON='seclo' # low 8.150 fi 8.151 8.152 # 8.153 @@ -350,7 +350,7 @@ 8.154 # Connected or not connected... 8.155 if ifconfig $WIFI_INTERFACE | fgrep -q inet && \ 8.156 iwconfig $WIFI_INTERFACE | fgrep -q "ESSID:\"$ESSID\""; then 8.157 - status="$(gettext 'Connected')" 8.158 + status="$(_ 'Connected')" 8.159 else 8.160 status='---' 8.161 fi 8.162 @@ -380,7 +380,7 @@ 8.163 8.164 . /etc/network.conf 8.165 cat <<EOT 8.166 -<h2>$(gettext 'Wireless connection')</h2> 8.167 +<h2>$(_ 'Wireless connection')</h2> 8.168 EOT 8.169 8.170 start_disabled=''; stop_disabled='' 8.171 @@ -393,9 +393,9 @@ 8.172 [ -w /etc/network.conf ] && cat <<EOT 8.173 <form> 8.174 <input type="hidden" name="wifi"/> 8.175 - <button name="start_wifi" data-icon="start" $start_disabled>$(gettext 'Start')</button><!-- 8.176 - --><button name="stop" data-icon="stop" $stop_disabled >$(gettext 'Stop' )</button><!-- 8.177 - --><button type="submit" data-icon="refresh" $stop_disabled >$(gettext 'Scan' )</button> 8.178 + <button name="start_wifi" data-icon="start" $start_disabled>$(_ 'Start')</button><!-- 8.179 + --><button name="stop" data-icon="stop" $stop_disabled >$(_ 'Stop' )</button><!-- 8.180 + --><button type="submit" data-icon="refresh" $stop_disabled >$(_ 'Scan' )</button> 8.181 </form> 8.182 EOT 8.183 8.184 @@ -403,7 +403,7 @@ 8.185 if [ -n "$start_disabled" ]; then 8.186 cat <<EOT 8.187 <section id="wifiList"> 8.188 - <div style="text-align: center;"><span id="ajaxStatus"></span>$(gettext 'Scanning wireless interface...')</div> 8.189 + <div style="text-align: center;"><span id="ajaxStatus"></span>$(_ 'Scanning wireless interface...')</div> 8.190 </section> 8.191 8.192 <script type="text/javascript"> 8.193 @@ -421,19 +421,19 @@ 8.194 8.195 cat <<EOT 8.196 <section> 8.197 - <header>$(gettext 'Connection')</header> 8.198 + <header>$(_ 'Connection')</header> 8.199 <div> 8.200 <form id="connection"> 8.201 <input type="hidden" name="connect_wifi"/> 8.202 <input type="hidden" name="bssid" id="bssid"/> 8.203 <table> 8.204 - <tr><td>$(gettext 'Network SSID')</td> 8.205 + <tr><td>$(_ 'Network SSID')</td> 8.206 <td><input type="text" name="essid" value="$WIFI_ESSID" id="essid"/></td> 8.207 </tr> 8.208 8.209 - <tr><td>$(gettext 'Security')</td> 8.210 + <tr><td>$(_ 'Security')</td> 8.211 <td><select name="keyType" id="keyType"> 8.212 - <option value="NONE">$(gettext 'None')</option> 8.213 + <option value="NONE">$(_ 'None')</option> 8.214 <option value="WEP" >WEP</option> 8.215 <option value="WPA" >WPA/WPA2 PSK</option> 8.216 <option value="EAP" >802.1x EAP</option> 8.217 @@ -442,7 +442,7 @@ 8.218 </tr> 8.219 8.220 <tr class="eap"> 8.221 - <td><div>$(gettext 'EAP method')</div></td> 8.222 + <td><div>$(_ 'EAP method')</div></td> 8.223 <td><div><select name="eap" id="eap"> 8.224 <option value="PEAP">PEAP</option> 8.225 <option value="TLS" >TLS</option> 8.226 @@ -453,9 +453,9 @@ 8.227 </tr> 8.228 8.229 <tr class="eap1"> 8.230 - <td><div>$(gettext 'Phase 2 authentication')</div></td> 8.231 + <td><div>$(_ 'Phase 2 authentication')</div></td> 8.232 <td><div><select name="phase2" id="phase2"> 8.233 - <option value="none" >$(gettext 'None')</option> 8.234 + <option value="none" >$(_ 'None')</option> 8.235 <option value="pap" >PAP</option> 8.236 <option value="mschap" >MSCHAP</option> 8.237 <option value="mschapv2">MSCHAPV2</option> 8.238 @@ -465,30 +465,30 @@ 8.239 </tr> 8.240 8.241 <tr class="eap1"> 8.242 - <td><div>$(gettext 'CA certificate')</div></td> 8.243 + <td><div>$(_ 'CA certificate')</div></td> 8.244 <td><div><input type="text" name="caCert" id="caCert"></div></td> 8.245 </tr> 8.246 8.247 <tr class="eap1"> 8.248 - <td><div>$(gettext 'User certificate')</div></td> 8.249 + <td><div>$(_ 'User certificate')</div></td> 8.250 <td><div><input type="text" name="clientCert" id="clientCert"></div></td> 8.251 </tr> 8.252 8.253 <tr class="eap"> 8.254 - <td><div>$(gettext 'Identity')</div></td> 8.255 + <td><div>$(_ 'Identity')</div></td> 8.256 <td><div><input type="text" name="identity" id="identity"></div></td> 8.257 </tr> 8.258 8.259 <tr class="eap1"> 8.260 - <td><div>$(gettext 'Anonymous identity')</div></td> 8.261 + <td><div>$(_ 'Anonymous identity')</div></td> 8.262 <td><div><input type="text" name="anonymousIdentity" id="anonymousIdentity"></div></td> 8.263 </tr> 8.264 8.265 <tr class="wep wpa eap"> 8.266 - <td><div>$(gettext 'Password')</div></td> 8.267 + <td><div>$(_ 'Password')</div></td> 8.268 <td><div> 8.269 <input type="password" name="password" value="$WIFI_KEY" id="password"/> 8.270 - <span data-img="view" title="$(gettext 'Show password')" 8.271 + <span data-img="view" title="$(_ 'Show password')" 8.272 onmousedown="document.getElementById('password').type='text'; return false" 8.273 onmouseup="document.getElementById('password').type='password'" 8.274 onmouseout="document.getElementById('password').type='password'" 8.275 @@ -498,7 +498,7 @@ 8.276 8.277 8.278 <!-- 8.279 - <tr><td>$(gettext 'Access point')</td> 8.280 + <tr><td>$(_ 'Access point')</td> 8.281 <td><input type="text" name="ap" value="$WIFI_AP"/></td> 8.282 </tr> 8.283 --> 8.284 @@ -536,7 +536,7 @@ 8.285 </form> 8.286 </div> 8.287 <footer> 8.288 - <button form="connection" type="submit" name="wifi" data-icon="ok">$(gettext 'Configure')</button> 8.289 + <button form="connection" type="submit" name="wifi" data-icon="ok">$(_ 'Configure')</button> 8.290 </footer> 8.291 </section> 8.292 EOT 8.293 @@ -545,23 +545,23 @@ 8.294 cat <<EOT 8.295 <section> 8.296 <header> 8.297 - $(gettext 'Configuration file') 8.298 + $(_ 'Configuration file') 8.299 EOT 8.300 [ -w /etc/network.conf ] && cat <<EOT 8.301 <form action="index.cgi"> 8.302 <input type="hidden" name="file" value="/etc/network.conf"/> 8.303 - <button name="action" value="edit" data-icon="edit">$(gettext 'Edit')</button> 8.304 + <button name="action" value="edit" data-icon="edit">$(_ 'Edit')</button> 8.305 </form> 8.306 EOT 8.307 cat <<EOT 8.308 </header> 8.309 - <div>$(gettext "These values are the wifi settings in the main /etc/network.conf configuration file")</div> 8.310 + <div>$(_ "These values are the wifi settings in the main /etc/network.conf configuration file")</div> 8.311 <pre>$(grep ^WIFI /etc/network.conf | sed '/WIFI_KEY=/s|".*"|"********"|' | syntax_highlighter conf)</pre> 8.312 </section> 8.313 8.314 8.315 <section> 8.316 - <header>$(gettext 'Output of iwconfig')</header> 8.317 + <header>$(_ 'Output of iwconfig')</header> 8.318 <pre>$(iwconfig)</pre> 8.319 </section> 8.320 EOT 8.321 @@ -584,20 +584,20 @@ 8.322 fi 8.323 8.324 cat <<EOT 8.325 -<h2>$(gettext 'Networking')</h2> 8.326 +<h2>$(_ 'Networking')</h2> 8.327 8.328 -<p>$(gettext 'Manage network connections and services')</p> 8.329 +<p>$(_ 'Manage network connections and services')</p> 8.330 8.331 <form action="index.cgi" id="indexform"></form> 8.332 8.333 <form id="mainform"><!-- 8.334 - --><button name="start" data-icon="start" $start_disabled>$(gettext 'Start' )</button><!-- 8.335 - --><button name="stop" data-icon="stop" $stop_disabled >$(gettext 'Stop' )</button><!-- 8.336 - --><button name="restart" data-icon="restart" $stop_disabled >$(gettext 'Restart')</button> 8.337 + --><button name="start" data-icon="start" $start_disabled>$(_ 'Start' )</button><!-- 8.338 + --><button name="stop" data-icon="stop" $stop_disabled >$(_ 'Stop' )</button><!-- 8.339 + --><button name="restart" data-icon="restart" $stop_disabled >$(_ 'Restart')</button> 8.340 </form> 8.341 8.342 <div class="float-right"><!-- 8.343 - -->$(gettext 'Configuration:')<!-- 8.344 + -->$(_ 'Configuration:')<!-- 8.345 --><button form="indexform" name="file" value="/etc/network.conf" data-icon="conf">network.conf</button><!-- 8.346 --><button form="mainform" name="eth" data-icon="eth">Ethernet</button><!-- 8.347 --><button form="mainform" name="wifi" data-icon="wifi">Wireless</button> 8.348 @@ -605,20 +605,20 @@ 8.349 8.350 8.351 <section> 8.352 - <header>$(gettext 'Network interfaces')</header> 8.353 + <header>$(_ 'Network interfaces')</header> 8.354 $(list_network_interfaces) 8.355 </section> 8.356 8.357 8.358 <section> 8.359 - <header id="hosts">$(gettext 'Hosts')</header> 8.360 + <header id="hosts">$(_ 'Hosts')</header> 8.361 <pre>$(cat /etc/hosts)</pre> 8.362 EOT 8.363 [ -w /etc/hosts ] && cat <<EOT 8.364 <footer> 8.365 <form action="index.cgi"> 8.366 <input type="hidden" name="file" value="/etc/hosts"/> 8.367 - <button name="action" value="edit" data-icon="edit">$(gettext 'Edit')</button> 8.368 + <button name="action" value="edit" data-icon="edit">$(_ 'Edit')</button> 8.369 </form> 8.370 </footer> 8.371 EOT 8.372 @@ -627,7 +627,7 @@ 8.373 8.374 8.375 <section> 8.376 - <header>$(gettext 'Hostname')</header> 8.377 + <header>$(_ 'Hostname')</header> 8.378 <footer> 8.379 EOT 8.380 if [ -w /etc/hostname ]; then 8.381 @@ -635,7 +635,7 @@ 8.382 <form> 8.383 <!-- was: name="hostname"; please don't use 'name' in name: unwanted webkit styling --> 8.384 <input type="text" name="host" value="$(cat /etc/hostname)"/><!-- 8.385 - --><button type="submit" data-icon="ok">$(gettext 'Change')</button> 8.386 + --><button type="submit" data-icon="ok">$(_ 'Change')</button> 8.387 </form> 8.388 EOT 8.389 else 8.390 @@ -647,31 +647,31 @@ 8.391 8.392 8.393 <section> 8.394 - <header id="ifconfig">$(gettext 'Output of ifconfig')</header> 8.395 + <header id="ifconfig">$(_ 'Output of ifconfig')</header> 8.396 <pre>$(ifconfig)</pre> 8.397 </section> 8.398 8.399 8.400 <section> 8.401 - <header id="routing">$(gettext 'Routing table')</header> 8.402 + <header id="routing">$(_ 'Routing table')</header> 8.403 <pre>$(route -n)</pre> 8.404 </section> 8.405 8.406 8.407 <section> 8.408 - <header id="dns">$(gettext 'Domain name resolution')</header> 8.409 + <header id="dns">$(_ 'Domain name resolution')</header> 8.410 <pre>$(cat /etc/resolv.conf)</pre> 8.411 </section> 8.412 8.413 8.414 <section> 8.415 - <header id="arp">$(gettext 'ARP table')</header> 8.416 + <header id="arp">$(_ 'ARP table')</header> 8.417 <pre>$(arp)</pre> 8.418 </section> 8.419 8.420 8.421 <section> 8.422 - <header id="connections">$(gettext 'IP Connections')</header> 8.423 + <header id="connections">$(_ 'IP Connections')</header> 8.424 <pre>$(netstat -anp 2>/dev/null | sed -e '/UNIX domain sockets/,$d' \ 8.425 -e 's#\([0-9]*\)/#<a href="boot.cgi?daemons=pid=\1">\1</a>/#')</pre> 8.426 </section>
9.1 --- a/po/el.po Wed Apr 08 10:20:10 2015 +0200 9.2 +++ b/po/el.po Wed Apr 08 15:32:20 2015 +0300 9.3 @@ -21,16 +21,15 @@ 9.4 #: tazpanel:33 9.5 #, fuzzy 9.6 msgid "Usage: tazpanel [start|stop|passwd|app]" 9.7 -msgstr "Χρήση: $program_name [start|stop|passwd]" 9.8 +msgstr "Χρήση: tazpanel [start|stop|passwd|app]" 9.9 9.10 #: tazpanel:37 9.11 msgid "TazPanel is already running." 9.12 msgstr "" 9.13 9.14 #: tazpanel:40 9.15 -#, sh-format 9.16 -msgid "Starting TazPanel web server on port $HTTPD_PORT..." 9.17 -msgstr "Εκκίνηση εξυπηρετητή ιστού TazPanel στη θύρα $HTTPD_PORT..." 9.18 +msgid "Starting TazPanel web server on port %d..." 9.19 +msgstr "Εκκίνηση εξυπηρετητή ιστού TazPanel στη θύρα %d..." 9.20 9.21 #: tazpanel:42 9.22 msgid "TazPanel Authentication - Default: root:root" 9.23 @@ -85,24 +84,20 @@ 9.24 msgstr "Μικρός προσομοιωτής τερματικού, υποστηρίζονται επιλογές εντολών" 9.25 9.26 #: index.cgi:172 index.cgi:189 9.27 -#, sh-format 9.28 -msgid "Commands: $commands" 9.29 -msgstr "Εντολές: $commands" 9.30 +msgid "Commands: %s" 9.31 +msgstr "Εντολές: %s" 9.32 9.33 #: index.cgi:177 9.34 -#, sh-format 9.35 -msgid "Downloading to: $dl" 9.36 -msgstr "Κατέβασμα στο: $dl" 9.37 +msgid "Downloading to: %s" 9.38 +msgstr "Κατέβασμα στο: %s" 9.39 9.40 #: index.cgi:184 9.41 -#, sh-format 9.42 -msgid "$cmd needs an argument" 9.43 -msgstr "$cmd χρειάζεται όρισμα" 9.44 +msgid "%s needs an argument" 9.45 +msgstr "%s χρειάζεται όρισμα" 9.46 9.47 #: index.cgi:188 9.48 -#, sh-format 9.49 -msgid "Unknown command: $cmd" 9.50 -msgstr "Άγνωστη εντολή: $cmd" 9.51 +msgid "Unknown command: %s" 9.52 +msgstr "Άγνωστη εντολή: %s" 9.53 9.54 #: index.cgi:196 9.55 msgid "TazPanel - Process activity" 9.56 @@ -141,9 +136,8 @@ 9.57 msgstr "TazPanel - Αναφορά συστήματος" 9.58 9.59 #: index.cgi:239 9.60 -#, sh-format 9.61 -msgid "Reporting to: $output" 9.62 -msgstr "Αναφορά σε: $output" 9.63 +msgid "Reporting to: %s" 9.64 +msgstr "Αναφορά σε: %s" 9.65 9.66 #: index.cgi:242 9.67 msgid "Creating report header..." 9.68 @@ -199,9 +193,8 @@ 9.69 "Αυτή η αναφορά μπορεί να επισυναφθεί μαζί με μια αναφορά σφάλματος στο:" 9.70 9.71 #: index.cgi:370 9.72 -#, sh-format 9.73 -msgid "Host: $hostname" 9.74 -msgstr "Τοπικός υπολογιστής (Host): $hostname" 9.75 +msgid "Host: %s" 9.76 +msgstr "Τοπικός υπολογιστής (Host): %s" 9.77 9.78 #: index.cgi:371 9.79 msgid "SliTaz administration and configuration Panel" 9.80 @@ -232,9 +225,8 @@ 9.81 msgstr "Μνήμη σε Mb:" 9.82 9.83 #: index.cgi:394 9.84 -#, sh-format 9.85 -msgid "Total: $memtotal, Used: $memused, Free: $memfree" 9.86 -msgstr "Σύνολο: $memtotal, Σε χρήση: $memused, Ελεύθερα: $memfree" 9.87 +msgid "Total: %d, Used: %d, Free: %d" 9.88 +msgstr "Σύνολο: %d, Σε χρήση: %d, Ελεύθερα: %d" 9.89 9.90 #: index.cgi:399 9.91 msgid "Linux kernel:" 9.92 @@ -278,18 +270,16 @@ 9.93 msgstr "Συνδεδεμένο" 9.94 9.95 #: network.cgi:99 9.96 -#, sh-format 9.97 -msgid "Changed hostname: $get_hostname" 9.98 -msgstr "Αλλαγμένο όνομα υπολογιστή: $get_hostname" 9.99 +msgid "Changed hostname: %s" 9.100 +msgstr "Αλλαγμένο όνομα υπολογιστή: %s" 9.101 9.102 #: network.cgi:115 9.103 msgid "Scanning open ports..." 9.104 msgstr "Σάρωση ανοιχτών θυρών..." 9.105 9.106 #: network.cgi:118 9.107 -#, sh-format 9.108 -msgid "Port scanning for $scan" 9.109 -msgstr "Σάρωση θύρας για $scan" 9.110 +msgid "Port scanning for %s" 9.111 +msgstr "Σάρωση θύρας για %s" 9.112 9.113 #: network.cgi:132 9.114 msgid "Setting up IP..." 9.115 @@ -670,14 +660,12 @@ 9.116 "πυρήνα Linux" 9.117 9.118 #: hardware.cgi:99 9.119 -#, sh-format 9.120 -msgid "Detailed information for module: $get_modinfo" 9.121 -msgstr "Λεπτομερείς πληροφορίες για το άρθρωμα: $get_modinfo" 9.122 +msgid "Detailed information for module: %s" 9.123 +msgstr "Λεπτομερείς πληροφορίες για το άρθρωμα: %s" 9.124 9.125 #: hardware.cgi:113 9.126 -#, sh-format 9.127 -msgid "Matching result(s) for: $get_search" 9.128 -msgstr "Ταίριασμα αποτελέσματος(-ατων) για: $get_search" 9.129 +msgid "Matching result(s) for: %s" 9.130 +msgstr "Ταίριασμα αποτελέσματος(-ατων) για: %s" 9.131 9.132 #: hardware.cgi:119 9.133 msgid "Module:" 9.134 @@ -700,8 +688,7 @@ 9.135 msgstr "από" 9.136 9.137 #: hardware.cgi:150 9.138 -#, sh-format 9.139 -msgid "Information for USB Device $vidpid" 9.140 +msgid "Information for USB Device %s" 9.141 msgstr "" 9.142 9.143 #: hardware.cgi:151 hardware.cgi:165 9.144 @@ -709,8 +696,7 @@ 9.145 msgstr "" 9.146 9.147 #: hardware.cgi:164 9.148 -#, sh-format 9.149 -msgid "Information for PCI Device $slot" 9.150 +msgid "Information for PCI Device %s" 9.151 msgstr "" 9.152 9.153 #: hardware.cgi:183 9.154 @@ -738,18 +724,16 @@ 9.155 msgstr "Υγεία" 9.156 9.157 #: hardware.cgi:223 9.158 -#, sh-format 9.159 -msgid "Discharging $rempct% - $remtimef" 9.160 -msgstr "Αποφορτίζεται $rempct% - $remtimef" 9.161 +msgid "Discharging %d%% - %s" 9.162 +msgstr "Αποφορτίζεται %d%% - %s" 9.163 9.164 #: hardware.cgi:227 9.165 -#, sh-format 9.166 -msgid "Charging $rempct% - $remtimef" 9.167 -msgstr "Φορτίζεται $rempct% - $remtimef" 9.168 +msgid "Charging %d%% - %s" 9.169 +msgstr "Φορτίζεται %d%% - %s" 9.170 9.171 #: hardware.cgi:229 9.172 -msgid "Charged 100%" 9.173 -msgstr "Φορτίστηκε 100%" 9.174 +msgid "Charged 100%%" 9.175 +msgstr "Φορτίστηκε 100%%" 9.176 9.177 #: hardware.cgi:237 9.178 msgid "Temperature:" 9.179 @@ -1004,13 +988,12 @@ 9.180 msgstr "Γλώσσα συστήματος" 9.181 9.182 #: settings.cgi:442 9.183 -#, sh-format 9.184 msgid "" 9.185 -"You must logout and login again to your current session to use $new_locale " 9.186 +"You must logout and login again to your current session to use %s " 9.187 "locale." 9.188 msgstr "" 9.189 "Πρέπει να αποσυνδεθείτε και να συνδεθείτε πάλι στην τρέχουσα συνεδρία σας " 9.190 -"για να χρησιμοποιήσετε τα $new_locale locale." 9.191 +"για να χρησιμοποιήσετε τα %s locale." 9.192 9.193 #: settings.cgi:444 9.194 msgid "Current system locale:" 9.195 @@ -1021,9 +1004,8 @@ 9.196 msgstr "Διάταξη πληκτρολογίου κονσόλας" 9.197 9.198 #: settings.cgi:465 9.199 -#, sh-format 9.200 -msgid "Current console keymap: $keymap" 9.201 -msgstr "Τρέχουσα διάταξη πληκτρολογίου κονσόλας: $keymap" 9.202 +msgid "Current console keymap: %s" 9.203 +msgstr "Τρέχουσα διάταξη πληκτρολογίου κονσόλας: %s" 9.204 9.205 #: settings.cgi:482 9.206 msgid "Suggested keymap for Xorg:"
10.1 --- a/po/es.po Wed Apr 08 10:20:10 2015 +0200 10.2 +++ b/po/es.po Wed Apr 08 15:32:20 2015 +0300 10.3 @@ -16,19 +16,13 @@ 10.4 "Content-Type: text/plain; charset=UTF-8\n" 10.5 "Content-Transfer-Encoding: 8bit\n" 10.6 10.7 -#: tazpanel:33 10.8 -#, fuzzy 10.9 -msgid "Usage: tazpanel [start|stop|passwd|app]" 10.10 -msgstr "Uso: $program_name [start|stop|passwd]" 10.11 - 10.12 #: tazpanel:37 10.13 msgid "TazPanel is already running." 10.14 msgstr "" 10.15 10.16 #: tazpanel:40 10.17 -#, sh-format 10.18 -msgid "Starting TazPanel web server on port $HTTPD_PORT..." 10.19 -msgstr "Iniciar Tazpanel web server en el puerto $HTTPD_PORT..." 10.20 +msgid "Starting TazPanel web server on port %d..." 10.21 +msgstr "Iniciar Tazpanel web server en el puerto %d..." 10.22 10.23 #: tazpanel:42 10.24 msgid "TazPanel Authentication - Default: root:root" 10.25 @@ -83,24 +77,20 @@ 10.26 msgstr "Pequeño emulador del terminal, opciónes de comandos están soportadas." 10.27 10.28 #: index.cgi:172 index.cgi:189 10.29 -#, sh-format 10.30 -msgid "Commands: $commands" 10.31 -msgstr "Comandos: $commands" 10.32 +msgid "Commands: %s" 10.33 +msgstr "Comandos: %s" 10.34 10.35 #: index.cgi:177 10.36 -#, sh-format 10.37 -msgid "Downloading to: $dl" 10.38 -msgstr "Descargando a: $dl" 10.39 +msgid "Downloading to: %s" 10.40 +msgstr "Descargando a: %s" 10.41 10.42 #: index.cgi:184 10.43 -#, sh-format 10.44 -msgid "$cmd needs an argument" 10.45 -msgstr "$cmd necesita un argumento" 10.46 +msgid "%s needs an argument" 10.47 +msgstr "%s necesita un argumento" 10.48 10.49 #: index.cgi:188 10.50 -#, sh-format 10.51 -msgid "Unknown command: $cmd" 10.52 -msgstr "Comando desconocido: $cmd" 10.53 +msgid "Unknown command: %s" 10.54 +msgstr "Comando desconocido: %s" 10.55 10.56 #: index.cgi:196 10.57 msgid "TazPanel - Process activity" 10.58 @@ -139,9 +129,8 @@ 10.59 msgstr "TazPanel - Reportar sistema" 10.60 10.61 #: index.cgi:239 10.62 -#, sh-format 10.63 -msgid "Reporting to: $output" 10.64 -msgstr "Reportando a: $output" 10.65 +msgid "Reporting to: %s" 10.66 +msgstr "Reportando a: %s" 10.67 10.68 #: index.cgi:242 10.69 msgid "Creating report header..." 10.70 @@ -196,9 +185,8 @@ 10.71 msgstr "Este reporte puede ser agregado con uno de bugs en:" 10.72 10.73 #: index.cgi:370 10.74 -#, sh-format 10.75 -msgid "Host: $hostname" 10.76 -msgstr "Cambiar nombre del $hostname" 10.77 +msgid "Host: %s" 10.78 +msgstr "Cambiar nombre del %s" 10.79 10.80 #: index.cgi:371 10.81 msgid "SliTaz administration and configuration Panel" 10.82 @@ -229,9 +217,8 @@ 10.83 msgstr "Memoria en Mb:" 10.84 10.85 #: index.cgi:394 10.86 -#, sh-format 10.87 -msgid "Total: $memtotal, Used: $memused, Free: $memfree" 10.88 -msgstr "Total: $memtotal, Usad: $memused, Libre: $memfree" 10.89 +msgid "Total: %d, Used: %d, Free: %d" 10.90 +msgstr "Total: %d, Usad: %d, Libre: %d" 10.91 10.92 #: index.cgi:399 10.93 msgid "Linux kernel:" 10.94 @@ -275,18 +262,16 @@ 10.95 msgstr "Conectado" 10.96 10.97 #: network.cgi:99 10.98 -#, sh-format 10.99 -msgid "Changed hostname: $get_hostname" 10.100 -msgstr "Cambiado el nombre de host: $get_hostname" 10.101 +msgid "Changed hostname: %s" 10.102 +msgstr "Cambiado el nombre de host: %s" 10.103 10.104 #: network.cgi:115 10.105 msgid "Scanning open ports..." 10.106 msgstr "Escaneando puertos abiertos..." 10.107 10.108 #: network.cgi:118 10.109 -#, sh-format 10.110 -msgid "Port scanning for $scan" 10.111 -msgstr "Escaneo de puertos $scan" 10.112 +msgid "Port scanning for %s" 10.113 +msgstr "Escaneo de puertos %s" 10.114 10.115 #: network.cgi:132 10.116 msgid "Setting up IP..." 10.117 @@ -667,14 +652,12 @@ 10.118 "Gestionar, buscar u obtener información sobre los módulos del kernel de Linux" 10.119 10.120 #: hardware.cgi:99 10.121 -#, sh-format 10.122 -msgid "Detailed information for module: $get_modinfo" 10.123 -msgstr "Informacion detallada del módulo: $get_modinfo" 10.124 +msgid "Detailed information for module: %s" 10.125 +msgstr "Informacion detallada del módulo: %s" 10.126 10.127 #: hardware.cgi:113 10.128 -#, sh-format 10.129 -msgid "Matching result(s) for: $get_search" 10.130 -msgstr "Resultado(s) para: $get_search" 10.131 +msgid "Matching result(s) for: %s" 10.132 +msgstr "Resultado(s) para: %s" 10.133 10.134 #: hardware.cgi:119 10.135 msgid "Module:" 10.136 @@ -697,8 +680,7 @@ 10.137 msgstr "por" 10.138 10.139 #: hardware.cgi:150 10.140 -#, sh-format 10.141 -msgid "Information for USB Device $vidpid" 10.142 +msgid "Information for USB Device %s" 10.143 msgstr "" 10.144 10.145 #: hardware.cgi:151 hardware.cgi:165 10.146 @@ -706,8 +688,7 @@ 10.147 msgstr "" 10.148 10.149 #: hardware.cgi:164 10.150 -#, sh-format 10.151 -msgid "Information for PCI Device $slot" 10.152 +msgid "Information for PCI Device %s" 10.153 msgstr "" 10.154 10.155 #: hardware.cgi:183 10.156 @@ -735,18 +716,16 @@ 10.157 msgstr "Estado" 10.158 10.159 #: hardware.cgi:223 10.160 -#, sh-format 10.161 -msgid "Discharging $rempct% - $remtimef" 10.162 -msgstr "Descargando $rempct% - $remtimef" 10.163 +msgid "Discharging %d%% - %s" 10.164 +msgstr "Descargando %d%% - %s" 10.165 10.166 #: hardware.cgi:227 10.167 -#, sh-format 10.168 -msgid "Charging $rempct% - $remtimef" 10.169 -msgstr "Cargando $rempct% - $remtimef" 10.170 +msgid "Charging %s%% - %s" 10.171 +msgstr "Cargando %s%% - %s" 10.172 10.173 #: hardware.cgi:229 10.174 -msgid "Charged 100%" 10.175 -msgstr "Cargado 100%" 10.176 +msgid "Charged 100%%" 10.177 +msgstr "Cargado 100%%" 10.178 10.179 #: hardware.cgi:237 10.180 msgid "Temperature:" 10.181 @@ -1002,11 +981,10 @@ 10.182 msgstr "Lenguaje del sistema" 10.183 10.184 #: settings.cgi:442 10.185 -#, sh-format 10.186 msgid "" 10.187 -"You must logout and login again to your current session to use $new_locale " 10.188 +"You must logout and login again to your current session to use %s " 10.189 "locale." 10.190 -msgstr "Usted debe iniciar sesion de nuevo para usar $new_locale locale." 10.191 +msgstr "Usted debe iniciar sesion de nuevo para usar %s locale." 10.192 10.193 #: settings.cgi:444 10.194 msgid "Current system locale:" 10.195 @@ -1017,9 +995,8 @@ 10.196 msgstr "Mapa de teclado de la consola" 10.197 10.198 #: settings.cgi:465 10.199 -#, sh-format 10.200 -msgid "Current console keymap: $keymap" 10.201 -msgstr "Actual mapa de teclado de la consola: $keymap" 10.202 +msgid "Current console keymap: %s" 10.203 +msgstr "Actual mapa de teclado de la consola: %s" 10.204 10.205 #: settings.cgi:482 10.206 msgid "Suggested keymap for Xorg:"
11.1 --- a/po/fr.po Wed Apr 08 10:20:10 2015 +0200 11.2 +++ b/po/fr.po Wed Apr 08 15:32:20 2015 +0300 11.3 @@ -18,19 +18,13 @@ 11.4 "Content-Transfer-Encoding: 8bit\n" 11.5 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 11.6 11.7 -#: tazpanel:33 11.8 -#, fuzzy 11.9 -msgid "Usage: tazpanel [start|stop|passwd|app]" 11.10 -msgstr "Usage : $program_name [start|stop|passwd]" 11.11 - 11.12 #: tazpanel:37 11.13 msgid "TazPanel is already running." 11.14 msgstr "TazPanel est déjà actif." 11.15 11.16 #: tazpanel:40 11.17 -#, sh-format 11.18 -msgid "Starting TazPanel web server on port $HTTPD_PORT..." 11.19 -msgstr "Lancement du serveur TazPanel sur le port $HTTPD_PORT..." 11.20 +msgid "Starting TazPanel web server on port %d..." 11.21 +msgstr "Lancement du serveur TazPanel sur le port %d..." 11.22 11.23 #: tazpanel:42 11.24 msgid "TazPanel Authentication - Default: root:root" 11.25 @@ -86,24 +80,20 @@ 11.26 "Petit émulateur de terminal, les options des commandes sont supportées." 11.27 11.28 #: index.cgi:172 index.cgi:189 11.29 -#, sh-format 11.30 -msgid "Commands: $commands" 11.31 -msgstr "Commandes : $commands" 11.32 +msgid "Commands: %s" 11.33 +msgstr "Commandes : %s" 11.34 11.35 #: index.cgi:177 11.36 -#, sh-format 11.37 -msgid "Downloading to: $dl" 11.38 -msgstr "Téléchargement dans : $dl" 11.39 +msgid "Downloading to: %s" 11.40 +msgstr "Téléchargement dans : %s" 11.41 11.42 #: index.cgi:184 11.43 -#, sh-format 11.44 -msgid "$cmd needs an argument" 11.45 -msgstr "La commande $cmd nécéssite un argument" 11.46 +msgid "%s needs an argument" 11.47 +msgstr "La commande %s nécéssite un argument" 11.48 11.49 #: index.cgi:188 11.50 -#, sh-format 11.51 -msgid "Unknown command: $cmd" 11.52 -msgstr "Commande inconnue : $cmd" 11.53 +msgid "Unknown command: %s" 11.54 +msgstr "Commande inconnue : %s" 11.55 11.56 #: index.cgi:196 11.57 msgid "TazPanel - Process activity" 11.58 @@ -142,9 +132,8 @@ 11.59 msgstr "TazPanel - Rapport système" 11.60 11.61 #: index.cgi:239 11.62 -#, sh-format 11.63 -msgid "Reporting to: $output" 11.64 -msgstr "Création du rapport vers : $output" 11.65 +msgid "Reporting to: %s" 11.66 +msgstr "Création du rapport vers : %s" 11.67 11.68 #: index.cgi:242 11.69 msgid "Creating report header..." 11.70 @@ -199,9 +188,8 @@ 11.71 msgstr "Ce rapport peut être attaché avec un rapport de bogue sur :" 11.72 11.73 #: index.cgi:370 11.74 -#, sh-format 11.75 -msgid "Host: $hostname" 11.76 -msgstr "Nom d'hôte : $hostname" 11.77 +msgid "Host: %s" 11.78 +msgstr "Nom d'hôte : %s" 11.79 11.80 #: index.cgi:371 11.81 msgid "SliTaz administration and configuration Panel" 11.82 @@ -232,9 +220,8 @@ 11.83 msgstr "Mémoire en Mb :" 11.84 11.85 #: index.cgi:394 11.86 -#, sh-format 11.87 -msgid "Total: $memtotal, Used: $memused, Free: $memfree" 11.88 -msgstr "Total : $memtotal, Utilisé : $memused, Disponible : $memfree" 11.89 +msgid "Total: %d, Used: %d, Free: %d" 11.90 +msgstr "Total : %d, Utilisé : %d, Disponible : %d" 11.91 11.92 #: index.cgi:399 11.93 msgid "Linux kernel:" 11.94 @@ -278,18 +265,16 @@ 11.95 msgstr "Connecté" 11.96 11.97 #: network.cgi:99 11.98 -#, sh-format 11.99 -msgid "Changed hostname: $get_hostname" 11.100 -msgstr "Nouveau hostname: $get_hostname" 11.101 +msgid "Changed hostname: %s" 11.102 +msgstr "Nouveau hostname: %s" 11.103 11.104 #: network.cgi:115 11.105 msgid "Scanning open ports..." 11.106 msgstr "Balayage des ports ouverts..." 11.107 11.108 #: network.cgi:118 11.109 -#, sh-format 11.110 -msgid "Port scanning for $scan" 11.111 -msgstr "Scanning du port $scan" 11.112 +msgid "Port scanning for %s" 11.113 +msgstr "Scanning du port %s" 11.114 11.115 #: network.cgi:132 11.116 msgid "Setting up IP..." 11.117 @@ -679,14 +664,12 @@ 11.118 "Gérer, rechercher ou obtenir des informations sur les modules du noyau Linux" 11.119 11.120 #: hardware.cgi:99 11.121 -#, sh-format 11.122 -msgid "Detailed information for module: $get_modinfo" 11.123 -msgstr "Les informations détaillées pour le module : $get_modinfo" 11.124 +msgid "Detailed information for module: %s" 11.125 +msgstr "Les informations détaillées pour le module : %s" 11.126 11.127 #: hardware.cgi:113 11.128 -#, sh-format 11.129 -msgid "Matching result(s) for: $get_search" 11.130 -msgstr "Résultats correspondants pour : $get_search" 11.131 +msgid "Matching result(s) for: %s" 11.132 +msgstr "Résultats correspondants pour : %s" 11.133 11.134 #: hardware.cgi:119 11.135 msgid "Module:" 11.136 @@ -709,18 +692,16 @@ 11.137 msgstr "par" 11.138 11.139 #: hardware.cgi:150 11.140 -#, sh-format 11.141 -msgid "Information for USB Device $vidpid" 11.142 -msgstr "Détails du périphérique USB $vidpid" 11.143 +msgid "Information for USB Device %s" 11.144 +msgstr "Détails du périphérique USB %s" 11.145 11.146 #: hardware.cgi:151 hardware.cgi:165 11.147 msgid "Detailed information about specified device." 11.148 msgstr "Détails sur un périphérique." 11.149 11.150 #: hardware.cgi:164 11.151 -#, sh-format 11.152 -msgid "Information for PCI Device $slot" 11.153 -msgstr "Détails du périphérique PCI $slot" 11.154 +msgid "Information for PCI Device %s" 11.155 +msgstr "Détails du périphérique PCI %s" 11.156 11.157 #: hardware.cgi:183 11.158 msgid "Drivers & Devices" 11.159 @@ -747,18 +728,16 @@ 11.160 msgstr "santé" 11.161 11.162 #: hardware.cgi:223 11.163 -#, sh-format 11.164 -msgid "Discharging $rempct% - $remtimef" 11.165 -msgstr "Déchargement $rempct% - $remtimef" 11.166 +msgid "Discharging %d%% - %s" 11.167 +msgstr "Déchargement %d%% - %s" 11.168 11.169 #: hardware.cgi:227 11.170 -#, sh-format 11.171 -msgid "Charging $rempct% - $remtimef" 11.172 -msgstr "Chargement $rempct% - $remtimef" 11.173 +msgid "Charging %d%% - %s" 11.174 +msgstr "Chargement %d%% - %s" 11.175 11.176 #: hardware.cgi:229 11.177 -msgid "Charged 100%" 11.178 -msgstr "Chargée à 100%" 11.179 +msgid "Charged 100%%" 11.180 +msgstr "Chargée à 100%%" 11.181 11.182 #: hardware.cgi:237 11.183 msgid "Temperature:" 11.184 @@ -1023,13 +1002,13 @@ 11.185 msgstr "Langue du système" 11.186 11.187 #: settings.cgi:442 11.188 -#, fuzzy, sh-format 11.189 +#, fuzzy 11.190 msgid "" 11.191 -"You must logout and login again to your current session to use $new_locale " 11.192 +"You must logout and login again to your current session to use %s " 11.193 "locale." 11.194 msgstr "" 11.195 "Vous devez vous déconnecter et vous reconnecter à votre session courante " 11.196 -"pour utiliser la locale $new_locale" 11.197 +"pour utiliser la locale %s" 11.198 11.199 #: settings.cgi:444 11.200 #, fuzzy 11.201 @@ -1041,9 +1020,8 @@ 11.202 msgstr "Type de clavier de la console" 11.203 11.204 #: settings.cgi:465 11.205 -#, sh-format 11.206 -msgid "Current console keymap: $keymap" 11.207 -msgstr "Clavier actif pour la console : $keymap" 11.208 +msgid "Current console keymap: %s" 11.209 +msgstr "Clavier actif pour la console : %s" 11.210 11.211 #: settings.cgi:482 11.212 msgid "Suggested keymap for Xorg:"
12.1 --- a/po/pl.po Wed Apr 08 10:20:10 2015 +0200 12.2 +++ b/po/pl.po Wed Apr 08 15:32:20 2015 +0300 12.3 @@ -21,19 +21,13 @@ 12.4 "X-Poedit-Country: POLAND\n" 12.5 "X-Poedit-SourceCharset: utf-8\n" 12.6 12.7 -#: tazpanel:33 12.8 -#, fuzzy 12.9 -msgid "Usage: tazpanel [start|stop|passwd|app]" 12.10 -msgstr "Użycie: $program_name [start|stop|passwd]" 12.11 - 12.12 #: tazpanel:37 12.13 msgid "TazPanel is already running." 12.14 msgstr "TazPanel jest już uruchomiony." 12.15 12.16 #: tazpanel:40 12.17 -#, sh-format 12.18 -msgid "Starting TazPanel web server on port $HTTPD_PORT..." 12.19 -msgstr "Uruchamianie web serwera TazPanel na porcie $HTTPD_PORT..." 12.20 +msgid "Starting TazPanel web server on port %d..." 12.21 +msgstr "Uruchamianie web serwera TazPanel na porcie %d..." 12.22 12.23 #: tazpanel:42 12.24 msgid "TazPanel Authentication - Default: root:root" 12.25 @@ -88,24 +82,20 @@ 12.26 msgstr "Niewielki emulator terminala, opcje poleceń są obsługiwane." 12.27 12.28 #: index.cgi:172 index.cgi:189 12.29 -#, sh-format 12.30 -msgid "Commands: $commands" 12.31 -msgstr "Polecenia: $commands" 12.32 +msgid "Commands: %s" 12.33 +msgstr "Polecenia: %s" 12.34 12.35 #: index.cgi:177 12.36 -#, sh-format 12.37 -msgid "Downloading to: $dl" 12.38 -msgstr "Pobieranie do: $dl" 12.39 +msgid "Downloading to: %s" 12.40 +msgstr "Pobieranie do: %s" 12.41 12.42 #: index.cgi:184 12.43 -#, sh-format 12.44 -msgid "$cmd needs an argument" 12.45 -msgstr "$cmd wymaga podania argumentu" 12.46 +msgid "%s needs an argument" 12.47 +msgstr "%s wymaga podania argumentu" 12.48 12.49 #: index.cgi:188 12.50 -#, sh-format 12.51 -msgid "Unknown command: $cmd" 12.52 -msgstr "Nieznane polecenie: $cmd" 12.53 +msgid "Unknown command: %s" 12.54 +msgstr "Nieznane polecenie: %s" 12.55 12.56 #: index.cgi:196 12.57 msgid "TazPanel - Process activity" 12.58 @@ -144,9 +134,8 @@ 12.59 msgstr "TazPanel - Raport systemu" 12.60 12.61 #: index.cgi:239 12.62 -#, sh-format 12.63 -msgid "Reporting to: $output" 12.64 -msgstr "Zapisywanie raportu do: $output" 12.65 +msgid "Reporting to: %s" 12.66 +msgstr "Zapisywanie raportu do: %s" 12.67 12.68 #: index.cgi:242 12.69 msgid "Creating report header..." 12.70 @@ -201,9 +190,8 @@ 12.71 msgstr "Ten raport może być dołączony do zgłoszenia błędu na:" 12.72 12.73 #: index.cgi:370 12.74 -#, sh-format 12.75 -msgid "Host: $hostname" 12.76 -msgstr "Host: $hostname" 12.77 +msgid "Host: %s" 12.78 +msgstr "Host: %s" 12.79 12.80 #: index.cgi:371 12.81 msgid "SliTaz administration and configuration Panel" 12.82 @@ -234,9 +222,8 @@ 12.83 msgstr "Pamięć w Mb:" 12.84 12.85 #: index.cgi:394 12.86 -#, sh-format 12.87 -msgid "Total: $memtotal, Used: $memused, Free: $memfree" 12.88 -msgstr "Całkowita: $memtotal, Użyta: $memused, Wolna: $memfree" 12.89 +msgid "Total: %d, Used: %d, Free: %d" 12.90 +msgstr "Całkowita: %d, Użyta: %d, Wolna: %d" 12.91 12.92 #: index.cgi:399 12.93 msgid "Linux kernel:" 12.94 @@ -280,18 +267,16 @@ 12.95 msgstr "Połączony" 12.96 12.97 #: network.cgi:99 12.98 -#, sh-format 12.99 -msgid "Changed hostname: $get_hostname" 12.100 -msgstr "Zmieniona nazwa hosta: $get_hostname" 12.101 +msgid "Changed hostname: %s" 12.102 +msgstr "Zmieniona nazwa hosta: %s" 12.103 12.104 #: network.cgi:115 12.105 msgid "Scanning open ports..." 12.106 msgstr "Skanowanie otwartych portów..." 12.107 12.108 #: network.cgi:118 12.109 -#, sh-format 12.110 -msgid "Port scanning for $scan" 12.111 -msgstr "Skanowanie portów dla $scan" 12.112 +msgid "Port scanning for %s" 12.113 +msgstr "Skanowanie portów dla %s" 12.114 12.115 #: network.cgi:132 12.116 msgid "Setting up IP..." 12.117 @@ -671,14 +656,12 @@ 12.118 msgstr "Zarządzaj, szukaj albo pobierz informacje na temat modułów jądra Linux" 12.119 12.120 #: hardware.cgi:99 12.121 -#, sh-format 12.122 -msgid "Detailed information for module: $get_modinfo" 12.123 -msgstr "Szczegółowe informacje dla modułu: $get_modinfo" 12.124 +msgid "Detailed information for module: %s" 12.125 +msgstr "Szczegółowe informacje dla modułu: %s" 12.126 12.127 #: hardware.cgi:113 12.128 -#, sh-format 12.129 -msgid "Matching result(s) for: $get_search" 12.130 -msgstr "Pasujące rezultat(y) dla: $get_search" 12.131 +msgid "Matching result(s) for: %s" 12.132 +msgstr "Pasujące rezultat(y) dla: %s" 12.133 12.134 #: hardware.cgi:119 12.135 msgid "Module:" 12.136 @@ -701,18 +684,16 @@ 12.137 msgstr "przez" 12.138 12.139 #: hardware.cgi:150 12.140 -#, sh-format 12.141 -msgid "Information for USB Device $vidpid" 12.142 -msgstr "Informacje i urządzeniu USB $vidpid" 12.143 +msgid "Information for USB Device %s" 12.144 +msgstr "Informacje i urządzeniu USB %s" 12.145 12.146 #: hardware.cgi:151 hardware.cgi:165 12.147 msgid "Detailed information about specified device." 12.148 msgstr "Szczegółowe informacje o wybranym urządzeniu." 12.149 12.150 #: hardware.cgi:164 12.151 -#, sh-format 12.152 -msgid "Information for PCI Device $slot" 12.153 -msgstr "Informacje o urządzeniu PCI $slot" 12.154 +msgid "Information for PCI Device %s" 12.155 +msgstr "Informacje o urządzeniu PCI %s" 12.156 12.157 #: hardware.cgi:183 12.158 msgid "Drivers & Devices" 12.159 @@ -739,18 +720,16 @@ 12.160 msgstr "zużycie" 12.161 12.162 #: hardware.cgi:223 12.163 -#, sh-format 12.164 -msgid "Discharging $rempct% - $remtimef" 12.165 -msgstr "Rozładowywanie $rempct% - $remtimef" 12.166 +msgid "Discharging %d%% - %s" 12.167 +msgstr "Rozładowywanie %d%% - %s" 12.168 12.169 #: hardware.cgi:227 12.170 -#, sh-format 12.171 -msgid "Charging $rempct% - $remtimef" 12.172 -msgstr "Ładowanie $rempct% - $remtimef" 12.173 +msgid "Charging %d%% - %s" 12.174 +msgstr "Ładowanie %d%% - %s" 12.175 12.176 #: hardware.cgi:229 12.177 -msgid "Charged 100%" 12.178 -msgstr "Naładowana w 100%" 12.179 +msgid "Charged 100%%" 12.180 +msgstr "Naładowana w 100%%" 12.181 12.182 #: hardware.cgi:237 12.183 msgid "Temperature:" 12.184 @@ -1010,13 +989,12 @@ 12.185 msgstr "Język systemu" 12.186 12.187 #: settings.cgi:442 12.188 -#, sh-format 12.189 msgid "" 12.190 -"You must logout and login again to your current session to use $new_locale " 12.191 +"You must logout and login again to your current session to use %s " 12.192 "locale." 12.193 msgstr "" 12.194 "Należy się wylogować i zalogować ponownie aby używać ustawień regionalnych " 12.195 -"$new_locale." 12.196 +"%s." 12.197 12.198 #: settings.cgi:444 12.199 msgid "Current system locale:" 12.200 @@ -1027,9 +1005,8 @@ 12.201 msgstr "Układ klawiatury konsoli" 12.202 12.203 #: settings.cgi:465 12.204 -#, sh-format 12.205 -msgid "Current console keymap: $keymap" 12.206 -msgstr "Aktualny układ klawiatury dla konsoli: $keymap" 12.207 +msgid "Current console keymap: %s" 12.208 +msgstr "Aktualny układ klawiatury dla konsoli: %s" 12.209 12.210 #: settings.cgi:482 12.211 msgid "Suggested keymap for Xorg:"
13.1 --- a/po/pt_BR.po Wed Apr 08 10:20:10 2015 +0200 13.2 +++ b/po/pt_BR.po Wed Apr 08 15:32:20 2015 +0300 13.3 @@ -17,18 +17,13 @@ 13.4 "Content-Transfer-Encoding: 8bit\n" 13.5 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 13.6 13.7 -#: tazpanel:33 13.8 -msgid "Usage: tazpanel [start|stop|passwd|app]" 13.9 -msgstr "Utilização: tazpanel [start|stop|passwd|app]" 13.10 - 13.11 #: tazpanel:37 13.12 msgid "TazPanel is already running." 13.13 msgstr "TazPanel já está sendo executado." 13.14 13.15 #: tazpanel:40 13.16 -#, sh-format 13.17 -msgid "Starting TazPanel web server on port $HTTPD_PORT..." 13.18 -msgstr "Parando o servidor web do TazPanel na porta $HTTPD_PORT..." 13.19 +msgid "Starting TazPanel web server on port %d..." 13.20 +msgstr "Parando o servidor web do TazPanel na porta %d..." 13.21 13.22 #: tazpanel:42 13.23 msgid "TazPanel Authentication - Default: root:root" 13.24 @@ -83,24 +78,20 @@ 13.25 msgstr "Pequeno emulador de terminal, opções de comandos são suportadas." 13.26 13.27 #: index.cgi:172 index.cgi:189 13.28 -#, sh-format 13.29 -msgid "Commands: $commands" 13.30 -msgstr "Comandos: $commands" 13.31 +msgid "Commands: %s" 13.32 +msgstr "Comandos: %s" 13.33 13.34 #: index.cgi:177 13.35 -#, sh-format 13.36 -msgid "Downloading to: $dl" 13.37 -msgstr "Baixando para: $dl" 13.38 +msgid "Downloading to: %s" 13.39 +msgstr "Baixando para: %s" 13.40 13.41 #: index.cgi:184 13.42 -#, sh-format 13.43 -msgid "$cmd needs an argument" 13.44 -msgstr "$cmd necessida de um argumento" 13.45 +msgid "%s needs an argument" 13.46 +msgstr "%s necessida de um argumento" 13.47 13.48 #: index.cgi:188 13.49 -#, sh-format 13.50 -msgid "Unknown command: $cmd" 13.51 -msgstr "Comando desconhecido: $cmd" 13.52 +msgid "Unknown command: %s" 13.53 +msgstr "Comando desconhecido: %s" 13.54 13.55 #: index.cgi:196 13.56 msgid "TazPanel - Process activity" 13.57 @@ -139,9 +130,8 @@ 13.58 msgstr "TazPanel - Relatório do sistema" 13.59 13.60 #: index.cgi:239 13.61 -#, sh-format 13.62 -msgid "Reporting to: $output" 13.63 -msgstr "Reportando a: $output" 13.64 +msgid "Reporting to: %s" 13.65 +msgstr "Reportando a: %s" 13.66 13.67 #: index.cgi:242 13.68 msgid "Creating report header..." 13.69 @@ -196,9 +186,8 @@ 13.70 msgstr "Este relatório pode ser anexado a um aviso de bug em:" 13.71 13.72 #: index.cgi:370 13.73 -#, sh-format 13.74 -msgid "Host: $hostname" 13.75 -msgstr "Nome do host: $hostname" 13.76 +msgid "Host: %s" 13.77 +msgstr "Nome do host: %s" 13.78 13.79 #: index.cgi:371 13.80 msgid "SliTaz administration and configuration Panel" 13.81 @@ -229,9 +218,8 @@ 13.82 msgstr "Memória em MB:" 13.83 13.84 #: index.cgi:394 13.85 -#, sh-format 13.86 -msgid "Total: $memtotal, Used: $memused, Free: $memfree" 13.87 -msgstr "Total: $memtotal, Usada: $memused, Livre: $memfree" 13.88 +msgid "Total: %d, Used: %d, Free: %d" 13.89 +msgstr "Total: %d, Usada: %d, Livre: %d" 13.90 13.91 #: index.cgi:399 13.92 msgid "Linux kernel:" 13.93 @@ -275,18 +263,16 @@ 13.94 msgstr "Conectado" 13.95 13.96 #: network.cgi:99 13.97 -#, sh-format 13.98 -msgid "Changed hostname: $get_hostname" 13.99 -msgstr "Nome de host alterado: $get_hostname" 13.100 +msgid "Changed hostname: %s" 13.101 +msgstr "Nome de host alterado: %s" 13.102 13.103 #: network.cgi:115 13.104 msgid "Scanning open ports..." 13.105 msgstr "Procurando portas abertas..." 13.106 13.107 #: network.cgi:118 13.108 -#, sh-format 13.109 -msgid "Port scanning for $scan" 13.110 -msgstr "Procura de portas para $scan" 13.111 +msgid "Port scanning for %s" 13.112 +msgstr "Procura de portas para %s" 13.113 13.114 #: network.cgi:132 13.115 msgid "Setting up IP..." 13.116 @@ -665,14 +651,12 @@ 13.117 msgstr "Gerenciar, buscar e obter informações sobre módulos do kernel linux" 13.118 13.119 #: hardware.cgi:99 13.120 -#, sh-format 13.121 -msgid "Detailed information for module: $get_modinfo" 13.122 -msgstr "Informações detalhadas de módulo: $get_modinfo" 13.123 +msgid "Detailed information for module: %s" 13.124 +msgstr "Informações detalhadas de módulo: %s" 13.125 13.126 #: hardware.cgi:113 13.127 -#, sh-format 13.128 -msgid "Matching result(s) for: $get_search" 13.129 -msgstr "Resultado(s) encontrado(s) para: $get_search" 13.130 +msgid "Matching result(s) for: %s" 13.131 +msgstr "Resultado(s) encontrado(s) para: %s" 13.132 13.133 #: hardware.cgi:119 13.134 msgid "Module:" 13.135 @@ -695,18 +679,16 @@ 13.136 msgstr "por" 13.137 13.138 #: hardware.cgi:150 13.139 -#, sh-format 13.140 -msgid "Information for USB Device $vidpid" 13.141 -msgstr "Informação sobre o dispositivo USB $vidpid" 13.142 +msgid "Information for USB Device %s" 13.143 +msgstr "Informação sobre o dispositivo USB %s" 13.144 13.145 #: hardware.cgi:151 hardware.cgi:165 13.146 msgid "Detailed information about specified device." 13.147 msgstr "Informação detalhada sobre um dispositivo específico." 13.148 13.149 #: hardware.cgi:164 13.150 -#, sh-format 13.151 -msgid "Information for PCI Device $slot" 13.152 -msgstr "Informação sobre o dispositivo PCI $slot" 13.153 +msgid "Information for PCI Device %s" 13.154 +msgstr "Informação sobre o dispositivo PCI %s" 13.155 13.156 #: hardware.cgi:183 13.157 msgid "Drivers & Devices" 13.158 @@ -733,18 +715,16 @@ 13.159 msgstr "estado" 13.160 13.161 #: hardware.cgi:223 13.162 -#, sh-format 13.163 -msgid "Discharging $rempct% - $remtimef" 13.164 -msgstr "Descarregando $rempct% - $remtimef" 13.165 +msgid "Discharging %d%% - %s" 13.166 +msgstr "Descarregando %d%% - %s" 13.167 13.168 #: hardware.cgi:227 13.169 -#, sh-format 13.170 -msgid "Charging $rempct% - $remtimef" 13.171 -msgstr "Carregando $rempct% - $remtimef" 13.172 +msgid "Charging %d%% - %s" 13.173 +msgstr "Carregando %d%% - %s" 13.174 13.175 #: hardware.cgi:229 13.176 -msgid "Charged 100%" 13.177 -msgstr "Carregada 100%" 13.178 +msgid "Charged 100%%" 13.179 +msgstr "Carregada 100%%" 13.180 13.181 #: hardware.cgi:237 13.182 msgid "Temperature:" 13.183 @@ -1001,12 +981,11 @@ 13.184 msgstr "Linguagem do sistema" 13.185 13.186 #: settings.cgi:442 13.187 -#, sh-format 13.188 msgid "" 13.189 -"You must logout and login again to your current session to use $new_locale " 13.190 +"You must logout and login again to your current session to use %s " 13.191 "locale." 13.192 msgstr "" 13.193 -"Você deve sair e fazer login novamente para usar o novo locale $new_locale." 13.194 +"Você deve sair e fazer login novamente para usar o novo locale %s." 13.195 13.196 #: settings.cgi:444 13.197 msgid "Current system locale:" 13.198 @@ -1017,9 +996,8 @@ 13.199 msgstr "Mapa de teclado" 13.200 13.201 #: settings.cgi:465 13.202 -#, sh-format 13.203 -msgid "Current console keymap: $keymap" 13.204 -msgstr "Mapa de teclado do console atual: $keymap" 13.205 +msgid "Current console keymap: %s" 13.206 +msgstr "Mapa de teclado do console atual: %s" 13.207 13.208 #: settings.cgi:482 13.209 msgid "Suggested keymap for Xorg:"
14.1 --- a/po/ru.po Wed Apr 08 10:20:10 2015 +0200 14.2 +++ b/po/ru.po Wed Apr 08 15:32:20 2015 +0300 14.3 @@ -20,19 +20,13 @@ 14.4 "X-Poedit-Basepath: ../\n" 14.5 "X-Poedit-SearchPath-0: .\n" 14.6 14.7 -#: tazpanel:33 14.8 -#, fuzzy 14.9 -msgid "Usage: tazpanel [start|stop|passwd|app]" 14.10 -msgstr "Использование: $program_name [start|stop|passwd]" 14.11 - 14.12 #: tazpanel:37 14.13 msgid "TazPanel is already running." 14.14 msgstr "TazPanel уже запущена." 14.15 14.16 #: tazpanel:40 14.17 -#, sh-format 14.18 -msgid "Starting TazPanel web server on port $HTTPD_PORT..." 14.19 -msgstr "Веб-сервер TazPanel запускается на порту $HTTPD_PORT..." 14.20 +msgid "Starting TazPanel web server on port %d..." 14.21 +msgstr "Веб-сервер TazPanel запускается на порту %d..." 14.22 14.23 #: tazpanel:42 14.24 msgid "TazPanel Authentication - Default: root:root" 14.25 @@ -87,24 +81,20 @@ 14.26 msgstr "Маленький эмулятор терминала; поддерживаются параметры команд." 14.27 14.28 #: index.cgi:172 index.cgi:189 14.29 -#, sh-format 14.30 -msgid "Commands: $commands" 14.31 -msgstr "Команды: $commands" 14.32 +msgid "Commands: %s" 14.33 +msgstr "Команды: %s" 14.34 14.35 #: index.cgi:177 14.36 -#, sh-format 14.37 -msgid "Downloading to: $dl" 14.38 -msgstr "Загрузка в: $dl" 14.39 +msgid "Downloading to: %s" 14.40 +msgstr "Загрузка в: %s" 14.41 14.42 #: index.cgi:184 14.43 -#, sh-format 14.44 -msgid "$cmd needs an argument" 14.45 -msgstr "Команда $cmd требует аргумент" 14.46 +msgid "%s needs an argument" 14.47 +msgstr "Команда %s требует аргумент" 14.48 14.49 #: index.cgi:188 14.50 -#, sh-format 14.51 -msgid "Unknown command: $cmd" 14.52 -msgstr "Неизвестная команда: $cmd" 14.53 +msgid "Unknown command: %s" 14.54 +msgstr "Неизвестная команда: %s" 14.55 14.56 #: index.cgi:196 14.57 msgid "TazPanel - Process activity" 14.58 @@ -143,9 +133,8 @@ 14.59 msgstr "Системный отчёт | TazPanel" 14.60 14.61 #: index.cgi:239 14.62 -#, sh-format 14.63 -msgid "Reporting to: $output" 14.64 -msgstr "Файл отчёта: $output" 14.65 +msgid "Reporting to: %s" 14.66 +msgstr "Файл отчёта: %s" 14.67 14.68 #: index.cgi:242 14.69 msgid "Creating report header..." 14.70 @@ -200,9 +189,8 @@ 14.71 msgstr "Этот отчёт можно прикрепить к баг-репорту здесь:" 14.72 14.73 #: index.cgi:370 14.74 -#, sh-format 14.75 -msgid "Host: $hostname" 14.76 -msgstr "Хост: $hostname" 14.77 +msgid "Host: %s" 14.78 +msgstr "Хост: %s" 14.79 14.80 #: index.cgi:371 14.81 msgid "SliTaz administration and configuration Panel" 14.82 @@ -233,9 +221,8 @@ 14.83 msgstr "Память в МБ:" 14.84 14.85 #: index.cgi:394 14.86 -#, sh-format 14.87 -msgid "Total: $memtotal, Used: $memused, Free: $memfree" 14.88 -msgstr "Всего: $memtotal, занято: $memused, свободно: $memfree" 14.89 +msgid "Total: %d, Used: %d, Free: %d" 14.90 +msgstr "Всего: %d, занято: %d, свободно: %d" 14.91 14.92 #: index.cgi:399 14.93 msgid "Linux kernel:" 14.94 @@ -279,18 +266,16 @@ 14.95 msgstr "Соединено" 14.96 14.97 #: network.cgi:99 14.98 -#, sh-format 14.99 -msgid "Changed hostname: $get_hostname" 14.100 -msgstr "Изменённое название хоста: $get_hostname" 14.101 +msgid "Changed hostname: %s" 14.102 +msgstr "Изменённое название хоста: %s" 14.103 14.104 #: network.cgi:115 14.105 msgid "Scanning open ports..." 14.106 msgstr "Сканирование открытых портов…" 14.107 14.108 #: network.cgi:118 14.109 -#, sh-format 14.110 -msgid "Port scanning for $scan" 14.111 -msgstr "Сканирование портов адреса $scan" 14.112 +msgid "Port scanning for %s" 14.113 +msgstr "Сканирование портов адреса %s" 14.114 14.115 #: network.cgi:132 14.116 msgid "Setting up IP..." 14.117 @@ -670,14 +655,12 @@ 14.118 msgstr "Управление, поиск и сведения о модулях ядра Linux" 14.119 14.120 #: hardware.cgi:99 14.121 -#, sh-format 14.122 -msgid "Detailed information for module: $get_modinfo" 14.123 -msgstr "Подробности о модуле $get_modinfo" 14.124 +msgid "Detailed information for module: %s" 14.125 +msgstr "Подробности о модуле %s" 14.126 14.127 #: hardware.cgi:113 14.128 -#, sh-format 14.129 -msgid "Matching result(s) for: $get_search" 14.130 -msgstr "Результаты поиска $get_search" 14.131 +msgid "Matching result(s) for: %s" 14.132 +msgstr "Результаты поиска %s" 14.133 14.134 #: hardware.cgi:119 14.135 msgid "Module:" 14.136 @@ -700,18 +683,16 @@ 14.137 msgstr "кем" 14.138 14.139 #: hardware.cgi:150 14.140 -#, sh-format 14.141 -msgid "Information for USB Device $vidpid" 14.142 -msgstr "Информация о USB-устройстве $vidpid" 14.143 +msgid "Information for USB Device %s" 14.144 +msgstr "Информация о USB-устройстве %s" 14.145 14.146 #: hardware.cgi:151 hardware.cgi:165 14.147 msgid "Detailed information about specified device." 14.148 msgstr "Подробная информация о выбранном устройстве." 14.149 14.150 #: hardware.cgi:164 14.151 -#, sh-format 14.152 -msgid "Information for PCI Device $slot" 14.153 -msgstr "Информация о PCI-устройстве $slot" 14.154 +msgid "Information for PCI Device %s" 14.155 +msgstr "Информация о PCI-устройстве %s" 14.156 14.157 #: hardware.cgi:183 14.158 msgid "Drivers & Devices" 14.159 @@ -738,17 +719,15 @@ 14.160 msgstr "здоровье" 14.161 14.162 #: hardware.cgi:223 14.163 -#, sh-format 14.164 -msgid "Discharging $rempct% - $remtimef" 14.165 -msgstr "Разряжается: $rempct % — осталось $remtimef" 14.166 +msgid "Discharging %d%% - %s" 14.167 +msgstr "Разряжается: %d %% — осталось %s" 14.168 14.169 #: hardware.cgi:227 14.170 -#, sh-format 14.171 -msgid "Charging $rempct% - $remtimef" 14.172 -msgstr "Заряжается: $rempct % — осталось $remtimef" 14.173 +msgid "Charging %d%% - %s" 14.174 +msgstr "Заряжается: %d %% — осталось %s" 14.175 14.176 #: hardware.cgi:229 14.177 -msgid "Charged 100%" 14.178 +msgid "Charged 100%%" 14.179 msgstr "Полностью заряжена" 14.180 14.181 #: hardware.cgi:237 14.182 @@ -1008,13 +987,12 @@ 14.183 msgstr "Язык системы" 14.184 14.185 #: settings.cgi:442 14.186 -#, sh-format 14.187 msgid "" 14.188 -"You must logout and login again to your current session to use $new_locale " 14.189 +"You must logout and login again to your current session to use %s " 14.190 "locale." 14.191 msgstr "" 14.192 "Вам необходимо выйти из системы и войти повторно, чтобы использовать локаль " 14.193 -"«$new_locale»." 14.194 +"«%s»." 14.195 14.196 #: settings.cgi:444 14.197 msgid "Current system locale:" 14.198 @@ -1025,9 +1003,8 @@ 14.199 msgstr "Консольная раскладка" 14.200 14.201 #: settings.cgi:465 14.202 -#, sh-format 14.203 -msgid "Current console keymap: $keymap" 14.204 -msgstr "Текущая консольная раскладка: $keymap" 14.205 +msgid "Current console keymap: %s" 14.206 +msgstr "Текущая консольная раскладка: %s" 14.207 14.208 #: settings.cgi:482 14.209 msgid "Suggested keymap for Xorg:"
15.1 --- a/po/sv.po Wed Apr 08 10:20:10 2015 +0200 15.2 +++ b/po/sv.po Wed Apr 08 15:32:20 2015 +0300 15.3 @@ -17,19 +17,14 @@ 15.4 "Content-Transfer-Encoding: 8bit\n" 15.5 "Plural-Forms: nplurals=2; plural=(n != 1);\n" 15.6 15.7 -#: tazpanel:33 15.8 -#, fuzzy 15.9 -msgid "Usage: tazpanel [start|stop|passwd|app]" 15.10 -msgstr "Användning: $program_name [start|stop|passwd]" 15.11 - 15.12 #: tazpanel:37 15.13 msgid "TazPanel is already running." 15.14 msgstr "" 15.15 15.16 #: tazpanel:40 15.17 #, sh-format 15.18 -msgid "Starting TazPanel web server on port $HTTPD_PORT..." 15.19 -msgstr "Startar TazPanel web server på port $HTTPD_PORT..." 15.20 +msgid "Starting TazPanel web server on port %d..." 15.21 +msgstr "Startar TazPanel web server på port %d..." 15.22 15.23 #: tazpanel:42 15.24 msgid "TazPanel Authentication - Default: root:root" 15.25 @@ -84,24 +79,20 @@ 15.26 msgstr "Liten terminalemulator, kommando val är stödda." 15.27 15.28 #: index.cgi:172 index.cgi:189 15.29 -#, sh-format 15.30 -msgid "Commands: $commands" 15.31 -msgstr "Kommandon: $commands" 15.32 +msgid "Commands: %s" 15.33 +msgstr "Kommandon: %s" 15.34 15.35 #: index.cgi:177 15.36 -#, sh-format 15.37 -msgid "Downloading to: $dl" 15.38 -msgstr "Laddar ner till: $dl" 15.39 +msgid "Downloading to: %s" 15.40 +msgstr "Laddar ner till: %s" 15.41 15.42 #: index.cgi:184 15.43 -#, sh-format 15.44 -msgid "$cmd needs an argument" 15.45 -msgstr "$cmd behöver ett argument" 15.46 +msgid "%s needs an argument" 15.47 +msgstr "%s behöver ett argument" 15.48 15.49 #: index.cgi:188 15.50 -#, sh-format 15.51 -msgid "Unknown command: $cmd" 15.52 -msgstr "Okänt kommando: $cmd" 15.53 +msgid "Unknown command: %s" 15.54 +msgstr "Okänt kommando: %s" 15.55 15.56 #: index.cgi:196 15.57 msgid "TazPanel - Process activity" 15.58 @@ -140,9 +131,8 @@ 15.59 msgstr "TazPanel - System rapport" 15.60 15.61 #: index.cgi:239 15.62 -#, sh-format 15.63 -msgid "Reporting to: $output" 15.64 -msgstr "Rapporterar till: $output" 15.65 +msgid "Reporting to: %s" 15.66 +msgstr "Rapporterar till: %s" 15.67 15.68 #: index.cgi:242 15.69 msgid "Creating report header..." 15.70 @@ -197,9 +187,8 @@ 15.71 msgstr "Den här rapporten kan bifogas med en bug rapport på:" 15.72 15.73 #: index.cgi:370 15.74 -#, sh-format 15.75 -msgid "Host: $hostname" 15.76 -msgstr "Host: $hostname" 15.77 +msgid "Host: %s" 15.78 +msgstr "Host: %s" 15.79 15.80 #: index.cgi:371 15.81 msgid "SliTaz administration and configuration Panel" 15.82 @@ -230,9 +219,8 @@ 15.83 msgstr "Minne i Mb:" 15.84 15.85 #: index.cgi:394 15.86 -#, sh-format 15.87 -msgid "Total: $memtotal, Used: $memused, Free: $memfree" 15.88 -msgstr "Totalt: $memtotal, Använt: $memused, Ledigt: $memfree" 15.89 +msgid "Total: %d, Used: %d, Free: %d" 15.90 +msgstr "Totalt: %d, Använt: %d, Ledigt: %d" 15.91 15.92 #: index.cgi:399 15.93 msgid "Linux kernel:" 15.94 @@ -276,18 +264,16 @@ 15.95 msgstr "Ansluten" 15.96 15.97 #: network.cgi:99 15.98 -#, sh-format 15.99 -msgid "Changed hostname: $get_hostname" 15.100 -msgstr "Ändrat värdnamn: $get_hostname" 15.101 +msgid "Changed hostname: %s" 15.102 +msgstr "Ändrat värdnamn: %s" 15.103 15.104 #: network.cgi:115 15.105 msgid "Scanning open ports..." 15.106 msgstr "Skannar öppna portar..." 15.107 15.108 #: network.cgi:118 15.109 -#, sh-format 15.110 -msgid "Port scanning for $scan" 15.111 -msgstr "Port skanning för $scan" 15.112 +msgid "Port scanning for %s" 15.113 +msgstr "Port skanning för %s" 15.114 15.115 #: network.cgi:132 15.116 msgid "Setting up IP..." 15.117 @@ -665,14 +651,12 @@ 15.118 msgstr "Hantera, sök eller samla information om Linux kärnmoduler" 15.119 15.120 #: hardware.cgi:99 15.121 -#, sh-format 15.122 -msgid "Detailed information for module: $get_modinfo" 15.123 -msgstr "Detaljerad information för modul: $get_modinfo" 15.124 +msgid "Detailed information for module: %s" 15.125 +msgstr "Detaljerad information för modul: %s" 15.126 15.127 #: hardware.cgi:113 15.128 -#, sh-format 15.129 -msgid "Matching result(s) for: $get_search" 15.130 -msgstr "Matchande resultat för: $get_search" 15.131 +msgid "Matching result(s) for: %s" 15.132 +msgstr "Matchande resultat för: %s" 15.133 15.134 #: hardware.cgi:119 15.135 msgid "Module:" 15.136 @@ -695,8 +679,7 @@ 15.137 msgstr "av" 15.138 15.139 #: hardware.cgi:150 15.140 -#, sh-format 15.141 -msgid "Information for USB Device $vidpid" 15.142 +msgid "Information for USB Device %s" 15.143 msgstr "" 15.144 15.145 #: hardware.cgi:151 hardware.cgi:165 15.146 @@ -704,8 +687,7 @@ 15.147 msgstr "" 15.148 15.149 #: hardware.cgi:164 15.150 -#, sh-format 15.151 -msgid "Information for PCI Device $slot" 15.152 +msgid "Information for PCI Device %s" 15.153 msgstr "" 15.154 15.155 #: hardware.cgi:183 15.156 @@ -733,18 +715,16 @@ 15.157 msgstr "hälsa" 15.158 15.159 #: hardware.cgi:223 15.160 -#, sh-format 15.161 -msgid "Discharging $rempct% - $remtimef" 15.162 -msgstr "Laddar ur $rempct% - $remtimef" 15.163 +msgid "Discharging %d%% - %s" 15.164 +msgstr "Laddar ur %d%% - %s" 15.165 15.166 #: hardware.cgi:227 15.167 -#, sh-format 15.168 -msgid "Charging $rempct% - $remtimef" 15.169 -msgstr "Laddar $rempct% - $remtimef" 15.170 +msgid "Charging %d%% - %s" 15.171 +msgstr "Laddar %d%% - %s" 15.172 15.173 #: hardware.cgi:229 15.174 -msgid "Charged 100%" 15.175 -msgstr "Laddad 100%" 15.176 +msgid "Charged 100%%" 15.177 +msgstr "Laddad 100%%" 15.178 15.179 #: hardware.cgi:237 15.180 msgid "Temperature:" 15.181 @@ -1003,13 +983,12 @@ 15.182 msgstr "System språk" 15.183 15.184 #: settings.cgi:442 15.185 -#, sh-format 15.186 msgid "" 15.187 -"You must logout and login again to your current session to use $new_locale " 15.188 +"You must logout and login again to your current session to use %s " 15.189 "locale." 15.190 msgstr "" 15.191 "Du måste logga ut och logga in till din nuvarande session för att använda " 15.192 -"$new_locale språk." 15.193 +"%s språk." 15.194 15.195 #: settings.cgi:444 15.196 msgid "Current system locale:" 15.197 @@ -1020,9 +999,8 @@ 15.198 msgstr "Tangentbordsspråk" 15.199 15.200 #: settings.cgi:465 15.201 -#, sh-format 15.202 -msgid "Current console keymap: $keymap" 15.203 -msgstr "Nuvarande tangentbordsspråk: $keymap" 15.204 +msgid "Current console keymap: %s" 15.205 +msgstr "Nuvarande tangentbordsspråk: %s" 15.206 15.207 #: settings.cgi:482 15.208 msgid "Suggested keymap for Xorg:"
16.1 --- a/po/tazpanel.pot Wed Apr 08 10:20:10 2015 +0200 16.2 +++ b/po/tazpanel.pot Wed Apr 08 15:32:20 2015 +0300 16.3 @@ -17,17 +17,13 @@ 16.4 "Content-Type: text/plain; charset=CHARSET\n" 16.5 "Content-Transfer-Encoding: 8bit\n" 16.6 16.7 -#: tazpanel:33 16.8 -msgid "Usage: tazpanel [start|stop|passwd|app]" 16.9 -msgstr "" 16.10 - 16.11 #: tazpanel:37 16.12 msgid "TazPanel is already running." 16.13 msgstr "" 16.14 16.15 #: tazpanel:40 16.16 #, sh-format 16.17 -msgid "Starting TazPanel web server on port $HTTPD_PORT..." 16.18 +msgid "Starting TazPanel web server on port %d..." 16.19 msgstr "" 16.20 16.21 #: tazpanel:42 16.22 @@ -83,23 +79,19 @@ 16.23 msgstr "" 16.24 16.25 #: index.cgi:172 index.cgi:189 16.26 -#, sh-format 16.27 -msgid "Commands: $commands" 16.28 +msgid "Commands: %s" 16.29 msgstr "" 16.30 16.31 #: index.cgi:177 16.32 -#, sh-format 16.33 -msgid "Downloading to: $dl" 16.34 +msgid "Downloading to: %s" 16.35 msgstr "" 16.36 16.37 #: index.cgi:184 16.38 -#, sh-format 16.39 -msgid "$cmd needs an argument" 16.40 +msgid "%s needs an argument" 16.41 msgstr "" 16.42 16.43 #: index.cgi:188 16.44 -#, sh-format 16.45 -msgid "Unknown command: $cmd" 16.46 +msgid "Unknown command: %s" 16.47 msgstr "" 16.48 16.49 #: index.cgi:196 16.50 @@ -139,8 +131,7 @@ 16.51 msgstr "" 16.52 16.53 #: index.cgi:239 16.54 -#, sh-format 16.55 -msgid "Reporting to: $output" 16.56 +msgid "Reporting to: %s" 16.57 msgstr "" 16.58 16.59 #: index.cgi:242 16.60 @@ -196,8 +187,7 @@ 16.61 msgstr "" 16.62 16.63 #: index.cgi:370 16.64 -#, sh-format 16.65 -msgid "Host: $hostname" 16.66 +msgid "Host: %s" 16.67 msgstr "" 16.68 16.69 #: index.cgi:371 16.70 @@ -229,8 +219,7 @@ 16.71 msgstr "" 16.72 16.73 #: index.cgi:394 16.74 -#, sh-format 16.75 -msgid "Total: $memtotal, Used: $memused, Free: $memfree" 16.76 +msgid "Total: %d, Used: %d, Free: %d" 16.77 msgstr "" 16.78 16.79 #: index.cgi:399 16.80 @@ -275,8 +264,7 @@ 16.81 msgstr "" 16.82 16.83 #: network.cgi:99 16.84 -#, sh-format 16.85 -msgid "Changed hostname: $get_hostname" 16.86 +msgid "Changed hostname: %s" 16.87 msgstr "" 16.88 16.89 #: network.cgi:115 16.90 @@ -284,8 +272,7 @@ 16.91 msgstr "" 16.92 16.93 #: network.cgi:118 16.94 -#, sh-format 16.95 -msgid "Port scanning for $scan" 16.96 +msgid "Port scanning for %s" 16.97 msgstr "" 16.98 16.99 #: network.cgi:132 16.100 @@ -659,13 +646,11 @@ 16.101 msgstr "" 16.102 16.103 #: hardware.cgi:99 16.104 -#, sh-format 16.105 -msgid "Detailed information for module: $get_modinfo" 16.106 +msgid "Detailed information for module: %s" 16.107 msgstr "" 16.108 16.109 #: hardware.cgi:113 16.110 -#, sh-format 16.111 -msgid "Matching result(s) for: $get_search" 16.112 +msgid "Matching result(s) for: %s" 16.113 msgstr "" 16.114 16.115 #: hardware.cgi:119 16.116 @@ -689,8 +674,7 @@ 16.117 msgstr "" 16.118 16.119 #: hardware.cgi:150 16.120 -#, sh-format 16.121 -msgid "Information for USB Device $vidpid" 16.122 +msgid "Information for USB Device %s" 16.123 msgstr "" 16.124 16.125 #: hardware.cgi:151 hardware.cgi:165 16.126 @@ -698,8 +682,7 @@ 16.127 msgstr "" 16.128 16.129 #: hardware.cgi:164 16.130 -#, sh-format 16.131 -msgid "Information for PCI Device $slot" 16.132 +msgid "Information for PCI Device %s" 16.133 msgstr "" 16.134 16.135 #: hardware.cgi:183 16.136 @@ -727,17 +710,15 @@ 16.137 msgstr "" 16.138 16.139 #: hardware.cgi:223 16.140 -#, sh-format 16.141 -msgid "Discharging $rempct% - $remtimef" 16.142 +msgid "Discharging %d%% - %s" 16.143 msgstr "" 16.144 16.145 #: hardware.cgi:227 16.146 -#, sh-format 16.147 -msgid "Charging $rempct% - $remtimef" 16.148 +msgid "Charging %d%% - %s" 16.149 msgstr "" 16.150 16.151 #: hardware.cgi:229 16.152 -msgid "Charged 100%" 16.153 +msgid "Charged 100%%" 16.154 msgstr "" 16.155 16.156 #: hardware.cgi:237 16.157 @@ -991,9 +972,8 @@ 16.158 msgstr "" 16.159 16.160 #: settings.cgi:442 16.161 -#, sh-format 16.162 msgid "" 16.163 -"You must logout and login again to your current session to use $new_locale " 16.164 +"You must logout and login again to your current session to use %s " 16.165 "locale." 16.166 msgstr "" 16.167 16.168 @@ -1006,8 +986,7 @@ 16.169 msgstr "" 16.170 16.171 #: settings.cgi:465 16.172 -#, sh-format 16.173 -msgid "Current console keymap: $keymap" 16.174 +msgid "Current console keymap: %s" 16.175 msgstr "" 16.176 16.177 #: settings.cgi:482
17.1 --- a/po/zh_CN.po Wed Apr 08 10:20:10 2015 +0200 17.2 +++ b/po/zh_CN.po Wed Apr 08 15:32:20 2015 +0300 17.3 @@ -17,18 +17,13 @@ 17.4 "Content-Transfer-Encoding: 8bit\n" 17.5 "X-Generator: Poedit 1.6.5\n" 17.6 17.7 -#: tazpanel:33 17.8 -msgid "Usage: tazpanel [start|stop|passwd|app]" 17.9 -msgstr "用法：tazpanel [start|stop|passwd|app] (开始、停止、密码、程序)" 17.10 - 17.11 #: tazpanel:37 17.12 msgid "TazPanel is already running." 17.13 msgstr "tazpanel已经运行。" 17.14 17.15 #: tazpanel:40 17.16 -#, sh-format 17.17 -msgid "Starting TazPanel web server on port $HTTPD_PORT..." 17.18 -msgstr "在端口 $HTTPD_PORT 启动Tazpanel Web服务器中..." 17.19 +msgid "Starting TazPanel web server on port %d..." 17.20 +msgstr "在端口 %d 启动Tazpanel Web服务器中..." 17.21 17.22 #: tazpanel:42 17.23 msgid "TazPanel Authentication - Default: root:root" 17.24 @@ -83,24 +78,20 @@ 17.25 msgstr "小型终端仿真器，支持命令选项。" 17.26 17.27 #: index.cgi:172 index.cgi:189 17.28 -#, sh-format 17.29 -msgid "Commands: $commands" 17.30 -msgstr "命令： $commands" 17.31 +msgid "Commands: %s" 17.32 +msgstr "命令： %s" 17.33 17.34 #: index.cgi:177 17.35 -#, sh-format 17.36 -msgid "Downloading to: $dl" 17.37 -msgstr "下载到：$dl" 17.38 +msgid "Downloading to: %s" 17.39 +msgstr "下载到：%s" 17.40 17.41 #: index.cgi:184 17.42 -#, sh-format 17.43 -msgid "$cmd needs an argument" 17.44 -msgstr "$cmd需要一个参数" 17.45 +msgid "%s needs an argument" 17.46 +msgstr "%s需要一个参数" 17.47 17.48 #: index.cgi:188 17.49 -#, sh-format 17.50 -msgid "Unknown command: $cmd" 17.51 -msgstr "未知的命令：$cmd" 17.52 +msgid "Unknown command: %s" 17.53 +msgstr "未知的命令：%s" 17.54 17.55 #: index.cgi:196 17.56 msgid "TazPanel - Process activity" 17.57 @@ -139,9 +130,8 @@ 17.58 msgstr "TazPanel - 系统报告" 17.59 17.60 #: index.cgi:239 17.61 -#, sh-format 17.62 -msgid "Reporting to: $output" 17.63 -msgstr "汇报给：$output" 17.64 +msgid "Reporting to: %s" 17.65 +msgstr "汇报给：%s" 17.66 17.67 #: index.cgi:242 17.68 msgid "Creating report header..." 17.69 @@ -196,9 +186,8 @@ 17.70 msgstr "这份报告可附带一个BUG报告：" 17.71 17.72 #: index.cgi:370 17.73 -#, sh-format 17.74 -msgid "Host: $hostname" 17.75 -msgstr "主机：$hostname" 17.76 +msgid "Host: %s" 17.77 +msgstr "主机：%s" 17.78 17.79 #: index.cgi:371 17.80 msgid "SliTaz administration and configuration Panel" 17.81 @@ -229,9 +218,8 @@ 17.82 msgstr "内存（MB）：" 17.83 17.84 #: index.cgi:394 17.85 -#, sh-format 17.86 -msgid "Total: $memtotal, Used: $memused, Free: $memfree" 17.87 -msgstr "总计：$memtotal，使用的：$memused，空闲的：$memfree" 17.88 +msgid "Total: %d, Used: %d, Free: %d" 17.89 +msgstr "总计：%d，使用的：%d，空闲的：%d" 17.90 17.91 #: index.cgi:399 17.92 msgid "Linux kernel:" 17.93 @@ -275,18 +263,16 @@ 17.94 msgstr "连接完毕" 17.95 17.96 #: network.cgi:99 17.97 -#, sh-format 17.98 -msgid "Changed hostname: $get_hostname" 17.99 -msgstr "已更改主机名: $get_hostname" 17.100 +msgid "Changed hostname: %s" 17.101 +msgstr "已更改主机名: %s" 17.102 17.103 #: network.cgi:115 17.104 msgid "Scanning open ports..." 17.105 msgstr "探索开放的端口中…" 17.106 17.107 #: network.cgi:118 17.108 -#, sh-format 17.109 -msgid "Port scanning for $scan" 17.110 -msgstr "端口扫描为$scan" 17.111 +msgid "Port scanning for %s" 17.112 +msgstr "端口扫描为%s" 17.113 17.114 #: network.cgi:132 17.115 msgid "Setting up IP..." 17.116 @@ -656,14 +642,12 @@ 17.117 msgstr "管理，搜索和获取关于Linux内核模块的信息" 17.118 17.119 #: hardware.cgi:93 17.120 -#, sh-format 17.121 -msgid "Detailed information for module: $get_modinfo" 17.122 -msgstr "有关模块的详细信息：$get_modinfo" 17.123 +msgid "Detailed information for module: %s" 17.124 +msgstr "有关模块的详细信息：%s" 17.125 17.126 #: hardware.cgi:107 17.127 -#, sh-format 17.128 -msgid "Matching result(s) for: $get_search" 17.129 -msgstr "匹配结果为：$get_search" 17.130 +msgid "Matching result(s) for: %s" 17.131 +msgstr "匹配结果为：%s" 17.132 17.133 #: hardware.cgi:113 17.134 msgid "Module:" 17.135 @@ -686,18 +670,16 @@ 17.136 msgstr "由" 17.137 17.138 #: hardware.cgi:144 17.139 -#, sh-format 17.140 -msgid "Information for USB Device $vidpid" 17.141 -msgstr "USB设备$vidpid的信息" 17.142 +msgid "Information for USB Device %s" 17.143 +msgstr "USB设备%s的信息" 17.144 17.145 #: hardware.cgi:145 hardware.cgi:159 17.146 msgid "Detailed information about specified device." 17.147 msgstr "有关指定的设备的详细信息。" 17.148 17.149 #: hardware.cgi:158 17.150 -#, sh-format 17.151 -msgid "Information for PCI Device $slot" 17.152 -msgstr "PCI设备的信息$slot" 17.153 +msgid "Information for PCI Device %s" 17.154 +msgstr "PCI设备的信息%s" 17.155 17.156 #: hardware.cgi:177 17.157 msgid "Drivers & Devices" 17.158 @@ -720,17 +702,15 @@ 17.159 msgstr "健康" 17.160 17.161 #: hardware.cgi:215 17.162 -#, sh-format 17.163 -msgid "Discharging $rempct% - $remtimef" 17.164 -msgstr "放电 $rempct% - $remtimef" 17.165 +msgid "Discharging %d%% - %s" 17.166 +msgstr "放电 %d%% - %s" 17.167 17.168 #: hardware.cgi:219 17.169 -#, sh-format 17.170 -msgid "Charging $rempct% - $remtimef" 17.171 -msgstr "充电 $rempct% - $remtimef" 17.172 +msgid "Charging %d%% - %s" 17.173 +msgstr "充电 %d%% - %s" 17.174 17.175 #: hardware.cgi:221 17.176 -msgid "Charged 100%" 17.177 +msgid "Charged 100%%" 17.178 msgstr "已充满" 17.179 17.180 #: hardware.cgi:229 17.181 @@ -986,11 +966,10 @@ 17.182 msgstr "系统语言" 17.183 17.184 #: settings.cgi:451 17.185 -#, sh-format 17.186 msgid "" 17.187 -"You must logout and login again to your current session to use $new_locale " 17.188 +"You must logout and login again to your current session to use %s " 17.189 "locale." 17.190 -msgstr "请您的当前会话注销并再次登录来使用新的（$new_locale）地区设置。" 17.191 +msgstr "请您的当前会话注销并再次登录来使用新的（%s）地区设置。" 17.192 17.193 #: settings.cgi:453 17.194 msgid "Current system locale:" 17.195 @@ -1001,9 +980,8 @@ 17.196 msgstr "鍵映射" 17.197 17.198 #: settings.cgi:474 17.199 -#, sh-format 17.200 -msgid "Current console keymap: $keymap" 17.201 -msgstr "当前控制台键盘映射：$keymap" 17.202 +msgid "Current console keymap: %s" 17.203 +msgstr "当前控制台键盘映射：%s" 17.204 17.205 #: settings.cgi:491 17.206 msgid "Suggested keymap for Xorg:"
18.1 --- a/settings.cgi Wed Apr 08 10:20:10 2015 +0200 18.2 +++ b/settings.cgi Wed Apr 08 15:32:20 2015 +0300 18.3 @@ -14,7 +14,7 @@ 18.4 get_config 18.5 header 18.6 18.7 -TITLE=$(gettext 'TazPanel - Settings') 18.8 +TITLE=$(_ 'TazPanel - Settings') 18.9 18.10 18.11 # Get system database. LDAP compatible. 18.12 @@ -80,9 +80,9 @@ 18.13 { 18.14 # faster to use pre-processed values 18.15 case $1 in 18.16 - en_AG|en_US|es_PR|es_US|nl_AW|yi_US) gettext 'US' ;; 18.17 + en_AG|en_US|es_PR|es_US|nl_AW|yi_US) _ 'US' ;; 18.18 POSIX) ;; 18.19 - *) gettext 'metric' ;; 18.20 + *) _ 'metric' ;; 18.21 esac 18.22 } 18.23 18.24 @@ -263,24 +263,24 @@ 18.25 # Groups management 18.26 # 18.27 cat <<EOT 18.28 -<h2 id="groups">$(gettext 'Manage groups')</h2> 18.29 +<h2 id="groups">$(_ 'Manage groups')</h2> 18.30 18.31 18.32 <section> 18.33 <form class="wide"> 18.34 <header> 18.35 <input type="hidden" name="groups"/> 18.36 - <!-- $(gettext 'Selection:') --> 18.37 - <button name="do" value="delgroups" data-icon="delete">$(gettext 'Delete group')</button> 18.38 + <!-- $(_ 'Selection:') --> 18.39 + <button name="do" value="delgroups" data-icon="delete">$(_ 'Delete group')</button> 18.40 </header> 18.41 18.42 <div class="scroll"> 18.43 <table class="wide zebra scroll"> 18.44 <thead> 18.45 <tr class="thead"> 18.46 - <td>$(gettext 'Group')</td> 18.47 - <td>$(gettext 'Group ID')</td> 18.48 - <td>$(gettext 'Members')</td> 18.49 + <td>$(_ 'Group')</td> 18.50 + <td>$(_ 'Group ID')</td> 18.51 + <td>$(_ 'Members')</td> 18.52 </tr> 18.53 </thead> 18.54 <tbody> 18.55 @@ -309,15 +309,15 @@ 18.56 18.57 18.58 <section> 18.59 - <header>$(gettext 'Add a new group')</header> 18.60 + <header>$(_ 'Add a new group')</header> 18.61 <form> 18.62 <input type="hidden" name="groups"/> 18.63 <table> 18.64 - <tr><td>$(gettext 'Group name:')</td> 18.65 + <tr><td>$(_ 'Group name:')</td> 18.66 <td><input type="text" name="group"/></td> 18.67 </tr> 18.68 <tr><td colspan="2"> 18.69 - <button type="submit" name="do" value="addgroup" data-icon="add">$(gettext 'Create group')</button> 18.70 + <button type="submit" name="do" value="addgroup" data-icon="add">$(_ 'Create group')</button> 18.71 </td></tr> 18.72 </table> 18.73 </form> 18.74 @@ -325,22 +325,22 @@ 18.75 18.76 18.77 <section> 18.78 - <header>$(gettext 'Manage group membership')</header> 18.79 + <header>$(_ 'Manage group membership')</header> 18.80 <form> 18.81 <input type="hidden" name="groups"/> 18.82 <table> 18.83 <tr> 18.84 - <td>$(gettext 'Group name:')</td> 18.85 + <td>$(_ 'Group name:')</td> 18.86 <td><select name="group">$(listdb group)</select></td> 18.87 - <td>$(gettext 'User name:')</td> 18.88 + <td>$(_ 'User name:')</td> 18.89 <td><select name="member">$(listdb passwd)</select></td> 18.90 </tr> 18.91 <tr> 18.92 <td colspan="2"> 18.93 - <button name="do" value="addmember" data-icon="add">$(gettext 'Add user')</button> 18.94 + <button name="do" value="addmember" data-icon="add">$(_ 'Add user')</button> 18.95 </td> 18.96 <td colspan="2"> 18.97 - <button name="do" value="delmember" data-icon="delete">$(gettext 'Remove user')</button> 18.98 + <button name="do" value="delmember" data-icon="delete">$(_ 'Remove user')</button> 18.99 </td> 18.100 </tr> 18.101 </table> 18.102 @@ -356,25 +356,25 @@ 18.103 # Users management 18.104 # 18.105 cat <<EOT 18.106 -<h2 id="users">$(gettext 'Manage users')</h2> 18.107 +<h2 id="users">$(_ 'Manage users')</h2> 18.108 18.109 <section> 18.110 <form class="wide"> 18.111 <header> 18.112 - <!--$(gettext 'Selection:')--> 18.113 - <button name="do" value="delusers" data-icon="delete">$(gettext 'Delete user')</button> 18.114 - <button name="do" value="lockusers" data-icon="lock" >$(gettext 'Lock user' )</button> 18.115 - <button name="do" value="unlockusers" data-icon="unlock">$(gettext 'Unlock user')</button> 18.116 + <!--$(_ 'Selection:')--> 18.117 + <button name="do" value="delusers" data-icon="delete">$(_ 'Delete user')</button> 18.118 + <button name="do" value="lockusers" data-icon="lock" >$(_ 'Lock user' )</button> 18.119 + <button name="do" value="unlockusers" data-icon="unlock">$(_ 'Unlock user')</button> 18.120 </header> 18.121 18.122 <table class="wide zebra center"> 18.123 <thead> 18.124 <tr> 18.125 - <td>$(gettext 'Login')</td> 18.126 - <td>$(gettext 'User ID')</td> 18.127 - <td>$(gettext 'Name')</td> 18.128 - <td>$(gettext 'Home')</td> 18.129 - <td>$(gettext 'Shell')</td> 18.130 + <td>$(_ 'Login')</td> 18.131 + <td>$(_ 'User ID')</td> 18.132 + <td>$(_ 'Name')</td> 18.133 + <td>$(_ 'Home')</td> 18.134 + <td>$(_ 'Shell')</td> 18.135 </tr> 18.136 </thead> 18.137 </tbody> 18.138 @@ -407,9 +407,9 @@ 18.139 cat <<EOT 18.140 <footer> 18.141 <div> 18.142 - $(gettext 'Password:') 18.143 + $(_ 'Password:') 18.144 <input type="password" name="password"/> 18.145 - <button type="submit" name="do" value="chpasswd" data-icon="ok">$(gettext 'Change password')</button> 18.146 + <button type="submit" name="do" value="chpasswd" data-icon="ok">$(_ 'Change password')</button> 18.147 </div> 18.148 </footer> 18.149 </form> 18.150 @@ -417,34 +417,34 @@ 18.151 18.152 18.153 <section> 18.154 - <header>$(gettext 'Add a new user')</header> 18.155 + <header>$(_ 'Add a new user')</header> 18.156 18.157 <form> 18.158 <input type="hidden" name="users"/> 18.159 <table class="summary"> 18.160 - <tr><td>$(gettext 'User login:')</td> 18.161 + <tr><td>$(_ 'User login:')</td> 18.162 <td><input type="text" name="user" size="30" pattern="[a-z]*"/></td></tr> 18.163 - <tr><td>$(gettext 'User name:')</td> 18.164 + <tr><td>$(_ 'User name:')</td> 18.165 <td><input type="text" name="name" size="30"/></td></tr> 18.166 - <tr><td>$(gettext 'User password:')</td> 18.167 + <tr><td>$(_ 'User password:')</td> 18.168 <td><input type="password" name="passwd" size="30"/></td></tr> 18.169 </table> 18.170 18.171 <footer> 18.172 - <button type="submit" name="do" value="adduser" data-icon="add">$(gettext 'Create user')</button> 18.173 + <button type="submit" name="do" value="adduser" data-icon="add">$(_ 'Create user')</button> 18.174 </footer> 18.175 </form> 18.176 </section> 18.177 18.178 18.179 <section> 18.180 - <header>$(gettext 'Current user sessions')</header> 18.181 + <header>$(_ 'Current user sessions')</header> 18.182 <pre>$(who)</pre> 18.183 </section> 18.184 18.185 18.186 <section> 18.187 - <header>$(gettext 'Last user sessions')</header> 18.188 + <header>$(_ 'Last user sessions')</header> 18.189 <div class="scroll"><pre>$(last)</pre></div> 18.190 </section> 18.191 EOT 18.192 @@ -455,21 +455,21 @@ 18.193 # 18.194 # Choose locale 18.195 # 18.196 - LOADING_MSG="$(gettext 'Please wait...')"; loading_msg 18.197 + LOADING_MSG="$(_ 'Please wait...')"; loading_msg 18.198 18.199 cur_loc=$(locale | grep LANG | cut -d= -f2) 18.200 cat <<EOT 18.201 -<h2 id="locale">$(gettext 'Choose locale')</h2> 18.202 +<h2 id="locale">$(_ 'Choose locale')</h2> 18.203 18.204 <section> 18.205 - <header>$(gettext 'Current locale settings:')</header> 18.206 + <header>$(_ 'Current locale settings:')</header> 18.207 <div> 18.208 <pre>$(locale)</pre> 18.209 </div> 18.210 </section> 18.211 18.212 <section> 18.213 - <header>$(gettext 'Locales that are currently installed on the machine:')</header> 18.214 + <header>$(_ 'Locales that are currently installed on the machine:')</header> 18.215 <div> 18.216 <pre>$(locale -a)</pre> 18.217 </div> 18.218 @@ -478,7 +478,7 @@ 18.219 18.220 is_installed "glibc-locale" 18.221 [ $? = 1 ] && 18.222 - msg tip $(gettext \ 18.223 + msg tip $(_ \ 18.224 "Can't see your language?<br/>You can \ 18.225 <a href='pkgs.cgi?do=Install&glibc-locale'>install glibc-locale</a> \ 18.226 to see a larger list of available locales.") 18.227 @@ -486,14 +486,14 @@ 18.228 18.229 cat <<EOT 18.230 <section> 18.231 - <header>$(gettext 'Available locales:')</header> 18.232 + <header>$(_ 'Available locales:')</header> 18.233 <form class="wide"> 18.234 <table class="wide zebra"> 18.235 <thead> 18.236 - <tr><td>$(gettext 'Code')</td> 18.237 - <td>$(gettext 'Language')</td> 18.238 - <td>$(gettext 'Territory')</td> 18.239 - <td>$(gettext 'Description')</td> 18.240 + <tr><td>$(_ 'Code')</td> 18.241 + <td>$(_ 'Language')</td> 18.242 + <td>$(_ 'Territory')</td> 18.243 + <td>$(_ 'Description')</td> 18.244 </tr> 18.245 </thead> 18.246 <tbody> 18.247 @@ -521,7 +521,7 @@ 18.248 </table> 18.249 18.250 <footer> 18.251 - <button type="submit" data-icon="ok">$(gettext 'Activate')</button> 18.252 + <button type="submit" data-icon="ok">$(_ 'Activate')</button> 18.253 </footer> 18.254 </form> 18.255 </section> 18.256 @@ -535,39 +535,39 @@ 18.257 # 18.258 18.259 cat <<EOT 18.260 -<h2>$(gettext 'System settings')</h2> 18.261 +<h2>$(_ 'System settings')</h2> 18.262 18.263 -<p>$(gettext 'Manage system time, users or language settings')<p> 18.264 +<p>$(_ 'Manage system time, users or language settings')<p> 18.265 18.266 <form><!-- 18.267 - --><button name="users" data-icon="user" >$(gettext 'Manage users' )</button><!-- 18.268 - --><button name="groups" data-icon="group">$(gettext 'Manage groups')</button> 18.269 + --><button name="users" data-icon="user" >$(_ 'Manage users' )</button><!-- 18.270 + --><button name="groups" data-icon="group">$(_ 'Manage groups')</button> 18.271 </form> 18.272 18.273 <section> 18.274 - <header>$(gettext 'System time')</header> 18.275 + <header>$(_ 'System time')</header> 18.276 <div> 18.277 <form class="wide"> 18.278 - <fieldset><legend>$(gettext 'Time zone:')</legend> 18.279 + <fieldset><legend>$(_ 'Time zone:')</legend> 18.280 <select name="tz"> 18.281 $(cd /usr/share/zoneinfo; find * -type f ! -name '*.tab' | sort | \ 18.282 awk -vtz="$(cat /etc/TZ)" \ 18.283 '{printf("<option%s>%s</option>", ($1 == tz)?" selected":"", $1)}') 18.284 </select> 18.285 - <button name="do" value="settz" data-icon="ok">$(gettext 'Change')</button> 18.286 + <button name="do" value="settz" data-icon="ok">$(_ 'Change')</button> 18.287 </fieldset> 18.288 18.289 - <fieldset><legend>$(gettext 'System time:')</legend> 18.290 + <fieldset><legend>$(_ 'System time:')</legend> 18.291 $(date | sed 's|[0-9][0-9]:[0-9:]*|<span id="time">&</span>|') 18.292 - <button name="do" value="rdate" data-icon="sync">$(gettext 'Sync online')</button> 18.293 + <button name="do" value="rdate" data-icon="sync">$(_ 'Sync online')</button> 18.294 </fieldset> 18.295 18.296 - <fieldset id="hwclock1"><legend>$(gettext 'Hardware clock:')</legend> 18.297 + <fieldset id="hwclock1"><legend>$(_ 'Hardware clock:')</legend> 18.298 $(hwclock -ur | sed 's|0.000000 seconds||') 18.299 - <button name="do" value="hwclock" id="hwclock" data-icon="clock">$(gettext 'Set hardware clock')</button> 18.300 + <button name="do" value="hwclock" id="hwclock" data-icon="clock">$(_ 'Set hardware clock')</button> 18.301 </fieldset> 18.302 18.303 - <fieldset><legend>$(gettext 'Set date')</legend> 18.304 + <fieldset><legend>$(_ 'Set date')</legend> 18.305 <input type="number" name="day" value="$(date +%d)" min="1" max="31" size="4" required/> 18.306 <select name="month" value="$(date +%m)"> 18.307 $(for i in $(seq 12); do 18.308 @@ -579,7 +579,7 @@ 18.309 - <input type="number" name="hour" value="$(date +%H)" min="0" max="23" size="4" required/><!-- 18.310 -->:<input type="number" name="min" value="$(date +%M)" min="0" max="59" size="4" required/><!-- 18.311 -->:<input type="number" name="sec" value="00" min="0" max="59" size="4" required/> 18.312 - <button name="do" value="date" data-icon="ok">$(gettext 'Set date')</button> 18.313 + <button name="do" value="date" data-icon="ok">$(_ 'Set date')</button> 18.314 </fieldset> 18.315 </form> 18.316 </div> 18.317 @@ -602,7 +602,7 @@ 18.318 # 18.319 cat <<EOT 18.320 <section> 18.321 - <header id="locale">$(gettext 'System language')</header> 18.322 + <header id="locale">$(_ 'System language')</header> 18.323 <div> 18.324 <form> 18.325 EOT 18.326 @@ -614,13 +614,13 @@ 18.327 # System configuration 18.328 echo "LANG=$new_locale" > /etc/locale.conf 18.329 echo "LC_ALL=$new_locale" >> /etc/locale.conf 18.330 - msg warn "$(eval_gettext \ 18.331 - 'You must logout and login again to your current session to use $new_locale locale.')" 18.332 + msg warn "$(_ \ 18.333 + 'You must logout and login again to your current session to use %s locale.' $new_locale)" 18.334 else 18.335 cat <<EOT 18.336 - $(gettext 'Current system locale:') 18.337 + $(_ 'Current system locale:') 18.338 <strong>$(locale | grep LANG | cut -d= -f2)</strong> 18.339 - <button name="locale" data-icon="locale">$(gettext 'Change')</button> 18.340 + <button name="locale" data-icon="locale">$(_ 'Change')</button> 18.341 EOT 18.342 fi 18.343 cat <<EOT 18.344 @@ -630,7 +630,7 @@ 18.345 18.346 18.347 <section> 18.348 - <header id="keymap">$(gettext 'Keyboard layout')</header> 18.349 + <header id="keymap">$(_ 'Keyboard layout')</header> 18.350 <div> 18.351 EOT 18.352 # Check if a new keymap was requested 18.353 @@ -644,7 +644,7 @@ 18.354 fi 18.355 18.356 keymap=$(cat /etc/keymap.conf) 18.357 - eval_gettext 'Current console keymap: $keymap' 18.358 + _ 'Current console keymap: %s' $keymap 18.359 if [ -n "$keymap" ]; then 18.360 case "$keymap" in 18.361 fr_CH*) 18.362 @@ -662,45 +662,45 @@ 18.363 <form id="settings"></form> 18.364 <form id="index" action="index.cgi"></form> 18.365 <br/> 18.366 - $(gettext 'Suggested keymap for Xorg:') $keymap 18.367 - <button form="settings" name="apply_xorg_kbd" value="$keymap" data-icon="ok">$(gettext 'Activate')</button> 18.368 - <button form="index" name="file" value="$keyboard_config" data-icon="edit">$(gettext 'Edit')</button> 18.369 + $(_ 'Suggested keymap for Xorg:') $keymap 18.370 + <button form="settings" name="apply_xorg_kbd" value="$keymap" data-icon="ok">$(_ 'Activate')</button> 18.371 + <button form="index" name="file" value="$keyboard_config" data-icon="edit">$(_ 'Edit')</button> 18.372 <br/> 18.373 EOT 18.374 fi 18.375 cat <<EOT 18.376 <form> 18.377 - $(gettext 'Available keymaps:') 18.378 + $(_ 'Available keymaps:') 18.379 <select name="gen_keymap"> 18.380 $(list_keymaps) 18.381 </select> 18.382 - <button type="submit" data-icon="ok">$(gettext 'Activate')</button> 18.383 + <button type="submit" data-icon="ok">$(_ 'Activate')</button> 18.384 </form> 18.385 </div> 18.386 </section> 18.387 18.388 18.389 <section> 18.390 - <header>$(gettext 'Panel configuration')</header> 18.391 + <header>$(_ 'Panel configuration')</header> 18.392 <div> 18.393 <form class="wide"> 18.394 - <fieldset><legend>$(gettext 'Style:')</legend> 18.395 + <fieldset><legend>$(_ 'Style:')</legend> 18.396 <select name="style">$(list_styles)</select> 18.397 - <button data-icon="ok">$(gettext 'Activate')</button> 18.398 + <button data-icon="ok">$(_ 'Activate')</button> 18.399 </fieldset> 18.400 18.401 - <fieldset><legend>$(gettext 'Panel password:')</legend> 18.402 + <fieldset><legend>$(_ 'Panel password:')</legend> 18.403 <input type="password" name="panel_pass"/> 18.404 - <button data-icon="ok">$(gettext 'Change')</button> 18.405 + <button data-icon="ok">$(_ 'Change')</button> 18.406 </fieldset> 18.407 </form> 18.408 18.409 - <fieldset><legend>$(gettext 'Configuration files:')</legend> 18.410 - <button form="index" name="file" value="$CONFIG" data-icon="edit">$(gettext 'Panel')</button> 18.411 - <button form="index" name="file" value="$HTTPD_CONF" data-icon="edit">$(gettext 'Server')</button> 18.412 + <fieldset><legend>$(_ 'Configuration files:')</legend> 18.413 + <button form="index" name="file" value="$CONFIG" data-icon="edit">$(_ 'Panel')</button> 18.414 + <button form="index" name="file" value="$HTTPD_CONF" data-icon="edit">$(_ 'Server')</button> 18.415 </fieldset> 18.416 18.417 - <p>$(gettext 'TazPanel provides a debugging mode and page:') 18.418 + <p>$(_ 'TazPanel provides a debugging mode and page:') 18.419 <a href="index.cgi?debug">debug</a> 18.420 </p> 18.421 </div>
19.1 --- a/styles/default/footer.html Wed Apr 08 10:20:10 2015 +0200 19.2 +++ b/styles/default/footer.html Wed Apr 08 15:32:20 2015 +0300 19.3 @@ -4,7 +4,7 @@ 19.4 </div> 19.5 19.6 <footer> 19.7 - $(gettext 'Copyright') © 2015 19.8 + $(_ 'Copyright') © 2015 19.9 <a href="http://www.slitaz.org/" target="_blank">SliTaz GNU/Linux</a> 19.10 - <a href="index.cgi?file=/usr/share/licenses/bsd.txt">$(gettext 'BSD License')</a> 19.11 </footer>
20.1 --- a/styles/default/header.html Wed Apr 08 10:20:10 2015 +0200 20.2 +++ b/styles/default/header.html Wed Apr 08 15:32:20 2015 +0300 20.3 @@ -6,6 +6,7 @@ 20.4 <head> 20.5 <title>$TITLE</title> 20.6 <link rel="shortcut icon" href="/styles/$STYLE/favicon.ico"/> 20.7 + <meta name="viewport" content="width=device-width,initial-scale=1"/> 20.8 $(printf '\t<link rel="stylesheet" type="text/css" href="/%s"/>\n' $(cd /var/www/tazpanel; ls styles/$STYLE/*.css)) 20.9 $(printf '\t<script type="text/javascript" src="/%s"></script>\n' $(cd /var/www/tazpanel; ls lib/*.js)) 20.10 </head> 20.11 @@ -19,62 +20,62 @@ 20.12 <nav id="toolbar"> 20.13 <menu type="toolbar" id="toolbarMenu"> 20.14 <li tabindex="1"> 20.15 - <span>$(gettext 'Panel')</span> 20.16 + <span>$(_ 'Panel')</span> 20.17 <menu> 20.18 - <li><a data-icon="info" href="index.cgi">$(gettext 'Summary')</a></li> 20.19 - <li><a data-icon="proc" href="index.cgi?top">$(gettext 'Processes')</a></li> 20.20 - <li><a data-icon="terminal" href="index.cgi?cmd=help">$(gettext 'Terminal')</a></li> 20.21 - <li><a data-icon="report" href="index.cgi?report" data-root>$(gettext 'Create Report')</a></li> 20.22 + <li><a data-icon="info" href="index.cgi">$(_ 'Summary')</a></li> 20.23 + <li><a data-icon="proc" href="index.cgi?top">$(_ 'Processes')</a></li> 20.24 + <li><a data-icon="terminal" href="index.cgi?cmd=help">$(_ 'Terminal')</a></li> 20.25 + <li><a data-icon="report" href="index.cgi?report" data-root>$(_ 'Create Report')</a></li> 20.26 $(for i in menu.d/panel/* ; do [ -f $i ] && sh $i menu $i ; done) 20.27 </menu> 20.28 </li> 20.29 <li tabindex="2"> 20.30 - <span>$(gettext 'Network')</span> 20.31 + <span>$(_ 'Network')</span> 20.32 <menu> 20.33 - <li><a data-icon="info" href="network.cgi">$(gettext 'Summary')</a></li> 20.34 - <li><a data-icon="conf" href="index.cgi?file=/etc/network.conf">$(gettext 'Config file')</a></li> 20.35 - <li><a data-icon="eth" href="network.cgi?eth">$(gettext 'Ethernet')</a></li> 20.36 - <li><a data-icon="wifi" href="network.cgi?wifi">$(gettext 'Wireless')</a></li> 20.37 + <li><a data-icon="info" href="network.cgi">$(_ 'Summary')</a></li> 20.38 + <li><a data-icon="conf" href="index.cgi?file=/etc/network.conf">$(_ 'Config file')</a></li> 20.39 + <li><a data-icon="eth" href="network.cgi?eth">$(_ 'Ethernet')</a></li> 20.40 + <li><a data-icon="wifi" href="network.cgi?wifi">$(_ 'Wireless')</a></li> 20.41 $(for i in menu.d/network/* ; do [ -f $i ] && sh $i menu $i ; done) 20.42 </menu> 20.43 </li> 20.44 <li tabindex="3"> 20.45 - <span>$(gettext 'Boot')</span> 20.46 + <span>$(_ 'Boot')</span> 20.47 <menu> 20.48 - <li><a data-icon="info" href="boot.cgi">$(gettext 'Summary')</a></li> 20.49 + <li><a data-icon="info" href="boot.cgi">$(_ 'Summary')</a></li> 20.50 EOT 20.51 [ -w /boot/grub/menu.lst ] && cat <<EOT 20.52 - <li><a data-icon="grub" href="boot.cgi?grub">$(gettext 'Boot loader')</a></li> 20.53 + <li><a data-icon="grub" href="boot.cgi?grub">$(_ 'Boot loader')</a></li> 20.54 EOT 20.55 cat << EOT 20.56 - <li><a data-icon="logs" href="boot.cgi?log">$(gettext 'Boot logs')</a> 20.57 + <li><a data-icon="logs" href="boot.cgi?log">$(_ 'Boot logs')</a> 20.58 <menu> 20.59 - <li><a data-icon="" href="boot.cgi?log=kernel">$(gettext 'Kernel messages')</a></li> 20.60 - <li><a data-icon="" href="boot.cgi?log=boot">$(gettext 'Boot scripts')</a></li> 20.61 - <li><a data-icon="" href="boot.cgi?log=xlog">$(gettext 'X server')</a></li> 20.62 - <li><a data-icon="" href="boot.cgi?log=slim">$(gettext 'X session')</a></li> 20.63 + <li><a data-icon="" href="boot.cgi?log=kernel">$(_ 'Kernel messages')</a></li> 20.64 + <li><a data-icon="" href="boot.cgi?log=boot">$(_ 'Boot scripts')</a></li> 20.65 + <li><a data-icon="" href="boot.cgi?log=xlog">$(_ 'X server')</a></li> 20.66 + <li><a data-icon="" href="boot.cgi?log=slim">$(_ 'X session')</a></li> 20.67 </menu> 20.68 </li> 20.69 - <li><a data-icon="daemons" href="boot.cgi?daemons">$(gettext 'Manage daemons')</a></li> 20.70 + <li><a data-icon="daemons" href="boot.cgi?daemons">$(_ 'Manage daemons')</a></li> 20.71 $(for i in menu.d/boot/* ; do [ -f $i ] && sh $i menu $i ; done) 20.72 </menu> 20.73 </li> 20.74 <li tabindex="4"> 20.75 - <span>$(gettext 'Hardware')</span> 20.76 + <span>$(_ 'Hardware')</span> 20.77 <menu> 20.78 - <li><a data-icon="info" href="hardware.cgi">$(gettext 'Summary')</a></li> 20.79 - <li><a data-icon="modules" href="hardware.cgi?modules">$(gettext 'Kernel modules')</a></li> 20.80 - <li><a data-icon="detect" href="hardware.cgi?detect" data-root>$(gettext 'Detect PCI/USB')</a></li> 20.81 - <li><a data-icon="hdd" href="hardware.cgi#disk">$(gettext 'Disks')</a></li> 20.82 + <li><a data-icon="info" href="hardware.cgi">$(_ 'Summary')</a></li> 20.83 + <li><a data-icon="modules" href="hardware.cgi?modules">$(_ 'Kernel modules')</a></li> 20.84 + <li><a data-icon="detect" href="hardware.cgi?detect" data-root>$(_ 'Detect PCI/USB')</a></li> 20.85 + <li><a data-icon="hdd" href="hardware.cgi#disk">$(_ 'Disks')</a></li> 20.86 $(for i in menu.d/hardware/* ; do [ -f $i ] && sh $i menu $i ; done) 20.87 </menu> 20.88 </li> 20.89 <li tabindex="5"> 20.90 - <span>$(gettext 'Settings')</span> 20.91 + <span>$(_ 'Settings')</span> 20.92 <menu> 20.93 - <li><a data-icon="info" href="settings.cgi" data-root>$(gettext 'Summary')</a></li> 20.94 - <li><a data-icon="user" href="settings.cgi?users" data-root>$(gettext 'Users')</a></li> 20.95 - <li><a data-icon="group" href="settings.cgi?groups" data-root>$(gettext 'Groups')</a></li> 20.96 + <li><a data-icon="info" href="settings.cgi" data-root>$(_ 'Summary')</a></li> 20.97 + <li><a data-icon="user" href="settings.cgi?users" data-root>$(_ 'Users')</a></li> 20.98 + <li><a data-icon="group" href="settings.cgi?groups" data-root>$(_ 'Groups')</a></li> 20.99 $(for i in menu.d/settings/* ; do [ -f $i ] && sh $i menu $i ; done) 20.100 </menu> 20.101 </li> 20.102 @@ -88,9 +89,9 @@ 20.103 username="${REMOTE_USER:-root}" 20.104 case "$username" in 20.105 root) icon='slitaz'; warn='' 20.106 - toggle_url="http://tazpanel:82/";; 20.107 + toggle_url="http://$HTTP_HOST/";; 20.108 *) icon='user'; warn="$(_ 'Some features are disabled.')"$'\n' 20.109 - toggle_url="http://$RANDOM:*@tazpanel:82/user/";; 20.110 + toggle_url="http://$RANDOM:*@$HTTP_HOST/user/";; 20.111 esac 20.112 20.113 cat << EOT
21.1 --- a/tazpanel Wed Apr 08 10:20:10 2015 +0200 21.2 +++ b/tazpanel Wed Apr 08 15:32:20 2015 +0300 21.3 @@ -50,22 +50,22 @@ 21.4 ;; 21.5 start) 21.6 if [ -f $PIDFILE ]; then 21.7 - gettext 'TazPanel is already running.'; echo 21.8 + _ 'TazPanel is already running.' 21.9 exit 1 21.10 fi 21.11 - eval_gettext 'Starting TazPanel web server on port $HTTPD_PORT...' 21.12 + _n 'Starting TazPanel web server on port %d...' $HTTPD_PORT 21.13 httpd -p $HTTPD_PORT -u root -c $HTTPD_CONF \ 21.14 - -r "$(gettext 'TazPanel Authentication - Default: root:root')" & 21.15 + -r "$(_ 'TazPanel Authentication - Default: root:root')" & 21.16 ps | grep "httpd -p $HTTPD_PORT " | grep -v grep | \ 21.17 awk '{ print $1 }' > $PIDFILE 21.18 [ ! -f /var/lib/tazpkg/installed.info ] && tazpkg -l>/dev/null& 21.19 status ;; 21.20 stop) 21.21 if [ ! -f $PIDFILE ]; then 21.22 - gettext 'TazPanel is not running.'; echo 21.23 + _ 'TazPanel is not running.' 21.24 exit 1 21.25 fi 21.26 - gettext 'Stopping TazPanel web server...' 21.27 + _n 'Stopping TazPanel web server...' 21.28 kill $(pgrep -f TazPanel) 21.29 rm -f $PIDFILE 21.30 status ;; 21.31 @@ -73,10 +73,10 @@ 21.32 tazpanel stop; sleep 1; tazpanel start;; 21.33 passwd|-p) 21.34 echo 21.35 - gettext 'Changing password for TazPanel'; echo 21.36 - gettext 'New password: ' && read pass 21.37 + _ 'Changing password for TazPanel' 21.38 + _n 'New password: ' && read pass 21.39 sed -i "s/\/:root:.*/\/:root:$pass/" $HTTPD_CONF 21.40 - gettext 'Password changed successfully'; echo 21.41 + _ 'Password changed successfully' 21.42 echo ;; 21.43 *) 21.44 . /etc/slitaz/applications.conf