slitaz-base-files rev 272
Update translations to use "%s" form instead of "$variable"
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Mon May 25 21:14:15 2015 +0300 (2015-05-25) |
| parents | 3f16616140ea |
| children | 205828e57e54 |
| files | po/el.po po/es.po po/fa.po po/fr.po po/pl.po po/pt_BR.po po/ru.po po/slitaz-base.pot po/sv.po po/zh_CN.po po/zh_TW.po rootfs/usr/bin/man rootfs/usr/lib/slitaz/libpkg.sh rootfs/var/www/cgi-bin/cgi-env.sh |
line diff
1.1 --- a/po/el.po Mon May 25 19:32:59 2015 +0300 1.2 +++ b/po/el.po Mon May 25 21:14:15 2015 +0300 1.3 @@ -55,14 +55,12 @@ 1.4 msgstr "Ο καθρέπτης (mirror) είναι ενημερωμένος" 1.5 1.6 #: rootfs/usr/lib/slitaz/libpkg.sh:46 1.7 -#, sh-format 1.8 -msgid "Missing receipt: $receipt" 1.9 -msgstr "Λείπει η απόδειξη: $receipt" 1.10 +msgid "Missing receipt: %s" 1.11 +msgstr "Λείπει η απόδειξη: %s" 1.12 1.13 #: rootfs/usr/lib/slitaz/libpkg.sh:66 1.14 -#, sh-format 1.15 -msgid "$file is not a tazpkg. Exiting" 1.16 -msgstr "To $file δεν είναι έγκυρο αρχείο tazpkg. Έξοδος" 1.17 +msgid "File %s is not a tazpkg. Exiting" 1.18 +msgstr "To %s δεν είναι έγκυρο αρχείο tazpkg. Έξοδος" 1.19 1.20 #: rootfs/var/www/cgi-bin/cgi-env.sh:12 1.21 msgid "CGI SHell Environment" 1.22 @@ -79,12 +77,10 @@ 1.23 "πληροφορίες για το HTTP και να δοκιμάστε κάποια αιτήματα." 1.24 1.25 #: rootfs/var/www/cgi-bin/cgi-env.sh:35 1.26 -msgid "" 1.27 -"Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-" 1.28 -"like syntax such as: $(GET var)" 1.29 +msgid "Including %s in your scripts lets you use PHP-like syntax such as: %s" 1.30 msgstr "" 1.31 -"Συμπεριλαμβάνοντας το /usr/lib/sliTaz/httphelper.sh στα script σας, σας " 1.32 -"επιτρέπει να χρησιμοποιήσετε παρόμοια σύνταξη με PHP, όπως: $(GET var)" 1.33 +"Συμπεριλαμβάνοντας το %s στα script σας, σας επιτρέπει να χρησιμοποιήσετε " 1.34 +"παρόμοια σύνταξη με PHP, όπως: %s" 1.35 1.36 #: rootfs/var/www/cgi-bin/cgi-env.sh:38 1.37 msgid "QUERY_STRING test:" 1.38 @@ -107,17 +103,15 @@ 1.39 msgstr "<b>Χρήση:</b> man [τμήμα] εντολή" 1.40 1.41 #: rootfs/usr/bin/man:40 1.42 -#, sh-format 1.43 -msgid "in section $SECTION" 1.44 -msgstr "στο τμήμα $SECTION" 1.45 +msgid "in section %s" 1.46 +msgstr "στο τμήμα %s" 1.47 1.48 #: rootfs/usr/bin/man:81 1.49 -#, sh-format 1.50 -msgid "No manual entry for $TOPIC$MSG" 1.51 -msgstr "Δεν υπάρχει καταχώρηση στο εγχειρίδιο για το $TOPIC$MSG" 1.52 +msgid "No manual entry for %s" 1.53 +msgstr "Δεν υπάρχει καταχώρηση στο εγχειρίδιο για το %s" 1.54 1.55 -#~ msgid "Index of $QUERY_STRING" 1.56 -#~ msgstr "Ευρετήριο του $QUERY_STRING" 1.57 +#~ msgid "Index of %s" 1.58 +#~ msgstr "Ευρετήριο του %s" 1.59 1.60 #~ msgid "HTTP Helper" 1.61 #~ msgstr "Βοηθός HTTP"
2.1 --- a/po/es.po Mon May 25 19:32:59 2015 +0300 2.2 +++ b/po/es.po Mon May 25 21:14:15 2015 +0300 2.3 @@ -53,14 +53,13 @@ 2.4 msgstr "Mirror está al día" 2.5 2.6 #: rootfs/usr/lib/slitaz/libpkg.sh:46 2.7 -#, sh-format 2.8 -msgid "Missing receipt: $receipt" 2.9 -msgstr "Falta el recibo: $receipt" 2.10 +msgid "Missing receipt: %s" 2.11 +msgstr "Falta el recibo: %s" 2.12 2.13 #: rootfs/usr/lib/slitaz/libpkg.sh:66 2.14 #, sh-format 2.15 -msgid "$file is not a tazpkg. Exiting" 2.16 -msgstr "El archivo no es un tazpkg. Salir" 2.17 +msgid "File %s is not a tazpkg. Exiting" 2.18 +msgstr "El archivo %s no es un tazpkg. Salir" 2.19 2.20 #: rootfs/var/www/cgi-bin/cgi-env.sh:12 2.21 msgid "CGI SHell Environment" 2.22 @@ -77,12 +76,10 @@ 2.23 "y probar algunas peticiones." 2.24 2.25 #: rootfs/var/www/cgi-bin/cgi-env.sh:35 2.26 -msgid "" 2.27 -"Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-" 2.28 -"like syntax such as: $(GET var)" 2.29 +msgid "Including %s in your scripts lets you use PHP-like syntax such as: %s" 2.30 msgstr "" 2.31 -"La inclusión de /usr/lib/slitaz/httphelper.sh en las secuencias de comandos " 2.32 -"le permite utilizar PHP-como la sintaxis: $(GET var)" 2.33 +"La inclusión de %s en las secuencias de comandos le permite utilizar PHP-" 2.34 +"como la sintaxis: %s" 2.35 2.36 #: rootfs/var/www/cgi-bin/cgi-env.sh:38 2.37 msgid "QUERY_STRING test:" 2.38 @@ -97,22 +94,20 @@ 2.39 msgstr "Falta el navegador web Retawq" 2.40 2.41 #: rootfs/usr/bin/man:16 2.42 -msgid "Please run: su -c 'tazpkg get-install retawq'" 2.43 -msgstr "Por favor ejecute: su -c 'tazpkg get-install retawq'" 2.44 +msgid "Please run: %s" 2.45 +msgstr "Por favor ejecute: %s" 2.46 2.47 #: rootfs/usr/bin/man:29 2.48 msgid "<b>Usage:</b> man [section] command" 2.49 msgstr "<b>Use:</b> man [seccion] comando" 2.50 2.51 #: rootfs/usr/bin/man:40 2.52 -#, sh-format 2.53 -msgid "in section $SECTION" 2.54 -msgstr "en la sección $SECTION" 2.55 +msgid "in section %s" 2.56 +msgstr "en la sección %s" 2.57 2.58 #: rootfs/usr/bin/man:81 2.59 -#, sh-format 2.60 -msgid "No manual entry for $TOPIC$MSG" 2.61 -msgstr "No hay entrada manual para $TOPIC$MSG" 2.62 +msgid "No manual entry for %s" 2.63 +msgstr "No hay entrada manual para %s" 2.64 2.65 -#~ msgid "Index of $QUERY_STRING" 2.66 -#~ msgstr "Indice de $QUERY_STRING" 2.67 +#~ msgid "Index of %s" 2.68 +#~ msgstr "Indice de %s"
3.1 --- a/po/fa.po Mon May 25 19:32:59 2015 +0300 3.2 +++ b/po/fa.po Mon May 25 21:14:15 2015 +0300 3.3 @@ -56,14 +56,12 @@ 3.4 msgstr "آینه به روز است" 3.5 3.6 #: rootfs/usr/lib/slitaz/libpkg.sh:46 3.7 -#, sh-format 3.8 -msgid "Missing receipt: $receipt" 3.9 -msgstr "$receipt :دریافتی گمشده" 3.10 +msgid "Missing receipt: %s" 3.11 +msgstr "%s :دریافتی گمشده" 3.12 3.13 #: rootfs/usr/lib/slitaz/libpkg.sh:66 3.14 -#, sh-format 3.15 -msgid "$file is not a tazpkg. Exiting" 3.16 -msgstr "...نیست.در حال خروج tazpkg یک فایل $file" 3.17 +msgid "File %s is not a tazpkg. Exiting" 3.18 +msgstr "...نیست.در حال خروج tazpkg یک فایل %s" 3.19 3.20 #: rootfs/var/www/cgi-bin/cgi-env.sh:12 3.21 msgid "CGI SHell Environment" 3.22 @@ -80,12 +78,10 @@ 3.23 "به محیط پوسته ی" 3.24 3.25 #: rootfs/var/www/cgi-bin/cgi-env.sh:35 3.26 -msgid "" 3.27 -"Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-" 3.28 -"like syntax such as: $(GET var)" 3.29 +msgid "Including %s in your scripts lets you use PHP-like syntax such as: %s" 3.30 msgstr "" 3.31 -"$(GET var) مانند استفاده کنید.مانند PHP در اسکریپت شما به شما این امکان را " 3.32 -"میدهد که از سینتکس های /usr/lib/slitaz/httphelper.sh قرار دادن" 3.33 +"%s مانند استفاده کنید.مانند PHP در اسکریپت شما به شما این امکان را " 3.34 +"میدهد که از سینتکس های %s قرار دادن" 3.35 3.36 #: rootfs/var/www/cgi-bin/cgi-env.sh:38 3.37 msgid "QUERY_STRING test:" 3.38 @@ -100,19 +96,17 @@ 3.39 msgstr "...گم شده است retawq مرورگر" 3.40 3.41 #: rootfs/usr/bin/man:16 3.42 -msgid "Please run: su -c 'tazpkg get-install retawq'" 3.43 -msgstr "su -c 'tazpkg get-install retawq' :لطفا این فرمان را اجرا کنید " 3.44 +msgid "Please run: %s" 3.45 +msgstr "%s :لطفا این فرمان را اجرا کنید " 3.46 3.47 #: rootfs/usr/bin/man:29 3.48 msgid "<b>Usage:</b> man [section] command" 3.49 msgstr "<b>:طریقه استفاده</b> man [section] command" 3.50 3.51 #: rootfs/usr/bin/man:40 3.52 -#, sh-format 3.53 -msgid "in section $SECTION" 3.54 -msgstr "$SECTION در قسمت" 3.55 +msgid "in section %s" 3.56 +msgstr "%s در قسمت" 3.57 3.58 #: rootfs/usr/bin/man:81 3.59 -#, sh-format 3.60 -msgid "No manual entry for $TOPIC$MSG" 3.61 -msgstr "$TOPIC$MSG ورودی دستی موجود نیست برای" 3.62 +msgid "No manual entry for %s" 3.63 +msgstr "%s ورودی دستی موجود نیست برای"
4.1 --- a/po/fr.po Mon May 25 19:32:59 2015 +0300 4.2 +++ b/po/fr.po Mon May 25 21:14:15 2015 +0300 4.3 @@ -54,14 +54,12 @@ 4.4 msgstr "Le miroir est à jour" 4.5 4.6 #: rootfs/usr/lib/slitaz/libpkg.sh:46 4.7 -#, sh-format 4.8 -msgid "Missing receipt: $receipt" 4.9 -msgstr "Recette manquante: $receipt" 4.10 +msgid "Missing receipt: %s" 4.11 +msgstr "Recette manquante: %s" 4.12 4.13 #: rootfs/usr/lib/slitaz/libpkg.sh:66 4.14 -#, sh-format 4.15 -msgid "$file is not a tazpkg. Exiting" 4.16 -msgstr "$file n'est pas un paquet tazpkg. Arrêt" 4.17 +msgid "File %s is not a tazpkg. Exiting" 4.18 +msgstr "%s n'est pas un paquet tazpkg. Arrêt" 4.19 4.20 #: rootfs/var/www/cgi-bin/cgi-env.sh:12 4.21 msgid "CGI SHell Environment" 4.22 @@ -78,12 +76,10 @@ 4.23 "essayer certaines demandes." 4.24 4.25 #: rootfs/var/www/cgi-bin/cgi-env.sh:35 4.26 -msgid "" 4.27 -"Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-" 4.28 -"like syntax such as: $(GET var)" 4.29 +msgid "Including %s in your scripts lets you use PHP-like syntax such as: %s" 4.30 msgstr "" 4.31 -"Vous devez inclure '/usr/lib/slitaz/httphelper.sh' dans vos scripts pour " 4.32 -"utiliser la synthaxe PHP comme par exemple: $(GET var)" 4.33 +"Vous devez inclure '%s' dans vos scripts pour utiliser la synthaxe PHP comme " 4.34 +"par exemple: %s" 4.35 4.36 #: rootfs/var/www/cgi-bin/cgi-env.sh:38 4.37 msgid "QUERY_STRING test:" 4.38 @@ -98,27 +94,23 @@ 4.39 msgstr "Navigateur web Retawq manquant..." 4.40 4.41 #: rootfs/usr/bin/man:16 4.42 -msgid "Please run: su -c 'tazpkg get-install retawq'" 4.43 -msgstr "" 4.44 -"Vous pouvez l'installer en exécutant la commande: su -c 'tazpkg get-install " 4.45 -"retawq'" 4.46 +msgid "Please run: %s" 4.47 +msgstr "Vous pouvez l'installer en exécutant la commande: %s" 4.48 4.49 #: rootfs/usr/bin/man:29 4.50 msgid "<b>Usage:</b> man [section] command" 4.51 msgstr "<b>Usage:</b> man [section] commande" 4.52 4.53 #: rootfs/usr/bin/man:40 4.54 -#, sh-format 4.55 -msgid "in section $SECTION" 4.56 -msgstr "dans cette section $SECTION" 4.57 +msgid "in section %s" 4.58 +msgstr "dans cette section %s" 4.59 4.60 #: rootfs/usr/bin/man:81 4.61 -#, sh-format 4.62 -msgid "No manual entry for $TOPIC$MSG" 4.63 -msgstr "Pas de manuel disponible pour $TOPIC$MSG" 4.64 +msgid "No manual entry for %s" 4.65 +msgstr "Pas de manuel disponible pour %s" 4.66 4.67 -#~ msgid "Index of $QUERY_STRING" 4.68 -#~ msgstr "Racine de $QUERY_STRING" 4.69 +#~ msgid "Index of %s" 4.70 +#~ msgstr "Racine de %s" 4.71 4.72 #~ msgid "HTTP Helper" 4.73 #~ msgstr "Helper HTTP"
5.1 --- a/po/pl.po Mon May 25 19:32:59 2015 +0300 5.2 +++ b/po/pl.po Mon May 25 21:14:15 2015 +0300 5.3 @@ -58,14 +58,12 @@ 5.4 msgstr "Serwer lustrzany jest aktualny" 5.5 5.6 #: rootfs/usr/lib/slitaz/libpkg.sh:46 5.7 -#, sh-format 5.8 -msgid "Missing receipt: $receipt" 5.9 -msgstr "Brakująca recepta: $receipt" 5.10 +msgid "Missing receipt: %s" 5.11 +msgstr "Brakująca recepta: %s" 5.12 5.13 #: rootfs/usr/lib/slitaz/libpkg.sh:66 5.14 -#, sh-format 5.15 -msgid "$file is not a tazpkg. Exiting" 5.16 -msgstr "$file nie jest plikiem tazpkg. Kończenie pracy" 5.17 +msgid "File %s is not a tazpkg. Exiting" 5.18 +msgstr "%s nie jest plikiem tazpkg. Kończenie pracy" 5.19 5.20 #: rootfs/var/www/cgi-bin/cgi-env.sh:12 5.21 msgid "CGI SHell Environment" 5.22 @@ -82,12 +80,10 @@ 5.23 "zapytań." 5.24 5.25 #: rootfs/var/www/cgi-bin/cgi-env.sh:35 5.26 -msgid "" 5.27 -"Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-" 5.28 -"like syntax such as: $(GET var)" 5.29 +msgid "Including %s in your scripts lets you use PHP-like syntax such as: %s" 5.30 msgstr "" 5.31 -"Dołączanie /usr/lib/slitaz/httphelper.sh do twoich skryptów pozwoli używać " 5.32 -"składnie podobną do PHP, taką jak: $(GET var)" 5.33 +"Dołączanie %s do twoich skryptów pozwoli używać składnie podobną do PHP, " 5.34 +"taką jak: %s" 5.35 5.36 #: rootfs/var/www/cgi-bin/cgi-env.sh:38 5.37 msgid "QUERY_STRING test:" 5.38 @@ -102,25 +98,23 @@ 5.39 msgstr "Brakuje przeglądarki internetowej Retawq..." 5.40 5.41 #: rootfs/usr/bin/man:16 5.42 -msgid "Please run: su -c 'tazpkg get-install retawq'" 5.43 -msgstr "Proszę uruchomić: su -c 'tazpkg get-install retawq'" 5.44 +msgid "Please run: %s" 5.45 +msgstr "Proszę uruchomić: %s" 5.46 5.47 #: rootfs/usr/bin/man:29 5.48 msgid "<b>Usage:</b> man [section] command" 5.49 msgstr "<b>Użycie:</b> man [section] command" 5.50 5.51 #: rootfs/usr/bin/man:40 5.52 -#, sh-format 5.53 -msgid "in section $SECTION" 5.54 -msgstr "w sekcji $SECTION" 5.55 +msgid "in section %s" 5.56 +msgstr "w sekcji %s" 5.57 5.58 #: rootfs/usr/bin/man:81 5.59 -#, sh-format 5.60 -msgid "No manual entry for $TOPIC$MSG" 5.61 -msgstr "Brak ręcznego wpisu dla $TOPIC$MSG" 5.62 +msgid "No manual entry for %s" 5.63 +msgstr "Brak ręcznego wpisu dla %s" 5.64 5.65 -#~ msgid "Index of $QUERY_STRING" 5.66 -#~ msgstr "Indeks $QUERY_STRING" 5.67 +#~ msgid "Index of %s" 5.68 +#~ msgstr "Indeks %s" 5.69 5.70 #~ msgid "HTTP Helper" 5.71 #~ msgstr "HTTP Helper"
6.1 --- a/po/pt_BR.po Mon May 25 19:32:59 2015 +0300 6.2 +++ b/po/pt_BR.po Mon May 25 21:14:15 2015 +0300 6.3 @@ -54,14 +54,12 @@ 6.4 msgstr "Mirror está atualizado" 6.5 6.6 #: rootfs/usr/lib/slitaz/libpkg.sh:46 6.7 -#, sh-format 6.8 -msgid "Missing receipt: $receipt" 6.9 -msgstr "Arquivo receipt não encontrado: $receipt" 6.10 +msgid "Missing receipt: %s" 6.11 +msgstr "Arquivo receipt não encontrado: %s" 6.12 6.13 #: rootfs/usr/lib/slitaz/libpkg.sh:66 6.14 -#, sh-format 6.15 -msgid "$file is not a tazpkg. Exiting" 6.16 -msgstr "$file não é um tazpkg. Abortando" 6.17 +msgid "File %s is not a tazpkg. Exiting" 6.18 +msgstr "%s não é um tazpkg. Abortando" 6.19 6.20 #: rootfs/var/www/cgi-bin/cgi-env.sh:12 6.21 msgid "CGI SHell Environment" 6.22 @@ -78,12 +76,10 @@ 6.23 "algumas requisições." 6.24 6.25 #: rootfs/var/www/cgi-bin/cgi-env.sh:35 6.26 -msgid "" 6.27 -"Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-" 6.28 -"like syntax such as: $(GET var)" 6.29 +msgid "Including %s in your scripts lets you use PHP-like syntax such as: %s" 6.30 msgstr "" 6.31 -"Incluindo o arquivo /usr/lib/slitaz/httphelper.sh em seus scripts permite a " 6.32 -"você utilizar sintaxe PHP como: $(GET var)" 6.33 +"Incluindo o arquivo %s em seus scripts permite a você utilizar sintaxe PHP " 6.34 +"como: %s" 6.35 6.36 #: rootfs/var/www/cgi-bin/cgi-env.sh:38 6.37 msgid "QUERY_STRING test:" 6.38 @@ -98,25 +94,23 @@ 6.39 msgstr "Navegador Retawq não instalado..." 6.40 6.41 #: rootfs/usr/bin/man:16 6.42 -msgid "Please run: su -c 'tazpkg get-install retawq'" 6.43 -msgstr "Por favor execute: su -c 'tazpkg get-install retawq'" 6.44 +msgid "Please run: %s" 6.45 +msgstr "Por favor execute: %s" 6.46 6.47 #: rootfs/usr/bin/man:29 6.48 msgid "<b>Usage:</b> man [section] command" 6.49 msgstr "<b>Utilização:</b> man [seção] comando" 6.50 6.51 #: rootfs/usr/bin/man:40 6.52 -#, sh-format 6.53 -msgid "in section $SECTION" 6.54 -msgstr "Na seção $SECTION" 6.55 +msgid "in section %s" 6.56 +msgstr "Na seção %s" 6.57 6.58 #: rootfs/usr/bin/man:81 6.59 -#, sh-format 6.60 -msgid "No manual entry for $TOPIC$MSG" 6.61 -msgstr "Nenhuma entrada para $TOPIC$MSG" 6.62 +msgid "No manual entry for %s" 6.63 +msgstr "Nenhuma entrada para %s" 6.64 6.65 -#~ msgid "Index of $QUERY_STRING" 6.66 -#~ msgstr "Índice do $QUERY_STRING" 6.67 +#~ msgid "Index of %s" 6.68 +#~ msgstr "Índice do %s" 6.69 6.70 #~ msgid "HTTP Helper" 6.71 #~ msgstr "Auxiliar HTTP"
7.1 --- a/po/ru.po Mon May 25 19:32:59 2015 +0300 7.2 +++ b/po/ru.po Mon May 25 21:14:15 2015 +0300 7.3 @@ -56,26 +56,31 @@ 7.4 msgstr "Репозиторий в актуальном состоянии" 7.5 7.6 #: rootfs/usr/lib/slitaz/libpkg.sh:46 7.7 -#, sh-format 7.8 -msgid "Missing receipt: $receipt" 7.9 -msgstr "Отсутствует рецепт: $receipt" 7.10 +msgid "Missing receipt: %s" 7.11 +msgstr "Отсутствует рецепт: %s" 7.12 7.13 #: rootfs/usr/lib/slitaz/libpkg.sh:66 7.14 -#, sh-format 7.15 -msgid "$file is not a tazpkg. Exiting" 7.16 -msgstr "Файл $file не является пакетом tazpkg. Выход" 7.17 +msgid "File %s is not a tazpkg. Exiting" 7.18 +msgstr "Файл %s не является пакетом tazpkg. Выход" 7.19 7.20 #: rootfs/var/www/cgi-bin/cgi-env.sh:12 7.21 msgid "CGI SHell Environment" 7.22 msgstr "Переменные окружения CGI" 7.23 7.24 #: rootfs/var/www/cgi-bin/cgi-env.sh:31 7.25 -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." 7.26 -msgstr "Добро пожаловать на сервер, работающий на SliTaz. Пусть мощь скриптов послужит вебу. Здесь вы можете проверить информацию HTTP и попробовать сделать некоторые запросы." 7.27 +msgid "" 7.28 +"Welcome to the SliTaz web server CGI Shell environment. Let the power of " 7.29 +"SHell script meet the web! Here you can check HTTP info and try some " 7.30 +"requests." 7.31 +msgstr "" 7.32 +"Добро пожаловать на сервер, работающий на SliTaz. Пусть мощь скриптов " 7.33 +"послужит вебу. Здесь вы можете проверить информацию HTTP и попробовать " 7.34 +"сделать некоторые запросы." 7.35 7.36 #: rootfs/var/www/cgi-bin/cgi-env.sh:35 7.37 -msgid "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-like syntax such as: $(GET var)" 7.38 -msgstr "Включив /usr/lib/slitaz/httphelper.sh в ваши скрипты, вы сможете использовать PHP-подобный синтаксис: $(GET var)" 7.39 +msgid "Including %s in your scripts lets you use PHP-like syntax such as: %s" 7.40 +msgstr "" 7.41 +"Включив %s в ваши скрипты, вы сможете использовать PHP-подобный синтаксис: %s" 7.42 7.43 #: rootfs/var/www/cgi-bin/cgi-env.sh:38 7.44 msgid "QUERY_STRING test:" 7.45 @@ -90,25 +95,23 @@ 7.46 msgstr "Отсутствует браузер Retawq…" 7.47 7.48 #: rootfs/usr/bin/man:16 7.49 -msgid "Please run: su -c 'tazpkg get-install retawq'" 7.50 -msgstr "Для его установки выполните: su -c 'tazpkg -gi retawq'" 7.51 +msgid "Please run: %s" 7.52 +msgstr "Для его установки выполните: %s" 7.53 7.54 #: rootfs/usr/bin/man:29 7.55 msgid "<b>Usage:</b> man [section] command" 7.56 msgstr "<b>Использование:</b> man [раздел] команда" 7.57 7.58 #: rootfs/usr/bin/man:40 7.59 -#, sh-format 7.60 -msgid "in section $SECTION" 7.61 -msgstr "в разделе $SECTION" 7.62 +msgid "in section %s" 7.63 +msgstr "в разделе %s" 7.64 7.65 #: rootfs/usr/bin/man:81 7.66 -#, sh-format 7.67 -msgid "No manual entry for $TOPIC$MSG" 7.68 -msgstr "Руководство по $TOPIC$MSG отсутствует" 7.69 +msgid "No manual entry for %s" 7.70 +msgstr "Руководство по %s отсутствует" 7.71 7.72 -#~ msgid "Index of $QUERY_STRING" 7.73 -#~ msgstr "Содержимое папки $QUERY_STRING" 7.74 +#~ msgid "Index of %s" 7.75 +#~ msgstr "Содержимое папки %s" 7.76 7.77 #~ msgid "HTTP Helper" 7.78 #~ msgstr "Помощник HTTP"
8.1 --- a/po/slitaz-base.pot Mon May 25 19:32:59 2015 +0300 8.2 +++ b/po/slitaz-base.pot Mon May 25 21:14:15 2015 +0300 8.3 @@ -54,13 +54,11 @@ 8.4 msgstr "" 8.5 8.6 #: rootfs/usr/lib/slitaz/libpkg.sh:46 8.7 -#, sh-format 8.8 -msgid "Missing receipt: $receipt" 8.9 +msgid "Missing receipt: %s" 8.10 msgstr "" 8.11 8.12 #: rootfs/usr/lib/slitaz/libpkg.sh:66 8.13 -#, sh-format 8.14 -msgid "$file is not a tazpkg. Exiting" 8.15 +msgid "File %s is not a tazpkg. Exiting" 8.16 msgstr "" 8.17 8.18 #: rootfs/var/www/cgi-bin/cgi-env.sh:12 8.19 @@ -75,9 +73,7 @@ 8.20 msgstr "" 8.21 8.22 #: rootfs/var/www/cgi-bin/cgi-env.sh:35 8.23 -msgid "" 8.24 -"Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-" 8.25 -"like syntax such as: $(GET var)" 8.26 +msgid "Including %s in your scripts lets you use PHP-like syntax such as: %s" 8.27 msgstr "" 8.28 8.29 #: rootfs/var/www/cgi-bin/cgi-env.sh:38 8.30 @@ -93,7 +89,7 @@ 8.31 msgstr "" 8.32 8.33 #: rootfs/usr/bin/man:16 8.34 -msgid "Please run: su -c 'tazpkg get-install retawq'" 8.35 +msgid "Please run: %s" 8.36 msgstr "" 8.37 8.38 #: rootfs/usr/bin/man:29 8.39 @@ -101,11 +97,9 @@ 8.40 msgstr "" 8.41 8.42 #: rootfs/usr/bin/man:40 8.43 -#, sh-format 8.44 -msgid "in section $SECTION" 8.45 +msgid "in section %s" 8.46 msgstr "" 8.47 8.48 #: rootfs/usr/bin/man:81 8.49 -#, sh-format 8.50 -msgid "No manual entry for $TOPIC$MSG" 8.51 +msgid "No manual entry for %s" 8.52 msgstr ""
9.1 --- a/po/sv.po Mon May 25 19:32:59 2015 +0300 9.2 +++ b/po/sv.po Mon May 25 21:14:15 2015 +0300 9.3 @@ -54,14 +54,12 @@ 9.4 msgstr "Spegeln är up-to-date" 9.5 9.6 #: rootfs/usr/lib/slitaz/libpkg.sh:46 9.7 -#, sh-format 9.8 -msgid "Missing receipt: $receipt" 9.9 -msgstr "Recept saknas: $receipt" 9.10 +msgid "Missing receipt: %s" 9.11 +msgstr "Recept saknas: %s" 9.12 9.13 #: rootfs/usr/lib/slitaz/libpkg.sh:66 9.14 -#, sh-format 9.15 -msgid "$file is not a tazpkg. Exiting" 9.16 -msgstr "$file är inte en taxpkg. Avslutar." 9.17 +msgid "File %s is not a tazpkg. Exiting" 9.18 +msgstr "%s är inte en taxpkg. Avslutar." 9.19 9.20 #: rootfs/var/www/cgi-bin/cgi-env.sh:12 9.21 msgid "CGI SHell Environment" 9.22 @@ -77,12 +75,10 @@ 9.23 "skript möta webben! Här kan du kolla HTTP info och pröva några kommandon." 9.24 9.25 #: rootfs/var/www/cgi-bin/cgi-env.sh:35 9.26 -msgid "" 9.27 -"Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-" 9.28 -"like syntax such as: $(GET var)" 9.29 +msgid "Including %s in your scripts lets you use PHP-like syntax such as: %s" 9.30 msgstr "" 9.31 -"Att inkludera /usr/lib/slitaz/httphelper.sh i dina skript tillåter dig att " 9.32 -"se PHP-aktiga syntax så som: $(GET var)" 9.33 +"Att inkludera %s i dina skript tillåter dig att se PHP-aktiga syntax så som: " 9.34 +"%s" 9.35 9.36 #: rootfs/var/www/cgi-bin/cgi-env.sh:38 9.37 msgid "QUERY_STRING test:" 9.38 @@ -97,25 +93,23 @@ 9.39 msgstr "Saknar webbläsaren Retawq..." 9.40 9.41 #: rootfs/usr/bin/man:16 9.42 -msgid "Please run: su -c 'tazpkg get-install retawq'" 9.43 -msgstr "Var god kör: su -c 'tazpkg get-install retawq'" 9.44 +msgid "Please run: %s" 9.45 +msgstr "Var god kör: %s" 9.46 9.47 #: rootfs/usr/bin/man:29 9.48 msgid "<b>Usage:</b> man [section] command" 9.49 msgstr "<b>Användning:</b> man [sektion] kommando" 9.50 9.51 #: rootfs/usr/bin/man:40 9.52 -#, sh-format 9.53 -msgid "in section $SECTION" 9.54 -msgstr "i sektion $SECTION" 9.55 +msgid "in section %s" 9.56 +msgstr "i sektion %s" 9.57 9.58 #: rootfs/usr/bin/man:81 9.59 -#, sh-format 9.60 -msgid "No manual entry for $TOPIC$MSG" 9.61 -msgstr "Inget manualinlägg för $TOPIC$MSG" 9.62 +msgid "No manual entry for %s" 9.63 +msgstr "Inget manualinlägg för %s" 9.64 9.65 -#~ msgid "Index of $QUERY_STRING" 9.66 -#~ msgstr "Början av $QUERY_STRING" 9.67 +#~ msgid "Index of %s" 9.68 +#~ msgstr "Början av %s" 9.69 9.70 #~ msgid "HTTP Helper" 9.71 #~ msgstr "HTTP hjälpare"
10.1 --- a/po/zh_CN.po Mon May 25 19:32:59 2015 +0300 10.2 +++ b/po/zh_CN.po Mon May 25 21:14:15 2015 +0300 10.3 @@ -55,14 +55,12 @@ 10.4 msgstr "镜像已是最新版本" 10.5 10.6 #: rootfs/usr/lib/slitaz/libpkg.sh:46 10.7 -#, sh-format 10.8 -msgid "Missing receipt: $receipt" 10.9 -msgstr "缺少 manquante: $receipt" 10.10 +msgid "Missing receipt: %s" 10.11 +msgstr "缺少 manquante: %s" 10.12 10.13 #: rootfs/usr/lib/slitaz/libpkg.sh:66 10.14 -#, sh-format 10.15 -msgid "$file is not a tazpkg. Exiting" 10.16 -msgstr "$file 并非 tazpkg 格式. 终止" 10.17 +msgid "File %s is not a tazpkg. Exiting" 10.18 +msgstr "%s 并非 tazpkg 格式. 终止" 10.19 10.20 #: rootfs/var/www/cgi-bin/cgi-env.sh:12 10.21 msgid "CGI SHell Environment" 10.22 @@ -78,12 +76,8 @@ 10.23 "这, 你可以查看HTTP信息和尝试请求。" 10.24 10.25 #: rootfs/var/www/cgi-bin/cgi-env.sh:35 10.26 -msgid "" 10.27 -"Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-" 10.28 -"like syntax such as: $(GET var)" 10.29 -msgstr "" 10.30 -"在你的脚本加入'/usr/lib/slitaz/httphelper.sh' 会令你可以使用像PHP的语法，例" 10.31 -"如: $(GET var)" 10.32 +msgid "Including %s in your scripts lets you use PHP-like syntax such as: %s" 10.33 +msgstr "在你的脚本加入'%s' 会令你可以使用像PHP的语法，例如: %s" 10.34 10.35 #: rootfs/var/www/cgi-bin/cgi-env.sh:38 10.36 msgid "QUERY_STRING test:" 10.37 @@ -98,19 +92,17 @@ 10.38 msgstr "缺少 Retawq 网页浏览器..." 10.39 10.40 #: rootfs/usr/bin/man:16 10.41 -msgid "Please run: su -c 'tazpkg get-install retawq'" 10.42 -msgstr "请运行: su -c 'tazpkg get-install retawq" 10.43 +msgid "Please run: %s" 10.44 +msgstr "请运行: %s" 10.45 10.46 #: rootfs/usr/bin/man:29 10.47 msgid "<b>Usage:</b> man [section] command" 10.48 msgstr "<b>用法:</b> man [章节] 命令" 10.49 10.50 #: rootfs/usr/bin/man:40 10.51 -#, sh-format 10.52 -msgid "in section $SECTION" 10.53 -msgstr "在 $SECTION 章节內" 10.54 +msgid "in section %s" 10.55 +msgstr "在 %s 章节內" 10.56 10.57 #: rootfs/usr/bin/man:81 10.58 -#, sh-format 10.59 -msgid "No manual entry for $TOPIC$MSG" 10.60 -msgstr "沒有 $TOPIC$MSG 项" 10.61 +msgid "No manual entry for %s" 10.62 +msgstr "沒有 %s 项"
11.1 --- a/po/zh_TW.po Mon May 25 19:32:59 2015 +0300 11.2 +++ b/po/zh_TW.po Mon May 25 21:14:15 2015 +0300 11.3 @@ -53,14 +53,12 @@ 11.4 msgstr "鏡像已是最新版本" 11.5 11.6 #: rootfs/usr/lib/slitaz/libpkg.sh:46 11.7 -#, sh-format 11.8 -msgid "Missing receipt: $receipt" 11.9 -msgstr "缺少 manquante: $receipt" 11.10 +msgid "Missing receipt: %s" 11.11 +msgstr "缺少 manquante: %s" 11.12 11.13 #: rootfs/usr/lib/slitaz/libpkg.sh:66 11.14 -#, sh-format 11.15 -msgid "$file is not a tazpkg. Exiting" 11.16 -msgstr "$file 並非 tazpkg 格式. 終止" 11.17 +msgid "File %s is not a tazpkg. Exiting" 11.18 +msgstr "%s 並非 tazpkg 格式. 終止" 11.19 11.20 #: rootfs/var/www/cgi-bin/cgi-env.sh:12 11.21 msgid "CGI SHell Environment" 11.22 @@ -77,12 +75,8 @@ 11.23 "請求。" 11.24 11.25 #: rootfs/var/www/cgi-bin/cgi-env.sh:35 11.26 -msgid "" 11.27 -"Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-" 11.28 -"like syntax such as: $(GET var)" 11.29 -msgstr "" 11.30 -"在你的腳本加入 '/usr/lib/slitaz/httphelper.sh' 會令你可以 " 11.31 -"使用像PHP的語法，例如: $(GET var)" 11.32 +msgid "Including %s in your scripts lets you use PHP-like syntax such as: %s" 11.33 +msgstr "在你的腳本加入 '%s' 會令你可以 使用像PHP的語法，例如: %s" 11.34 11.35 #: rootfs/var/www/cgi-bin/cgi-env.sh:38 11.36 msgid "QUERY_STRING test:" 11.37 @@ -97,20 +91,17 @@ 11.38 msgstr "缺少 Retawq 網頁瀏覽器..." 11.39 11.40 #: rootfs/usr/bin/man:16 11.41 -msgid "Please run: su -c 'tazpkg get-install retawq'" 11.42 -msgstr "" 11.43 -"請運行: su -c 'tazpkg get-install retawq" 11.44 +msgid "Please run: %s" 11.45 +msgstr "請運行: %s" 11.46 11.47 #: rootfs/usr/bin/man:29 11.48 msgid "<b>Usage:</b> man [section] command" 11.49 msgstr "<b>用法:</b> man [章節] 命令" 11.50 11.51 #: rootfs/usr/bin/man:40 11.52 -#, sh-format 11.53 -msgid "in section $SECTION" 11.54 -msgstr "在 $SECTION 章節內" 11.55 +msgid "in section %s" 11.56 +msgstr "在 %s 章節內" 11.57 11.58 #: rootfs/usr/bin/man:81 11.59 -#, sh-format 11.60 -msgid "No manual entry for $TOPIC$MSG" 11.61 -msgstr "沒有 $TOPIC$MSG 項" 11.62 +msgid "No manual entry for %s" 11.63 +msgstr "沒有 %s 項"
12.1 --- a/rootfs/usr/bin/man Mon May 25 19:32:59 2015 +0300 12.2 +++ b/rootfs/usr/bin/man Mon May 25 21:14:15 2015 +0300 12.3 @@ -1,7 +1,7 @@ 12.4 #!/bin/sh 12.5 # 12.6 # Tiny man fake using online manuals. 12.7 -# Copyright (C) 2009-2014 SliTaz GNU/Linux. 12.8 +# Copyright (C) 2009-2015 SliTaz GNU/Linux. 12.9 # 12.10 . /lib/libtaz.sh 12.11 12.12 @@ -13,17 +13,12 @@ 12.13 check_retawq() { 12.14 if [ ! -x /usr/bin/retawq ]; then 12.15 echo; _ "Missing Retawq web browser..." 12.16 - _ "Please run: su -c 'tazpkg get-install retawq'" 12.17 + _ 'Please run: %s' "su -c 'tazpkg get-install retawq'" 12.18 exit 0 12.19 fi 12.20 } 12.21 12.22 -local i 12.23 -local SECTION 12.24 -local SECTIONS 12.25 -local MSG 12.26 -local TOPIC 12.27 -local MAN_SECTION 12.28 +local i SECTION SECTIONS MSG TOPIC MAN_SECTION 12.29 12.30 case "$1" in 12.31 ''|-*) 12.32 @@ -31,18 +26,18 @@ 12.33 return ;; 12.34 esac 12.35 12.36 -SECTION=all 12.37 +SECTION='all' 12.38 MAN_SECTION='*' 12.39 -MSG="" 12.40 +MSG='' 12.41 12.42 if [ -n "$2" ]; then 12.43 - SECTION=$1 12.44 - MAN_SECTION=$1 12.45 - MSG=" $(_n 'in section $SECTION')" 12.46 + SECTION="$1" 12.47 + MAN_SECTION="$1" 12.48 + MSG=" $(_n 'in section %s' "$SECTION")" 12.49 shift 12.50 fi 12.51 12.52 -TOPIC=$1 12.53 +TOPIC="$1" 12.54 12.55 if [ check_retawq -a -f /usr/share/doc/$TOPIC/$TOPIC.html ]; then 12.56 retawq --dump=file:///usr/share/doc/$TOPIC/$TOPIC.html | less -M 12.57 @@ -64,7 +59,7 @@ 12.58 i=$(ls $i/$TOPIC.* 2> /dev/null) 12.59 if [ "x$i" != "x" ]; then 12.60 case "$i" in 12.61 - *gz) (zcat $i || unlzma -c $i 2> /dev/null) | less -M;; 12.62 + *gz) (zcat $i || unlzma -c $i 2>/dev/null) | less -M;; 12.63 *) less -M $i;; 12.64 esac 12.65 fi 12.66 @@ -76,13 +71,12 @@ 12.67 fi 12.68 done 12.69 12.70 -if [ "$SECTION" = all ] 12.71 -then SECTIONS="1 2 3 4 5 6 7 8" 12.72 -else SECTIONS=$SECTION 12.73 +if [ "$SECTION" == 'all' ] 12.74 + then SECTIONS='1 2 3 4 5 6 7 8' 12.75 + else SECTIONS="$SECTION" 12.76 fi 12.77 12.78 -for SECTION in $SECTIONS 12.79 -do 12.80 +for SECTION in $SECTIONS; do 12.81 URL=$( wget -q -O - http://man7.org/linux/man-pages/dir_all_alphabetic.html | \ 12.82 sed -n -r "s%.*href=\"\./(man./.*html)\">$TOPIC\($SECTION\).*%\1%p" ) 12.83 if [ -n "$URL" ] 12.84 @@ -94,5 +88,5 @@ 12.85 exit 0 12.86 fi 12.87 done 12.88 -_ 'No manual entry for $TOPIC$MSG' 12.89 +_ 'No manual entry for %s' "$TOPIC$MSG" 12.90 exit 0
13.1 --- a/rootfs/usr/lib/slitaz/libpkg.sh Mon May 25 19:32:59 2015 +0300 13.2 +++ b/rootfs/usr/lib/slitaz/libpkg.sh Mon May 25 21:14:15 2015 +0300 13.3 @@ -5,7 +5,7 @@ 13.4 # 13.5 # Documentation: man libpkg or /usr/share/doc/slitaz/libpkg.txt 13.6 # 13.7 -# Copyright (C) 2014 SliTaz GNU/Linux - BSD License 13.8 +# Copyright (C) 2014-2015 SliTaz GNU/Linux - BSD License 13.9 # 13.10 13.11 . /lib/libtaz.sh 13.12 @@ -23,30 +23,30 @@ 13.13 13.14 # Check mirror ID: return false if no changes or mirror unreachable 13.15 check_mirror_id() { 13.16 - [ "$forced" ] && rm -f ID 13.17 - [ -f "ID" ] || echo $$ > ID 13.18 + [ -n "$forced" ] && rm -f ID 13.19 + [ -f 'ID' ] || echo $$ > ID 13.20 mv ID ID.bak 13.21 if wget -qs ${mirror%/}/ID; then 13.22 wget -q ${mirror%/}/ID 13.23 else 13.24 - _n "Mirror is unreachable" 13.25 + _n 'Mirror is unreachable' 13.26 false; status; return 1 13.27 fi 13.28 if [ "$(cat ID)" == "$(cat ID.bak)" ]; then 13.29 - _n "Mirror is up-to-date" 13.30 + _n 'Mirror is up-to-date' 13.31 true; status; return 1 13.32 fi 13.33 } 13.34 13.35 # Source a package receipt 13.36 source_receipt() { 13.37 - local receipt=$1 13.38 - if [ ! -f $receipt ]; then 13.39 - indent 28 $(_ 'Missing receipt: $receipt') 13.40 - continue 13.41 - else 13.42 - . $receipt 13.43 - fi 13.44 + local receipt="$1" 13.45 + if [ ! -f $receipt ]; then 13.46 + indent 28 $(_ 'Missing receipt: %s' "$receipt") 13.47 + continue 13.48 + else 13.49 + . $receipt 13.50 + fi 13.51 } 13.52 13.53 # 13.54 @@ -55,14 +55,14 @@ 13.55 13.56 # checks to see if file is proper tazpkg 13.57 is_valid_tazpkg() { 13.58 - local file=$1 13.59 + local file="$1" 13.60 [ -a $file ] && [ "$file" != "$(package_name $file)" ] 13.61 } 13.62 13.63 check_valid_tazpkg() { 13.64 - local file=$1 13.65 + local file="$1" 13.66 if ! is_valid_tazpkg $file; then 13.67 - _ '$file is not a tazpkg. Exiting' 13.68 + _ 'File %s is not a tazpkg. Exiting' "$file" 13.69 exit 1 13.70 fi 13.71 }
14.1 --- a/rootfs/var/www/cgi-bin/cgi-env.sh Mon May 25 19:32:59 2015 +0300 14.2 +++ b/rootfs/var/www/cgi-bin/cgi-env.sh Mon May 25 21:14:15 2015 +0300 14.3 @@ -9,7 +9,7 @@ 14.4 . /usr/lib/slitaz/httphelper.sh 14.5 header 14.6 14.7 -title=$(_ "CGI SHell Environment") 14.8 +title=$(_ 'CGI SHell Environment') 14.9 cat << EOT 14.10 <!DOCTYPE html> 14.11 <html xmlns="http://www.w3.org/1999/xhtml"> 14.12 @@ -32,15 +32,15 @@ 14.13 power of SHell script meet the web! Here you can check HTTP info and try some \ 14.14 requests.")</p> 14.15 14.16 -<p>$(_ "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you \ 14.17 -use PHP-like syntax such as: \$(GET var)")</p> 14.18 +<p>$(_ 'Including %s in your scripts lets you use PHP-like syntax such as: %s' \ 14.19 +'/usr/lib/slitaz/httphelper.sh' '$(GET var)')</p> 14.20 14.21 -<p>$(_ "QUERY_STRING test:") 14.22 +<p>$(_ 'QUERY_STRING test:') 14.23 <a href="$SCRIPT_NAME?var=value">$SCRIPT_NAME?var=value</a> 14.24 </p> 14.25 14.26 14.27 -<h2>$(_ "HTTP Info")</h2> 14.28 +<h2>$(_ 'HTTP Info')</h2> 14.29 14.30 <pre>$(httpinfo)</pre> 14.31