slitaz-base-files rev 219 5.4.1
libtaz.sh: add (and use) short gettext aliases: _ and _n
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Fri Aug 09 15:38:43 2013 +0300 (2013-08-09) |
| parents | c39c843d64e5 |
| children | 79741640ba8a |
| files | Makefile doc/libtaz.txt po/el.po po/es_AR.po po/fr.po po/pl.po po/pt_BR.po po/ru.po po/slitaz-base.pot po/sv.po rootfs/lib/libtaz.sh rootfs/usr/bin/ldd rootfs/usr/bin/man rootfs/usr/lib/slitaz/httphelper.sh rootfs/usr/lib/slitaz/libpkg.sh rootfs/usr/share/applications/httpd-cgi.desktop rootfs/var/www/cgi-bin/cgi-env.sh rootfs/var/www/cgi-bin/index.cgi |
line diff
1.1 --- a/Makefile Thu Jul 25 03:54:11 2013 +0300 1.2 +++ b/Makefile Fri Aug 09 15:38:43 2013 +0300 1.3 @@ -17,7 +17,7 @@ 1.4 --copyright-holder="SliTaz" -k -klgettext \ 1.5 ./rootfs/lib/libtaz.sh 1.6 xgettext -j -o po/$(PACKAGE).pot -L Shell --package-name="SliTaz Base" \ 1.7 - --copyright-holder="SliTaz" \ 1.8 + --copyright-holder="SliTaz" -k_ -k_n \ 1.9 ./rootfs/usr/lib/slitaz/libpkg.sh \ 1.10 ./rootfs/var/www/cgi-bin/cgi-env.sh \ 1.11 ./rootfs/var/www/cgi-bin/index.cgi \
2.1 --- a/doc/libtaz.txt Thu Jul 25 03:54:11 2013 +0300 2.2 +++ b/doc/libtaz.txt Fri Aug 09 15:38:43 2013 +0300 2.3 @@ -12,6 +12,8 @@ 2.4 /lib/libtaz.sh since it is used when /usr may not be mounted. 2.5 2.6 FUNCTIONS 2.7 + _ string Short name for "gettext string; echo" 2.8 + _n string Short name for "gettext string" 2.9 status Return command status [Done|Failed] 2.10 separator Display a line separator 2.11 newline Echo a new line if gettext or echo -n is used
3.1 --- a/po/el.po Thu Jul 25 03:54:11 2013 +0300 3.2 +++ b/po/el.po Fri Aug 09 15:38:43 2013 +0300 3.3 @@ -7,7 +7,7 @@ 3.4 msgstr "" 3.5 "Project-Id-Version: SliTaz Base\n" 3.6 "Report-Msgid-Bugs-To: \n" 3.7 -"POT-Creation-Date: 2012-07-01 18:58+0000\n" 3.8 +"POT-Creation-Date: 2013-08-09 15:29+0300\n" 3.9 "PO-Revision-Date: 2012-06-09 21:15+0200\n" 3.10 "Last-Translator: Douros Dimitris <dourosdimitris@gmail.com>\n" 3.11 "Language-Team: \n" 3.12 @@ -18,31 +18,31 @@ 3.13 "X-Poedit-Language: Greek\n" 3.14 "X-Poedit-Country: GREECE\n" 3.15 3.16 -#: rootfs/lib/libtaz.sh:25 3.17 +#: rootfs/lib/libtaz.sh:23 3.18 msgid "Done" 3.19 msgstr "Έγινε" 3.20 3.21 -#: rootfs/lib/libtaz.sh:26 3.22 +#: rootfs/lib/libtaz.sh:24 3.23 msgid "Failed" 3.24 msgstr "Απέτυχε" 3.25 3.26 -#: rootfs/lib/libtaz.sh:155 3.27 +#: rootfs/lib/libtaz.sh:153 3.28 msgid "You must be root to execute:" 3.29 msgstr "Χρειάζονται δικαιώματα διαχειριστή (root) για να εκτελέσετε:" 3.30 3.31 -#: rootfs/lib/libtaz.sh:168 3.32 +#: rootfs/lib/libtaz.sh:166 3.33 msgid "y" 3.34 msgstr "" 3.35 3.36 -#: rootfs/lib/libtaz.sh:169 3.37 +#: rootfs/lib/libtaz.sh:167 3.38 msgid "Y" 3.39 msgstr "" 3.40 3.41 -#: rootfs/lib/libtaz.sh:170 3.42 +#: rootfs/lib/libtaz.sh:168 3.43 msgid "n" 3.44 msgstr "" 3.45 3.46 -#: rootfs/lib/libtaz.sh:171 3.47 +#: rootfs/lib/libtaz.sh:169 3.48 msgid "N" 3.49 msgstr "" 3.50 3.51 @@ -64,11 +64,11 @@ 3.52 msgid "$file is not a tazpkg. Exiting" 3.53 msgstr "To $file δεν είναι tazpkg. Έξοδος" 3.54 3.55 -#: rootfs/var/www/cgi-bin/cgi-env.sh:17 rootfs/var/www/cgi-bin/cgi-env.sh:24 3.56 +#: rootfs/var/www/cgi-bin/cgi-env.sh:12 3.57 msgid "CGI SHell Environment" 3.58 msgstr "Περιβάλλον CGI SHell" 3.59 3.60 -#: rootfs/var/www/cgi-bin/cgi-env.sh:30 3.61 +#: rootfs/var/www/cgi-bin/cgi-env.sh:31 3.62 msgid "" 3.63 "Welcome to the SliTaz web server CGI Shell environment. Let the power of " 3.64 "SHell script meet the web! Here you can check HTTP info and try some " 3.65 @@ -78,7 +78,7 @@ 3.66 "τη δύναμη του shell script να συναντήσει το διαδίκτυο! Εδώ μπορείτε να δείτε " 3.67 "πληροφορίες για το HTTP και να δοκιμάστε κάποια αιτήματα." 3.68 3.69 -#: rootfs/var/www/cgi-bin/cgi-env.sh:34 3.70 +#: rootfs/var/www/cgi-bin/cgi-env.sh:35 3.71 msgid "" 3.72 "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-" 3.73 "like syntax such as: $(GET var)" 3.74 @@ -86,41 +86,40 @@ 3.75 "Συμπεριλαμβάνοντας το /usr/lib/sliTaz/httphelper.sh στα script σας, σας " 3.76 "επιτρέπει να χρησιμοποιήσετε σύνταξη σαν PHP, όπως: $(GET var)" 3.77 3.78 -#: rootfs/var/www/cgi-bin/cgi-env.sh:37 3.79 +#: rootfs/var/www/cgi-bin/cgi-env.sh:38 3.80 msgid "QUERY_STRING test:" 3.81 msgstr "Δοκιμή QUERY_STRING:" 3.82 3.83 -#: rootfs/var/www/cgi-bin/cgi-env.sh:42 3.84 +#: rootfs/var/www/cgi-bin/cgi-env.sh:43 3.85 msgid "HTTP Info" 3.86 msgstr "Πληροφορίες HTTP" 3.87 3.88 -#: rootfs/var/www/cgi-bin/cgi-env.sh:47 3.89 -msgid "HTTP Helper" 3.90 -msgstr "Βοηθός HTTP" 3.91 - 3.92 -#: rootfs/var/www/cgi-bin/index.cgi:15 rootfs/var/www/cgi-bin/index.cgi:22 3.93 +#: rootfs/var/www/cgi-bin/index.cgi:12 3.94 #, sh-format 3.95 msgid "Index of $QUERY_STRING" 3.96 msgstr "Ευρετήριο του $QUERY_STRING" 3.97 3.98 -#: rootfs/usr/bin/man:15 3.99 +#: rootfs/usr/bin/man:14 3.100 msgid "Missing Retawq web browser..." 3.101 msgstr "Λείπει ο περιηγητής Retawq..." 3.102 3.103 -#: rootfs/usr/bin/man:16 3.104 +#: rootfs/usr/bin/man:15 3.105 msgid "Please run: su -c 'tazpkg get-install retawq'" 3.106 msgstr "Παρακαλώ εκτελέστε: su -c 'tazpkg get-install retawq'" 3.107 3.108 -#: rootfs/usr/bin/man:28 3.109 +#: rootfs/usr/bin/man:27 3.110 msgid "<b>Usage:</b> man [section] command" 3.111 msgstr "<b>Χρήση:</b> man [τομέας] εντολή" 3.112 3.113 -#: rootfs/usr/bin/man:39 3.114 +#: rootfs/usr/bin/man:38 3.115 #, sh-format 3.116 msgid "in section $SECTION" 3.117 msgstr "στον τομέα $SECTION" 3.118 3.119 -#: rootfs/usr/bin/man:80 3.120 +#: rootfs/usr/bin/man:79 3.121 #, sh-format 3.122 msgid "No manual entry for $TOPIC$MSG" 3.123 msgstr "Δεν υπάρχει καταχώρηση εγχειριδίου για το $TOPIC$MSG" 3.124 + 3.125 +#~ msgid "HTTP Helper" 3.126 +#~ msgstr "Βοηθός HTTP"
4.1 --- a/po/es_AR.po Thu Jul 25 03:54:11 2013 +0300 4.2 +++ b/po/es_AR.po Fri Aug 09 15:38:43 2013 +0300 4.3 @@ -7,7 +7,7 @@ 4.4 msgstr "" 4.5 "Project-Id-Version: SliTaz Base\n" 4.6 "Report-Msgid-Bugs-To: \n" 4.7 -"POT-Creation-Date: 2012-07-01 18:58+0000\n" 4.8 +"POT-Creation-Date: 2013-08-09 15:29+0300\n" 4.9 "PO-Revision-Date: 2013-03-19 20:55-0300\n" 4.10 "Last-Translator: René Rivero <arca2@hotmail.com>\n" 4.11 "Language-Team: Argentinian\n" 4.12 @@ -16,31 +16,31 @@ 4.13 "Content-Type: text/plain; charset=UTF-8\n" 4.14 "Content-Transfer-Encoding: 8bit\n" 4.15 4.16 -#: rootfs/lib/libtaz.sh:25 4.17 +#: rootfs/lib/libtaz.sh:23 4.18 msgid "Done" 4.19 msgstr "Hecho" 4.20 4.21 -#: rootfs/lib/libtaz.sh:26 4.22 +#: rootfs/lib/libtaz.sh:24 4.23 msgid "Failed" 4.24 msgstr "Falló" 4.25 4.26 -#: rootfs/lib/libtaz.sh:155 4.27 +#: rootfs/lib/libtaz.sh:153 4.28 msgid "You must be root to execute:" 4.29 msgstr "Tiene que ser root para ejecutar:" 4.30 4.31 -#: rootfs/lib/libtaz.sh:168 4.32 +#: rootfs/lib/libtaz.sh:166 4.33 msgid "y" 4.34 msgstr "y" 4.35 4.36 -#: rootfs/lib/libtaz.sh:169 4.37 +#: rootfs/lib/libtaz.sh:167 4.38 msgid "Y" 4.39 msgstr "Y" 4.40 4.41 -#: rootfs/lib/libtaz.sh:170 4.42 +#: rootfs/lib/libtaz.sh:168 4.43 msgid "n" 4.44 msgstr "n" 4.45 4.46 -#: rootfs/lib/libtaz.sh:171 4.47 +#: rootfs/lib/libtaz.sh:169 4.48 msgid "N" 4.49 msgstr "N" 4.50 4.51 @@ -62,11 +62,11 @@ 4.52 msgid "$file is not a tazpkg. Exiting" 4.53 msgstr "El archivo no es un tazpkg. Salir" 4.54 4.55 -#: rootfs/var/www/cgi-bin/cgi-env.sh:17 rootfs/var/www/cgi-bin/cgi-env.sh:24 4.56 +#: rootfs/var/www/cgi-bin/cgi-env.sh:12 4.57 msgid "CGI SHell Environment" 4.58 msgstr "Entorno CGI Shell" 4.59 4.60 -#: rootfs/var/www/cgi-bin/cgi-env.sh:30 4.61 +#: rootfs/var/www/cgi-bin/cgi-env.sh:31 4.62 msgid "" 4.63 "Welcome to the SliTaz web server CGI Shell environment. Let the power of " 4.64 "SHell script meet the web! Here you can check HTTP info and try some " 4.65 @@ -76,7 +76,7 @@ 4.66 "los script shell satisfaga la web! Aquí puede comprobar la información HTTP " 4.67 "y probar algunas peticiones." 4.68 4.69 -#: rootfs/var/www/cgi-bin/cgi-env.sh:34 4.70 +#: rootfs/var/www/cgi-bin/cgi-env.sh:35 4.71 msgid "" 4.72 "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-" 4.73 "like syntax such as: $(GET var)" 4.74 @@ -84,41 +84,40 @@ 4.75 "La inclusión de /usr/lib/slitaz/httphelper.sh en las secuencias de comandos " 4.76 "le permite utilizar PHP-como la sintaxis: $(GET var)" 4.77 4.78 -#: rootfs/var/www/cgi-bin/cgi-env.sh:37 4.79 +#: rootfs/var/www/cgi-bin/cgi-env.sh:38 4.80 msgid "QUERY_STRING test:" 4.81 msgstr "Prueba QUERY_STRING:" 4.82 4.83 -#: rootfs/var/www/cgi-bin/cgi-env.sh:42 4.84 +#: rootfs/var/www/cgi-bin/cgi-env.sh:43 4.85 msgid "HTTP Info" 4.86 msgstr "Información HTTP" 4.87 4.88 -#: rootfs/var/www/cgi-bin/cgi-env.sh:47 4.89 -msgid "HTTP Helper" 4.90 -msgstr "Ayuda HTTP" 4.91 - 4.92 -#: rootfs/var/www/cgi-bin/index.cgi:15 rootfs/var/www/cgi-bin/index.cgi:22 4.93 +#: rootfs/var/www/cgi-bin/index.cgi:12 4.94 #, sh-format 4.95 msgid "Index of $QUERY_STRING" 4.96 msgstr "Indice de $QUERY_STRING" 4.97 4.98 -#: rootfs/usr/bin/man:15 4.99 +#: rootfs/usr/bin/man:14 4.100 msgid "Missing Retawq web browser..." 4.101 msgstr "Falta el navegador web Retawq" 4.102 4.103 -#: rootfs/usr/bin/man:16 4.104 +#: rootfs/usr/bin/man:15 4.105 msgid "Please run: su -c 'tazpkg get-install retawq'" 4.106 msgstr "Por favor ejecute: su -c 'tazpkg get-install retawq'" 4.107 4.108 -#: rootfs/usr/bin/man:28 4.109 +#: rootfs/usr/bin/man:27 4.110 msgid "<b>Usage:</b> man [section] command" 4.111 msgstr "<b>Use:</b> man [seccion] comando" 4.112 4.113 -#: rootfs/usr/bin/man:39 4.114 +#: rootfs/usr/bin/man:38 4.115 #, sh-format 4.116 msgid "in section $SECTION" 4.117 msgstr "en la sección $SECTION" 4.118 4.119 -#: rootfs/usr/bin/man:80 4.120 +#: rootfs/usr/bin/man:79 4.121 #, sh-format 4.122 msgid "No manual entry for $TOPIC$MSG" 4.123 msgstr "No hay entrada manual para $TOPIC$MSG" 4.124 + 4.125 +#~ msgid "HTTP Helper" 4.126 +#~ msgstr "Ayuda HTTP"
5.1 --- a/po/fr.po Thu Jul 25 03:54:11 2013 +0300 5.2 +++ b/po/fr.po Fri Aug 09 15:38:43 2013 +0300 5.3 @@ -7,7 +7,7 @@ 5.4 msgstr "" 5.5 "Project-Id-Version: SliTaz Base\n" 5.6 "Report-Msgid-Bugs-To: \n" 5.7 -"POT-Creation-Date: 2012-07-01 18:58+0000\n" 5.8 +"POT-Creation-Date: 2013-08-09 15:29+0300\n" 5.9 "PO-Revision-Date: 2012-05-17 09:09+0100\n" 5.10 "Last-Translator: Christophe Lincoln <pankso@slitaz.org>\n" 5.11 "Language-Team: French\n" 5.12 @@ -17,31 +17,31 @@ 5.13 "Content-Transfer-Encoding: 8bit\n" 5.14 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 5.15 5.16 -#: rootfs/lib/libtaz.sh:25 5.17 +#: rootfs/lib/libtaz.sh:23 5.18 msgid "Done" 5.19 msgstr "Fait" 5.20 5.21 -#: rootfs/lib/libtaz.sh:26 5.22 +#: rootfs/lib/libtaz.sh:24 5.23 msgid "Failed" 5.24 msgstr "Echec" 5.25 5.26 -#: rootfs/lib/libtaz.sh:155 5.27 +#: rootfs/lib/libtaz.sh:153 5.28 msgid "You must be root to execute:" 5.29 msgstr "Vous devez être root pour exécuter:" 5.30 5.31 -#: rootfs/lib/libtaz.sh:168 5.32 +#: rootfs/lib/libtaz.sh:166 5.33 msgid "y" 5.34 msgstr "o" 5.35 5.36 -#: rootfs/lib/libtaz.sh:169 5.37 +#: rootfs/lib/libtaz.sh:167 5.38 msgid "Y" 5.39 msgstr "O" 5.40 5.41 -#: rootfs/lib/libtaz.sh:170 5.42 +#: rootfs/lib/libtaz.sh:168 5.43 msgid "n" 5.44 msgstr "n" 5.45 5.46 -#: rootfs/lib/libtaz.sh:171 5.47 +#: rootfs/lib/libtaz.sh:169 5.48 msgid "N" 5.49 msgstr "N" 5.50 5.51 @@ -63,11 +63,11 @@ 5.52 msgid "$file is not a tazpkg. Exiting" 5.53 msgstr "$file n'est pas un paquet tazpkg. Arrêt" 5.54 5.55 -#: rootfs/var/www/cgi-bin/cgi-env.sh:17 rootfs/var/www/cgi-bin/cgi-env.sh:24 5.56 +#: rootfs/var/www/cgi-bin/cgi-env.sh:12 5.57 msgid "CGI SHell Environment" 5.58 msgstr "Environnement SHell CGI" 5.59 5.60 -#: rootfs/var/www/cgi-bin/cgi-env.sh:30 5.61 +#: rootfs/var/www/cgi-bin/cgi-env.sh:31 5.62 msgid "" 5.63 "Welcome to the SliTaz web server CGI Shell environment. Let the power of " 5.64 "SHell script meet the web! Here you can check HTTP info and try some " 5.65 @@ -77,7 +77,7 @@ 5.66 "script shell rencontrer le web! Ici, vous pouvez vérifier les info HTTP et " 5.67 "essayer certaines demandes." 5.68 5.69 -#: rootfs/var/www/cgi-bin/cgi-env.sh:34 5.70 +#: rootfs/var/www/cgi-bin/cgi-env.sh:35 5.71 msgid "" 5.72 "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-" 5.73 "like syntax such as: $(GET var)" 5.74 @@ -85,43 +85,42 @@ 5.75 "Vous devez inclure '/usr/lib/slitaz/httphelper.sh' dans vos scripts pour " 5.76 "utiliser la synthaxe PHPcomme par exemple: $(GET var)" 5.77 5.78 -#: rootfs/var/www/cgi-bin/cgi-env.sh:37 5.79 +#: rootfs/var/www/cgi-bin/cgi-env.sh:38 5.80 msgid "QUERY_STRING test:" 5.81 msgstr "Test de la chaine de caractères:" 5.82 5.83 -#: rootfs/var/www/cgi-bin/cgi-env.sh:42 5.84 +#: rootfs/var/www/cgi-bin/cgi-env.sh:43 5.85 msgid "HTTP Info" 5.86 msgstr "Info HTTP" 5.87 5.88 -#: rootfs/var/www/cgi-bin/cgi-env.sh:47 5.89 -msgid "HTTP Helper" 5.90 -msgstr "Helper HTTP" 5.91 - 5.92 -#: rootfs/var/www/cgi-bin/index.cgi:15 rootfs/var/www/cgi-bin/index.cgi:22 5.93 +#: rootfs/var/www/cgi-bin/index.cgi:12 5.94 #, sh-format 5.95 msgid "Index of $QUERY_STRING" 5.96 msgstr "Racine de $QUERY_STRING" 5.97 5.98 -#: rootfs/usr/bin/man:15 5.99 +#: rootfs/usr/bin/man:14 5.100 msgid "Missing Retawq web browser..." 5.101 msgstr "Navigateur web Retawq manquant..." 5.102 5.103 -#: rootfs/usr/bin/man:16 5.104 +#: rootfs/usr/bin/man:15 5.105 msgid "Please run: su -c 'tazpkg get-install retawq'" 5.106 msgstr "" 5.107 "Vous pouvez l'installer en exécutant la commande: su -c 'tazpkg get-install " 5.108 "retawq'" 5.109 5.110 -#: rootfs/usr/bin/man:28 5.111 +#: rootfs/usr/bin/man:27 5.112 msgid "<b>Usage:</b> man [section] command" 5.113 msgstr "<b>Usage:</b> man [section] commande" 5.114 5.115 -#: rootfs/usr/bin/man:39 5.116 +#: rootfs/usr/bin/man:38 5.117 #, sh-format 5.118 msgid "in section $SECTION" 5.119 msgstr "dans cette section $SECTION" 5.120 5.121 -#: rootfs/usr/bin/man:80 5.122 +#: rootfs/usr/bin/man:79 5.123 #, sh-format 5.124 msgid "No manual entry for $TOPIC$MSG" 5.125 msgstr "Pas de manuel disponible pour $TOPIC$MSG" 5.126 + 5.127 +#~ msgid "HTTP Helper" 5.128 +#~ msgstr "Helper HTTP"
6.1 --- a/po/pl.po Thu Jul 25 03:54:11 2013 +0300 6.2 +++ b/po/pl.po Fri Aug 09 15:38:43 2013 +0300 6.3 @@ -7,7 +7,7 @@ 6.4 msgstr "" 6.5 "Project-Id-Version: SliTaz Base\n" 6.6 "Report-Msgid-Bugs-To: \n" 6.7 -"POT-Creation-Date: 2012-07-01 18:58+0000\n" 6.8 +"POT-Creation-Date: 2013-08-09 15:29+0300\n" 6.9 "PO-Revision-Date: 2013-07-23 12:34+0100\n" 6.10 "Last-Translator: Paweł Pyrczak <tkr.tkr.pl@gmail.com>\n" 6.11 "Language-Team: \n" 6.12 @@ -15,36 +15,37 @@ 6.13 "MIME-Version: 1.0\n" 6.14 "Content-Type: text/plain; charset=UTF-8\n" 6.15 "Content-Transfer-Encoding: 8bit\n" 6.16 -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" 6.17 +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " 6.18 +"|| n%100>=20) ? 1 : 2);\n" 6.19 "X-Poedit-Language: Polish\n" 6.20 "X-Poedit-Country: POLAND\n" 6.21 "X-Poedit-SourceCharset: utf-8\n" 6.22 6.23 -#: rootfs/lib/libtaz.sh:25 6.24 +#: rootfs/lib/libtaz.sh:23 6.25 msgid "Done" 6.26 msgstr "Zakończono" 6.27 6.28 -#: rootfs/lib/libtaz.sh:26 6.29 +#: rootfs/lib/libtaz.sh:24 6.30 msgid "Failed" 6.31 msgstr "Niepowodzenie" 6.32 6.33 -#: rootfs/lib/libtaz.sh:155 6.34 +#: rootfs/lib/libtaz.sh:153 6.35 msgid "You must be root to execute:" 6.36 msgstr "Musisz być administratorem (root) aby wykonać:" 6.37 6.38 -#: rootfs/lib/libtaz.sh:168 6.39 +#: rootfs/lib/libtaz.sh:166 6.40 msgid "y" 6.41 msgstr "t" 6.42 6.43 -#: rootfs/lib/libtaz.sh:169 6.44 +#: rootfs/lib/libtaz.sh:167 6.45 msgid "Y" 6.46 msgstr "T" 6.47 6.48 -#: rootfs/lib/libtaz.sh:170 6.49 +#: rootfs/lib/libtaz.sh:168 6.50 msgid "n" 6.51 msgstr "n" 6.52 6.53 -#: rootfs/lib/libtaz.sh:171 6.54 +#: rootfs/lib/libtaz.sh:169 6.55 msgid "N" 6.56 msgstr "N" 6.57 6.58 @@ -66,56 +67,62 @@ 6.59 msgid "$file is not a tazpkg. Exiting" 6.60 msgstr "$file nie jest plikiem tazpkg. Kończenie pracy" 6.61 6.62 -#: rootfs/var/www/cgi-bin/cgi-env.sh:17 6.63 -#: rootfs/var/www/cgi-bin/cgi-env.sh:24 6.64 +#: rootfs/var/www/cgi-bin/cgi-env.sh:12 6.65 msgid "CGI SHell Environment" 6.66 msgstr "Środowisko CGI SHell" 6.67 6.68 -#: rootfs/var/www/cgi-bin/cgi-env.sh:30 6.69 -msgid "Welcome to the SliTaz web server CGI Shell environment. Let the power of SHell script meet the web! Here you can check HTTP info and try some requests." 6.70 -msgstr "Witamy w środowisku CGI SHell serwera web SliTaz. Niech siła skryptów SHell pozna sieć ! Tu może sprawdzić informacje HTTP, i spróbować wykonać kilka zapytań." 6.71 +#: rootfs/var/www/cgi-bin/cgi-env.sh:31 6.72 +msgid "" 6.73 +"Welcome to the SliTaz web server CGI Shell environment. Let the power of " 6.74 +"SHell script meet the web! Here you can check HTTP info and try some " 6.75 +"requests." 6.76 +msgstr "" 6.77 +"Witamy w środowisku CGI SHell serwera web SliTaz. Niech siła skryptów SHell " 6.78 +"pozna sieć ! Tu może sprawdzić informacje HTTP, i spróbować wykonać kilka " 6.79 +"zapytań." 6.80 6.81 -#: rootfs/var/www/cgi-bin/cgi-env.sh:34 6.82 -msgid "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-like syntax such as: $(GET var)" 6.83 -msgstr "Dołączanie /usr/lib/slitaz/httphelper.sh do twoich skryptów pozwoli używać składnie podobną do PHP, taką jak: $(GET var)" 6.84 +#: rootfs/var/www/cgi-bin/cgi-env.sh:35 6.85 +msgid "" 6.86 +"Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-" 6.87 +"like syntax such as: $(GET var)" 6.88 +msgstr "" 6.89 +"Dołączanie /usr/lib/slitaz/httphelper.sh do twoich skryptów pozwoli używać " 6.90 +"składnie podobną do PHP, taką jak: $(GET var)" 6.91 6.92 -#: rootfs/var/www/cgi-bin/cgi-env.sh:37 6.93 +#: rootfs/var/www/cgi-bin/cgi-env.sh:38 6.94 msgid "QUERY_STRING test:" 6.95 msgstr "Test QUERY_STRING:" 6.96 6.97 -#: rootfs/var/www/cgi-bin/cgi-env.sh:42 6.98 +#: rootfs/var/www/cgi-bin/cgi-env.sh:43 6.99 msgid "HTTP Info" 6.100 msgstr "HTTP Info" 6.101 6.102 -#: rootfs/var/www/cgi-bin/cgi-env.sh:47 6.103 -msgid "HTTP Helper" 6.104 -msgstr "HTTP Helper" 6.105 - 6.106 -#: rootfs/var/www/cgi-bin/index.cgi:15 6.107 -#: rootfs/var/www/cgi-bin/index.cgi:22 6.108 +#: rootfs/var/www/cgi-bin/index.cgi:12 6.109 #, sh-format 6.110 msgid "Index of $QUERY_STRING" 6.111 msgstr "Indeks $QUERY_STRING" 6.112 6.113 -#: rootfs/usr/bin/man:15 6.114 +#: rootfs/usr/bin/man:14 6.115 msgid "Missing Retawq web browser..." 6.116 msgstr "Brakuje przeglądarki internetowej Retawq..." 6.117 6.118 -#: rootfs/usr/bin/man:16 6.119 +#: rootfs/usr/bin/man:15 6.120 msgid "Please run: su -c 'tazpkg get-install retawq'" 6.121 msgstr "Proszę uruchomić: su -c 'tazpkg get-install retawq'" 6.122 6.123 -#: rootfs/usr/bin/man:28 6.124 +#: rootfs/usr/bin/man:27 6.125 msgid "<b>Usage:</b> man [section] command" 6.126 msgstr "<b>Użycie:</b> man [section] command" 6.127 6.128 -#: rootfs/usr/bin/man:39 6.129 +#: rootfs/usr/bin/man:38 6.130 #, sh-format 6.131 msgid "in section $SECTION" 6.132 msgstr "w sekcji $SECTION" 6.133 6.134 -#: rootfs/usr/bin/man:80 6.135 +#: rootfs/usr/bin/man:79 6.136 #, sh-format 6.137 msgid "No manual entry for $TOPIC$MSG" 6.138 msgstr "Brak ręcznego wpisu dla $TOPIC$MSG" 6.139 6.140 +#~ msgid "HTTP Helper" 6.141 +#~ msgstr "HTTP Helper"
7.1 --- a/po/pt_BR.po Thu Jul 25 03:54:11 2013 +0300 7.2 +++ b/po/pt_BR.po Fri Aug 09 15:38:43 2013 +0300 7.3 @@ -7,7 +7,7 @@ 7.4 msgstr "" 7.5 "Project-Id-Version: SliTaz Base\n" 7.6 "Report-Msgid-Bugs-To: \n" 7.7 -"POT-Creation-Date: 2012-07-01 18:58+0000\n" 7.8 +"POT-Creation-Date: 2013-08-09 15:29+0300\n" 7.9 "PO-Revision-Date: 2013-01-22 23:00-0300\n" 7.10 "Last-Translator: Claudinei Pereira <claudinei@slitaz.org>\n" 7.11 "Language-Team: Brazilian Portuguese <i18n@slitaz.org>\n" 7.12 @@ -17,31 +17,31 @@ 7.13 "Content-Transfer-Encoding: 8bit\n" 7.14 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 7.15 7.16 -#: rootfs/lib/libtaz.sh:25 7.17 +#: rootfs/lib/libtaz.sh:23 7.18 msgid "Done" 7.19 msgstr "Terminado" 7.20 7.21 -#: rootfs/lib/libtaz.sh:26 7.22 +#: rootfs/lib/libtaz.sh:24 7.23 msgid "Failed" 7.24 msgstr "Falhou" 7.25 7.26 -#: rootfs/lib/libtaz.sh:155 7.27 +#: rootfs/lib/libtaz.sh:153 7.28 msgid "You must be root to execute:" 7.29 msgstr "Você deve ser usuário root para executar" 7.30 7.31 -#: rootfs/lib/libtaz.sh:168 7.32 +#: rootfs/lib/libtaz.sh:166 7.33 msgid "y" 7.34 msgstr "y" 7.35 7.36 -#: rootfs/lib/libtaz.sh:169 7.37 +#: rootfs/lib/libtaz.sh:167 7.38 msgid "Y" 7.39 msgstr "Y" 7.40 7.41 -#: rootfs/lib/libtaz.sh:170 7.42 +#: rootfs/lib/libtaz.sh:168 7.43 msgid "n" 7.44 msgstr "n" 7.45 7.46 -#: rootfs/lib/libtaz.sh:171 7.47 +#: rootfs/lib/libtaz.sh:169 7.48 msgid "N" 7.49 msgstr "N" 7.50 7.51 @@ -63,11 +63,11 @@ 7.52 msgid "$file is not a tazpkg. Exiting" 7.53 msgstr "$file não é um tazpkg. Abortando" 7.54 7.55 -#: rootfs/var/www/cgi-bin/cgi-env.sh:17 rootfs/var/www/cgi-bin/cgi-env.sh:24 7.56 +#: rootfs/var/www/cgi-bin/cgi-env.sh:12 7.57 msgid "CGI SHell Environment" 7.58 msgstr "Ambiente SHell CGI" 7.59 7.60 -#: rootfs/var/www/cgi-bin/cgi-env.sh:30 7.61 +#: rootfs/var/www/cgi-bin/cgi-env.sh:31 7.62 msgid "" 7.63 "Welcome to the SliTaz web server CGI Shell environment. Let the power of " 7.64 "SHell script meet the web! Here you can check HTTP info and try some " 7.65 @@ -77,7 +77,7 @@ 7.66 "script SHell dominar a rede! Aqui você pode checar informações HTTP e tentar " 7.67 "algumas requisições." 7.68 7.69 -#: rootfs/var/www/cgi-bin/cgi-env.sh:34 7.70 +#: rootfs/var/www/cgi-bin/cgi-env.sh:35 7.71 msgid "" 7.72 "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-" 7.73 "like syntax such as: $(GET var)" 7.74 @@ -85,41 +85,40 @@ 7.75 "Incluindo o arquivo /usr/lib/slitaz/httphelper.sh em seus scripts permite a " 7.76 "você utilizar sintaxe PHP como: $(GET var)" 7.77 7.78 -#: rootfs/var/www/cgi-bin/cgi-env.sh:37 7.79 +#: rootfs/var/www/cgi-bin/cgi-env.sh:38 7.80 msgid "QUERY_STRING test:" 7.81 msgstr "Teste QUERY_STRING:" 7.82 7.83 -#: rootfs/var/www/cgi-bin/cgi-env.sh:42 7.84 +#: rootfs/var/www/cgi-bin/cgi-env.sh:43 7.85 msgid "HTTP Info" 7.86 msgstr "Informação HTTP" 7.87 7.88 -#: rootfs/var/www/cgi-bin/cgi-env.sh:47 7.89 -msgid "HTTP Helper" 7.90 -msgstr "Auxiliar HTTP" 7.91 - 7.92 -#: rootfs/var/www/cgi-bin/index.cgi:15 rootfs/var/www/cgi-bin/index.cgi:22 7.93 +#: rootfs/var/www/cgi-bin/index.cgi:12 7.94 #, sh-format 7.95 msgid "Index of $QUERY_STRING" 7.96 msgstr "Índice do $QUERY_STRING" 7.97 7.98 -#: rootfs/usr/bin/man:15 7.99 +#: rootfs/usr/bin/man:14 7.100 msgid "Missing Retawq web browser..." 7.101 msgstr "Navegador Retawq não instalado..." 7.102 7.103 -#: rootfs/usr/bin/man:16 7.104 +#: rootfs/usr/bin/man:15 7.105 msgid "Please run: su -c 'tazpkg get-install retawq'" 7.106 msgstr "Por favor execute: su -c 'tazpkg get-install retawq'" 7.107 7.108 -#: rootfs/usr/bin/man:28 7.109 +#: rootfs/usr/bin/man:27 7.110 msgid "<b>Usage:</b> man [section] command" 7.111 msgstr "<b>Utilização:</b> man [seção] comando" 7.112 7.113 -#: rootfs/usr/bin/man:39 7.114 +#: rootfs/usr/bin/man:38 7.115 #, sh-format 7.116 msgid "in section $SECTION" 7.117 msgstr "Na seção $SECTION" 7.118 7.119 -#: rootfs/usr/bin/man:80 7.120 +#: rootfs/usr/bin/man:79 7.121 #, sh-format 7.122 msgid "No manual entry for $TOPIC$MSG" 7.123 msgstr "Nenhuma entrada para $TOPIC$MSG" 7.124 + 7.125 +#~ msgid "HTTP Helper" 7.126 +#~ msgstr "Auxiliar HTTP"
8.1 --- a/po/ru.po Thu Jul 25 03:54:11 2013 +0300 8.2 +++ b/po/ru.po Fri Aug 09 15:38:43 2013 +0300 8.3 @@ -7,8 +7,8 @@ 8.4 msgstr "" 8.5 "Project-Id-Version: SliTaz Base\n" 8.6 "Report-Msgid-Bugs-To: \n" 8.7 -"POT-Creation-Date: 2012-07-01 18:58+0000\n" 8.8 -"PO-Revision-Date: 2012-06-03 14:06-0000\n" 8.9 +"POT-Creation-Date: 2013-08-09 15:29+0300\n" 8.10 +"PO-Revision-Date: 2013-08-09 13:31+0300\n" 8.11 "Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n" 8.12 "Language-Team: \n" 8.13 "Language: ru\n" 8.14 @@ -19,41 +19,41 @@ 8.15 "X-Poedit-Basepath: ../\n" 8.16 "X-Poedit-SearchPath-0: .\n" 8.17 8.18 -#: rootfs/lib/libtaz.sh:25 8.19 +#: rootfs/lib/libtaz.sh:23 8.20 msgid "Done" 8.21 msgstr "Готово" 8.22 8.23 -#: rootfs/lib/libtaz.sh:26 8.24 +#: rootfs/lib/libtaz.sh:24 8.25 msgid "Failed" 8.26 msgstr "Ошибка" 8.27 8.28 -#: rootfs/lib/libtaz.sh:155 8.29 +#: rootfs/lib/libtaz.sh:153 8.30 msgid "You must be root to execute:" 8.31 msgstr "Вы должны обладать правами root для запуска:" 8.32 8.33 -#: rootfs/lib/libtaz.sh:168 8.34 +#: rootfs/lib/libtaz.sh:166 8.35 msgid "y" 8.36 msgstr "" 8.37 8.38 -#: rootfs/lib/libtaz.sh:169 8.39 +#: rootfs/lib/libtaz.sh:167 8.40 msgid "Y" 8.41 msgstr "" 8.42 8.43 -#: rootfs/lib/libtaz.sh:170 8.44 +#: rootfs/lib/libtaz.sh:168 8.45 msgid "n" 8.46 msgstr "" 8.47 8.48 -#: rootfs/lib/libtaz.sh:171 8.49 +#: rootfs/lib/libtaz.sh:169 8.50 msgid "N" 8.51 msgstr "" 8.52 8.53 #: rootfs/usr/lib/slitaz/libpkg.sh:33 8.54 msgid "Mirror is unreachable" 8.55 -msgstr "Зеркало недоступно" 8.56 +msgstr "Репозиторий недоступен" 8.57 8.58 #: rootfs/usr/lib/slitaz/libpkg.sh:37 8.59 msgid "Mirror is up-to-date" 8.60 -msgstr "Зеркало в актуальном состоянии" 8.61 +msgstr "Репозиторий в актуальном состоянии" 8.62 8.63 #: rootfs/usr/lib/slitaz/libpkg.sh:46 8.64 #, sh-format 8.65 @@ -65,11 +65,11 @@ 8.66 msgid "$file is not a tazpkg. Exiting" 8.67 msgstr "Файл $file не является пакетом tazpkg. Выход" 8.68 8.69 -#: rootfs/var/www/cgi-bin/cgi-env.sh:17 rootfs/var/www/cgi-bin/cgi-env.sh:24 8.70 +#: rootfs/var/www/cgi-bin/cgi-env.sh:12 8.71 msgid "CGI SHell Environment" 8.72 msgstr "Переменные окружения CGI" 8.73 8.74 -#: rootfs/var/www/cgi-bin/cgi-env.sh:30 8.75 +#: rootfs/var/www/cgi-bin/cgi-env.sh:31 8.76 msgid "" 8.77 "Welcome to the SliTaz web server CGI Shell environment. Let the power of " 8.78 "SHell script meet the web! Here you can check HTTP info and try some " 8.79 @@ -79,7 +79,7 @@ 8.80 "послужит вебу. Здесь вы можете проверить информацию HTTP и попробовать " 8.81 "сделать некоторые запросы." 8.82 8.83 -#: rootfs/var/www/cgi-bin/cgi-env.sh:34 8.84 +#: rootfs/var/www/cgi-bin/cgi-env.sh:35 8.85 msgid "" 8.86 "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-" 8.87 "like syntax such as: $(GET var)" 8.88 @@ -87,41 +87,40 @@ 8.89 "Включив /usr/lib/slitaz/httphelper.sh в ваши скрипты, вы сможете " 8.90 "использовать PHP-подобный синтаксис: $(GET var)" 8.91 8.92 -#: rootfs/var/www/cgi-bin/cgi-env.sh:37 8.93 +#: rootfs/var/www/cgi-bin/cgi-env.sh:38 8.94 msgid "QUERY_STRING test:" 8.95 msgstr "Тест QUERY_STRING:" 8.96 8.97 -#: rootfs/var/www/cgi-bin/cgi-env.sh:42 8.98 +#: rootfs/var/www/cgi-bin/cgi-env.sh:43 8.99 msgid "HTTP Info" 8.100 msgstr "Информация HTTP" 8.101 8.102 -#: rootfs/var/www/cgi-bin/cgi-env.sh:47 8.103 -msgid "HTTP Helper" 8.104 -msgstr "Помощник HTTP" 8.105 - 8.106 -#: rootfs/var/www/cgi-bin/index.cgi:15 rootfs/var/www/cgi-bin/index.cgi:22 8.107 +#: rootfs/var/www/cgi-bin/index.cgi:12 8.108 #, sh-format 8.109 msgid "Index of $QUERY_STRING" 8.110 msgstr "Содержимое папки $QUERY_STRING" 8.111 8.112 -#: rootfs/usr/bin/man:15 8.113 +#: rootfs/usr/bin/man:14 8.114 msgid "Missing Retawq web browser..." 8.115 msgstr "Отсутствует браузер Retawq…" 8.116 8.117 -#: rootfs/usr/bin/man:16 8.118 +#: rootfs/usr/bin/man:15 8.119 msgid "Please run: su -c 'tazpkg get-install retawq'" 8.120 msgstr "Для его установки выполните: su -c 'tazpkg get-install retawq'" 8.121 8.122 -#: rootfs/usr/bin/man:28 8.123 +#: rootfs/usr/bin/man:27 8.124 msgid "<b>Usage:</b> man [section] command" 8.125 msgstr "<b>Использование:</b> man [раздел] команда" 8.126 8.127 -#: rootfs/usr/bin/man:39 8.128 +#: rootfs/usr/bin/man:38 8.129 #, sh-format 8.130 msgid "in section $SECTION" 8.131 msgstr "в разделе $SECTION" 8.132 8.133 -#: rootfs/usr/bin/man:80 8.134 +#: rootfs/usr/bin/man:79 8.135 #, sh-format 8.136 msgid "No manual entry for $TOPIC$MSG" 8.137 msgstr "Руководство по $TOPIC$MSG отсутствует" 8.138 + 8.139 +#~ msgid "HTTP Helper" 8.140 +#~ msgstr "Помощник HTTP"
9.1 --- a/po/slitaz-base.pot Thu Jul 25 03:54:11 2013 +0300 9.2 +++ b/po/slitaz-base.pot Fri Aug 09 15:38:43 2013 +0300 9.3 @@ -1,5 +1,5 @@ 9.4 # SOME DESCRIPTIVE TITLE. 9.5 -# Copyright (C) YEAR SliTaz Association 9.6 +# Copyright (C) YEAR SliTaz 9.7 # This file is distributed under the same license as the PACKAGE package. 9.8 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. 9.9 # 9.10 @@ -8,7 +8,7 @@ 9.11 msgstr "" 9.12 "Project-Id-Version: SliTaz Base\n" 9.13 "Report-Msgid-Bugs-To: \n" 9.14 -"POT-Creation-Date: 2012-07-01 18:58+0000\n" 9.15 +"POT-Creation-Date: 2013-08-09 15:29+0300\n" 9.16 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 9.17 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 9.18 "Language-Team: LANGUAGE <LL@li.org>\n" 9.19 @@ -17,31 +17,31 @@ 9.20 "Content-Type: text/plain; charset=CHARSET\n" 9.21 "Content-Transfer-Encoding: 8bit\n" 9.22 9.23 -#: rootfs/lib/libtaz.sh:25 9.24 +#: rootfs/lib/libtaz.sh:23 9.25 msgid "Done" 9.26 msgstr "" 9.27 9.28 -#: rootfs/lib/libtaz.sh:26 9.29 +#: rootfs/lib/libtaz.sh:24 9.30 msgid "Failed" 9.31 msgstr "" 9.32 9.33 -#: rootfs/lib/libtaz.sh:155 9.34 +#: rootfs/lib/libtaz.sh:153 9.35 msgid "You must be root to execute:" 9.36 msgstr "" 9.37 9.38 -#: rootfs/lib/libtaz.sh:168 9.39 +#: rootfs/lib/libtaz.sh:166 9.40 msgid "y" 9.41 msgstr "" 9.42 9.43 -#: rootfs/lib/libtaz.sh:169 9.44 +#: rootfs/lib/libtaz.sh:167 9.45 msgid "Y" 9.46 msgstr "" 9.47 9.48 -#: rootfs/lib/libtaz.sh:170 9.49 +#: rootfs/lib/libtaz.sh:168 9.50 msgid "n" 9.51 msgstr "" 9.52 9.53 -#: rootfs/lib/libtaz.sh:171 9.54 +#: rootfs/lib/libtaz.sh:169 9.55 msgid "N" 9.56 msgstr "" 9.57 9.58 @@ -63,58 +63,54 @@ 9.59 msgid "$file is not a tazpkg. Exiting" 9.60 msgstr "" 9.61 9.62 -#: rootfs/var/www/cgi-bin/cgi-env.sh:17 rootfs/var/www/cgi-bin/cgi-env.sh:24 9.63 +#: rootfs/var/www/cgi-bin/cgi-env.sh:12 9.64 msgid "CGI SHell Environment" 9.65 msgstr "" 9.66 9.67 -#: rootfs/var/www/cgi-bin/cgi-env.sh:30 9.68 +#: rootfs/var/www/cgi-bin/cgi-env.sh:31 9.69 msgid "" 9.70 "Welcome to the SliTaz web server CGI Shell environment. Let the power of " 9.71 "SHell script meet the web! Here you can check HTTP info and try some " 9.72 "requests." 9.73 msgstr "" 9.74 9.75 -#: rootfs/var/www/cgi-bin/cgi-env.sh:34 9.76 +#: rootfs/var/www/cgi-bin/cgi-env.sh:35 9.77 msgid "" 9.78 "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-" 9.79 "like syntax such as: $(GET var)" 9.80 msgstr "" 9.81 9.82 -#: rootfs/var/www/cgi-bin/cgi-env.sh:37 9.83 +#: rootfs/var/www/cgi-bin/cgi-env.sh:38 9.84 msgid "QUERY_STRING test:" 9.85 msgstr "" 9.86 9.87 -#: rootfs/var/www/cgi-bin/cgi-env.sh:42 9.88 +#: rootfs/var/www/cgi-bin/cgi-env.sh:43 9.89 msgid "HTTP Info" 9.90 msgstr "" 9.91 9.92 -#: rootfs/var/www/cgi-bin/cgi-env.sh:47 9.93 -msgid "HTTP Helper" 9.94 -msgstr "" 9.95 - 9.96 -#: rootfs/var/www/cgi-bin/index.cgi:15 rootfs/var/www/cgi-bin/index.cgi:22 9.97 +#: rootfs/var/www/cgi-bin/index.cgi:12 9.98 #, sh-format 9.99 msgid "Index of $QUERY_STRING" 9.100 msgstr "" 9.101 9.102 -#: rootfs/usr/bin/man:15 9.103 +#: rootfs/usr/bin/man:14 9.104 msgid "Missing Retawq web browser..." 9.105 msgstr "" 9.106 9.107 -#: rootfs/usr/bin/man:16 9.108 +#: rootfs/usr/bin/man:15 9.109 msgid "Please run: su -c 'tazpkg get-install retawq'" 9.110 msgstr "" 9.111 9.112 -#: rootfs/usr/bin/man:28 9.113 +#: rootfs/usr/bin/man:27 9.114 msgid "<b>Usage:</b> man [section] command" 9.115 msgstr "" 9.116 9.117 -#: rootfs/usr/bin/man:39 9.118 +#: rootfs/usr/bin/man:38 9.119 #, sh-format 9.120 msgid "in section $SECTION" 9.121 msgstr "" 9.122 9.123 -#: rootfs/usr/bin/man:80 9.124 +#: rootfs/usr/bin/man:79 9.125 #, sh-format 9.126 msgid "No manual entry for $TOPIC$MSG" 9.127 msgstr ""
10.1 --- a/po/sv.po Thu Jul 25 03:54:11 2013 +0300 10.2 +++ b/po/sv.po Fri Aug 09 15:38:43 2013 +0300 10.3 @@ -7,7 +7,7 @@ 10.4 msgstr "" 10.5 "Project-Id-Version: SliTaz Base\n" 10.6 "Report-Msgid-Bugs-To: \n" 10.7 -"POT-Creation-Date: 2012-07-01 18:58+0000\n" 10.8 +"POT-Creation-Date: 2013-08-09 15:29+0300\n" 10.9 "PO-Revision-Date: 2012-07-10 18:24-0000\n" 10.10 "Last-Translator: Emil Eklund <emileklund123@gmail.com>\n" 10.11 "Language-Team: Swedish\n" 10.12 @@ -17,31 +17,31 @@ 10.13 "Content-Transfer-Encoding: 8bit\n" 10.14 "Plural-Forms: nplurals=2; plural=(n != 1);\n" 10.15 10.16 -#: rootfs/lib/libtaz.sh:25 10.17 +#: rootfs/lib/libtaz.sh:23 10.18 msgid "Done" 10.19 msgstr "Klar" 10.20 10.21 -#: rootfs/lib/libtaz.sh:26 10.22 +#: rootfs/lib/libtaz.sh:24 10.23 msgid "Failed" 10.24 msgstr "Fel" 10.25 10.26 -#: rootfs/lib/libtaz.sh:155 10.27 +#: rootfs/lib/libtaz.sh:153 10.28 msgid "You must be root to execute:" 10.29 msgstr "Du måste vara root-användare för att utföra:" 10.30 10.31 -#: rootfs/lib/libtaz.sh:168 10.32 +#: rootfs/lib/libtaz.sh:166 10.33 msgid "y" 10.34 msgstr "j" 10.35 10.36 -#: rootfs/lib/libtaz.sh:169 10.37 +#: rootfs/lib/libtaz.sh:167 10.38 msgid "Y" 10.39 msgstr "J" 10.40 10.41 -#: rootfs/lib/libtaz.sh:170 10.42 +#: rootfs/lib/libtaz.sh:168 10.43 msgid "n" 10.44 msgstr "n" 10.45 10.46 -#: rootfs/lib/libtaz.sh:171 10.47 +#: rootfs/lib/libtaz.sh:169 10.48 msgid "N" 10.49 msgstr "N" 10.50 10.51 @@ -63,11 +63,11 @@ 10.52 msgid "$file is not a tazpkg. Exiting" 10.53 msgstr "$file är inte en taxpkg. Avslutar." 10.54 10.55 -#: rootfs/var/www/cgi-bin/cgi-env.sh:17 rootfs/var/www/cgi-bin/cgi-env.sh:24 10.56 +#: rootfs/var/www/cgi-bin/cgi-env.sh:12 10.57 msgid "CGI SHell Environment" 10.58 msgstr "CGI SHell Environment" 10.59 10.60 -#: rootfs/var/www/cgi-bin/cgi-env.sh:30 10.61 +#: rootfs/var/www/cgi-bin/cgi-env.sh:31 10.62 msgid "" 10.63 "Welcome to the SliTaz web server CGI Shell environment. Let the power of " 10.64 "SHell script meet the web! Here you can check HTTP info and try some " 10.65 @@ -76,7 +76,7 @@ 10.66 "Välkommen till Slitaz web server CGI Shell environment. Låt kraften av SHell " 10.67 "skript möta webben! Här kan du kolla HTTP info och pröva några kommandon." 10.68 10.69 -#: rootfs/var/www/cgi-bin/cgi-env.sh:34 10.70 +#: rootfs/var/www/cgi-bin/cgi-env.sh:35 10.71 msgid "" 10.72 "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-" 10.73 "like syntax such as: $(GET var)" 10.74 @@ -84,41 +84,40 @@ 10.75 "Att inkludera /usr/lib/slitaz/httphelper.sh i dina skript tillåter dig att " 10.76 "se PHP-aktiga syntax så som: $(GET var)" 10.77 10.78 -#: rootfs/var/www/cgi-bin/cgi-env.sh:37 10.79 +#: rootfs/var/www/cgi-bin/cgi-env.sh:38 10.80 msgid "QUERY_STRING test:" 10.81 msgstr "QUERY_STRING test:" 10.82 10.83 -#: rootfs/var/www/cgi-bin/cgi-env.sh:42 10.84 +#: rootfs/var/www/cgi-bin/cgi-env.sh:43 10.85 msgid "HTTP Info" 10.86 msgstr "HTTP info" 10.87 10.88 -#: rootfs/var/www/cgi-bin/cgi-env.sh:47 10.89 -msgid "HTTP Helper" 10.90 -msgstr "HTTP hjälpare" 10.91 - 10.92 -#: rootfs/var/www/cgi-bin/index.cgi:15 rootfs/var/www/cgi-bin/index.cgi:22 10.93 +#: rootfs/var/www/cgi-bin/index.cgi:12 10.94 #, sh-format 10.95 msgid "Index of $QUERY_STRING" 10.96 msgstr "Början av $QUERY_STRING" 10.97 10.98 -#: rootfs/usr/bin/man:15 10.99 +#: rootfs/usr/bin/man:14 10.100 msgid "Missing Retawq web browser..." 10.101 msgstr "Saknar webbläsaren Retawq..." 10.102 10.103 -#: rootfs/usr/bin/man:16 10.104 +#: rootfs/usr/bin/man:15 10.105 msgid "Please run: su -c 'tazpkg get-install retawq'" 10.106 msgstr "Var god kör: su -c 'tazpkg get-install retawq'" 10.107 10.108 -#: rootfs/usr/bin/man:28 10.109 +#: rootfs/usr/bin/man:27 10.110 msgid "<b>Usage:</b> man [section] command" 10.111 msgstr "<b>Användning:</b> man [sektion] kommando" 10.112 10.113 -#: rootfs/usr/bin/man:39 10.114 +#: rootfs/usr/bin/man:38 10.115 #, sh-format 10.116 msgid "in section $SECTION" 10.117 msgstr "i sektion $SECTION" 10.118 10.119 -#: rootfs/usr/bin/man:80 10.120 +#: rootfs/usr/bin/man:79 10.121 #, sh-format 10.122 msgid "No manual entry for $TOPIC$MSG" 10.123 msgstr "Inget manualinlägg för $TOPIC$MSG" 10.124 + 10.125 +#~ msgid "HTTP Helper" 10.126 +#~ msgstr "HTTP hjälpare"
11.1 --- a/rootfs/lib/libtaz.sh Thu Jul 25 03:54:11 2013 +0300 11.2 +++ b/rootfs/lib/libtaz.sh Fri Aug 09 15:38:43 2013 +0300 11.3 @@ -7,19 +7,17 @@ 11.4 # 11.5 # Documentation: man libtaz or /usr/share/doc/slitaz/libtaz.txt 11.6 # 11.7 -# Copyright (C) 2012 SliTaz GNU/Linux - BSD License 11.8 +# Copyright (C) 2012-2013 SliTaz GNU/Linux - BSD License 11.9 # 11.10 11.11 -# Internationalization. We can't export TEXTDOMAIN because this script 11.12 -# includes to other scripts with other TEXTDOMAIN exported 11.13 . /usr/bin/gettext.sh 11.14 11.15 -# xgettext (from Makefile) can't extract strings from above example: 11.16 -# gettext -d 'slitaz-base' 'Done' 11.17 -# so, I define own function (and add it as option to xgettext to Makefile) 11.18 -lgettext() { 11.19 - gettext -d 'slitaz-base' "$@" 11.20 -} 11.21 +# short names for common i18n functions (like 'echo' and 'echo -n') 11.22 +_() { eval_gettext "$@"; echo; } 11.23 +_n() { eval_gettext "$@"; } 11.24 + 11.25 +# internal i18n 11.26 +lgettext() { gettext -d 'slitaz-base' "$@"; } 11.27 11.28 # Internal variables. 11.29 okmsg="$(lgettext 'Done')"
12.1 --- a/rootfs/usr/bin/ldd Thu Jul 25 03:54:11 2013 +0300 12.2 +++ b/rootfs/usr/bin/ldd Fri Aug 09 15:38:43 2013 +0300 12.3 @@ -8,11 +8,9 @@ 12.4 file="$@" 12.5 for file do 12.6 case $file in 12.7 - */*) : 12.8 - ;; 12.9 - *) file=./$file 12.10 - ;; 12.11 - esac 12.12 + */*) : ;; 12.13 + *) file=./$file ;; 12.14 + esac 12.15 echo "$file:" | sed 's%^./%%' 12.16 LD_TRACE_LOADED_OBJECTS=1 /lib/ld*.so "$file" 12.17 echo ""
13.1 --- a/rootfs/usr/bin/man Thu Jul 25 03:54:11 2013 +0300 13.2 +++ b/rootfs/usr/bin/man Fri Aug 09 15:38:43 2013 +0300 13.3 @@ -6,14 +6,13 @@ 13.4 . /lib/libtaz.sh 13.5 13.6 # Internationalization. 13.7 -. /usr/bin/gettext.sh 13.8 TEXTDOMAIN='slitaz-base' 13.9 . /etc/locale.conf 13.10 export TEXTDOMAIN LANG 13.11 13.12 if [ ! -x /usr/bin/retawq ]; then 13.13 - echo; gettext "Missing Retawq web browser..."; echo 13.14 - gettext "Please run: su -c 'tazpkg get-install retawq'"; echo -e "\n" 13.15 + echo; _ "Missing Retawq web browser..." 13.16 + _ "Please run: su -c 'tazpkg get-install retawq'" 13.17 exit 0 13.18 fi 13.19 13.20 @@ -25,7 +24,7 @@ 13.21 13.22 case "$1" in 13.23 ''|-*) 13.24 - emsg "$(gettext '<b>Usage:</b> man [section] command')" 13.25 + emsg "$(_ '<b>Usage:</b> man [section] command')" 13.26 return ;; 13.27 esac 13.28 13.29 @@ -36,7 +35,7 @@ 13.30 if [ -n "$2" ]; then 13.31 SECTION=$1 13.32 MAN_SECTION=$1 13.33 - MSG=" $(eval_gettext 'in section $SECTION')" 13.34 + MSG=" $(_n 'in section $SECTION')" 13.35 shift 13.36 fi 13.37 13.38 @@ -77,7 +76,7 @@ 13.39 [ "x$SECTION" = "x" ] && SECTION="all" 13.40 (wget -O - "http://mirror.slitaz.org/man/$SECTION/$TOPIC.html" || \ 13.41 wget -O - "http://man.he.net/?topic=$TOPIC§ion=$SECTION") 2> /dev/null | \ 13.42 - awk "BEGIN { s=0; n=0 } /<PRE>/ { s=1 } { if (s) { print; n++} } /<\/PRE>/ { s=0 } END { if (n == 0) print \"$(eval_gettext 'No manual entry for $TOPIC$MSG')\" }" | \ 13.43 + awk "BEGIN { s=0; n=0 } /<PRE>/ { s=1 } { if (s) { print; n++} } /<\/PRE>/ { s=0 } END { if (n == 0) print \"$(_ 'No manual entry for $TOPIC$MSG')\" }" | \ 13.44 sed -e 's/<[^>]*>//g' -e 's/</</g' -e 's/>/>/g' -e 's/&/\&/g' | less -M 13.45 13.46 exit 0
14.1 --- a/rootfs/usr/lib/slitaz/httphelper.sh Thu Jul 25 03:54:11 2013 +0300 14.2 +++ b/rootfs/usr/lib/slitaz/httphelper.sh Fri Aug 09 15:38:43 2013 +0300 14.3 @@ -9,7 +9,7 @@ 14.4 # 14.5 # Documentation: man httphelper or /usr/share/doc/slitaz/httpelper.txt 14.6 # 14.7 -# Copyright (C) SliTaz 2012 - GNU gpl v2 14.8 +# Copyright (C) SliTaz 2012 - GNU GPL v2 14.9 # 14.10 14.11 alias urlencode='busybox httpd -e'
15.1 --- a/rootfs/usr/lib/slitaz/libpkg.sh Thu Jul 25 03:54:11 2013 +0300 15.2 +++ b/rootfs/usr/lib/slitaz/libpkg.sh Fri Aug 09 15:38:43 2013 +0300 15.3 @@ -30,11 +30,11 @@ 15.4 if wget -qs ${mirror%/}/ID; then 15.5 wget -q ${mirror%/}/ID 15.6 else 15.7 - gettext "Mirror is unreachable"; false 15.8 + _n "Mirror is unreachable"; false 15.9 status && return 1 15.10 fi 15.11 if [ "$(cat ID)" == "$(cat ID.bak)" ]; then 15.12 - gettext "Mirror is up-to-date"; true 15.13 + _n "Mirror is up-to-date"; true 15.14 status && return 1 15.15 fi 15.16 } 15.17 @@ -43,7 +43,7 @@ 15.18 source_receipt() { 15.19 local receipt=$1 15.20 if [ ! -f $receipt ]; then 15.21 - indent 28 $(eval_gettext 'Missing receipt: $receipt') 15.22 + indent 28 $(_ 'Missing receipt: $receipt') 15.23 continue 15.24 else 15.25 . $receipt 15.26 @@ -63,7 +63,7 @@ 15.27 check_valid_tazpkg() { 15.28 local file=$1 15.29 if ! is_valid_tazpkg $file; then 15.30 - eval_gettext "\$file is not a tazpkg. Exiting"; newline 15.31 + _ '$file is not a tazpkg. Exiting' 15.32 exit 1 15.33 fi 15.34 }
16.1 --- a/rootfs/usr/share/applications/httpd-cgi.desktop Thu Jul 25 03:54:11 2013 +0300 16.2 +++ b/rootfs/usr/share/applications/httpd-cgi.desktop Fri Aug 09 15:38:43 2013 +0300 16.3 @@ -1,10 +1,9 @@ 16.4 [Desktop Entry] 16.5 -Encoding=UTF-8 16.6 +Type=Application 16.7 Name=CGI SHell Environment 16.8 -Name[ru]=Переменные окружения CGI 16.9 Name[pt]=Ambiente SHell CGI 16.10 Name[pt_BR]=Ambiente SHell CGI 16.11 +Name[ru]=Переменные окружения CGI 16.12 Exec=browser http://localhost/cgi-bin/cgi-env.sh 16.13 Icon=text-x-script 16.14 -Type=Application 16.15 -Categories=Application;Development; 16.16 +Categories=Development;WebDevelopment;
17.1 --- a/rootfs/var/www/cgi-bin/cgi-env.sh Thu Jul 25 03:54:11 2013 +0300 17.2 +++ b/rootfs/var/www/cgi-bin/cgi-env.sh Fri Aug 09 15:38:43 2013 +0300 17.3 @@ -1,7 +1,7 @@ 17.4 #!/bin/sh 17.5 +. /lib/libtaz.sh 17.6 17.7 # Internationalization. 17.8 -. /usr/bin/gettext.sh 17.9 TEXTDOMAIN='slitaz-base' 17.10 . /etc/locale.conf 17.11 export TEXTDOMAIN LANG 17.12 @@ -9,45 +9,42 @@ 17.13 . /usr/lib/slitaz/httphelper.sh 17.14 header 17.15 17.16 +title=$(_ "CGI SHell Environment") 17.17 cat << EOT 17.18 <!DOCTYPE html> 17.19 <html xmlns="http://www.w3.org/1999/xhtml"> 17.20 <head> 17.21 <meta charset="utf-8" /> 17.22 - <title>$(gettext "CGI SHell Environment")</title> 17.23 + <title>$title</title> 17.24 <link rel="stylesheet" type="text/css" href="../style.css" /> 17.25 </head> 17.26 <body> 17.27 17.28 <!-- Header --> 17.29 <div id="header"> 17.30 - <h1>$(gettext "CGI SHell Environment")</h1> 17.31 + <h1>$title</h1> 17.32 </div> 17.33 17.34 <!-- Content --> 17.35 <div id="content"> 17.36 17.37 -<p>$(gettext "Welcome to the SliTaz web server CGI Shell environment. Let the \ 17.38 +<p>$(_ "Welcome to the SliTaz web server CGI Shell environment. Let the \ 17.39 power of SHell script meet the web! Here you can check HTTP info and try some \ 17.40 requests.")</p> 17.41 17.42 -<p>$(gettext "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you \ 17.43 +<p>$(_ "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you \ 17.44 use PHP-like syntax such as: \$(GET var)")</p> 17.45 17.46 -<p>$(gettext "QUERY_STRING test:") 17.47 +<p>$(_ "QUERY_STRING test:") 17.48 <a href="$SCRIPT_NAME?var=value">$SCRIPT_NAME?var=value</a> 17.49 </p> 17.50 17.51 17.52 -<h2>$(gettext "HTTP Info")</h2> 17.53 +<h2>$(_ "HTTP Info")</h2> 17.54 17.55 <pre>$(httpinfo)</pre> 17.56 17.57 17.58 -<h2>$(gettext "HTTP Helper")</h2> 17.59 - 17.60 -<pre>$(httphelper)</pre> 17.61 - 17.62 <!-- End content --> 17.63 </div> 17.64
18.1 --- a/rootfs/var/www/cgi-bin/index.cgi Thu Jul 25 03:54:11 2013 +0300 18.2 +++ b/rootfs/var/www/cgi-bin/index.cgi Fri Aug 09 15:38:43 2013 +0300 18.3 @@ -1,25 +1,29 @@ 18.4 #!/bin/sh 18.5 +. /lib/libtaz.sh 18.6 18.7 # Internationalization. 18.8 -. /usr/bin/gettext.sh 18.9 TEXTDOMAIN='slitaz-base' 18.10 . /etc/locale.conf 18.11 export TEXTDOMAIN LANG 18.12 18.13 -[ ! -d ..$QUERY_STRING ] && echo "HTTP/1.1 404 Not Found" || cat <<EOT 18.14 +if [ ! -d ..$QUERY_STRING ]; then 18.15 + echo "HTTP/1.1 404 Not Found"; 18.16 +else 18.17 + title=$(_ 'Index of $QUERY_STRING') 18.18 + cat << EOT 18.19 Content-type: text/html 18.20 18.21 <!DOCTYPE html> 18.22 <html xmlns="http://www.w3.org/1999/xhtml"> 18.23 <head> 18.24 - <title>$(eval_gettext "Index of \$QUERY_STRING")</title> 18.25 + <title>$title</title> 18.26 <meta charset="utf-8" /> 18.27 <link rel="stylesheet" type="text/css" href="/style.css" /> 18.28 </head> 18.29 18.30 <!-- Header --> 18.31 <div id="header"> 18.32 - <h1>$(eval_gettext "Index of \$QUERY_STRING")</h1> 18.33 + <h1>$title</h1> 18.34 </div> 18.35 18.36 <!-- Content --> 18.37 @@ -39,3 +43,4 @@ 18.38 </body> 18.39 </html> 18.40 EOT 18.41 +fi