# HG changeset patch # User Paul Issott # Date 1302434586 0 # Node ID 730f8bcacabc0f305dd21823a7c60cfefa6f0373 # Parent a7f0d1a1ed2e6b4cc4ccaed53309db0669718335 Tiny edits and make pot diff -r a7f0d1a1ed2e -r 730f8bcacabc README --- a/README Sat Apr 09 05:45:44 2011 +0200 +++ b/README Sun Apr 10 11:23:06 2011 +0000 @@ -2,26 +2,26 @@ ================================================================================ -Tazpanel is the SliTaz Control Panel, a web interface who let you manage the -full system in a redically simple way. The output xHTML code is valid xHTML 5 +Tazpanel is the SliTaz Control Panel, a web interface which lets you manage the +full system in a radically simple way. The output xHTML code is valid xHTML 5 and all theming is done with standard CSS 3. Use it! ------ You can clone the tazpanel repo into /var/www/tazpanel and work on this -copy or clone it someweher esle and 'make install'. After, add tazpanel to +copy or clone it somewhere else and 'make install'. After, add tazpanel to your /etc/hosts, type './tazpanel start' to start the server and go to the -URL: http://tazpanel:8090 Panel user and password is defined in httpd.conf +URL: http://tazpanel:8090. Panel user and password is defined in httpd.conf and default is root:root i18n ---- -TazPanel have been coded from the beginning with gettext support. Please +TazPanel has been coded from the beginning with gettext support. Please forget 'echo' and use gettext, but remember that gettext "" is equivalent -to echo -n. All script use the same TEXTDOMAIN and the same pot files, all -translations goes in the po/ folder. To start a new translation please +to echo -n. All scripts use the same TEXTDOMAIN and the same pot files, all +translations go in the po/ folder. To start a new translation please use msginit from the pot file directory. Example for French/France locale (fr_FR): @@ -34,44 +34,44 @@ User interface -------------- -If you develope an official SliTaz GUI for TazPanel, please follow the style. -If you need more CSS markup and you not a coder, please ask an official -developer the better way to implement your idea. TazPanel is fully themable +If you develop an official SliTaz GUI for TazPanel, please follow the style. +If you need more CSS markup and you are not a coder, please ask an official +developer for the best way to implement your idea. TazPanel is fully themable and more than one theme can be installed, this will let us make packages -for TazPanel style! All the GUI is done with xHTML 5 and CSS 3, some -javascript can be used, but with precaution... one more time, it's better -to check with a main contributor before adding to much stuff, the goal is, -as for the all SliTaz project: KISS +in a TazPanel style! All the GUI is done with xHTML 5 and CSS 3, some +javascript can be used, but with precautions... one more time, it's better +to check with a main contributor before adding too much stuff, the goal is, +as for the all SliTaz projects: KISS CGI template and files ---------------------- To start or test new function with TazPanel you will find a a file in -utils/template.cgi that need to be in the $PANEL root to work, all TazPanel +utils/template.cgi that needs to be in the $PANEL root to work, all TazPanel CGI scripts are in that location. If you think your code is too big to fit -in an other script you can eventually creat a new CGI page and update all +in another script you can eventually create a new CGI page and update all links, but please to talk to the AUTHORS before. - * index.cgi Main Tazpanel CGI script (some stuff may be splited + * index.cgi Main Tazpanel CGI script (some stuff may be split into users.cgi, boot.cgi, etc if too big or slow) - * network.cgi All related stuff to networking (eth, wifi, servives) + * network.cgi All related stuff to networking (eth, wifi, services) * pkgs.cgi Tazpkg packages CGI interface * system.cgi System settings and services such as time, users accounts, locales or daemons management * live.cgi All tools related to Live systems (CD, USB, Frugal) * hardware.cgi Devices drivers, firmware, printing -For common function have a look to lib/libtazpanel you may founf functions -yoou need already coded such as xhtml_header to get the style header.html -in you CGI script. For the loading message you can use loading_msg. When +For common functions have a look to lib/libtazpanel, you may found functions +you need already coded such as xhtml_header to get the style header.html +in your CGI script. For the loading message you can use loading_msg. When cat is used: `gettext "Text to translate"` Web server ---------- -Tazpanel can run with Busybox httpd applet or LightTPD an propably Apache. -Start the webserver with custom config to listen only on local port for -security reason since we run as root to perform system actions, example: +Tazpanel can run with Busybox httpd applet or LightTPD and probably Apache. +Start the webserver with a custom config to listen only on a local port for +security reasons since we run as root to perform system actions, example: # httpd -p 8090 u root -c /etc/slitaz/httpd.conf diff -r a7f0d1a1ed2e -r 730f8bcacabc boot.cgi --- a/boot.cgi Sat Apr 09 05:45:44 2011 +0200 +++ b/boot.cgi Sun Apr 10 11:23:06 2011 +0000 @@ -30,8 +30,8 @@ # # Everything until user login # - # Start and stop a daemom. I think we dont need restart sine 2 - # clicks and you done + # Start and stop a daemon. I think we dont need restart since 2 + # clicks and you are done case "$QUERY_STRING" in *=start=*) daemon=${QUERY_STRING#*=start=} @@ -47,9 +47,9 @@ debug_info cat << EOT
-

`gettext "Manage deamons"`

+

`gettext "Manage daemons"`

- `gettext "Check, start and stop deamons on SliTaz"` + `gettext "Check, start and stop daemons on SliTaz"`

EOT @@ -78,16 +78,16 @@ echo '' # Name echo "$name" - # First check if deamon is started at bootime + # First check if daemon is started at bootime [ echo "RUN_DAEMONS" | fgrep $name ] && boot="on boot" - # Standard SliTaz busybox deamons and firewall + # Standard SliTaz busybox daemons and firewall case "$name" in firewall) gettext "SliTaz Firewall with iptable rules" ;; httpd) gettext "Small and fast web server with CGI support" ;; ntpd) - gettext "Network time protocol deamon" ;; + gettext "Network time protocol daemon" ;; ftpd) gettext "Anonymous FTP server" ;; udhcpd) @@ -95,7 +95,7 @@ syslogd|klogd) gettext "Linux Kernel log daemon" ;; crond|dnsd|tftpd|inetd|zcip) - gettext "Deamon powered by BusyBox" ;; + gettext "Daemon powered by BusyBox" ;; *) # Descrition from receipt [ -d "$LOCALSTATE/installed/$name" ] && pkg=$name diff -r a7f0d1a1ed2e -r 730f8bcacabc doc/tazpanel.en.html --- a/doc/tazpanel.en.html Sat Apr 09 05:45:44 2011 +0200 +++ b/doc/tazpanel.en.html Sun Apr 10 11:23:06 2011 +0000 @@ -3,10 +3,10 @@

TazPanel is the SliTaz administration and settings center from where - you can manage your entire system such as managing packages, adding - or removing users, create Live systems and much more. Navigation + you can control your entire system such as package management, adding + or removing users, creating Live systems and much more. Navigation is done with the toolbar at the top of the application window and - is some case, with a submenu. + in some cases with a submenu.

Get support on the Slitaz forum diff -r a7f0d1a1ed2e -r 730f8bcacabc hardware.cgi --- a/hardware.cgi Sat Apr 09 05:45:44 2011 +0200 +++ b/hardware.cgi Sun Apr 10 11:23:06 2011 +0000 @@ -51,7 +51,7 @@ case "$QUERY_STRING" in modinfo=*) mod=${QUERY_STRING#modinfo=} - gettext "Detailled information for module:"; echo " $mod" + gettext "Detailed information for module:"; echo " $mod" echo '

'
 				modinfo $mod
 				echo '
' ;; diff -r a7f0d1a1ed2e -r 730f8bcacabc index.cgi --- a/index.cgi Sat Apr 09 05:45:44 2011 +0200 +++ b/index.cgi Sun Apr 10 11:23:06 2011 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # -# Main CGI interface for TazPanel. In on word: KISS. Use the main cas form -# command so we are faster and dont load unneeded function. If nececarry +# Main CGI interface for TazPanel. In on word: KISS. Use the main css form +# command so we are faster and do not load unneeded functions. If necessary # you can use the lib/ dir to handle external resources. # # Copyright (C) 2011 SliTaz GNU/Linux - GNU gpl v3 @@ -51,7 +51,7 @@ cat << EOT

`gettext "Host:"` `hostname`

-

`gettext "SliTaz administration et configuration Panel"`

+

`gettext "SliTaz administration and configuration Panel"`

`gettext "Summary"`

diff -r a7f0d1a1ed2e -r 730f8bcacabc live.cgi --- a/live.cgi Sat Apr 09 05:45:44 2011 +0200 +++ b/live.cgi Sun Apr 10 11:23:06 2011 +0000 @@ -47,7 +47,7 @@ case "$QUERY_STRING" in create) # - # Create a flavor file and ISO in option with all settings + # Create a flavor file and ISO in options with all settings # Step by step interface and store files in cache. # gettext "TODO" ;; @@ -76,7 +76,7 @@ - +

`gettext "Live USB"`

@@ -99,7 +99,7 @@ fi cat << EOT - + EOT diff -r a7f0d1a1ed2e -r 730f8bcacabc network.cgi --- a/network.cgi Sat Apr 09 05:45:44 2011 +0200 +++ b/network.cgi Sun Apr 10 11:23:06 2011 +0000 @@ -65,7 +65,7 @@ cat << EOT

`gettext "Networking`

- `gettext "Manage network connection and services` + `gettext "Manage network connections and services`

diff -r a7f0d1a1ed2e -r 730f8bcacabc pkgs.cgi --- a/pkgs.cgi Sat Apr 09 05:45:44 2011 +0200 +++ b/pkgs.cgi Sun Apr 10 11:23:06 2011 +0000 @@ -1,9 +1,9 @@ #!/bin/sh # -# TazPKG CGI interface - Manage packages via the a browse +# TazPKG CGI interface - Manage packages via a browser # -# This CGI interface intensively use tazpkg to manage package and have -# it own code for some tasks. Please KISS it important and keep speed +# This CGI interface intensively uses tazpkg to manage packages and have +# its own code for some tasks. Please KISS, it is important and keep speed # in mind. Thanks, Pankso. # # (C) 2011 SliTaz GNU/Linux - GNU gpl v3 @@ -191,7 +191,7 @@ cat*) # # List all available packages by category on mirror. Listing all - # packages is to resource intensive and not usefull. + # packages is too resource intensive and not useful. # cd $LOCALSTATE category=${QUERY_STRING#cat=} @@ -289,7 +289,7 @@ cat << EOT

- `gettext "Packages lists are up-to-date. You should check for upgrade now."` + `gettext "Packages lists are up-to-date. You should check for upgrades now."`

EOT ;; @@ -300,10 +300,10 @@ cd $LOCALSTATE search_form sidebar - LOADING_MSG="Checking for upgrade..." + LOADING_MSG="Checking for upgrades..." loading_msg cat << EOT -

`gettext "up packages"`

+

`gettext "Up packages"`

@@ -352,7 +352,7 @@

- `gettext "Performing task on packages"` + `gettext "Performing tasks on packages"`

diff -r a7f0d1a1ed2e -r 730f8bcacabc po/tazpanel.pot --- a/po/tazpanel.pot Sat Apr 09 05:45:44 2011 +0200 +++ b/po/tazpanel.pot Sun Apr 10 11:23:06 2011 +0000 @@ -8,307 +8,216 @@ msgstr "" "Project-Id-Version: TazPanel 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-06 20:37+0200\n" +"POT-Creation-Date: 2011-04-10 10:36+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: tazpanel:33 +#: tazpanel:34 msgid "TazPanel Authentication" msgstr "" -#: tazpanel:36 +#: tazpanel:37 msgid "Stopping TazPanel web server..." msgstr "" -#: tazpanel:40 +#: tazpanel:41 msgid "Changing password for TazPanel" msgstr "" -#: tazpanel:41 +#: tazpanel:42 msgid "New password: " msgstr "" -#: tazpanel:43 -msgid "Password changed succeffuly" +#: tazpanel:44 +msgid "Password changed successfully" msgstr "" -#: tazpanel:47 +#: tazpanel:48 msgid "Usage:" msgstr "" -#: index.cgi:43 -msgid "Boot & startup" +#: index.cgi:53 +msgid "Host:" msgstr "" -#: index.cgi:45 -msgid "Everything that appends before user login." +#: index.cgi:54 +msgid "SliTaz administration and configuration Panel" msgstr "" -#: index.cgi:49 -msgid "Kernel cmdline" +#: index.cgi:57 pkgs.cgi:473 +msgid "Summary" msgstr "" -#: index.cgi:90 -msgid "Manage users" +#: index.cgi:60 +msgid "Uptime:" msgstr "" -#: index.cgi:91 -msgid "Manage human users on your SliTaz system" +#: index.cgi:63 +msgid "Memory in Mb" msgstr "" -#: index.cgi:98 -msgid "Login" +#: index.cgi:70 +msgid "Network status" msgstr "" -#: index.cgi:99 -msgid "User ID" +#: index.cgi:73 +msgid "Filesystem usage statistics" msgstr "" -#: index.cgi:100 pkgs.cgi:118 lib/libtazpanel:40 +#: index.cgi:78 +msgid "Panel settings" +msgstr "" + +#: index.cgi:81 +msgid "Change Panel password" +msgstr "" + +#: pkgs.cgi:58 +msgid "Last recharge : " +msgstr "" + +#: pkgs.cgi:68 +msgid "Installed packages : " +msgstr "" + +#: pkgs.cgi:70 +msgid "Mirrored packages : " +msgstr "" + +#: pkgs.cgi:72 +msgid "Upgradeable packages : " +msgstr "" + +#: pkgs.cgi:76 +msgid "Blocked packages : " +msgstr "" + +#: pkgs.cgi:102 +msgid "Search" +msgstr "" + +#: pkgs.cgi:112 lib/libtazpanel:52 msgid "Name" msgstr "" -#: index.cgi:101 -msgid "Home" -msgstr "" - -#: index.cgi:102 -msgid "SHell" -msgstr "" - -#: index.cgi:129 -msgid "Delete selected user" -msgstr "" - -#: index.cgi:133 -msgid "Add a new user" -msgstr "" - -#: index.cgi:136 -msgid "User login:" -msgstr "" - -#: index.cgi:138 -msgid "User password:" -msgstr "" - -#: index.cgi:140 -msgid "Create user" -msgstr "" - -#: index.cgi:152 -msgid "Drivers & Devices" -msgstr "" - -#: index.cgi:153 -msgid "Manage your computer hardware" -msgstr "" - -#: index.cgi:179 -msgid "Host:" -msgstr "" - -#: index.cgi:180 -msgid "SliTaz administration et configuration Panel" -msgstr "" - -#: index.cgi:183 pkgs.cgi:476 -msgid "Summary" -msgstr "" - -#: index.cgi:186 -msgid "Uptime:" -msgstr "" - -#: index.cgi:189 -msgid "Memory in Mb" -msgstr "" - -#: index.cgi:196 -msgid "Network status" -msgstr "" - -#: index.cgi:199 -msgid "Filesystem usage statistics" -msgstr "" - -#: index.cgi:204 -msgid "System language" -msgstr "" - -#: index.cgi:215 -#, sh-format -msgid "" -"You must logout and login again your current\n" -"\t\t\t\tsession to use $new_locale language." -msgstr "" - -#: index.cgi:218 -#, sh-format -msgid "Current system locales: " -msgstr "" - -#: index.cgi:224 -msgid "Avalaible locales:" -msgstr "" - -#: index.cgi:229 -msgid "Generated and use" -msgstr "" - -#: pkgs.cgi:64 -msgid "Last recharge : " -msgstr "" - -#: pkgs.cgi:74 -msgid "Installed packages : " -msgstr "" - -#: pkgs.cgi:76 -msgid "Mirrored packages : " -msgstr "" - -#: pkgs.cgi:78 -msgid "Upgradeable packages : " -msgstr "" - -#: pkgs.cgi:80 -msgid "Installed files : " -msgstr "" - -#: pkgs.cgi:82 -msgid "Blocked packages : " -msgstr "" - -#: pkgs.cgi:108 -msgid "Search" -msgstr "" - -#: pkgs.cgi:119 +#: pkgs.cgi:113 msgid "Version" msgstr "" -#: pkgs.cgi:120 +#: pkgs.cgi:114 msgid "Description" msgstr "" -#: pkgs.cgi:121 +#: pkgs.cgi:115 msgid "Web" msgstr "" -#: pkgs.cgi:152 pkgs.cgi:167 pkgs.cgi:185 pkgs.cgi:204 +#: pkgs.cgi:158 pkgs.cgi:217 pkgs.cgi:251 pkgs.cgi:282 pkgs.cgi:319 +#: pkgs.cgi:361 pkgs.cgi:395 pkgs.cgi:476 +msgid "My packages" +msgstr "" + +#: pkgs.cgi:162 pkgs.cgi:208 pkgs.cgi:241 pkgs.cgi:310 msgid "Selection:" msgstr "" -#: pkgs.cgi:156 pkgs.cgi:172 pkgs.cgi:191 pkgs.cgi:210 +#: pkgs.cgi:166 pkgs.cgi:213 pkgs.cgi:247 pkgs.cgi:316 msgid "List:" msgstr "" -#: pkgs.cgi:176 pkgs.cgi:195 pkgs.cgi:213 pkgs.cgi:230 pkgs.cgi:312 -#: pkgs.cgi:369 pkgs.cgi:400 pkgs.cgi:484 -msgid "My packages" +#: pkgs.cgi:204 +msgid "Category:" msgstr "" -#: pkgs.cgi:188 pkgs.cgi:207 +#: pkgs.cgi:237 +msgid "Search packages" +msgstr "" + +#: pkgs.cgi:244 pkgs.cgi:313 msgid "Toogle all" msgstr "" -#: pkgs.cgi:265 -msgid "Category:" -msgstr "" - -#: pkgs.cgi:284 -msgid "Search packages" -msgstr "" - -#: pkgs.cgi:300 +#: pkgs.cgi:269 msgid "Recharge" msgstr "" -#: pkgs.cgi:305 -msgid "" -"Recharge will check for new or updated packages...\n" -"please wait" +#: pkgs.cgi:274 +msgid "Recharge checks for new or updated packages" msgstr "" -#: pkgs.cgi:321 -msgid "Packages lists are up-to-date" +#: pkgs.cgi:280 pkgs.cgi:480 +msgid "Check upgrade" msgstr "" -#: pkgs.cgi:328 -msgid "Upgradeable packages" +#: pkgs.cgi:292 +msgid "Packages lists are up-to-date. You should check for upgrades now." msgstr "" -#: pkgs.cgi:363 -msgid "Performing task on packages... please wait" +#: pkgs.cgi:306 +msgid "Up packages" msgstr "" -#: pkgs.cgi:390 +#: pkgs.cgi:355 +msgid "Performing tasks on packages" +msgstr "" + +#: pkgs.cgi:385 msgid "Package" msgstr "" -#: pkgs.cgi:394 +#: pkgs.cgi:389 msgid "Remove" msgstr "" -#: pkgs.cgi:416 +#: pkgs.cgi:411 msgid "Installed files:" msgstr "" -#: pkgs.cgi:440 pkgs.cgi:490 +#: pkgs.cgi:437 pkgs.cgi:482 msgid "Configuration" msgstr "" -#: pkgs.cgi:442 +#: pkgs.cgi:439 msgid "Tazpkg configuration and settings" msgstr "" -#: pkgs.cgi:447 +#: pkgs.cgi:444 msgid "Packages in the cache:" msgstr "" -#: pkgs.cgi:454 +#: pkgs.cgi:451 msgid "Current mirror list" msgstr "" #: pkgs.cgi:478 -msgid "Overview of all installed and mirrored packages" -msgstr "" - -#: pkgs.cgi:486 msgid "Recharge list" msgstr "" #: pkgs.cgi:488 -msgid "Check upgrade" -msgstr "" - -#: pkgs.cgi:492 msgid "Latest log entries" msgstr "" -#: live.cgi:50 +#: live.cgi:53 msgid "TODO" msgstr "" -#: live.cgi:58 +#: live.cgi:61 msgid "SliTaz Live Systems" msgstr "" -#: live.cgi:59 +#: live.cgi:62 msgid "Create and manage Live CD or USB SliTaz systems" msgstr "" -#: live.cgi:62 +#: live.cgi:65 msgid "Write a Live CD" msgstr "" -#: live.cgi:64 +#: live.cgi:67 msgid "" "The command writeiso will generate an ISO image of the\n" "\tcurrent filesystem as is, including all files in the /home directory.\n" @@ -316,77 +225,77 @@ "\tto: boot, modify, writeiso." msgstr "" -#: live.cgi:70 +#: live.cgi:73 msgid "Compression type:" msgstr "" -#: live.cgi:76 -msgid "write ISO" +#: live.cgi:79 +msgid "Write ISO" msgstr "" -#: live.cgi:79 +#: live.cgi:82 msgid "Live USB" msgstr "" -#: live.cgi:81 +#: live.cgi:84 msgid "" "Generate SliTaz LiveUSB media and boot in RAM! Insert a\n" "\tLiveCD into the cdrom drive, select the correct device and press\n" "\tGenerate." msgstr "" -#: live.cgi:86 +#: live.cgi:89 msgid "USB Media to use:" msgstr "" -#: live.cgi:95 +#: live.cgi:98 msgid "Not found" msgstr "" -#: live.cgi:99 -msgid "generate" +#: live.cgi:102 +msgid "Generate" msgstr "" -#: network.cgi:41 +#: network.cgi:44 msgid "Ethernet connection" msgstr "" -#: network.cgi:51 +#: network.cgi:55 msgid "Wireless connection" msgstr "" -#: network.cgi:61 +#: network.cgi:66 msgid "Networking" msgstr "" -#: network.cgi:63 -msgid "Manage network connection and services" +#: network.cgi:68 +msgid "Manage network connections and services" msgstr "" -#: network.cgi:67 +#: network.cgi:72 msgid "Connection:" msgstr "" -#: network.cgi:68 +#: network.cgi:73 msgid "Start" msgstr "" -#: network.cgi:69 +#: network.cgi:74 msgid "Stop" msgstr "" -#: network.cgi:75 +#: network.cgi:80 msgid "Output of ifconfig" msgstr "" -#: lib/libtazpanel:39 +#: lib/libtazpanel:51 msgid "Interface" msgstr "" -#: lib/libtazpanel:41 +#: lib/libtazpanel:53 msgid "Status" msgstr "" -#: lib/libtazpanel:42 +#: lib/libtazpanel:54 msgid "IP Address" msgstr "" diff -r a7f0d1a1ed2e -r 730f8bcacabc settings.cgi --- a/settings.cgi Sat Apr 09 05:45:44 2011 +0200 +++ b/settings.cgi Sun Apr 10 11:23:06 2011 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # # System settings CGI interface: user, locale, keyboard, date. Since we -# dont have multiple page here there is only one case used to get commands +# dont have multiple pages here there is only one case used to get command # values and the full content is following directly. # # Copyright (C) 2011 SliTaz GNU/Linux - GNU gpl v3 @@ -92,7 +92,7 @@ `gettext "Hardware clock :"` `hwclock -r` `gettext "Sync online"` -`gettext "Set harware clock"` +`gettext "Set hardware clock"` EOT # # Users management @@ -167,7 +167,7 @@ # System configuration echo "LANG=$new_locale" > /etc/locale.conf echo "LC_ALL=$new_locale" >> /etc/locale.conf - eval_gettext "You must logout and login again your current + eval_gettext "You must logout and login again to your current session to use \$new_locale locale." else eval_gettext "Current system locales: " @@ -176,7 +176,7 @@ cat << EOT

- `gettext "Avalaible locales:"` + `gettext "Available locales:"`