# HG changeset patch # User Aleksej Bobylev # Date 1433427096 -10800 # Node ID 3be081525506abdaf7ab1106a58533fd09682f2d # Parent 00c7d84edcd551b487187e7320e40eed77d106fe Move translations to use '%s'. Fix subox icon and allow it to work with spaces in the path. diff -r 00c7d84edcd5 -r 3be081525506 boxes/burn-box --- a/boxes/burn-box Thu May 14 12:55:55 2015 +0200 +++ b/boxes/burn-box Thu Jun 04 17:11:36 2015 +0300 @@ -73,7 +73,7 @@ # Decode audio files with: decode [file] decode_audio() { - _ 'Decoding files from: $audio' + _ 'Decoding files from: %s' "$audio" for f in "$audio"/*.* do debug "handling $f" @@ -95,7 +95,7 @@ burn_iso() { if [ "${iso##*.}" != "iso" ]; then - _ 'Not an ISO image: "$iso"'; exit 1 + _ 'Not an ISO image: "%s"' "$iso"; exit 1 fi wodim -v speed=$speed $options "$iso" } @@ -172,7 +172,7 @@ # Let burn an ISO from cmdline: burn-box -i /path/to/image.iso [ "$iso" == " " ] && iso="$2" if [ ! -f "$iso" ]; then - _ 'Missing ISO image "$iso"'; exit 1 + _ 'Missing ISO image "%s"' "$iso"; exit 1 fi burn_iso ;; audio|-a) @@ -180,7 +180,7 @@ [ "$2" ] && audio="$2" [ "$audio" == "$HOME" ] && unset audio if [ ! -d "$audio" ]; then - _ 'Missing audio directory "$audio"'; exit 1 + _ 'Missing audio directory "%s"' "$audio"; exit 1 fi burn_audio ;; blank) diff -r 00c7d84edcd5 -r 3be081525506 po/slitaz-boxes/es.po --- a/po/slitaz-boxes/es.po Thu May 14 12:55:55 2015 +0200 +++ b/po/slitaz-boxes/es.po Thu Jun 04 17:11:36 2015 +0300 @@ -147,14 +147,12 @@ msgstr "Ejemplos:" #: boxes/burn-box:64 -#, sh-format -msgid "Decoding files from: $audio" -msgstr "Decodificación de archivos de: $audio" +msgid "Decoding files from: %s" +msgstr "Decodificación de archivos de: %s" #: boxes/burn-box:84 -#, sh-format -msgid "Not an ISO image: \"$iso\"" -msgstr "No es una imagen ISO: \"$iso\"" +msgid "Not an ISO image: \"%s\"" +msgstr "No es una imagen ISO: \"%s\"" #: boxes/burn-box:100 msgid "Burn-box" @@ -208,14 +206,12 @@ msgstr "Ayuda de Wodim" #: boxes/burn-box:154 -#, sh-format -msgid "Missing ISO image \"$iso\"" -msgstr "Falta la imagen ISO \"$iso\"" +msgid "Missing ISO image \"%s\"" +msgstr "Falta la imagen ISO \"%s\"" #: boxes/burn-box:162 -#, sh-format -msgid "Missing audio directory \"$audio\"" -msgstr "Falta el directorio de audio \"$audio\"" +msgid "Missing audio directory \"%s\"" +msgstr "Falta el directorio de audio \"%s\"" #: boxes/burn-box:166 #, fuzzy diff -r 00c7d84edcd5 -r 3be081525506 po/slitaz-boxes/fa.po --- a/po/slitaz-boxes/fa.po Thu May 14 12:55:55 2015 +0200 +++ b/po/slitaz-boxes/fa.po Thu Jun 04 17:11:36 2015 +0300 @@ -148,14 +148,12 @@ msgstr ":مثال ها" #: boxes/burn-box:64 -#, sh-format -msgid "Decoding files from: $audio" -msgstr "$audio رمز گشایی فایل ها از" +msgid "Decoding files from: %s" +msgstr "%s رمز گشایی فایل ها از" #: boxes/burn-box:84 -#, sh-format -msgid "Not an ISO image: \"$iso\"" -msgstr "یک فایل ایزو نیست \"$iso\"" +msgid "Not an ISO image: \"%s\"" +msgstr "یک فایل ایزو نیست \"%s\"" #: boxes/burn-box:100 msgid "Burn-box" @@ -206,14 +204,12 @@ msgstr "Wodim راهنمای" #: boxes/burn-box:154 -#, sh-format -msgid "Missing ISO image \"$iso\"" -msgstr "فایل ایزو گمشده است. \"$iso\"" +msgid "Missing ISO image \"%s\"" +msgstr "فایل ایزو گمشده است. \"%s\"" #: boxes/burn-box:162 -#, sh-format -msgid "Missing audio directory \"$audio\"" -msgstr ".دایرکتوری صوتی گمشده است \"$audio\"" +msgid "Missing audio directory \"%s\"" +msgstr ".دایرکتوری صوتی گمشده است \"%s\"" #: boxes/burn-box:166 msgid "Blank disk" diff -r 00c7d84edcd5 -r 3be081525506 po/slitaz-boxes/fr.po --- a/po/slitaz-boxes/fr.po Thu May 14 12:55:55 2015 +0200 +++ b/po/slitaz-boxes/fr.po Thu Jun 04 17:11:36 2015 +0300 @@ -159,14 +159,12 @@ msgstr "Exemples:" #: boxes/burn-box:64 -#, sh-format -msgid "Decoding files from: $audio" -msgstr "Décodage des fichiers depuis: $audio" +msgid "Decoding files from: %s" +msgstr "Décodage des fichiers depuis: %s" #: boxes/burn-box:84 -#, sh-format -msgid "Not an ISO image: \"$iso\"" -msgstr "Ceci n'est pas une image ISO: \"$iso\"" +msgid "Not an ISO image: \"%s\"" +msgstr "Ceci n'est pas une image ISO: \"%s\"" #: boxes/burn-box:100 msgid "Burn-box" @@ -217,14 +215,12 @@ msgstr "Aide de Wodim" #: boxes/burn-box:154 -#, sh-format -msgid "Missing ISO image \"$iso\"" -msgstr "Image ISO \"$iso\" manquante" +msgid "Missing ISO image \"%s\"" +msgstr "Image ISO \"%s\" manquante" #: boxes/burn-box:162 -#, sh-format -msgid "Missing audio directory \"$audio\"" -msgstr "Le dossier audio \"$audio\" est manquant" +msgid "Missing audio directory \"%s\"" +msgstr "Le dossier audio \"%s\" est manquant" #: boxes/burn-box:166 msgid "Blank disk" diff -r 00c7d84edcd5 -r 3be081525506 po/slitaz-boxes/pl.po --- a/po/slitaz-boxes/pl.po Thu May 14 12:55:55 2015 +0200 +++ b/po/slitaz-boxes/pl.po Thu Jun 04 17:11:36 2015 +0300 @@ -150,14 +150,12 @@ msgstr "Przykłady:" #: boxes/burn-box:64 -#, sh-format -msgid "Decoding files from: $audio" -msgstr "Dekodowanie plików z: $audio" +msgid "Decoding files from: %s" +msgstr "Dekodowanie plików z: %s" #: boxes/burn-box:84 -#, sh-format -msgid "Not an ISO image: \"$iso\"" -msgstr "Niezgodny z formatem obrazu ISO: \"$iso\"" +msgid "Not an ISO image: \"%s\"" +msgstr "Niezgodny z formatem obrazu ISO: \"%s\"" #: boxes/burn-box:100 #, fuzzy @@ -209,14 +207,12 @@ msgstr "Pomoc Wodim" #: boxes/burn-box:154 -#, sh-format -msgid "Missing ISO image \"$iso\"" -msgstr "Brakujący obraz ISO \"$iso\"" +msgid "Missing ISO image \"%s\"" +msgstr "Brakujący obraz ISO \"%s\"" #: boxes/burn-box:162 -#, sh-format -msgid "Missing audio directory \"$audio\"" -msgstr "Brakujący katalog audio \"$audio\"" +msgid "Missing audio directory \"%s\"" +msgstr "Brakujący katalog audio \"%s\"" #: boxes/burn-box:166 msgid "Blank disk" diff -r 00c7d84edcd5 -r 3be081525506 po/slitaz-boxes/pt_BR.po --- a/po/slitaz-boxes/pt_BR.po Thu May 14 12:55:55 2015 +0200 +++ b/po/slitaz-boxes/pt_BR.po Thu Jun 04 17:11:36 2015 +0300 @@ -146,14 +146,12 @@ msgstr "Exemplos:" #: boxes/burn-box:64 -#, sh-format -msgid "Decoding files from: $audio" -msgstr "Decodificando arquivos de: $audio" +msgid "Decoding files from: %s" +msgstr "Decodificando arquivos de: %s" #: boxes/burn-box:84 -#, sh-format -msgid "Not an ISO image: \"$iso\"" -msgstr "Imagem ISO \"$iso\" inválida" +msgid "Not an ISO image: \"%s\"" +msgstr "Imagem ISO \"%s\" inválida" #: boxes/burn-box:100 msgid "Burn-box" @@ -204,14 +202,12 @@ msgstr "Ajuda do Wodim" #: boxes/burn-box:154 -#, sh-format -msgid "Missing ISO image \"$iso\"" -msgstr "Imagem ISO \"$iso\" não encontrada" +msgid "Missing ISO image \"%s\"" +msgstr "Imagem ISO \"%s\" não encontrada" #: boxes/burn-box:162 -#, sh-format -msgid "Missing audio directory \"$audio\"" -msgstr "Diretório com áudio \"$audio\" não encontrado" +msgid "Missing audio directory \"%s\"" +msgstr "Diretório com áudio \"%s\" não encontrado" #: boxes/burn-box:166 msgid "Blank disk" diff -r 00c7d84edcd5 -r 3be081525506 po/slitaz-boxes/ru.po --- a/po/slitaz-boxes/ru.po Thu May 14 12:55:55 2015 +0200 +++ b/po/slitaz-boxes/ru.po Thu Jun 04 17:11:36 2015 +0300 @@ -160,14 +160,12 @@ msgstr "Примеры:" #: boxes/burn-box:64 -#, sh-format -msgid "Decoding files from: $audio" -msgstr "Обработка файлов из папки: $audio" +msgid "Decoding files from: %s" +msgstr "Обработка файлов из папки: %s" #: boxes/burn-box:84 -#, sh-format -msgid "Not an ISO image: \"$iso\"" -msgstr "Файл «$iso» не является образом ISO" +msgid "Not an ISO image: \"%s\"" +msgstr "Файл «%s» не является образом ISO" #: boxes/burn-box:100 msgid "Burn-box" @@ -218,14 +216,12 @@ msgstr "Справка Wodim" #: boxes/burn-box:154 -#, sh-format -msgid "Missing ISO image \"$iso\"" -msgstr "Образ ISO «$iso» не найден" +msgid "Missing ISO image \"%s\"" +msgstr "Образ ISO «%s» не найден" #: boxes/burn-box:162 -#, sh-format -msgid "Missing audio directory \"$audio\"" -msgstr "Папка аудио «$audio» не найдена" +msgid "Missing audio directory \"%s\"" +msgstr "Папка аудио «%s» не найдена" #: boxes/burn-box:166 msgid "Blank disk" diff -r 00c7d84edcd5 -r 3be081525506 po/slitaz-boxes/slitaz-boxes.pot --- a/po/slitaz-boxes/slitaz-boxes.pot Thu May 14 12:55:55 2015 +0200 +++ b/po/slitaz-boxes/slitaz-boxes.pot Thu Jun 04 17:11:36 2015 +0300 @@ -146,13 +146,11 @@ msgstr "" #: boxes/burn-box:64 -#, sh-format -msgid "Decoding files from: $audio" +msgid "Decoding files from: %s" msgstr "" #: boxes/burn-box:84 -#, sh-format -msgid "Not an ISO image: \"$iso\"" +msgid "Not an ISO image: \"%s\"" msgstr "" #: boxes/burn-box:100 @@ -204,13 +202,11 @@ msgstr "" #: boxes/burn-box:154 -#, sh-format -msgid "Missing ISO image \"$iso\"" +msgid "Missing ISO image \"%s\"" msgstr "" #: boxes/burn-box:162 -#, sh-format -msgid "Missing audio directory \"$audio\"" +msgid "Missing audio directory \"%s\"" msgstr "" #: boxes/burn-box:166 diff -r 00c7d84edcd5 -r 3be081525506 po/slitaz-boxes/sv.po --- a/po/slitaz-boxes/sv.po Thu May 14 12:55:55 2015 +0200 +++ b/po/slitaz-boxes/sv.po Thu Jun 04 17:11:36 2015 +0300 @@ -146,14 +146,12 @@ msgstr "Exempel:" #: boxes/burn-box:64 -#, sh-format -msgid "Decoding files from: $audio" -msgstr "Avkodar filer från: $audio" +msgid "Decoding files from: %s" +msgstr "Avkodar filer från: %s" #: boxes/burn-box:84 -#, sh-format -msgid "Not an ISO image: \"$iso\"" -msgstr "Inte en ISO bild: \"$iso\"" +msgid "Not an ISO image: \"%s\"" +msgstr "Inte en ISO bild: \"%s\"" #: boxes/burn-box:100 msgid "Burn-box" @@ -204,14 +202,12 @@ msgstr "Wodim hjälp" #: boxes/burn-box:154 -#, sh-format -msgid "Missing ISO image \"$iso\"" -msgstr "Saknar ISO bild \"$iso\"" +msgid "Missing ISO image \"%s\"" +msgstr "Saknar ISO bild \"%s\"" #: boxes/burn-box:162 -#, sh-format -msgid "Missing audio directory \"$audio\"" -msgstr "Saknar ljud mapp \"$audio\"" +msgid "Missing audio directory \"%s\"" +msgstr "Saknar ljud mapp \"%s\"" #: boxes/burn-box:166 msgid "Blank disk" diff -r 00c7d84edcd5 -r 3be081525506 po/slitaz-boxes/zh_CN.po --- a/po/slitaz-boxes/zh_CN.po Thu May 14 12:55:55 2015 +0200 +++ b/po/slitaz-boxes/zh_CN.po Thu Jun 04 17:11:36 2015 +0300 @@ -147,14 +147,12 @@ msgstr "例子：" #: boxes/burn-box:64 -#, sh-format -msgid "Decoding files from: $audio" -msgstr "解码文件：$audio" +msgid "Decoding files from: %s" +msgstr "解码文件：%s" #: boxes/burn-box:84 -#, sh-format -msgid "Not an ISO image: \"$iso\"" -msgstr "不是一个ISO映像：\"$iso\"" +msgid "Not an ISO image: \"%s\"" +msgstr "不是一个ISO映像：\"%s\"" #: boxes/burn-box:100 msgid "Burn-box" @@ -205,14 +203,12 @@ msgstr "Wodim帮助讯息" #: boxes/burn-box:154 -#, sh-format -msgid "Missing ISO image \"$iso\"" -msgstr "丢失（找不到）的ISO映像\"$iso\"" +msgid "Missing ISO image \"%s\"" +msgstr "丢失（找不到）的ISO映像\"%s\"" #: boxes/burn-box:162 -#, sh-format -msgid "Missing audio directory \"$audio\"" -msgstr "丢失（找不到）的音频目录（或文件） \"$audio\"" +msgid "Missing audio directory \"%s\"" +msgstr "丢失（找不到）的音频目录（或文件） \"%s\"" #: boxes/burn-box:166 msgid "Blank disk" diff -r 00c7d84edcd5 -r 3be081525506 po/slitaz-tools/el.po --- a/po/slitaz-tools/el.po Thu May 14 12:55:55 2015 +0200 +++ b/po/slitaz-tools/el.po Thu Jun 04 17:11:36 2015 +0300 @@ -67,16 +67,16 @@ msgstr "" #: tinyutils/tazlocale:136 tinyutils/tazkeymap:41 -msgid "Config file:" -msgstr "Αρχείο ρυθμίσεων:" +msgid "Config file: %s" +msgstr "Αρχείο ρυθμίσεων: %s" #: tinyutils/tazlocale:137 -msgid "Current locale:" -msgstr "Τρέχον locale:" +msgid "Current locale: %s" +msgstr "Τρέχον locale: %s" #: tinyutils/tazkeymap:42 -msgid "Current keymap:" -msgstr "Τρέχον keymap:" +msgid "Current keymap: %s" +msgstr "Τρέχον keymap: %s" #: tinyutils/tazkeymap:51 #, fuzzy @@ -132,8 +132,7 @@ msgstr "" #: tinyutils/tazx:289 tinyutils/hwsetup:117 -#, sh-format -msgid "Installing pkg: $pkg" +msgid "Installing pkg: %s" msgstr "" #: tinyutils/tazx:307 tinyutils/tazx:423 @@ -247,29 +246,24 @@ msgstr "" #: tinyutils/decode:47 -#, sh-format -msgid "Missing decoder: $dec" -msgstr "Λείπει ο αποκωδικοποιητής: $dec" +msgid "Missing decoder: %s" +msgstr "Λείπει ο αποκωδικοποιητής: %s" #: tinyutils/decode:48 tinyutils/decode:80 -#, sh-format -msgid "Skipping file: $name" -msgstr "Γίνεται παράκαμψη του αρχείου: $name" +msgid "Skipping file: %s" +msgstr "Γίνεται παράκαμψη του αρχείου: %s" #: tinyutils/decode:51 -#, sh-format -msgid "Decoding: $name" -msgstr "Γίνεται αποκωδικοποίηση: $name" +msgid "Decoding: %s" +msgstr "Γίνεται αποκωδικοποίηση: %s" #: tinyutils/decode:60 -#, sh-format -msgid "No file: $file" -msgstr "Κανένα αρχείο: $file" +msgid "No file: %s" +msgstr "Κανένα αρχείο: %s" #: tinyutils/decode:82 -#, sh-format -msgid "Unsupported file: $file" -msgstr "Μη υποστηριζόμενο αρχείο: $file" +msgid "Unsupported file: %s" +msgstr "Μη υποστηριζόμενο αρχείο: %s" #: tinyutils/terminal:10 msgid "configurable SliTaz wrapper for terminal." @@ -288,13 +282,11 @@ msgstr "" #: tinyutils/terminal:15 -#, sh-format -msgid "Width and height of terminal window ($GEOMETRY)" +msgid "Width and height of terminal window (%s)" msgstr "" #: tinyutils/terminal:16 -#, sh-format -msgid "Title name for window (\"$TITLE\")" +msgid "Title name for window (\"%s\")" msgstr "" #: tinyutils/terminal:17 @@ -306,8 +298,7 @@ msgstr "" #: tinyutils/terminal:21 -#, sh-format -msgid "Help for $TERMINAL:" +msgid "Help for %s:" msgstr "" #: tinyutils/hwsetup:22 @@ -367,26 +358,22 @@ msgstr "" #: tinyutils/hwsetup:98 -#, sh-format msgid "" -"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " +"Due to a lack of compatible hardware for troubleshooting, this %s " "device has not been properly tested. Please report any success, failure, bug " "to SliTaz Bug tracker or Forum." msgstr "" #: tinyutils/hwsetup:107 -#, sh-format -msgid "Failed to setup $DEVICE" +msgid "Failed to setup %s" msgstr "" #: tinyutils/hwsetup:131 -#, sh-format -msgid "Would you like to install pkg: $pkg" +msgid "Would you like to install pkg: %s" msgstr "" #: tinyutils/hwsetup:148 -#, sh-format -msgid "adding $user to $grp" +msgid "adding %s to %s" msgstr "" #: tinyutils/hwsetup:171 @@ -398,13 +385,11 @@ msgstr "" #: tinyutils/hwsetup:228 -#, sh-format -msgid "Verify $DEVICE Permissions" +msgid "Verify %s Permissions" msgstr "" #: tinyutils/hwsetup:229 -#, sh-format -msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" +msgid "Your %s must be in %s group with rw-rw-rw- permissions" msgstr "" #: tinyutils/hwsetup:250 @@ -512,8 +497,7 @@ msgstr "" #: tinyutils/hwsetup:483 -#, sh-format -msgid "Quick start guide: $guide_url" +msgid "Quick start guide: %s" msgstr "" #: tinyutils/hwsetup:494 @@ -541,8 +525,7 @@ msgstr "" #: tinyutils/hwsetup:520 tinyutils/hwsetup:541 -#, sh-format -msgid "You can manually edit the configuration files in $bt if need be" +msgid "You can manually edit the configuration files in %s if need be" msgstr "" #: tinyutils/hwsetup:534 @@ -574,13 +557,11 @@ msgstr "" #: tinyutils/hwsetup:567 -#, sh-format -msgid "Edit $wc for phone number, login name, password and pin" +msgid "Edit %s for phone number, login name, password and pin" msgstr "" #: tinyutils/hwsetup:568 -#, sh-format -msgid "Add DNS address of your provider in $rc" +msgid "Add DNS address of your provider in %s" msgstr "" #: tinyutils/hwsetup:577 @@ -601,13 +582,11 @@ #: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 #: tinyutils/hwsetup:714 -#, sh-format -msgid "Your previous config is in $xorg60" +msgid "Your previous config is in %s" msgstr "" #: tinyutils/hwsetup:611 tinyutils/hwsetup:650 -#, sh-format -msgid "If nvidia fails, you can remove $xorg55 to restore previous config." +msgid "If nvidia fails, you can remove %s to restore previous config." msgstr "" #: tinyutils/hwsetup:618 @@ -635,8 +614,7 @@ msgstr "" #: tinyutils/hwsetup:652 -#, sh-format -msgid "Create $xorg55short configured with nv driver." +msgid "Create %s configured with nv driver." msgstr "" #: tinyutils/hwsetup:678 @@ -644,8 +622,7 @@ msgstr "" #: tinyutils/hwsetup:682 -#, sh-format -msgid "If ati fails, you can remove $xorg55 to restore previous config." +msgid "If ati fails, you can remove %s to restore previous config." msgstr "" #: tinyutils/hwsetup:691 @@ -666,13 +643,11 @@ msgstr "" #: tinyutils/hwsetup:715 -#, sh-format -msgid "If ATI fails, you can remove $xorg55 to restore previous config." +msgid "If ATI fails, you can remove %s to restore previous config." msgstr "" #: tinyutils/hwsetup:717 -#, sh-format -msgid "Create $xorg55short configured with radeon driver." +msgid "Create %s configured with radeon driver." msgstr "" #: tinyutils/hwsetup:723 @@ -777,7 +752,7 @@ msgstr "" #: tinyutils/slitaz-config:44 -msgid "Enter new password for \\Zb\\Z1root" +msgid "Enter new password for %s" msgstr "" #: tinyutils/slitaz-config:53 @@ -789,8 +764,7 @@ msgstr "" #: tinyutils/slitaz-config:61 -#, sh-format -msgid "Enter password for user \\Zb\\Z4$user" +msgid "Enter password for user \\Zb\\Z4%s" msgstr "" #: tinyutils/slitaz-config:121 @@ -838,8 +812,7 @@ msgstr "" #: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 -#, sh-format -msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4%s" msgstr "" #: tinyutils/slitaz-config:197 @@ -847,7 +820,7 @@ msgstr "" #: tinyutils/slitaz-config:201 -msgid "Configuring: /etc/network.conf..." +msgid "Configuring: %s..." msgstr "" #: tinyutils/slitaz-config:211 @@ -859,8 +832,7 @@ msgstr "" #: tinyutils/slitaz-config:220 -#, sh-format -msgid "IP address: $ip" +msgid "IP address: %s" msgstr "" #: tinyutils/slitaz-config:222 @@ -922,5 +894,5 @@ #~ msgstr "" #~ "Πρέπει να είστε διαχειριστής συστήματος για να ρυθμίσετε τον X server." -#~ msgid "Setting system locale to: $locale" -#~ msgstr "Ρύθμιση του locale στο: $locale" +#~ msgid "Setting system locale to: %s" +#~ msgstr "Ρύθμιση του locale στο: %s" diff -r 00c7d84edcd5 -r 3be081525506 po/slitaz-tools/es.po --- a/po/slitaz-tools/es.po Thu May 14 12:55:55 2015 +0200 +++ b/po/slitaz-tools/es.po Thu Jun 04 17:11:36 2015 +0300 @@ -66,15 +66,15 @@ msgstr "" #: tinyutils/tazlocale:136 tinyutils/tazkeymap:41 -msgid "Config file:" +msgid "Config file: %s" msgstr "" #: tinyutils/tazlocale:137 -msgid "Current locale:" +msgid "Current locale: %s" msgstr "" #: tinyutils/tazkeymap:42 -msgid "Current keymap:" +msgid "Current keymap: %s" msgstr "" #: tinyutils/tazkeymap:51 @@ -130,8 +130,7 @@ msgstr "" #: tinyutils/tazx:289 tinyutils/hwsetup:117 -#, sh-format -msgid "Installing pkg: $pkg" +msgid "Installing pkg: %s" msgstr "" #: tinyutils/tazx:307 tinyutils/tazx:423 @@ -245,28 +244,23 @@ msgstr "" #: tinyutils/decode:47 -#, sh-format -msgid "Missing decoder: $dec" +msgid "Missing decoder: %s" msgstr "" #: tinyutils/decode:48 tinyutils/decode:80 -#, sh-format -msgid "Skipping file: $name" +msgid "Skipping file: %s" msgstr "" #: tinyutils/decode:51 -#, sh-format -msgid "Decoding: $name" +msgid "Decoding: %s" msgstr "" #: tinyutils/decode:60 -#, sh-format -msgid "No file: $file" +msgid "No file: %s" msgstr "" #: tinyutils/decode:82 -#, sh-format -msgid "Unsupported file: $file" +msgid "Unsupported file: %s" msgstr "" #: tinyutils/terminal:10 @@ -286,13 +280,11 @@ msgstr "" #: tinyutils/terminal:15 -#, sh-format -msgid "Width and height of terminal window ($GEOMETRY)" +msgid "Width and height of terminal window (%s)" msgstr "" #: tinyutils/terminal:16 -#, sh-format -msgid "Title name for window (\"$TITLE\")" +msgid "Title name for window (\"%s\")" msgstr "" #: tinyutils/terminal:17 @@ -304,8 +296,7 @@ msgstr "" #: tinyutils/terminal:21 -#, sh-format -msgid "Help for $TERMINAL:" +msgid "Help for %s:" msgstr "" #: tinyutils/hwsetup:22 @@ -365,26 +356,22 @@ msgstr "" #: tinyutils/hwsetup:98 -#, sh-format msgid "" -"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " +"Due to a lack of compatible hardware for troubleshooting, this %s " "device has not been properly tested. Please report any success, failure, bug " "to SliTaz Bug tracker or Forum." msgstr "" #: tinyutils/hwsetup:107 -#, sh-format -msgid "Failed to setup $DEVICE" +msgid "Failed to setup %s" msgstr "" #: tinyutils/hwsetup:131 -#, sh-format -msgid "Would you like to install pkg: $pkg" +msgid "Would you like to install pkg: %s" msgstr "" #: tinyutils/hwsetup:148 -#, sh-format -msgid "adding $user to $grp" +msgid "adding %s to %s" msgstr "" #: tinyutils/hwsetup:171 @@ -396,13 +383,11 @@ msgstr "" #: tinyutils/hwsetup:228 -#, sh-format -msgid "Verify $DEVICE Permissions" +msgid "Verify %s Permissions" msgstr "" #: tinyutils/hwsetup:229 -#, sh-format -msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" +msgid "Your %s must be in %s group with rw-rw-rw- permissions" msgstr "" #: tinyutils/hwsetup:250 @@ -510,8 +495,7 @@ msgstr "" #: tinyutils/hwsetup:483 -#, sh-format -msgid "Quick start guide: $guide_url" +msgid "Quick start guide: %s" msgstr "" #: tinyutils/hwsetup:494 @@ -539,8 +523,7 @@ msgstr "" #: tinyutils/hwsetup:520 tinyutils/hwsetup:541 -#, sh-format -msgid "You can manually edit the configuration files in $bt if need be" +msgid "You can manually edit the configuration files in %s if need be" msgstr "" #: tinyutils/hwsetup:534 @@ -572,13 +555,11 @@ msgstr "" #: tinyutils/hwsetup:567 -#, sh-format -msgid "Edit $wc for phone number, login name, password and pin" +msgid "Edit %s for phone number, login name, password and pin" msgstr "" #: tinyutils/hwsetup:568 -#, sh-format -msgid "Add DNS address of your provider in $rc" +msgid "Add DNS address of your provider in %s" msgstr "" #: tinyutils/hwsetup:577 @@ -599,13 +580,11 @@ #: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 #: tinyutils/hwsetup:714 -#, sh-format -msgid "Your previous config is in $xorg60" +msgid "Your previous config is in %s" msgstr "" #: tinyutils/hwsetup:611 tinyutils/hwsetup:650 -#, sh-format -msgid "If nvidia fails, you can remove $xorg55 to restore previous config." +msgid "If nvidia fails, you can remove %s to restore previous config." msgstr "" #: tinyutils/hwsetup:618 @@ -633,8 +612,7 @@ msgstr "" #: tinyutils/hwsetup:652 -#, sh-format -msgid "Create $xorg55short configured with nv driver." +msgid "Create %s configured with nv driver." msgstr "" #: tinyutils/hwsetup:678 @@ -642,8 +620,7 @@ msgstr "" #: tinyutils/hwsetup:682 -#, sh-format -msgid "If ati fails, you can remove $xorg55 to restore previous config." +msgid "If ati fails, you can remove %s to restore previous config." msgstr "" #: tinyutils/hwsetup:691 @@ -664,13 +641,11 @@ msgstr "" #: tinyutils/hwsetup:715 -#, sh-format -msgid "If ATI fails, you can remove $xorg55 to restore previous config." +msgid "If ATI fails, you can remove %s to restore previous config." msgstr "" #: tinyutils/hwsetup:717 -#, sh-format -msgid "Create $xorg55short configured with radeon driver." +msgid "Create %s configured with radeon driver." msgstr "" #: tinyutils/hwsetup:723 @@ -775,7 +750,7 @@ msgstr "" #: tinyutils/slitaz-config:44 -msgid "Enter new password for \\Zb\\Z1root" +msgid "Enter new password for %s" msgstr "" #: tinyutils/slitaz-config:53 @@ -787,8 +762,7 @@ msgstr "" #: tinyutils/slitaz-config:61 -#, sh-format -msgid "Enter password for user \\Zb\\Z4$user" +msgid "Enter password for user \\Zb\\Z4%s" msgstr "" #: tinyutils/slitaz-config:121 @@ -836,8 +810,7 @@ msgstr "" #: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 -#, sh-format -msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4%s" msgstr "" #: tinyutils/slitaz-config:197 @@ -845,7 +818,7 @@ msgstr "" #: tinyutils/slitaz-config:201 -msgid "Configuring: /etc/network.conf..." +msgid "Configuring: %s..." msgstr "" #: tinyutils/slitaz-config:211 @@ -857,8 +830,7 @@ msgstr "" #: tinyutils/slitaz-config:220 -#, sh-format -msgid "IP address: $ip" +msgid "IP address: %s" msgstr "" #: tinyutils/slitaz-config:222 diff -r 00c7d84edcd5 -r 3be081525506 po/slitaz-tools/fa.po --- a/po/slitaz-tools/fa.po Thu May 14 12:55:55 2015 +0200 +++ b/po/slitaz-tools/fa.po Thu Jun 04 17:11:36 2015 +0300 @@ -66,16 +66,16 @@ msgstr "اطلاعات" #: tinyutils/tazlocale:136 tinyutils/tazkeymap:41 -msgid "Config file:" -msgstr ":فایل پیکربندی" +msgid "Config file: %s" +msgstr "%s :فایل پیکربندی" #: tinyutils/tazlocale:137 -msgid "Current locale:" -msgstr ":منطقه فعلی" +msgid "Current locale: %s" +msgstr "%s :منطقه فعلی" #: tinyutils/tazkeymap:42 -msgid "Current keymap:" -msgstr ":فعلی Keymap" +msgid "Current keymap: %s" +msgstr "%s :فعلی Keymap" #: tinyutils/tazkeymap:51 msgid "SliTaz keyboard setting" @@ -123,16 +123,15 @@ #: tinyutils/tazx:276 #, fuzzy msgid "Failed to setup driver" -msgstr "نشد $DEVICE موفق به نصب " +msgstr "نشد %s موفق به نصب " #: tinyutils/tazx:276 msgid "(unknown hardware)" msgstr "" #: tinyutils/tazx:289 tinyutils/hwsetup:117 -#, sh-format -msgid "Installing pkg: $pkg" -msgstr "$pkg :در حال نصب پکیج" +msgid "Installing pkg: %s" +msgstr "%s :در حال نصب پکیج" #: tinyutils/tazx:307 tinyutils/tazx:423 #, fuzzy @@ -249,29 +248,24 @@ msgstr "/path/to/files/*" #: tinyutils/decode:47 -#, sh-format -msgid "Missing decoder: $dec" -msgstr "$dec :گم شده (Decoder) رمز گشای " +msgid "Missing decoder: %s" +msgstr "%s :گم شده (Decoder) رمز گشای " #: tinyutils/decode:48 tinyutils/decode:80 -#, sh-format -msgid "Skipping file: $name" -msgstr "$name :در حال گذر (نادیده گرفتن) از فایل" +msgid "Skipping file: %s" +msgstr "%s :در حال گذر (نادیده گرفتن) از فایل" #: tinyutils/decode:51 -#, sh-format -msgid "Decoding: $name" -msgstr "$name :در حال رمزگشایی" +msgid "Decoding: %s" +msgstr "%s :در حال رمزگشایی" #: tinyutils/decode:60 -#, sh-format -msgid "No file: $file" -msgstr "$file :فایل موجود نیست" +msgid "No file: %s" +msgstr "%s :فایل موجود نیست" #: tinyutils/decode:82 -#, sh-format -msgid "Unsupported file: $file" -msgstr "$file :فایل پشتیبانی نشده" +msgid "Unsupported file: %s" +msgstr "%s :فایل پشتیبانی نشده" #: tinyutils/terminal:10 msgid "configurable SliTaz wrapper for terminal." @@ -290,14 +284,12 @@ msgstr "چاپ این پیام" #: tinyutils/terminal:15 -#, sh-format -msgid "Width and height of terminal window ($GEOMETRY)" -msgstr "($GEOMETRY) پهنا و ارتفاع پنجره ی ترمینال" +msgid "Width and height of terminal window (%s)" +msgstr "(%s) پهنا و ارتفاع پنجره ی ترمینال" #: tinyutils/terminal:16 -#, sh-format -msgid "Title name for window (\"$TITLE\")" -msgstr "(\"$TITLE\") نام عنوان پنجره" +msgid "Title name for window (\"%s\")" +msgstr "(\"%s\") نام عنوان پنجره" #: tinyutils/terminal:17 msgid "Don't close terminal after command finished" @@ -308,9 +300,8 @@ msgstr "فرمان برای اجرا (باید آخرین فرمان در خط باشد)" #: tinyutils/terminal:21 -#, sh-format -msgid "Help for $TERMINAL:" -msgstr ":$TERMINAL راهنمایی درمورد " +msgid "Help for %s:" +msgstr ":%s راهنمایی درمورد " #: tinyutils/hwsetup:22 msgid "SliTaz Setup configuration" @@ -369,30 +360,26 @@ msgstr ".درخواست تائید قبل از نصب وابسته های اختیاری" #: tinyutils/hwsetup:98 -#, sh-format msgid "" -"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " +"Due to a lack of compatible hardware for troubleshooting, this %s " "device has not been properly tested. Please report any success, failure, bug " "to SliTaz Bug tracker or Forum." msgstr "" ".اطلاع دهید SliTaz دستگاه به درستی تست نشده است.لطفا هرگونه موفقیت، شکست یا " -"باگ در دستگاه را به انجمن یا پیگیری باگ های $DEVICE به علت کمبود سخت افزار " +"باگ در دستگاه را به انجمن یا پیگیری باگ های %s به علت کمبود سخت افزار " "هماهنگ برای عیب یابی، این" #: tinyutils/hwsetup:107 -#, sh-format -msgid "Failed to setup $DEVICE" -msgstr "نشد $DEVICE موفق به نصب " +msgid "Failed to setup %s" +msgstr "نشد %s موفق به نصب " #: tinyutils/hwsetup:131 -#, sh-format -msgid "Would you like to install pkg: $pkg" -msgstr "$pkg :آیا مایلید که این پکیج را نصب کنید" +msgid "Would you like to install pkg: %s" +msgstr "%s :آیا مایلید که این پکیج را نصب کنید" #: tinyutils/hwsetup:148 -#, sh-format -msgid "adding $user to $grp" -msgstr "$grpبه $user در حال افزودن " +msgid "adding %s to %s" +msgstr "%sبه %s در حال افزودن " #: tinyutils/hwsetup:171 msgid "Detected USB Device : Vendor : Product" @@ -403,14 +390,12 @@ msgstr "استفاده کنید HP آیا مایلید از ابزار نصب " #: tinyutils/hwsetup:228 -#, sh-format -msgid "Verify $DEVICE Permissions" -msgstr ".را تائید کنید $DEVICE مجوز های " +msgid "Verify %s Permissions" +msgstr ".را تائید کنید %s مجوز های " #: tinyutils/hwsetup:229 -#, sh-format -msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" -msgstr "rw-rw-rw باشد با مجوز های $grp شما باید در گروه $DEVICE" +msgid "Your %s must be in %s group with rw-rw-rw- permissions" +msgstr "rw-rw-rw باشد با مجوز های %s شما باید در گروه %s" #: tinyutils/hwsetup:250 msgid "New udev rules are added by a package" @@ -520,9 +505,8 @@ msgstr "برای وارد کردن عکس استفاده کنید gphoto2 دوربین نصب شده است؛ لطفا از " #: tinyutils/hwsetup:483 -#, sh-format -msgid "Quick start guide: $guide_url" -msgstr "$guide_url :راهنمای شروع سریع" +msgid "Quick start guide: %s" +msgstr "%s :راهنمای شروع سریع" #: tinyutils/hwsetup:494 msgid "Do you want to see if the bluetooth is working" @@ -549,10 +533,9 @@ msgstr "...در حال جفت شدن با دستگاه بلوتوث راه دور" #: tinyutils/hwsetup:520 tinyutils/hwsetup:541 -#, sh-format -msgid "You can manually edit the configuration files in $bt if need be" +msgid "You can manually edit the configuration files in %s if need be" msgstr "" -".به صورت دستی در صورت نیاز ویرایش کنید $bt شما میتوانید فایل های پیکربندی را " +".به صورت دستی در صورت نیاز ویرایش کنید %s شما میتوانید فایل های پیکربندی را " "در " #: tinyutils/hwsetup:534 @@ -584,14 +567,12 @@ msgstr "را پیکربندی کنید wvdial آیا میخواهید " #: tinyutils/hwsetup:567 -#, sh-format -msgid "Edit $wc for phone number, login name, password and pin" -msgstr "برای شماره تلفن، نام کاربری، رمز عبور و کد پین$wc ویرایش " +msgid "Edit %s for phone number, login name, password and pin" +msgstr "برای شماره تلفن، نام کاربری، رمز عبور و کد پین%s ویرایش " #: tinyutils/hwsetup:568 -#, sh-format -msgid "Add DNS address of your provider in $rc" -msgstr " اضافه کنید $rc ارائه دهنده خود را در DNS آدرس " +msgid "Add DNS address of your provider in %s" +msgstr " اضافه کنید %s ارائه دهنده خود را در DNS آدرس " #: tinyutils/hwsetup:577 msgid "Setting IPTABLES_RULES to yes in /etc/slitaz/firewall.conf" @@ -612,15 +593,13 @@ #: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 #: tinyutils/hwsetup:714 -#, sh-format -msgid "Your previous config is in $xorg60" -msgstr "قرار دارد $xorg60 پیکربندی پیشین شما در " +msgid "Your previous config is in %s" +msgstr "قرار دارد %s پیکربندی پیشین شما در " #: tinyutils/hwsetup:611 tinyutils/hwsetup:650 -#, sh-format -msgid "If nvidia fails, you can remove $xorg55 to restore previous config." +msgid "If nvidia fails, you can remove %s to restore previous config." msgstr "" -".را حذف کنید تا پیکربندی پیشین شما بازگردانی شود $xorg55 ناموفق بود، شما " +".را حذف کنید تا پیکربندی پیشین شما بازگردانی شود %s ناموفق بود، شما " "میتوانید Nvidia اگر " #: tinyutils/hwsetup:618 @@ -649,9 +628,8 @@ msgstr "پیکربندی نمایید nvidia را با استفاده از درایور آزاد X آیا میخواهید " #: tinyutils/hwsetup:652 -#, sh-format -msgid "Create $xorg55short configured with nv driver." -msgstr "nv پیکربندی شده با درایور $xorg55short ایجاد " +msgid "Create %s configured with nv driver." +msgstr "nv پیکربندی شده با درایور %s ایجاد " #: tinyutils/hwsetup:678 msgid "Do you want to configure X using non-free catalyst ATI (radeon) driver" @@ -659,10 +637,9 @@ "پیکر بندی نمایید ATI (Radeon) را با استفاده از درایور غیر آزاد X آیا مایلید " #: tinyutils/hwsetup:682 -#, sh-format -msgid "If ati fails, you can remove $xorg55 to restore previous config." +msgid "If ati fails, you can remove %s to restore previous config." msgstr "" -".را برای بازگردانی پیکربندی قبلی حذف نمایید $xorg55 ناموفق بود، شما میتوانید " +".را برای بازگردانی پیکربندی قبلی حذف نمایید %s ناموفق بود، شما میتوانید " "ati اگر " #: tinyutils/hwsetup:691 @@ -686,16 +663,14 @@ "پیکر بندی نمایید ATI (Radeon) را با استفاده از درایور آزاد X آیا مایلید " #: tinyutils/hwsetup:715 -#, sh-format -msgid "If ATI fails, you can remove $xorg55 to restore previous config." +msgid "If ATI fails, you can remove %s to restore previous config." msgstr "" -"را برای بازگردانی پیکربندی پیشین حذف نمایید $xorg55 ناموفق بود، شما میتوانید " +"را برای بازگردانی پیکربندی پیشین حذف نمایید %s ناموفق بود، شما میتوانید " "ATI اگر" #: tinyutils/hwsetup:717 -#, sh-format -msgid "Create $xorg55short configured with radeon driver." -msgstr ".radeon پیکربندی شده با درایور $xorg55short ایجاد " +msgid "Create %s configured with radeon driver." +msgstr ".radeon پیکربندی شده با درایور %s ایجاد " #: tinyutils/hwsetup:723 msgid "Checking if ATI radeon is working..." @@ -802,7 +777,7 @@ msgstr ":رمز عبور" #: tinyutils/slitaz-config:44 -msgid "Enter new password for \\Zb\\Z1root" +msgid "Enter new password for %s" msgstr "" #: tinyutils/slitaz-config:53 @@ -814,8 +789,7 @@ msgstr "" #: tinyutils/slitaz-config:61 -#, sh-format -msgid "Enter password for user \\Zb\\Z4$user" +msgid "Enter password for user \\Zb\\Z4%s" msgstr "" #: tinyutils/slitaz-config:121 @@ -864,8 +838,7 @@ msgstr ":رمز عبور" #: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 -#, sh-format -msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4%s" msgstr "" #: tinyutils/slitaz-config:197 @@ -874,7 +847,7 @@ #: tinyutils/slitaz-config:201 #, fuzzy -msgid "Configuring: /etc/network.conf..." +msgid "Configuring: %s..." msgstr "Xorg در حال پیکربندی " #: tinyutils/slitaz-config:211 @@ -886,8 +859,7 @@ msgstr "" #: tinyutils/slitaz-config:220 -#, sh-format -msgid "IP address: $ip" +msgid "IP address: %s" msgstr "" #: tinyutils/slitaz-config:222 diff -r 00c7d84edcd5 -r 3be081525506 po/slitaz-tools/fr.po --- a/po/slitaz-tools/fr.po Thu May 14 12:55:55 2015 +0200 +++ b/po/slitaz-tools/fr.po Thu Jun 04 17:11:36 2015 +0300 @@ -68,16 +68,16 @@ msgstr "" #: tinyutils/tazlocale:136 tinyutils/tazkeymap:41 -msgid "Config file:" -msgstr "Fichier de config :" +msgid "Config file: %s" +msgstr "Fichier de config : %s" #: tinyutils/tazlocale:137 -msgid "Current locale:" -msgstr "Locale actuelle :" +msgid "Current locale: %s" +msgstr "Locale actuelle : %s" #: tinyutils/tazkeymap:42 -msgid "Current keymap:" -msgstr "Clavier actuel :" +msgid "Current keymap: %s" +msgstr "Clavier actuel : %s" #: tinyutils/tazkeymap:51 #, fuzzy @@ -128,16 +128,15 @@ #: tinyutils/tazx:276 #, fuzzy msgid "Failed to setup driver" -msgstr "Echec de la configuration de $DEVICE" +msgstr "Echec de la configuration de %s" #: tinyutils/tazx:276 msgid "(unknown hardware)" msgstr "(matériel inconnu)" #: tinyutils/tazx:289 tinyutils/hwsetup:117 -#, sh-format -msgid "Installing pkg: $pkg" -msgstr "Installation du paquet : $pkg" +msgid "Installing pkg: %s" +msgstr "Installation du paquet : %s" #: tinyutils/tazx:307 tinyutils/tazx:423 #, fuzzy @@ -176,7 +175,7 @@ #: tinyutils/tazx:422 msgid "(Re)Start Simple Login Manager now" -msgstr "(Re)démarrer SLiM maintenant"" +msgstr "(Re)démarrer SLiM maintenant" #: tinyutils/tazx:424 msgid "Quit Tazx utility" @@ -253,29 +252,24 @@ msgstr "/chemin/vers/fichier/*" #: tinyutils/decode:47 -#, sh-format -msgid "Missing decoder: $dec" -msgstr "Manque le décodeur : $dec" +msgid "Missing decoder: %s" +msgstr "Manque le décodeur : %s" #: tinyutils/decode:48 tinyutils/decode:80 -#, sh-format -msgid "Skipping file: $name" -msgstr "Fichier ingoré : $name" +msgid "Skipping file: %s" +msgstr "Fichier ingoré : %s" #: tinyutils/decode:51 -#, sh-format -msgid "Decoding: $name" -msgstr "Décodage de : $name" +msgid "Decoding: %s" +msgstr "Décodage de : %s" #: tinyutils/decode:60 -#, sh-format -msgid "No file: $file" -msgstr "Pas de fichier : $file" +msgid "No file: %s" +msgstr "Pas de fichier : %s" #: tinyutils/decode:82 -#, sh-format -msgid "Unsupported file: $file" -msgstr "Fichier pas supporté : $file" +msgid "Unsupported file: %s" +msgstr "Fichier pas supporté : %s" #: tinyutils/terminal:10 msgid "configurable SliTaz wrapper for terminal." @@ -294,14 +288,12 @@ msgstr "Affiche ce message" #: tinyutils/terminal:15 -#, sh-format -msgid "Width and height of terminal window ($GEOMETRY)" -msgstr "Largeur et hauteur du terminal ($GEOMETRY)" +msgid "Width and height of terminal window (%s)" +msgstr "Largeur et hauteur du terminal (%s)" #: tinyutils/terminal:16 -#, sh-format -msgid "Title name for window (\"$TITLE\")" -msgstr "Titre de la fenêtre (\"$TITLE\")" +msgid "Title name for window (\"%s\")" +msgstr "Titre de la fenêtre (\"%s\")" #: tinyutils/terminal:17 msgid "Don't close terminal after command finished" @@ -312,9 +304,8 @@ msgstr "Command à lancer (doit être la dernière ligne)" #: tinyutils/terminal:21 -#, sh-format -msgid "Help for $TERMINAL:" -msgstr "Aide pour $TERMINAL:" +msgid "Help for %s:" +msgstr "Aide pour %s:" #: tinyutils/hwsetup:22 msgid "SliTaz Setup configuration" @@ -374,30 +365,26 @@ msgstr "vous confirmez l'installtion des dépendances optionnelles" #: tinyutils/hwsetup:98 -#, sh-format msgid "" -"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " +"Due to a lack of compatible hardware for troubleshooting, this %s " "device has not been properly tested. Please report any success, failure, bug " "to SliTaz Bug tracker or Forum." msgstr "" "A cause du manque de matériels pour la mise au point, ce périphérique " -"$DEVICE n'a pas été correctement testé. Veuillez reporter les succés, " +"%s n'a pas été correctement testé. Veuillez reporter les succés, " "échecs, et bugs sur les SliTaz Bug tracker ou Forum." #: tinyutils/hwsetup:107 -#, sh-format -msgid "Failed to setup $DEVICE" -msgstr "Echec de la configuration de $DEVICE" +msgid "Failed to setup %s" +msgstr "Echec de la configuration de %s" #: tinyutils/hwsetup:131 -#, sh-format -msgid "Would you like to install pkg: $pkg" -msgstr "Voulez vous installer le paquet : $pkg" +msgid "Would you like to install pkg: %s" +msgstr "Voulez vous installer le paquet : %s" #: tinyutils/hwsetup:148 -#, sh-format -msgid "adding $user to $grp" -msgstr "ajoute $user dans $grp" +msgid "adding %s to %s" +msgstr "ajoute %s dans %s" #: tinyutils/hwsetup:171 msgid "Detected USB Device : Vendor : Product" @@ -408,14 +395,12 @@ msgstr "Voulez vous utiliser l'utilitaire hp-setup" #: tinyutils/hwsetup:228 -#, sh-format -msgid "Verify $DEVICE Permissions" -msgstr "Vérifie les permissions de $DEVICE" +msgid "Verify %s Permissions" +msgstr "Vérifie les permissions de %s" #: tinyutils/hwsetup:229 -#, sh-format -msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" -msgstr "Votre $DEVICE doit être dans le groupe $grp avec les droits rw-rw-rw-" +msgid "Your %s must be in %s group with rw-rw-rw- permissions" +msgstr "Votre %s doit être dans le groupe %s avec les droits rw-rw-rw-" #: tinyutils/hwsetup:250 msgid "New udev rules are added by a package" @@ -525,9 +510,8 @@ "la webcam est active ; veuillez utiliser gphoto2 pour importer des photos" #: tinyutils/hwsetup:483 -#, sh-format -msgid "Quick start guide: $guide_url" -msgstr "Guide succinct : $guide_url" +msgid "Quick start guide: %s" +msgstr "Guide succinct : %s" #: tinyutils/hwsetup:494 msgid "Do you want to see if the bluetooth is working" @@ -554,9 +538,8 @@ msgstr "Association avec les périphériques distants..." #: tinyutils/hwsetup:520 tinyutils/hwsetup:541 -#, sh-format -msgid "You can manually edit the configuration files in $bt if need be" -msgstr "Vous pouvez éditer les fichiers de configuration dans $bt" +msgid "You can manually edit the configuration files in %s if need be" +msgstr "Vous pouvez éditer les fichiers de configuration dans %s" #: tinyutils/hwsetup:534 msgid "for starting bluetooth daemon" @@ -587,16 +570,14 @@ msgstr "Voulez vous configurer wvdial" #: tinyutils/hwsetup:567 -#, sh-format -msgid "Edit $wc for phone number, login name, password and pin" +msgid "Edit %s for phone number, login name, password and pin" msgstr "" "Edition du numéro de téléphone et des login, mot de passe et code pin dans " -"$wc" +"%s" #: tinyutils/hwsetup:568 -#, sh-format -msgid "Add DNS address of your provider in $rc" -msgstr "Ajout de l'adresse DNS de votre provide dans $rc" +msgid "Add DNS address of your provider in %s" +msgstr "Ajout de l'adresse DNS de votre provide dans %s" #: tinyutils/hwsetup:577 msgid "Setting IPTABLES_RULES to yes in /etc/slitaz/firewall.conf" @@ -616,15 +597,13 @@ #: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 #: tinyutils/hwsetup:714 -#, sh-format -msgid "Your previous config is in $xorg60" -msgstr "La config précédante est dans $xorg60" +msgid "Your previous config is in %s" +msgstr "La config précédante est dans %s" #: tinyutils/hwsetup:611 tinyutils/hwsetup:650 -#, sh-format -msgid "If nvidia fails, you can remove $xorg55 to restore previous config." +msgid "If nvidia fails, you can remove %s to restore previous config." msgstr "" -"Si nvidia se plante, retirez $xorg55 pour restorer la config précédante." +"Si nvidia se plante, retirez %s pour restorer la config précédante." #: tinyutils/hwsetup:618 msgid "Adding to xorg.conf:" @@ -651,9 +630,8 @@ msgstr "Voulez vous configurer X avec le pilote nvidia libre" #: tinyutils/hwsetup:652 -#, sh-format -msgid "Create $xorg55short configured with nv driver." -msgstr "Crée $xorg55short pour le pilote nv." +msgid "Create %s configured with nv driver." +msgstr "Crée %s pour le pilote nv." #: tinyutils/hwsetup:678 msgid "Do you want to configure X using non-free catalyst ATI (radeon) driver" @@ -661,9 +639,8 @@ "Voulez vous configurer X avec le pilote catalyst ATI (radeon) non-libre" #: tinyutils/hwsetup:682 -#, sh-format -msgid "If ati fails, you can remove $xorg55 to restore previous config." -msgstr "Si ATI se plante, retirez $xorg55 pour restorer la config précédante." +msgid "If ati fails, you can remove %s to restore previous config." +msgstr "Si ATI se plante, retirez %s pour restorer la config précédante." #: tinyutils/hwsetup:691 msgid "Checking if ati catalyst is working..." @@ -683,14 +660,12 @@ msgstr "Voulez vous configurer X avec le pilote libre ATI (radeon)" #: tinyutils/hwsetup:715 -#, sh-format -msgid "If ATI fails, you can remove $xorg55 to restore previous config." -msgstr "Si ATI se plante, retirez $xorg55 pour restorer la config précédante." +msgid "If ATI fails, you can remove %s to restore previous config." +msgstr "Si ATI se plante, retirez %s pour restorer la config précédante." #: tinyutils/hwsetup:717 -#, sh-format -msgid "Create $xorg55short configured with radeon driver." -msgstr "Création de $xorg55short avec le pilote radeon." +msgid "Create %s configured with radeon driver." +msgstr "Création de %s avec le pilote radeon." #: tinyutils/hwsetup:723 msgid "Checking if ATI radeon is working..." @@ -796,8 +771,8 @@ msgstr "Mot de passe:" #: tinyutils/slitaz-config:44 -msgid "Enter new password for \\Zb\\Z1root" -msgstr "Entrez le nouveau mot de passe de \\Zb\\Z1root" +msgid "Enter new password for %s" +msgstr "Entrez le nouveau mot de passe de %s" #: tinyutils/slitaz-config:53 msgid "Add User" @@ -808,9 +783,8 @@ msgstr "Entrez l'identifiant du nouvel utilisateur \\Zb\\Z4utilisateur" #: tinyutils/slitaz-config:61 -#, sh-format -msgid "Enter password for user \\Zb\\Z4$user" -msgstr "Entrez le mot de passe de l'utilisateur \\Zb\\Z4$user" +msgid "Enter password for user \\Zb\\Z4%s" +msgstr "Entrez le mot de passe de l'utilisateur \\Zb\\Z4%s" #: tinyutils/slitaz-config:121 msgid "connected" @@ -858,9 +832,8 @@ msgstr "Mot de passe:" #: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 -#, sh-format -msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" -msgstr "Enterz la clé (ou mot de passe) Wi-Fi pour \\Zb\\Z4$essid" +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4%s" +msgstr "Enterz la clé (ou mot de passe) Wi-Fi pour \\Zb\\Z4%s" #: tinyutils/slitaz-config:197 msgid "Shutting down network interfaces..." @@ -868,7 +841,7 @@ #: tinyutils/slitaz-config:201 #, fuzzy -msgid "Configuring: /etc/network.conf..." +msgid "Configuring: %s..." msgstr "Configuration de Xorg..." #: tinyutils/slitaz-config:211 @@ -880,9 +853,8 @@ msgstr "Vérifie la connexion..." #: tinyutils/slitaz-config:220 -#, sh-format -msgid "IP address: $ip" -msgstr "Adresse IP : $ip" +msgid "IP address: %s" +msgstr "Adresse IP : %s" #: tinyutils/slitaz-config:222 msgid "Unable to connect..." @@ -944,8 +916,8 @@ #~ msgid "You must be root to configure X server." #~ msgstr "Vous devez être root pour configurer le serveur X." -#~ msgid "Setting system locale to: $locale" -#~ msgstr "Paramétrage de la langue du système : $locale" +#~ msgid "Setting system locale to: %s" +#~ msgstr "Paramétrage de la langue du système : %s" #~ msgid "You must be root to run:" #~ msgstr "Vous devez être root pour lancer:" diff -r 00c7d84edcd5 -r 3be081525506 po/slitaz-tools/pl.po --- a/po/slitaz-tools/pl.po Thu May 14 12:55:55 2015 +0200 +++ b/po/slitaz-tools/pl.po Thu Jun 04 17:11:36 2015 +0300 @@ -71,16 +71,16 @@ msgstr "" #: tinyutils/tazlocale:136 tinyutils/tazkeymap:41 -msgid "Config file:" -msgstr "Plik konfiguracyjny:" +msgid "Config file: %s" +msgstr "Plik konfiguracyjny: %s" #: tinyutils/tazlocale:137 -msgid "Current locale:" -msgstr "Aktualne ustawienia regionalne:" +msgid "Current locale: %s" +msgstr "Aktualne ustawienia regionalne: %s" #: tinyutils/tazkeymap:42 -msgid "Current keymap:" -msgstr "Aktualny układ klawiatury:" +msgid "Current keymap: %s" +msgstr "Aktualny układ klawiatury: %s" #: tinyutils/tazkeymap:51 #, fuzzy @@ -135,8 +135,7 @@ msgstr "" #: tinyutils/tazx:289 tinyutils/hwsetup:117 -#, sh-format -msgid "Installing pkg: $pkg" +msgid "Installing pkg: %s" msgstr "" #: tinyutils/tazx:307 tinyutils/tazx:423 @@ -250,29 +249,24 @@ msgstr "" #: tinyutils/decode:47 -#, sh-format -msgid "Missing decoder: $dec" -msgstr "Brakujący dekoder: $dec" +msgid "Missing decoder: %s" +msgstr "Brakujący dekoder: %s" #: tinyutils/decode:48 tinyutils/decode:80 -#, sh-format -msgid "Skipping file: $name" -msgstr "Pomijanie pliku: $name" +msgid "Skipping file: %s" +msgstr "Pomijanie pliku: %s" #: tinyutils/decode:51 -#, sh-format -msgid "Decoding: $name" -msgstr "Dekodowanie: $name" +msgid "Decoding: %s" +msgstr "Dekodowanie: %s" #: tinyutils/decode:60 -#, sh-format -msgid "No file: $file" -msgstr "Brak pliku: $file" +msgid "No file: %s" +msgstr "Brak pliku: %s" #: tinyutils/decode:82 -#, sh-format -msgid "Unsupported file: $file" -msgstr "Nieobsługiwany plik: $file" +msgid "Unsupported file: %s" +msgstr "Nieobsługiwany plik: %s" #: tinyutils/terminal:10 msgid "configurable SliTaz wrapper for terminal." @@ -291,14 +285,12 @@ msgstr "Wyświetl tą wiadomość" #: tinyutils/terminal:15 -#, sh-format -msgid "Width and height of terminal window ($GEOMETRY)" -msgstr "Szerokość i wysokość okna terminala ($GEOMETRY)" +msgid "Width and height of terminal window (%s)" +msgstr "Szerokość i wysokość okna terminala (%s)" #: tinyutils/terminal:16 -#, sh-format -msgid "Title name for window (\"$TITLE\")" -msgstr "Pasek tytułu dla okna (\"$TITLE\")" +msgid "Title name for window (\"%s\")" +msgstr "Pasek tytułu dla okna (\"%s\")" #: tinyutils/terminal:17 msgid "Don't close terminal after command finished" @@ -309,9 +301,8 @@ msgstr "Polecenie do wykonania (musi być ostatnie w lini)" #: tinyutils/terminal:21 -#, sh-format -msgid "Help for $TERMINAL:" -msgstr "Pomoc dla $TERMINAL:" +msgid "Help for %s:" +msgstr "Pomoc dla %s:" #: tinyutils/hwsetup:22 msgid "SliTaz Setup configuration" @@ -370,26 +361,22 @@ msgstr "" #: tinyutils/hwsetup:98 -#, sh-format msgid "" -"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " +"Due to a lack of compatible hardware for troubleshooting, this %s " "device has not been properly tested. Please report any success, failure, bug " "to SliTaz Bug tracker or Forum." msgstr "" #: tinyutils/hwsetup:107 -#, sh-format -msgid "Failed to setup $DEVICE" +msgid "Failed to setup %s" msgstr "" #: tinyutils/hwsetup:131 -#, sh-format -msgid "Would you like to install pkg: $pkg" +msgid "Would you like to install pkg: %s" msgstr "" #: tinyutils/hwsetup:148 -#, sh-format -msgid "adding $user to $grp" +msgid "adding %s to %s" msgstr "" #: tinyutils/hwsetup:171 @@ -401,13 +388,11 @@ msgstr "" #: tinyutils/hwsetup:228 -#, sh-format -msgid "Verify $DEVICE Permissions" +msgid "Verify %s Permissions" msgstr "" #: tinyutils/hwsetup:229 -#, sh-format -msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" +msgid "Your %s must be in %s group with rw-rw-rw- permissions" msgstr "" #: tinyutils/hwsetup:250 @@ -515,8 +500,7 @@ msgstr "" #: tinyutils/hwsetup:483 -#, sh-format -msgid "Quick start guide: $guide_url" +msgid "Quick start guide: %s" msgstr "" #: tinyutils/hwsetup:494 @@ -544,8 +528,7 @@ msgstr "" #: tinyutils/hwsetup:520 tinyutils/hwsetup:541 -#, sh-format -msgid "You can manually edit the configuration files in $bt if need be" +msgid "You can manually edit the configuration files in %s if need be" msgstr "" #: tinyutils/hwsetup:534 @@ -577,13 +560,11 @@ msgstr "" #: tinyutils/hwsetup:567 -#, sh-format -msgid "Edit $wc for phone number, login name, password and pin" +msgid "Edit %s for phone number, login name, password and pin" msgstr "" #: tinyutils/hwsetup:568 -#, sh-format -msgid "Add DNS address of your provider in $rc" +msgid "Add DNS address of your provider in %s" msgstr "" #: tinyutils/hwsetup:577 @@ -604,13 +585,11 @@ #: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 #: tinyutils/hwsetup:714 -#, sh-format -msgid "Your previous config is in $xorg60" +msgid "Your previous config is in %s" msgstr "" #: tinyutils/hwsetup:611 tinyutils/hwsetup:650 -#, sh-format -msgid "If nvidia fails, you can remove $xorg55 to restore previous config." +msgid "If nvidia fails, you can remove %s to restore previous config." msgstr "" #: tinyutils/hwsetup:618 @@ -638,8 +617,7 @@ msgstr "" #: tinyutils/hwsetup:652 -#, sh-format -msgid "Create $xorg55short configured with nv driver." +msgid "Create %s configured with nv driver." msgstr "" #: tinyutils/hwsetup:678 @@ -647,8 +625,7 @@ msgstr "" #: tinyutils/hwsetup:682 -#, sh-format -msgid "If ati fails, you can remove $xorg55 to restore previous config." +msgid "If ati fails, you can remove %s to restore previous config." msgstr "" #: tinyutils/hwsetup:691 @@ -669,13 +646,11 @@ msgstr "" #: tinyutils/hwsetup:715 -#, sh-format -msgid "If ATI fails, you can remove $xorg55 to restore previous config." +msgid "If ATI fails, you can remove %s to restore previous config." msgstr "" #: tinyutils/hwsetup:717 -#, sh-format -msgid "Create $xorg55short configured with radeon driver." +msgid "Create %s configured with radeon driver." msgstr "" #: tinyutils/hwsetup:723 @@ -780,7 +755,7 @@ msgstr "" #: tinyutils/slitaz-config:44 -msgid "Enter new password for \\Zb\\Z1root" +msgid "Enter new password for %s" msgstr "" #: tinyutils/slitaz-config:53 @@ -792,8 +767,7 @@ msgstr "" #: tinyutils/slitaz-config:61 -#, sh-format -msgid "Enter password for user \\Zb\\Z4$user" +msgid "Enter password for user \\Zb\\Z4%s" msgstr "" #: tinyutils/slitaz-config:121 @@ -841,8 +815,7 @@ msgstr "" #: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 -#, sh-format -msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4%s" msgstr "" #: tinyutils/slitaz-config:197 @@ -850,7 +823,7 @@ msgstr "" #: tinyutils/slitaz-config:201 -msgid "Configuring: /etc/network.conf..." +msgid "Configuring: %s..." msgstr "" #: tinyutils/slitaz-config:211 @@ -862,8 +835,7 @@ msgstr "" #: tinyutils/slitaz-config:220 -#, sh-format -msgid "IP address: $ip" +msgid "IP address: %s" msgstr "" #: tinyutils/slitaz-config:222 @@ -923,5 +895,5 @@ #~ msgid "You must be root to configure X server." #~ msgstr "Aby konfigurować serwer X wymagane są uprawnienia administratora." -#~ msgid "Setting system locale to: $locale" -#~ msgstr "Zmienianie ustawień regionalnych systemu na: $locale" +#~ msgid "Setting system locale to: %s" +#~ msgstr "Zmienianie ustawień regionalnych systemu na: %s" diff -r 00c7d84edcd5 -r 3be081525506 po/slitaz-tools/pt_BR.po --- a/po/slitaz-tools/pt_BR.po Thu May 14 12:55:55 2015 +0200 +++ b/po/slitaz-tools/pt_BR.po Thu Jun 04 17:11:36 2015 +0300 @@ -68,16 +68,16 @@ msgstr "Informação" #: tinyutils/tazlocale:136 tinyutils/tazkeymap:41 -msgid "Config file:" -msgstr "Arquivo de configuração:" +msgid "Config file: %s" +msgstr "Arquivo de configuração: %s" #: tinyutils/tazlocale:137 -msgid "Current locale:" -msgstr "Linguagem atual:" +msgid "Current locale: %s" +msgstr "Linguagem atual: %s" #: tinyutils/tazkeymap:42 -msgid "Current keymap:" -msgstr "Mapa de teclado atual:" +msgid "Current keymap: %s" +msgstr "Mapa de teclado atual: %s" #: tinyutils/tazkeymap:51 msgid "SliTaz keyboard setting" @@ -126,16 +126,15 @@ #: tinyutils/tazx:276 #, fuzzy msgid "Failed to setup driver" -msgstr "Falha ao configurar $DEVICE" +msgstr "Falha ao configurar %s" #: tinyutils/tazx:276 msgid "(unknown hardware)" msgstr "" #: tinyutils/tazx:289 tinyutils/hwsetup:117 -#, sh-format -msgid "Installing pkg: $pkg" -msgstr "Instalando pacote: $pkg" +msgid "Installing pkg: %s" +msgstr "Instalando pacote: %s" #: tinyutils/tazx:307 tinyutils/tazx:423 #, fuzzy @@ -252,29 +251,24 @@ msgstr "/caminho/para/arquivos/*" #: tinyutils/decode:47 -#, sh-format -msgid "Missing decoder: $dec" -msgstr "Decodificador não encontrado: $dec" +msgid "Missing decoder: %s" +msgstr "Decodificador não encontrado: %s" #: tinyutils/decode:48 tinyutils/decode:80 -#, sh-format -msgid "Skipping file: $name" -msgstr "Ignorando arquivo: $name" +msgid "Skipping file: %s" +msgstr "Ignorando arquivo: %s" #: tinyutils/decode:51 -#, sh-format -msgid "Decoding: $name" -msgstr "Decodificando: $name" +msgid "Decoding: %s" +msgstr "Decodificando: %s" #: tinyutils/decode:60 -#, sh-format -msgid "No file: $file" -msgstr "Nenhum arquivo: $file" +msgid "No file: %s" +msgstr "Nenhum arquivo: %s" #: tinyutils/decode:82 -#, sh-format -msgid "Unsupported file: $file" -msgstr "Arquivo não suportado: $file" +msgid "Unsupported file: %s" +msgstr "Arquivo não suportado: %s" #: tinyutils/terminal:10 msgid "configurable SliTaz wrapper for terminal." @@ -293,14 +287,12 @@ msgstr "Mostra esta mensagem" #: tinyutils/terminal:15 -#, sh-format -msgid "Width and height of terminal window ($GEOMETRY)" -msgstr "Largura e altura da janela de terminal ($GEOMETRY)" +msgid "Width and height of terminal window (%s)" +msgstr "Largura e altura da janela de terminal (%s)" #: tinyutils/terminal:16 -#, sh-format -msgid "Title name for window (\"$TITLE\")" -msgstr "Título para a janela (\"$TITLE\")" +msgid "Title name for window (\"%s\")" +msgstr "Título para a janela (\"%s\")" #: tinyutils/terminal:17 msgid "Don't close terminal after command finished" @@ -311,9 +303,8 @@ msgstr "Comando para executar (deve estar por último na linha)" #: tinyutils/terminal:21 -#, sh-format -msgid "Help for $TERMINAL:" -msgstr "Ajuda para $TERMINAL:" +msgid "Help for %s:" +msgstr "Ajuda para %s:" #: tinyutils/hwsetup:22 msgid "SliTaz Setup configuration" @@ -372,30 +363,26 @@ msgstr "confirmar antes de instalar dependências opcionais" #: tinyutils/hwsetup:98 -#, sh-format msgid "" -"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " +"Due to a lack of compatible hardware for troubleshooting, this %s " "device has not been properly tested. Please report any success, failure, bug " "to SliTaz Bug tracker or Forum." msgstr "" -"Devido à falta de hardware compatível para testes, este dispositivo $DEVICE " +"Devido à falta de hardware compatível para testes, este dispositivo %s " "não foi testado adequadamente. Por favor reportar qualquer sucesso, falha ou " "bug no fórum ou no SliTaz Bug tracker." #: tinyutils/hwsetup:107 -#, sh-format -msgid "Failed to setup $DEVICE" -msgstr "Falha ao configurar $DEVICE" +msgid "Failed to setup %s" +msgstr "Falha ao configurar %s" #: tinyutils/hwsetup:131 -#, sh-format -msgid "Would you like to install pkg: $pkg" -msgstr "Você gostaria de instalar o pacote: $pkg" +msgid "Would you like to install pkg: %s" +msgstr "Você gostaria de instalar o pacote: %s" #: tinyutils/hwsetup:148 -#, sh-format -msgid "adding $user to $grp" -msgstr "adicionando $user para $grp" +msgid "adding %s to %s" +msgstr "adicionando %s para %s" #: tinyutils/hwsetup:171 msgid "Detected USB Device : Vendor : Product" @@ -406,14 +393,12 @@ msgstr "Você gostaria de usar o utilitário hp-setup" #: tinyutils/hwsetup:228 -#, sh-format -msgid "Verify $DEVICE Permissions" -msgstr "Verificar permissões de $DEVICE" +msgid "Verify %s Permissions" +msgstr "Verificar permissões de %s" #: tinyutils/hwsetup:229 -#, sh-format -msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" -msgstr "Seu $DEVICE deve estar no grupo $grp com permissão rw-rw-rw-" +msgid "Your %s must be in %s group with rw-rw-rw- permissions" +msgstr "Seu %s deve estar no grupo %s com permissão rw-rw-rw-" #: tinyutils/hwsetup:250 msgid "New udev rules are added by a package" @@ -522,9 +507,8 @@ msgstr "A câmera está configurada; utilize gphoto2 para importar fotos" #: tinyutils/hwsetup:483 -#, sh-format -msgid "Quick start guide: $guide_url" -msgstr "Guia de início rápido: $guide_url" +msgid "Quick start guide: %s" +msgstr "Guia de início rápido: %s" #: tinyutils/hwsetup:494 msgid "Do you want to see if the bluetooth is working" @@ -551,10 +535,9 @@ msgstr "pareando com dispositivo bluetooth remoto..." #: tinyutils/hwsetup:520 tinyutils/hwsetup:541 -#, sh-format -msgid "You can manually edit the configuration files in $bt if need be" +msgid "You can manually edit the configuration files in %s if need be" msgstr "" -"Você pode editar o arquivo de configuração manualmente em $bt se necessário" +"Você pode editar o arquivo de configuração manualmente em %s se necessário" #: tinyutils/hwsetup:534 msgid "for starting bluetooth daemon" @@ -585,14 +568,12 @@ msgstr "Você gostaria de configurar o wvdial" #: tinyutils/hwsetup:567 -#, sh-format -msgid "Edit $wc for phone number, login name, password and pin" -msgstr "Editar $wc para número de telefone, login, senha e pin" +msgid "Edit %s for phone number, login name, password and pin" +msgstr "Editar %s para número de telefone, login, senha e pin" #: tinyutils/hwsetup:568 -#, sh-format -msgid "Add DNS address of your provider in $rc" -msgstr "Adicionar endereço DNS de seu provedor em $rc" +msgid "Add DNS address of your provider in %s" +msgstr "Adicionar endereço DNS de seu provedor em %s" #: tinyutils/hwsetup:577 msgid "Setting IPTABLES_RULES to yes in /etc/slitaz/firewall.conf" @@ -613,15 +594,13 @@ #: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 #: tinyutils/hwsetup:714 -#, sh-format -msgid "Your previous config is in $xorg60" -msgstr "Sua configuração anterior está em $xorg60" +msgid "Your previous config is in %s" +msgstr "Sua configuração anterior está em %s" #: tinyutils/hwsetup:611 tinyutils/hwsetup:650 -#, sh-format -msgid "If nvidia fails, you can remove $xorg55 to restore previous config." +msgid "If nvidia fails, you can remove %s to restore previous config." msgstr "" -"Se o nvidia falhar, você pode remover $xorg55 para restaurar configuração " +"Se o nvidia falhar, você pode remover %s para restaurar configuração " "anterior." #: tinyutils/hwsetup:618 @@ -649,19 +628,17 @@ msgstr "Você gostaria de configurar o X usando o driver livre da nvidia" #: tinyutils/hwsetup:652 -#, sh-format -msgid "Create $xorg55short configured with nv driver." -msgstr "Criando $xorg55short configurado com o driver nv." +msgid "Create %s configured with nv driver." +msgstr "Criando %s configurado com o driver nv." #: tinyutils/hwsetup:678 msgid "Do you want to configure X using non-free catalyst ATI (radeon) driver" msgstr "Você gostaria de configurar o X usando o driver não-livre ATI (radeon)" #: tinyutils/hwsetup:682 -#, sh-format -msgid "If ati fails, you can remove $xorg55 to restore previous config." +msgid "If ati fails, you can remove %s to restore previous config." msgstr "" -"Se o ATI falhar, você pode remover $xorg55 para restaurar configuração " +"Se o ATI falhar, você pode remover %s para restaurar configuração " "anterior." #: tinyutils/hwsetup:691 @@ -684,16 +661,14 @@ msgstr "Você gostaria de configurar o X usando o driver ATI (radeon) livre" #: tinyutils/hwsetup:715 -#, sh-format -msgid "If ATI fails, you can remove $xorg55 to restore previous config." +msgid "If ATI fails, you can remove %s to restore previous config." msgstr "" -"Se o ATI falhar, você pode remover $xorg55 para restaurar configuração " +"Se o ATI falhar, você pode remover %s para restaurar configuração " "anterior." #: tinyutils/hwsetup:717 -#, sh-format -msgid "Create $xorg55short configured with radeon driver." -msgstr "Criar $xorg55short configurado com o driver radeon." +msgid "Create %s configured with radeon driver." +msgstr "Criar %s configurado com o driver radeon." #: tinyutils/hwsetup:723 msgid "Checking if ATI radeon is working..." @@ -799,7 +774,7 @@ msgstr "Senha:" #: tinyutils/slitaz-config:44 -msgid "Enter new password for \\Zb\\Z1root" +msgid "Enter new password for %s" msgstr "" #: tinyutils/slitaz-config:53 @@ -811,8 +786,7 @@ msgstr "" #: tinyutils/slitaz-config:61 -#, sh-format -msgid "Enter password for user \\Zb\\Z4$user" +msgid "Enter password for user \\Zb\\Z4%s" msgstr "" #: tinyutils/slitaz-config:121 @@ -861,8 +835,7 @@ msgstr "Senha:" #: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 -#, sh-format -msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4%s" msgstr "" #: tinyutils/slitaz-config:197 @@ -871,7 +844,7 @@ #: tinyutils/slitaz-config:201 #, fuzzy -msgid "Configuring: /etc/network.conf..." +msgid "Configuring: %s..." msgstr "Configurando Xorg..." #: tinyutils/slitaz-config:211 @@ -883,8 +856,7 @@ msgstr "" #: tinyutils/slitaz-config:220 -#, sh-format -msgid "IP address: $ip" +msgid "IP address: %s" msgstr "" #: tinyutils/slitaz-config:222 @@ -947,8 +919,8 @@ #~ msgid "You must be root to configure X server." #~ msgstr "Você deve ser root para configurar o servidor gráfico." -#~ msgid "Setting system locale to: $locale" -#~ msgstr "Definido linguagem do sistema para: $locale" +#~ msgid "Setting system locale to: %s" +#~ msgstr "Definido linguagem do sistema para: %s" #~ msgid "You must be root to run:" #~ msgstr "Você deve ser root para executar:" diff -r 00c7d84edcd5 -r 3be081525506 po/slitaz-tools/ru.po --- a/po/slitaz-tools/ru.po Thu May 14 12:55:55 2015 +0200 +++ b/po/slitaz-tools/ru.po Thu Jun 04 17:11:36 2015 +0300 @@ -71,16 +71,16 @@ msgstr "Информация" #: tinyutils/tazlocale:136 tinyutils/tazkeymap:41 -msgid "Config file:" -msgstr "Файл настроек:" +msgid "Config file: %s" +msgstr "Файл настроек: %s" #: tinyutils/tazlocale:137 -msgid "Current locale:" -msgstr "Текущая локаль:" +msgid "Current locale: %s" +msgstr "Текущая локаль: %s" #: tinyutils/tazkeymap:42 -msgid "Current keymap:" -msgstr "Текущая раскладка:" +msgid "Current keymap: %s" +msgstr "Текущая раскладка: %s" #: tinyutils/tazkeymap:51 msgid "SliTaz keyboard setting" @@ -134,9 +134,8 @@ msgstr "(неизвестное оборудование)" #: tinyutils/tazx:289 tinyutils/hwsetup:117 -#, sh-format -msgid "Installing pkg: $pkg" -msgstr "Установка пакета «$pkg»" +msgid "Installing pkg: %s" +msgstr "Установка пакета «%s»" #: tinyutils/tazx:307 tinyutils/tazx:423 msgid "Install Window Manager and applications" @@ -247,29 +246,24 @@ msgstr "/путь/к/файлам/*" #: tinyutils/decode:47 -#, sh-format -msgid "Missing decoder: $dec" -msgstr "Отсутствует декодер «$dec»" +msgid "Missing decoder: %s" +msgstr "Отсутствует декодер «%s»" #: tinyutils/decode:48 tinyutils/decode:80 -#, sh-format -msgid "Skipping file: $name" -msgstr "Файл «$name» не обработан" +msgid "Skipping file: %s" +msgstr "Файл «%s» не обработан" #: tinyutils/decode:51 -#, sh-format -msgid "Decoding: $name" -msgstr "Преобразование «$name»" +msgid "Decoding: %s" +msgstr "Преобразование «%s»" #: tinyutils/decode:60 -#, sh-format -msgid "No file: $file" -msgstr "Файл «$file» отсутствует" +msgid "No file: %s" +msgstr "Файл «%s» отсутствует" #: tinyutils/decode:82 -#, sh-format -msgid "Unsupported file: $file" -msgstr "Файл «$file» не поддерживается" +msgid "Unsupported file: %s" +msgstr "Файл «%s» не поддерживается" #: tinyutils/terminal:10 msgid "configurable SliTaz wrapper for terminal." @@ -288,14 +282,12 @@ msgstr "Вывести эту справку" #: tinyutils/terminal:15 -#, sh-format -msgid "Width and height of terminal window ($GEOMETRY)" -msgstr "Ширина и высота окна терминала ($GEOMETRY)" +msgid "Width and height of terminal window (%s)" +msgstr "Ширина и высота окна терминала (%s)" #: tinyutils/terminal:16 -#, sh-format -msgid "Title name for window (\"$TITLE\")" -msgstr "Заголовок окна (\"$TITLE\")" +msgid "Title name for window (\"%s\")" +msgstr "Заголовок окна (\"%s\")" #: tinyutils/terminal:17 msgid "Don't close terminal after command finished" @@ -306,9 +298,8 @@ msgstr "Выполнить команду (должна быть последней в строке)" #: tinyutils/terminal:21 -#, sh-format -msgid "Help for $TERMINAL:" -msgstr "Справка программы $TERMINAL:" +msgid "Help for %s:" +msgstr "Справка программы %s:" #: tinyutils/hwsetup:22 msgid "SliTaz Setup configuration" @@ -367,30 +358,26 @@ msgstr "подтверждать установку дополнительных зависимостей" #: tinyutils/hwsetup:98 -#, sh-format msgid "" -"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " +"Due to a lack of compatible hardware for troubleshooting, this %s " "device has not been properly tested. Please report any success, failure, bug " "to SliTaz Bug tracker or Forum." msgstr "" -"Работа этого устройства $DEVICE не проверялась, его нет у разработчиков " +"Работа этого устройства %s не проверялась, его нет у разработчиков " "SliTaz. Сообщите о ваших успехах, неудачах, ошибках в баг-трекер SliTaz или " "на форум." #: tinyutils/hwsetup:107 -#, sh-format -msgid "Failed to setup $DEVICE" -msgstr "Не удалось настроить $DEVICE" +msgid "Failed to setup %s" +msgstr "Не удалось настроить %s" #: tinyutils/hwsetup:131 -#, sh-format -msgid "Would you like to install pkg: $pkg" -msgstr "Установить пакет «$pkg»" +msgid "Would you like to install pkg: %s" +msgstr "Установить пакет «%s»" #: tinyutils/hwsetup:148 -#, sh-format -msgid "adding $user to $grp" -msgstr "пользователь «$user» добавляется в группу «$grp»" +msgid "adding %s to %s" +msgstr "пользователь «%s» добавляется в группу «%s»" #: tinyutils/hwsetup:171 msgid "Detected USB Device : Vendor : Product" @@ -401,16 +388,13 @@ msgstr "Использовать утилиту hp-setup" #: tinyutils/hwsetup:228 -#, sh-format -msgid "Verify $DEVICE Permissions" -msgstr "Проверка прав доступа «$DEVICE»" +msgid "Verify %s Permissions" +msgstr "Проверка прав доступа «%s»" #: tinyutils/hwsetup:229 -#, sh-format -msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" +msgid "Your %s must be in %s group with rw-rw-rw- permissions" msgstr "" -"Устройство «$DEVICE» должно принадлежать группе $grp и иметь права доступа " -"rw-rw-rw-" +"Устройство «%s» должно принадлежать группе %s и иметь права доступа rw-rw-rw-" #: tinyutils/hwsetup:250 msgid "New udev rules are added by a package" @@ -519,9 +503,8 @@ msgstr "Камера настроена; запустите gphoto2 для импорта фотографий" #: tinyutils/hwsetup:483 -#, sh-format -msgid "Quick start guide: $guide_url" -msgstr "Краткое руководство: $guide_url" +msgid "Quick start guide: %s" +msgstr "Краткое руководство: %s" #: tinyutils/hwsetup:494 msgid "Do you want to see if the bluetooth is working" @@ -548,10 +531,9 @@ msgstr "сопряжение с устройством Bluetooth…" #: tinyutils/hwsetup:520 tinyutils/hwsetup:541 -#, sh-format -msgid "You can manually edit the configuration files in $bt if need be" +msgid "You can manually edit the configuration files in %s if need be" msgstr "" -"Если понадобится, вы можете самостоятельно править файлы настроек в $bt" +"Если понадобится, вы можете самостоятельно править файлы настроек в %s" #: tinyutils/hwsetup:534 msgid "for starting bluetooth daemon" @@ -582,14 +564,12 @@ msgstr "Хотите ли вы настроить wvdial" #: tinyutils/hwsetup:567 -#, sh-format -msgid "Edit $wc for phone number, login name, password and pin" -msgstr "В файле $wc вы можете изменить номер дозвона, логин, пароль и PIN" +msgid "Edit %s for phone number, login name, password and pin" +msgstr "В файле %s вы можете изменить номер дозвона, логин, пароль и PIN" #: tinyutils/hwsetup:568 -#, sh-format -msgid "Add DNS address of your provider in $rc" -msgstr "Добавьте адрес DNS-сервера вашего провайдера в файл $rc" +msgid "Add DNS address of your provider in %s" +msgstr "Добавьте адрес DNS-сервера вашего провайдера в файл %s" #: tinyutils/hwsetup:577 msgid "Setting IPTABLES_RULES to yes in /etc/slitaz/firewall.conf" @@ -611,15 +591,13 @@ #: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 #: tinyutils/hwsetup:714 -#, sh-format -msgid "Your previous config is in $xorg60" -msgstr "Предыдущие настройки находятся в файле $xorg60" +msgid "Your previous config is in %s" +msgstr "Предыдущие настройки находятся в файле %s" #: tinyutils/hwsetup:611 tinyutils/hwsetup:650 -#, sh-format -msgid "If nvidia fails, you can remove $xorg55 to restore previous config." +msgid "If nvidia fails, you can remove %s to restore previous config." msgstr "" -"Если драйвер ATI не будет корректно работать, вы можете удалить $xorg55, " +"Если драйвер ATI не будет корректно работать, вы можете удалить %s, " "чтобы вернуться к предыдущим настройкам." #: tinyutils/hwsetup:618 @@ -648,19 +626,17 @@ msgstr "Настроить Xorg, используя свободный драйвер nVidia" #: tinyutils/hwsetup:652 -#, sh-format -msgid "Create $xorg55short configured with nv driver." -msgstr "Создание файла «$xorg55short», содержащего настройки драйвера Radeon." +msgid "Create %s configured with nv driver." +msgstr "Создание файла «%s», содержащего настройки драйвера Radeon." #: tinyutils/hwsetup:678 msgid "Do you want to configure X using non-free catalyst ATI (radeon) driver" msgstr "Настроить Xorg, используя несвободный драйвер ATI Catalyst (Radeon)" #: tinyutils/hwsetup:682 -#, sh-format -msgid "If ati fails, you can remove $xorg55 to restore previous config." +msgid "If ati fails, you can remove %s to restore previous config." msgstr "" -"Если драйвер ATI не будет корректно работать, вы можете удалить $xorg55, " +"Если драйвер ATI не будет корректно работать, вы можете удалить %s, " "чтобы вернуться к предыдущим настройкам." #: tinyutils/hwsetup:691 @@ -683,16 +659,14 @@ msgstr "Настроить Xorg, используя свободный драйвер ATI (Radeon)" #: tinyutils/hwsetup:715 -#, sh-format -msgid "If ATI fails, you can remove $xorg55 to restore previous config." +msgid "If ATI fails, you can remove %s to restore previous config." msgstr "" -"Если драйвер ATI не будет корректно работать, вы можете удалить $xorg55, " +"Если драйвер ATI не будет корректно работать, вы можете удалить %s, " "чтобы вернуться к предыдущим настройкам." #: tinyutils/hwsetup:717 -#, sh-format -msgid "Create $xorg55short configured with radeon driver." -msgstr "Создание файла «$xorg55short», содержащего настройки драйвера Radeon." +msgid "Create %s configured with radeon driver." +msgstr "Создание файла «%s», содержащего настройки драйвера Radeon." #: tinyutils/hwsetup:723 msgid "Checking if ATI radeon is working..." @@ -796,8 +770,8 @@ msgstr "Пароль root" #: tinyutils/slitaz-config:44 -msgid "Enter new password for \\Zb\\Z1root" -msgstr "Введите новый пароль для \\Zb\\Z1root" +msgid "Enter new password for %s" +msgstr "Введите новый пароль для %s" #: tinyutils/slitaz-config:53 msgid "Add User" @@ -808,9 +782,8 @@ msgstr "Введите логин нового \\Zb\\Z4пользователя" #: tinyutils/slitaz-config:61 -#, sh-format -msgid "Enter password for user \\Zb\\Z4$user" -msgstr "Введите пароль для пользователя \\Zb\\Z4$user" +msgid "Enter password for user \\Zb\\Z4%s" +msgstr "Введите пароль для пользователя \\Zb\\Z4%s" #: tinyutils/slitaz-config:121 msgid "connected" @@ -857,17 +830,16 @@ msgstr "Пароль Wi-Fi" #: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 -#, sh-format -msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" -msgstr "Введите пароль Wi-Fi для \\Zb\\Z4$essid" +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4%s" +msgstr "Введите пароль Wi-Fi для \\Zb\\Z4%s" #: tinyutils/slitaz-config:197 msgid "Shutting down network interfaces..." msgstr "Выключение сетевых интерфейсов…" #: tinyutils/slitaz-config:201 -msgid "Configuring: /etc/network.conf..." -msgstr "Настройка /etc/network.conf…" +msgid "Configuring: %s..." +msgstr "Настройка %s…" #: tinyutils/slitaz-config:211 msgid "Restarting Wi-Fi interface..." @@ -878,9 +850,8 @@ msgstr "Проверка соединения…" #: tinyutils/slitaz-config:220 -#, sh-format -msgid "IP address: $ip" -msgstr "IP-адрес: $ip" +msgid "IP address: %s" +msgstr "IP-адрес: %s" #: tinyutils/slitaz-config:222 msgid "Unable to connect..." diff -r 00c7d84edcd5 -r 3be081525506 po/slitaz-tools/slitaz-tools.pot --- a/po/slitaz-tools/slitaz-tools.pot Thu May 14 12:55:55 2015 +0200 +++ b/po/slitaz-tools/slitaz-tools.pot Thu Jun 04 17:11:36 2015 +0300 @@ -64,15 +64,15 @@ msgstr "" #: tinyutils/tazlocale:136 tinyutils/tazkeymap:41 -msgid "Config file:" +msgid "Config file: %s" msgstr "" #: tinyutils/tazlocale:137 -msgid "Current locale:" +msgid "Current locale: %s" msgstr "" #: tinyutils/tazkeymap:42 -msgid "Current keymap:" +msgid "Current keymap: %s" msgstr "" #: tinyutils/tazkeymap:51 @@ -125,8 +125,7 @@ msgstr "" #: tinyutils/tazx:289 tinyutils/hwsetup:117 -#, sh-format -msgid "Installing pkg: $pkg" +msgid "Installing pkg: %s" msgstr "" #: tinyutils/tazx:307 tinyutils/tazx:423 @@ -238,28 +237,23 @@ msgstr "" #: tinyutils/decode:47 -#, sh-format -msgid "Missing decoder: $dec" +msgid "Missing decoder: %s" msgstr "" #: tinyutils/decode:48 tinyutils/decode:80 -#, sh-format -msgid "Skipping file: $name" +msgid "Skipping file: %s" msgstr "" #: tinyutils/decode:51 -#, sh-format -msgid "Decoding: $name" +msgid "Decoding: %s" msgstr "" #: tinyutils/decode:60 -#, sh-format -msgid "No file: $file" +msgid "No file: %s" msgstr "" #: tinyutils/decode:82 -#, sh-format -msgid "Unsupported file: $file" +msgid "Unsupported file: %s" msgstr "" #: tinyutils/terminal:10 @@ -279,13 +273,11 @@ msgstr "" #: tinyutils/terminal:15 -#, sh-format -msgid "Width and height of terminal window ($GEOMETRY)" +msgid "Width and height of terminal window (%s)" msgstr "" #: tinyutils/terminal:16 -#, sh-format -msgid "Title name for window (\"$TITLE\")" +msgid "Title name for window (\"%s\")" msgstr "" #: tinyutils/terminal:17 @@ -297,8 +289,7 @@ msgstr "" #: tinyutils/terminal:21 -#, sh-format -msgid "Help for $TERMINAL:" +msgid "Help for %s:" msgstr "" #: tinyutils/hwsetup:22 @@ -358,26 +349,22 @@ msgstr "" #: tinyutils/hwsetup:98 -#, sh-format msgid "" -"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " +"Due to a lack of compatible hardware for troubleshooting, this %s " "device has not been properly tested. Please report any success, failure, bug " "to SliTaz Bug tracker or Forum." msgstr "" #: tinyutils/hwsetup:107 -#, sh-format -msgid "Failed to setup $DEVICE" +msgid "Failed to setup %s" msgstr "" #: tinyutils/hwsetup:131 -#, sh-format -msgid "Would you like to install pkg: $pkg" +msgid "Would you like to install pkg: %s" msgstr "" #: tinyutils/hwsetup:148 -#, sh-format -msgid "adding $user to $grp" +msgid "adding %s to %s" msgstr "" #: tinyutils/hwsetup:171 @@ -389,13 +376,11 @@ msgstr "" #: tinyutils/hwsetup:228 -#, sh-format -msgid "Verify $DEVICE Permissions" +msgid "Verify %s Permissions" msgstr "" #: tinyutils/hwsetup:229 -#, sh-format -msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" +msgid "Your %s must be in %s group with rw-rw-rw- permissions" msgstr "" #: tinyutils/hwsetup:250 @@ -503,8 +488,7 @@ msgstr "" #: tinyutils/hwsetup:483 -#, sh-format -msgid "Quick start guide: $guide_url" +msgid "Quick start guide: %s" msgstr "" #: tinyutils/hwsetup:494 @@ -532,8 +516,7 @@ msgstr "" #: tinyutils/hwsetup:520 tinyutils/hwsetup:541 -#, sh-format -msgid "You can manually edit the configuration files in $bt if need be" +msgid "You can manually edit the configuration files in %s if need be" msgstr "" #: tinyutils/hwsetup:534 @@ -565,13 +548,11 @@ msgstr "" #: tinyutils/hwsetup:567 -#, sh-format -msgid "Edit $wc for phone number, login name, password and pin" +msgid "Edit %s for phone number, login name, password and pin" msgstr "" #: tinyutils/hwsetup:568 -#, sh-format -msgid "Add DNS address of your provider in $rc" +msgid "Add DNS address of your provider in %s" msgstr "" #: tinyutils/hwsetup:577 @@ -592,13 +573,11 @@ #: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 #: tinyutils/hwsetup:714 -#, sh-format -msgid "Your previous config is in $xorg60" +msgid "Your previous config is in %s" msgstr "" #: tinyutils/hwsetup:611 tinyutils/hwsetup:650 -#, sh-format -msgid "If nvidia fails, you can remove $xorg55 to restore previous config." +msgid "If nvidia fails, you can remove %s to restore previous config." msgstr "" #: tinyutils/hwsetup:618 @@ -626,8 +605,7 @@ msgstr "" #: tinyutils/hwsetup:652 -#, sh-format -msgid "Create $xorg55short configured with nv driver." +msgid "Create %s configured with nv driver." msgstr "" #: tinyutils/hwsetup:678 @@ -635,8 +613,7 @@ msgstr "" #: tinyutils/hwsetup:682 -#, sh-format -msgid "If ati fails, you can remove $xorg55 to restore previous config." +msgid "If ati fails, you can remove %s to restore previous config." msgstr "" #: tinyutils/hwsetup:691 @@ -657,13 +634,11 @@ msgstr "" #: tinyutils/hwsetup:715 -#, sh-format -msgid "If ATI fails, you can remove $xorg55 to restore previous config." +msgid "If ATI fails, you can remove %s to restore previous config." msgstr "" #: tinyutils/hwsetup:717 -#, sh-format -msgid "Create $xorg55short configured with radeon driver." +msgid "Create %s configured with radeon driver." msgstr "" #: tinyutils/hwsetup:723 @@ -767,7 +742,7 @@ msgstr "" #: tinyutils/slitaz-config:44 -msgid "Enter new password for \\Zb\\Z1root" +msgid "Enter new password for %s" msgstr "" #: tinyutils/slitaz-config:53 @@ -779,8 +754,7 @@ msgstr "" #: tinyutils/slitaz-config:61 -#, sh-format -msgid "Enter password for user \\Zb\\Z4$user" +msgid "Enter password for user \\Zb\\Z4%s" msgstr "" #: tinyutils/slitaz-config:121 @@ -828,8 +802,7 @@ msgstr "" #: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 -#, sh-format -msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4%s" msgstr "" #: tinyutils/slitaz-config:197 @@ -837,7 +810,7 @@ msgstr "" #: tinyutils/slitaz-config:201 -msgid "Configuring: /etc/network.conf..." +msgid "Configuring: %s..." msgstr "" #: tinyutils/slitaz-config:211 @@ -849,8 +822,7 @@ msgstr "" #: tinyutils/slitaz-config:220 -#, sh-format -msgid "IP address: $ip" +msgid "IP address: %s" msgstr "" #: tinyutils/slitaz-config:222 diff -r 00c7d84edcd5 -r 3be081525506 po/slitaz-tools/sv.po --- a/po/slitaz-tools/sv.po Thu May 14 12:55:55 2015 +0200 +++ b/po/slitaz-tools/sv.po Thu Jun 04 17:11:36 2015 +0300 @@ -67,16 +67,16 @@ msgstr "" #: tinyutils/tazlocale:136 tinyutils/tazkeymap:41 -msgid "Config file:" -msgstr "Konfigurations fil:" +msgid "Config file: %s" +msgstr "Konfigurations fil: %s" #: tinyutils/tazlocale:137 -msgid "Current locale:" -msgstr "Nuvarande språk:" +msgid "Current locale: %s" +msgstr "Nuvarande språk: %s" #: tinyutils/tazkeymap:42 -msgid "Current keymap:" -msgstr "Nuvarande tangentbords layout:" +msgid "Current keymap: %s" +msgstr "Nuvarande tangentbords layout: %s" #: tinyutils/tazkeymap:51 #, fuzzy @@ -131,8 +131,7 @@ msgstr "" #: tinyutils/tazx:289 tinyutils/hwsetup:117 -#, sh-format -msgid "Installing pkg: $pkg" +msgid "Installing pkg: %s" msgstr "" #: tinyutils/tazx:307 tinyutils/tazx:423 @@ -246,29 +245,24 @@ msgstr "" #: tinyutils/decode:47 -#, sh-format -msgid "Missing decoder: $dec" -msgstr "Saknar avkodare: $dec" +msgid "Missing decoder: %s" +msgstr "Saknar avkodare: %s" #: tinyutils/decode:48 tinyutils/decode:80 -#, sh-format -msgid "Skipping file: $name" -msgstr "Saknar fil: $name" +msgid "Skipping file: %s" +msgstr "Saknar fil: %s" #: tinyutils/decode:51 -#, sh-format -msgid "Decoding: $name" -msgstr "Avkodning: $name" +msgid "Decoding: %s" +msgstr "Avkodning: %s" #: tinyutils/decode:60 -#, sh-format -msgid "No file: $file" -msgstr "Ingen fil: $file" +msgid "No file: %s" +msgstr "Ingen fil: %s" #: tinyutils/decode:82 -#, sh-format -msgid "Unsupported file: $file" -msgstr "Ostödd filtyp: $file" +msgid "Unsupported file: %s" +msgstr "Ostödd filtyp: %s" #: tinyutils/terminal:10 msgid "configurable SliTaz wrapper for terminal." @@ -287,13 +281,11 @@ msgstr "" #: tinyutils/terminal:15 -#, sh-format -msgid "Width and height of terminal window ($GEOMETRY)" +msgid "Width and height of terminal window (%s)" msgstr "" #: tinyutils/terminal:16 -#, sh-format -msgid "Title name for window (\"$TITLE\")" +msgid "Title name for window (\"%s\")" msgstr "" #: tinyutils/terminal:17 @@ -305,8 +297,7 @@ msgstr "" #: tinyutils/terminal:21 -#, sh-format -msgid "Help for $TERMINAL:" +msgid "Help for %s:" msgstr "" #: tinyutils/hwsetup:22 @@ -366,26 +357,22 @@ msgstr "" #: tinyutils/hwsetup:98 -#, sh-format msgid "" -"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " +"Due to a lack of compatible hardware for troubleshooting, this %s " "device has not been properly tested. Please report any success, failure, bug " "to SliTaz Bug tracker or Forum." msgstr "" #: tinyutils/hwsetup:107 -#, sh-format -msgid "Failed to setup $DEVICE" +msgid "Failed to setup %s" msgstr "" #: tinyutils/hwsetup:131 -#, sh-format -msgid "Would you like to install pkg: $pkg" +msgid "Would you like to install pkg: %s" msgstr "" #: tinyutils/hwsetup:148 -#, sh-format -msgid "adding $user to $grp" +msgid "adding %s to %s" msgstr "" #: tinyutils/hwsetup:171 @@ -397,13 +384,11 @@ msgstr "" #: tinyutils/hwsetup:228 -#, sh-format -msgid "Verify $DEVICE Permissions" +msgid "Verify %s Permissions" msgstr "" #: tinyutils/hwsetup:229 -#, sh-format -msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" +msgid "Your %s must be in %s group with rw-rw-rw- permissions" msgstr "" #: tinyutils/hwsetup:250 @@ -511,8 +496,7 @@ msgstr "" #: tinyutils/hwsetup:483 -#, sh-format -msgid "Quick start guide: $guide_url" +msgid "Quick start guide: %s" msgstr "" #: tinyutils/hwsetup:494 @@ -540,8 +524,7 @@ msgstr "" #: tinyutils/hwsetup:520 tinyutils/hwsetup:541 -#, sh-format -msgid "You can manually edit the configuration files in $bt if need be" +msgid "You can manually edit the configuration files in %s if need be" msgstr "" #: tinyutils/hwsetup:534 @@ -573,13 +556,11 @@ msgstr "" #: tinyutils/hwsetup:567 -#, sh-format -msgid "Edit $wc for phone number, login name, password and pin" +msgid "Edit %s for phone number, login name, password and pin" msgstr "" #: tinyutils/hwsetup:568 -#, sh-format -msgid "Add DNS address of your provider in $rc" +msgid "Add DNS address of your provider in %s" msgstr "" #: tinyutils/hwsetup:577 @@ -600,13 +581,11 @@ #: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 #: tinyutils/hwsetup:714 -#, sh-format -msgid "Your previous config is in $xorg60" +msgid "Your previous config is in %s" msgstr "" #: tinyutils/hwsetup:611 tinyutils/hwsetup:650 -#, sh-format -msgid "If nvidia fails, you can remove $xorg55 to restore previous config." +msgid "If nvidia fails, you can remove %s to restore previous config." msgstr "" #: tinyutils/hwsetup:618 @@ -634,8 +613,7 @@ msgstr "" #: tinyutils/hwsetup:652 -#, sh-format -msgid "Create $xorg55short configured with nv driver." +msgid "Create %s configured with nv driver." msgstr "" #: tinyutils/hwsetup:678 @@ -643,8 +621,7 @@ msgstr "" #: tinyutils/hwsetup:682 -#, sh-format -msgid "If ati fails, you can remove $xorg55 to restore previous config." +msgid "If ati fails, you can remove %s to restore previous config." msgstr "" #: tinyutils/hwsetup:691 @@ -665,13 +642,11 @@ msgstr "" #: tinyutils/hwsetup:715 -#, sh-format -msgid "If ATI fails, you can remove $xorg55 to restore previous config." +msgid "If ATI fails, you can remove %s to restore previous config." msgstr "" #: tinyutils/hwsetup:717 -#, sh-format -msgid "Create $xorg55short configured with radeon driver." +msgid "Create %s configured with radeon driver." msgstr "" #: tinyutils/hwsetup:723 @@ -776,7 +751,7 @@ msgstr "" #: tinyutils/slitaz-config:44 -msgid "Enter new password for \\Zb\\Z1root" +msgid "Enter new password for %s" msgstr "" #: tinyutils/slitaz-config:53 @@ -788,8 +763,7 @@ msgstr "" #: tinyutils/slitaz-config:61 -#, sh-format -msgid "Enter password for user \\Zb\\Z4$user" +msgid "Enter password for user \\Zb\\Z4%s" msgstr "" #: tinyutils/slitaz-config:121 @@ -837,8 +811,7 @@ msgstr "" #: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 -#, sh-format -msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4%s" msgstr "" #: tinyutils/slitaz-config:197 @@ -846,7 +819,7 @@ msgstr "" #: tinyutils/slitaz-config:201 -msgid "Configuring: /etc/network.conf..." +msgid "Configuring: %s..." msgstr "" #: tinyutils/slitaz-config:211 @@ -858,8 +831,7 @@ msgstr "" #: tinyutils/slitaz-config:220 -#, sh-format -msgid "IP address: $ip" +msgid "IP address: %s" msgstr "" #: tinyutils/slitaz-config:222 @@ -919,5 +891,5 @@ #~ msgid "You must be root to configure X server." #~ msgstr "Du måste vara root får att konfigurera X server" -#~ msgid "Setting system locale to: $locale" -#~ msgstr "Ställer in systemspråket till: $locale" +#~ msgid "Setting system locale to: %s" +#~ msgstr "Ställer in systemspråket till: %s" diff -r 00c7d84edcd5 -r 3be081525506 po/slitaz-tools/zh_CN.po --- a/po/slitaz-tools/zh_CN.po Thu May 14 12:55:55 2015 +0200 +++ b/po/slitaz-tools/zh_CN.po Thu Jun 04 17:11:36 2015 +0300 @@ -65,16 +65,16 @@ msgstr "信息" #: tinyutils/tazlocale:136 tinyutils/tazkeymap:41 -msgid "Config file:" -msgstr "配置文件：" +msgid "Config file: %s" +msgstr "配置文件：%s" #: tinyutils/tazlocale:137 -msgid "Current locale:" -msgstr "区域设置：" +msgid "Current locale: %s" +msgstr "区域设置：%s" #: tinyutils/tazkeymap:42 -msgid "Current keymap:" -msgstr "键盘映射：" +msgid "Current keymap: %s" +msgstr "键盘映射：%s" #: tinyutils/tazkeymap:51 msgid "SliTaz keyboard setting" @@ -121,16 +121,15 @@ #: tinyutils/tazx:276 #, fuzzy msgid "Failed to setup driver" -msgstr "未能设置$DEVICE" +msgstr "未能设置%s" #: tinyutils/tazx:276 msgid "(unknown hardware)" msgstr "" #: tinyutils/tazx:289 tinyutils/hwsetup:117 -#, sh-format -msgid "Installing pkg: $pkg" -msgstr "安装 $pkg包" +msgid "Installing pkg: %s" +msgstr "安装 %s包" #: tinyutils/tazx:307 tinyutils/tazx:423 #, fuzzy @@ -245,29 +244,24 @@ msgstr "/path/to/files/*" #: tinyutils/decode:47 -#, sh-format -msgid "Missing decoder: $dec" -msgstr "欠缺解码器: $dec" +msgid "Missing decoder: %s" +msgstr "欠缺解码器: %s" #: tinyutils/decode:48 tinyutils/decode:80 -#, sh-format -msgid "Skipping file: $name" -msgstr "跳过文件：$name" +msgid "Skipping file: %s" +msgstr "跳过文件：%s" #: tinyutils/decode:51 -#, sh-format -msgid "Decoding: $name" -msgstr "解码$name中" +msgid "Decoding: %s" +msgstr "解码%s中" #: tinyutils/decode:60 -#, sh-format -msgid "No file: $file" -msgstr "没有文件：$file" +msgid "No file: %s" +msgstr "没有文件：%s" #: tinyutils/decode:82 -#, sh-format -msgid "Unsupported file: $file" -msgstr "不支持的文件：$file" +msgid "Unsupported file: %s" +msgstr "不支持的文件：%s" #: tinyutils/terminal:10 msgid "configurable SliTaz wrapper for terminal." @@ -286,14 +280,12 @@ msgstr "打印此信息" #: tinyutils/terminal:15 -#, sh-format -msgid "Width and height of terminal window ($GEOMETRY)" -msgstr "终端窗口的宽度和高度($GEOMETRY)" +msgid "Width and height of terminal window (%s)" +msgstr "终端窗口的宽度和高度(%s)" #: tinyutils/terminal:16 -#, sh-format -msgid "Title name for window (\"$TITLE\")" -msgstr "在窗口的标题名称 (\"$TITLE\")" +msgid "Title name for window (\"%s\")" +msgstr "在窗口的标题名称 (\"%s\")" #: tinyutils/terminal:17 msgid "Don't close terminal after command finished" @@ -304,9 +296,8 @@ msgstr "要执行的命令（必须在最后一行）" #: tinyutils/terminal:21 -#, sh-format -msgid "Help for $TERMINAL:" -msgstr "$TERMINAL的帮助：" +msgid "Help for %s:" +msgstr "%s的帮助：" #: tinyutils/hwsetup:22 msgid "SliTaz Setup configuration" @@ -365,29 +356,25 @@ msgstr "在安装可选的相关性确认" #: tinyutils/hwsetup:98 -#, sh-format msgid "" -"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " +"Due to a lack of compatible hardware for troubleshooting, this %s " "device has not been properly tested. Please report any success, failure, bug " "to SliTaz Bug tracker or Forum." msgstr "" -"由于不兼容的硬件故障，这个 $DEVICE 设备没有得到正确的测试。请报告任何成功，失" +"由于不兼容的硬件故障，这个 %s 设备没有得到正确的测试。请报告任何成功，失" "败，错误SliTaz bug跟踪或论坛。" #: tinyutils/hwsetup:107 -#, sh-format -msgid "Failed to setup $DEVICE" -msgstr "未能设置$DEVICE" +msgid "Failed to setup %s" +msgstr "未能设置%s" #: tinyutils/hwsetup:131 -#, sh-format -msgid "Would you like to install pkg: $pkg" -msgstr "要安装PKG：$pkg 吗" +msgid "Would you like to install pkg: %s" +msgstr "要安装PKG：%s 吗" #: tinyutils/hwsetup:148 -#, sh-format -msgid "adding $user to $grp" -msgstr "正在加入$user用户到$grp组" +msgid "adding %s to %s" +msgstr "正在加入%s用户到%s组" #: tinyutils/hwsetup:171 msgid "Detected USB Device : Vendor : Product" @@ -398,14 +385,12 @@ msgstr "你想使用惠普设置实用程序吗" #: tinyutils/hwsetup:228 -#, sh-format -msgid "Verify $DEVICE Permissions" -msgstr "验证$DEVICE权限" +msgid "Verify %s Permissions" +msgstr "验证%s权限" #: tinyutils/hwsetup:229 -#, sh-format -msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" -msgstr "你必须在$grp和拥有rw-rw-rw-权限，才能使用$DEVICE" +msgid "Your %s must be in %s group with rw-rw-rw- permissions" +msgstr "你必须在%s和拥有rw-rw-rw-权限，才能使用%s" #: tinyutils/hwsetup:250 msgid "New udev rules are added by a package" @@ -512,9 +497,8 @@ msgstr "请检查相机设置，使用gphoto2" #: tinyutils/hwsetup:483 -#, sh-format -msgid "Quick start guide: $guide_url" -msgstr "快速启动指南：$guide_url" +msgid "Quick start guide: %s" +msgstr "快速启动指南：%s" #: tinyutils/hwsetup:494 msgid "Do you want to see if the bluetooth is working" @@ -541,9 +525,8 @@ msgstr "配对与远程蓝牙设备中…" #: tinyutils/hwsetup:520 tinyutils/hwsetup:541 -#, sh-format -msgid "You can manually edit the configuration files in $bt if need be" -msgstr "您可以手动编辑配置文件中的$bt ，如果需要" +msgid "You can manually edit the configuration files in %s if need be" +msgstr "您可以手动编辑配置文件中的%s ，如果需要" #: tinyutils/hwsetup:534 msgid "for starting bluetooth daemon" @@ -574,14 +557,12 @@ msgstr "你要想要配置软件吗？" #: tinyutils/hwsetup:567 -#, sh-format -msgid "Edit $wc for phone number, login name, password and pin" -msgstr "编辑为$wc的电话号码，用户名，密码和PIN" +msgid "Edit %s for phone number, login name, password and pin" +msgstr "编辑为%s的电话号码，用户名，密码和PIN" #: tinyutils/hwsetup:568 -#, sh-format -msgid "Add DNS address of your provider in $rc" -msgstr "添加您的供应商DNS地址在$rc" +msgid "Add DNS address of your provider in %s" +msgstr "添加您的供应商DNS地址在%s" #: tinyutils/hwsetup:577 #, fuzzy @@ -602,14 +583,12 @@ #: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 #: tinyutils/hwsetup:714 -#, sh-format -msgid "Your previous config is in $xorg60" -msgstr "你以前的配置是$xorg60" +msgid "Your previous config is in %s" +msgstr "你以前的配置是%s" #: tinyutils/hwsetup:611 tinyutils/hwsetup:650 -#, sh-format -msgid "If nvidia fails, you can remove $xorg55 to restore previous config." -msgstr "如果nvidia失败，您可以删除$xorg55恢复到以前的配置。" +msgid "If nvidia fails, you can remove %s to restore previous config." +msgstr "如果nvidia失败，您可以删除%s恢复到以前的配置。" #: tinyutils/hwsetup:618 msgid "Adding to xorg.conf:" @@ -636,20 +615,17 @@ msgstr "你要配置X使用免费的驱动程序吗" #: tinyutils/hwsetup:652 -#, sh-format -msgid "Create $xorg55short configured with nv driver." +msgid "Create %s configured with nv driver." msgstr "" -"创建$xorg55short配置nvidia显卡驱动。（原文：Create $xorg55short configured " -"with nv driver.）" +"创建%s配置nvidia显卡驱动。（原文：Create configured with nv driver.）" #: tinyutils/hwsetup:678 msgid "Do you want to configure X using non-free catalyst ATI (radeon) driver" msgstr "你要配置X使用非自由的催化剂（ATI 显卡）驱动程序吗？" #: tinyutils/hwsetup:682 -#, sh-format -msgid "If ati fails, you can remove $xorg55 to restore previous config." -msgstr "如果ATI失败，您可以删除$xorg55恢复到以前的配置。" +msgid "If ati fails, you can remove %s to restore previous config." +msgstr "如果ATI失败，您可以删除%s恢复到以前的配置。" #: tinyutils/hwsetup:691 msgid "Checking if ati catalyst is working..." @@ -669,16 +645,13 @@ msgstr "你要配置X使用免费的ATI显卡驱动吗？" #: tinyutils/hwsetup:715 -#, sh-format -msgid "If ATI fails, you can remove $xorg55 to restore previous config." -msgstr "如果ATI失败，您可以删除$xorg55恢复到以前的配置。" +msgid "If ATI fails, you can remove %s to restore previous config." +msgstr "如果ATI失败，您可以删除%s恢复到以前的配置。" #: tinyutils/hwsetup:717 -#, sh-format -msgid "Create $xorg55short configured with radeon driver." +msgid "Create %s configured with radeon driver." msgstr "" -"创建$xorg55short配置显卡驱动。（原文：Create $xorg55short configured with " -"radeon driver.）" +"创建%s配置显卡驱动。（原文：Create configured with radeon driver.）" #: tinyutils/hwsetup:723 msgid "Checking if ATI radeon is working..." @@ -784,7 +757,7 @@ msgstr "密码:" #: tinyutils/slitaz-config:44 -msgid "Enter new password for \\Zb\\Z1root" +msgid "Enter new password for %s" msgstr "" #: tinyutils/slitaz-config:53 @@ -796,8 +769,7 @@ msgstr "" #: tinyutils/slitaz-config:61 -#, sh-format -msgid "Enter password for user \\Zb\\Z4$user" +msgid "Enter password for user \\Zb\\Z4%s" msgstr "" #: tinyutils/slitaz-config:121 @@ -846,8 +818,7 @@ msgstr "密码:" #: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 -#, sh-format -msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4%s" msgstr "" #: tinyutils/slitaz-config:197 @@ -856,7 +827,7 @@ #: tinyutils/slitaz-config:201 #, fuzzy -msgid "Configuring: /etc/network.conf..." +msgid "Configuring: %s..." msgstr "配置Xorg中…" #: tinyutils/slitaz-config:211 @@ -868,8 +839,7 @@ msgstr "" #: tinyutils/slitaz-config:220 -#, sh-format -msgid "IP address: $ip" +msgid "IP address: %s" msgstr "" #: tinyutils/slitaz-config:222 diff -r 00c7d84edcd5 -r 3be081525506 po/tazbox/el.po --- a/po/tazbox/el.po Thu May 14 12:55:55 2015 +0200 +++ b/po/tazbox/el.po Thu Jun 04 17:11:36 2015 +0300 @@ -193,8 +193,7 @@ msgstr "" #: tazbox/tazbox:189 -#, sh-format -msgid "Locale was set to $locale" +msgid "Locale was set to %s" msgstr "" #: tazbox/tazbox:202 @@ -258,8 +257,7 @@ msgstr "" #: tazbox/tazbox:331 -#, sh-format -msgid "TimeZone was set to $timezone" +msgid "TimeZone was set to %s" msgstr "" #: tazbox/tazbox:367 @@ -303,13 +301,11 @@ msgstr "" #: tazbox/tazbox:464 -#, sh-format -msgid "REMOVE: $pkg" +msgid "REMOVE: %s" msgstr "" #: tazbox/tazbox:468 -#, sh-format -msgid "INSTALL: $pkg" +msgid "INSTALL: %s" msgstr "" #: tazbox/tazbox:471 diff -r 00c7d84edcd5 -r 3be081525506 po/tazbox/es.po --- a/po/tazbox/es.po Thu May 14 12:55:55 2015 +0200 +++ b/po/tazbox/es.po Thu Jun 04 17:11:36 2015 +0300 @@ -192,8 +192,7 @@ msgstr "" #: tazbox/tazbox:189 -#, sh-format -msgid "Locale was set to $locale" +msgid "Locale was set to %s" msgstr "" #: tazbox/tazbox:202 @@ -257,8 +256,7 @@ msgstr "" #: tazbox/tazbox:331 -#, sh-format -msgid "TimeZone was set to $timezone" +msgid "TimeZone was set to %s" msgstr "" #: tazbox/tazbox:367 @@ -302,13 +300,11 @@ msgstr "" #: tazbox/tazbox:464 -#, sh-format -msgid "REMOVE: $pkg" +msgid "REMOVE: %s" msgstr "" #: tazbox/tazbox:468 -#, sh-format -msgid "INSTALL: $pkg" +msgid "INSTALL: %s" msgstr "" #: tazbox/tazbox:471 diff -r 00c7d84edcd5 -r 3be081525506 po/tazbox/fa.po --- a/po/tazbox/fa.po Thu May 14 12:55:55 2015 +0200 +++ b/po/tazbox/fa.po Thu Jun 04 17:11:36 2015 +0300 @@ -190,9 +190,8 @@ msgstr "مدیریت" #: tazbox/tazbox:189 -#, sh-format -msgid "Locale was set to $locale" -msgstr "تنظیم شد $locale منطقه به" +msgid "Locale was set to %s" +msgstr "تنظیم شد %s منطقه به" #: tazbox/tazbox:202 msgid "SliTaz keymap" @@ -258,9 +257,8 @@ msgstr "محل سکونت/شهر" #: tazbox/tazbox:331 -#, sh-format -msgid "TimeZone was set to $timezone" -msgstr "$timezone منطقه زمانی تنظیم شد به" +msgid "TimeZone was set to %s" +msgstr "%s منطقه زمانی تنظیم شد به" #: tazbox/tazbox:367 msgid "Please wait" @@ -304,14 +302,12 @@ msgstr "TazPKG فایل لوگ " #: tazbox/tazbox:464 -#, sh-format -msgid "REMOVE: $pkg" -msgstr "$pkg :حذف" +msgid "REMOVE: %s" +msgstr "%s :حذف" #: tazbox/tazbox:468 -#, sh-format -msgid "INSTALL: $pkg" -msgstr "$pkg :نصب" +msgid "INSTALL: %s" +msgstr "%s :نصب" #: tazbox/tazbox:471 msgid "Done!" diff -r 00c7d84edcd5 -r 3be081525506 po/tazbox/fr.po --- a/po/tazbox/fr.po Thu May 14 12:55:55 2015 +0200 +++ b/po/tazbox/fr.po Thu Jun 04 17:11:36 2015 +0300 @@ -192,8 +192,7 @@ msgstr "Gère" #: tazbox/tazbox:189 -#, sh-format -msgid "Locale was set to $locale" +msgid "Locale was set to %s" msgstr "" #: tazbox/tazbox:202 @@ -259,9 +258,8 @@ msgstr "Location/Ville" #: tazbox/tazbox:331 -#, sh-format -msgid "TimeZone was set to $timezone" -msgstr "Le fuseau horaire était $timezone" +msgid "TimeZone was set to %s" +msgstr "Le fuseau horaire était %s" #: tazbox/tazbox:367 msgid "Please wait" @@ -305,14 +303,12 @@ msgstr "" #: tazbox/tazbox:464 -#, sh-format -msgid "REMOVE: $pkg" -msgstr "RETIRE: $pkg" +msgid "REMOVE: %s" +msgstr "RETIRE: %s" #: tazbox/tazbox:468 -#, sh-format -msgid "INSTALL: $pkg" -msgstr "AJOUTE: $pkg" +msgid "INSTALL: %s" +msgstr "AJOUTE: %s" #: tazbox/tazbox:471 msgid "Done!" diff -r 00c7d84edcd5 -r 3be081525506 po/tazbox/pl.po --- a/po/tazbox/pl.po Thu May 14 12:55:55 2015 +0200 +++ b/po/tazbox/pl.po Thu Jun 04 17:11:36 2015 +0300 @@ -194,8 +194,7 @@ msgstr "" #: tazbox/tazbox:189 -#, sh-format -msgid "Locale was set to $locale" +msgid "Locale was set to %s" msgstr "" #: tazbox/tazbox:202 @@ -259,8 +258,7 @@ msgstr "" #: tazbox/tazbox:331 -#, sh-format -msgid "TimeZone was set to $timezone" +msgid "TimeZone was set to %s" msgstr "" #: tazbox/tazbox:367 @@ -304,13 +302,11 @@ msgstr "" #: tazbox/tazbox:464 -#, sh-format -msgid "REMOVE: $pkg" +msgid "REMOVE: %s" msgstr "" #: tazbox/tazbox:468 -#, sh-format -msgid "INSTALL: $pkg" +msgid "INSTALL: %s" msgstr "" #: tazbox/tazbox:471 diff -r 00c7d84edcd5 -r 3be081525506 po/tazbox/pt_BR.po --- a/po/tazbox/pt_BR.po Thu May 14 12:55:55 2015 +0200 +++ b/po/tazbox/pt_BR.po Thu Jun 04 17:11:36 2015 +0300 @@ -190,9 +190,8 @@ msgstr "Gerencie" #: tazbox/tazbox:189 -#, sh-format -msgid "Locale was set to $locale" -msgstr "Locale foi definido para $locale" +msgid "Locale was set to %s" +msgstr "Locale foi definido para %s" #: tazbox/tazbox:202 msgid "SliTaz keymap" @@ -259,9 +258,8 @@ msgstr "Localidade/Cidade" #: tazbox/tazbox:331 -#, sh-format -msgid "TimeZone was set to $timezone" -msgstr "Zona horária foi definida para $timezone" +msgid "TimeZone was set to %s" +msgstr "Zona horária foi definida para %s" #: tazbox/tazbox:367 msgid "Please wait" @@ -306,14 +304,12 @@ msgstr "Log do TazPKG" #: tazbox/tazbox:464 -#, sh-format -msgid "REMOVE: $pkg" -msgstr "REMOVER: $pkg" +msgid "REMOVE: %s" +msgstr "REMOVER: %s" #: tazbox/tazbox:468 -#, sh-format -msgid "INSTALL: $pkg" -msgstr "INSTALAR: $pkg" +msgid "INSTALL: %s" +msgstr "INSTALAR: %s" #: tazbox/tazbox:471 msgid "Done!" diff -r 00c7d84edcd5 -r 3be081525506 po/tazbox/ru.po --- a/po/tazbox/ru.po Thu May 14 12:55:55 2015 +0200 +++ b/po/tazbox/ru.po Thu Jun 04 17:11:36 2015 +0300 @@ -198,9 +198,8 @@ msgstr "Пакеты" #: tazbox/tazbox:189 -#, sh-format -msgid "Locale was set to $locale" -msgstr "Установлена локаль «$locale»" +msgid "Locale was set to %s" +msgstr "Установлена локаль «%s»" #: tazbox/tazbox:202 msgid "SliTaz keymap" @@ -266,9 +265,8 @@ msgstr "местность/город" #: tazbox/tazbox:331 -#, sh-format -msgid "TimeZone was set to $timezone" -msgstr "Установлен часовой пояс «$timezone»" +msgid "TimeZone was set to %s" +msgstr "Установлен часовой пояс «%s»" #: tazbox/tazbox:367 msgid "Please wait" @@ -312,14 +310,12 @@ msgstr "Журнал TazPkg" #: tazbox/tazbox:464 -#, sh-format -msgid "REMOVE: $pkg" -msgstr "УДАЛЕНИЕ $pkg" +msgid "REMOVE: %s" +msgstr "УДАЛЕНИЕ %s" #: tazbox/tazbox:468 -#, sh-format -msgid "INSTALL: $pkg" -msgstr "УСТАНОВКА $pkg" +msgid "INSTALL: %s" +msgstr "УСТАНОВКА %s" #: tazbox/tazbox:471 msgid "Done!" diff -r 00c7d84edcd5 -r 3be081525506 po/tazbox/sv.po --- a/po/tazbox/sv.po Thu May 14 12:55:55 2015 +0200 +++ b/po/tazbox/sv.po Thu Jun 04 17:11:36 2015 +0300 @@ -190,8 +190,7 @@ msgstr "" #: tazbox/tazbox:189 -#, sh-format -msgid "Locale was set to $locale" +msgid "Locale was set to %s" msgstr "" #: tazbox/tazbox:202 @@ -255,8 +254,7 @@ msgstr "" #: tazbox/tazbox:331 -#, sh-format -msgid "TimeZone was set to $timezone" +msgid "TimeZone was set to %s" msgstr "" #: tazbox/tazbox:367 @@ -300,13 +298,11 @@ msgstr "" #: tazbox/tazbox:464 -#, sh-format -msgid "REMOVE: $pkg" +msgid "REMOVE: %s" msgstr "" #: tazbox/tazbox:468 -#, sh-format -msgid "INSTALL: $pkg" +msgid "INSTALL: %s" msgstr "" #: tazbox/tazbox:471 diff -r 00c7d84edcd5 -r 3be081525506 po/tazbox/tazbox.pot --- a/po/tazbox/tazbox.pot Thu May 14 12:55:55 2015 +0200 +++ b/po/tazbox/tazbox.pot Thu Jun 04 17:11:36 2015 +0300 @@ -187,8 +187,7 @@ msgstr "" #: tazbox/tazbox:189 -#, sh-format -msgid "Locale was set to $locale" +msgid "Locale was set to %s" msgstr "" #: tazbox/tazbox:202 @@ -252,8 +251,7 @@ msgstr "" #: tazbox/tazbox:331 -#, sh-format -msgid "TimeZone was set to $timezone" +msgid "TimeZone was set to %s" msgstr "" #: tazbox/tazbox:367 @@ -297,13 +295,11 @@ msgstr "" #: tazbox/tazbox:464 -#, sh-format -msgid "REMOVE: $pkg" +msgid "REMOVE: %s" msgstr "" #: tazbox/tazbox:468 -#, sh-format -msgid "INSTALL: $pkg" +msgid "INSTALL: %s" msgstr "" #: tazbox/tazbox:471 diff -r 00c7d84edcd5 -r 3be081525506 po/tazbox/zh_CN.po --- a/po/tazbox/zh_CN.po Thu May 14 12:55:55 2015 +0200 +++ b/po/tazbox/zh_CN.po Thu Jun 04 17:11:36 2015 +0300 @@ -188,9 +188,8 @@ msgstr "管理" #: tazbox/tazbox:189 -#, sh-format -msgid "Locale was set to $locale" -msgstr "Locale已设為 $locale" +msgid "Locale was set to %s" +msgstr "Locale已设為 %s" #: tazbox/tazbox:202 msgid "SliTaz keymap" @@ -253,9 +252,8 @@ msgstr "所在地/城市" #: tazbox/tazbox:331 -#, sh-format -msgid "TimeZone was set to $timezone" -msgstr "时区已设為 $timezone" +msgid "TimeZone was set to %s" +msgstr "时区已设為 %s" #: tazbox/tazbox:367 msgid "Please wait" @@ -298,14 +296,12 @@ msgstr "TazPkg 纪录" #: tazbox/tazbox:464 -#, sh-format -msgid "REMOVE: $pkg" -msgstr "移除: $pkg" +msgid "REMOVE: %s" +msgstr "移除: %s" #: tazbox/tazbox:468 -#, sh-format -msgid "INSTALL: $pkg" -msgstr "安装: $pkg" +msgid "INSTALL: %s" +msgstr "安装: %s" #: tazbox/tazbox:471 msgid "Done!" diff -r 00c7d84edcd5 -r 3be081525506 po/tazbox/zh_TW.po --- a/po/tazbox/zh_TW.po Thu May 14 12:55:55 2015 +0200 +++ b/po/tazbox/zh_TW.po Thu Jun 04 17:11:36 2015 +0300 @@ -187,9 +187,8 @@ msgstr "管理" #: tazbox/tazbox:189 -#, sh-format -msgid "Locale was set to $locale" -msgstr "Locale已設為 $locale" +msgid "Locale was set to %s" +msgstr "Locale已設為 %s" #: tazbox/tazbox:202 msgid "SliTaz keymap" @@ -252,9 +251,8 @@ msgstr "所在地/城市" #: tazbox/tazbox:331 -#, sh-format -msgid "TimeZone was set to $timezone" -msgstr "時區已設為 $timezone" +msgid "TimeZone was set to %s" +msgstr "時區已設為 %s" #: tazbox/tazbox:367 msgid "Please wait" @@ -297,14 +295,12 @@ msgstr "TazPkg 紀錄" #: tazbox/tazbox:464 -#, sh-format -msgid "REMOVE: $pkg" -msgstr "移除: $pkg" +msgid "REMOVE: %s" +msgstr "移除: %s" #: tazbox/tazbox:468 -#, sh-format -msgid "INSTALL: $pkg" -msgstr "安裝: $pkg" +msgid "INSTALL: %s" +msgstr "安裝: %s" #: tazbox/tazbox:471 msgid "Done!" diff -r 00c7d84edcd5 -r 3be081525506 tazbox/tazbox --- a/tazbox/tazbox Thu May 14 12:55:55 2015 +0200 +++ b/tazbox/tazbox Thu Jun 04 17:11:36 2015 +0300 @@ -14,16 +14,16 @@ # download dir (may be in a config file) -DOWNLOADS=$HOME/Downloads +DOWNLOADS="$HOME/Downloads" # some constants to be used inside functions -tmp=/tmp/keymap.list -db=/usr/share/i18n/locales -zi=/usr/share/zoneinfo/ -ztab=${zi}zone-mini.tab -csv=/tmp/freegeoip.csv +tmp='/tmp/keymap.list' +db='/usr/share/i18n/locales' +zi='/usr/share/zoneinfo/' +ztab="${zi}zone-mini.tab" +csv='/tmp/freegeoip.csv' # @@ -58,7 +58,7 @@ # try to find icon in .desktop files find_icon() { - local_desktop=$(find $HOME/.local/share/applications + local_desktop=$(find $HOME/.local/share/applications \ -name ${1##*/}.desktop 2&>/dev/null | head -n1) system_desktop=$(find /usr/share/applications \ -name ${1##*/}.desktop 2&>/dev/null | head -n1) @@ -71,7 +71,7 @@ # su frontend GUIs su_main() { - CMD1="$1"; shift; CMD2="$(echo $@ | sed 's|&|&|g')" + CMD1="${1%% *}"; CMD2="$(echo "${1#* }" | sed 's|&|&|g')" : ${icon=$(find_icon $CMD1)} icon="${icon:-dialog-password}" @@ -99,7 +99,7 @@ # user may press cancel on download. cancel_dl() { - if [ "$?" == 1 ]; then + if [ "$?" -eq 1 ]; then _ "CANCEL" rm -f $DOWNLOADS/$(basename $url) fi @@ -112,10 +112,10 @@ : ${title=$(_n 'TazBox Output')} : ${icon=dialog-information} - yad --title="$title" --window-icon=$icon \ - --geometry="600x220+0-24" --fore="#ffffff" --back="#000000" \ + yad --title="$title" --window-icon="$icon" \ + --geometry='600x220+0-24' --fore='#ffffff' --back='#000000' \ --text-info --fontname=monospace --wrap $opts \ - --button="gtk-close:1" + --button='gtk-close:1' } @@ -123,9 +123,9 @@ logout_main() { icon='/usr/share/pixmaps/slitaz-icon.png' - yad --title="$(_n 'SliTaz Logout')" --window-icon=$icon \ - --on-top --center --height=130 \ - --image=$icon --image-on-top \ + yad --title="$(_n 'SliTaz Logout')" --window-icon="$icon" \ + --on-top --center --height='130' \ + --image="$icon" --image-on-top \ --text="$(_n 'SliTaz Logout - Please choose an action:')" \ --always-print-result \ --button "$(_n 'Close X session')!system-log-out:4" \ @@ -155,8 +155,8 @@ keymap=$(cat $tmp | sort | tr "\n" "!") timezone=$(find $zi -type f | sed s,$zi,,g | grep -v -F '.tab' | tr "\n" "!") yad --title="$(_n 'SliTaz Initial Setup')" --window-icon=$icon \ - --width=500 \ - --image=$icon --image-on-top \ + --width='500' \ + --image="$icon" --image-on-top \ --text="$(_n 'Here you can set your preferences \n for locale, keymap and timezone.')" \ --form \ --field "$(_n 'Locale'):CB" $locale \ @@ -167,12 +167,12 @@ setup() { choices=$(setup_main) - locale=$(echo $choices | cut -d"|" -f1) - keymap=$(echo $choices | cut -d"|" -f2) - timezone=$(echo $choices | cut -d"|" -f3) - [ $locale ] && tazlocale init $locale - [ $keymap ] && tazkeymap init $keymap - [ $timezone ] && echo $timezone > /etc/TZ + locale=$( echo $choices | cut -d'|' -f1) + keymap=$( echo $choices | cut -d'|' -f2) + timezone=$(echo $choices | cut -d'|' -f3) + [ -n "$locale" ] && tazlocale init $locale + [ -n "$keymap" ] && tazkeymap init $keymap + [ -n "$timezone" ] && echo $timezone > /etc/TZ } @@ -187,14 +187,14 @@ ll_CC=${locale%%@*} echo -e "${ll_CC##*_}\n$locale\n$desc" done | \ - yad --title="$(_n 'SliTaz locale')" --window-icon=$icon \ - --width=600 --height=380 --sticky --on-top --center \ - --image=$icon --image-on-top \ + yad --title="$(_n 'SliTaz locale')" --window-icon="$icon" \ + --width='600' --height='380' --sticky --on-top --center \ + --image="$icon" --image-on-top \ --text="$(_n 'Language configuration') \ \n\n$(_ 'Tip: manage locales list by installing/removing locale packages.')" \ --list --column="$(_n 'Flag'):IMG" --column $(_n 'Name') \ --column $(_n 'Description') \ - --print-column=2 --separator='' \ + --print-column='2' --separator='' \ --button="$(_n 'Manage')!stock_properties:2" \ --button="gtk-cancel:1" --button="gtk-ok:0" } @@ -211,7 +211,7 @@ # System language configuration. if [ "$locale" ]; then tazlocale $locale - tazbox notify "$(_ 'Locale was set to $locale')" \ + tazbox notify "$(_ 'Locale was set to %s' "$locale")" \ preferences-desktop-locale 3 fi } @@ -238,9 +238,9 @@ keymap() { keymap=$(keymap_main) # Deal with --button values - [ x$? == x1 ] && exit 0 + [ "$?" -eq 1 ] && exit 0 # System keymap configuration - [ "$keymap" ] && tazkeymap $keymap + [ -n "$keymap" ] && tazkeymap $keymap } @@ -272,16 +272,16 @@ tz_suggest() { CountryCode=$(geoip) - if [ "x$CountryCode" != x ]; then - if [ "x$(tz_list $CountryCode)" != x ]; then + if [ -n "$CountryCode" ]; then + if [ -n "$(tz_list $CountryCode)" ]; then CountryName=$(cut -d, -f3 $csv) - yad --title="$(_ 'SliTaz TZ')" --window-icon=$icon \ + yad --title="$(_ 'SliTaz TZ')" --window-icon="$icon" \ --on-top --center \ - --image=$CountryCode --image-on-top \ + --image="$CountryCode" --image-on-top \ --text="$(_ 'Suggested location:') $CountryName\n $(_ 'Are you agreed?')" \ - --button="gtk-yes:0" --button="gtk-no:1" - [ $? == 0 ] && echo $CountryCode + --button='gtk-yes:0' --button='gtk-no:1' + [ "$?" -eq 0 ] && echo $CountryCode fi fi } @@ -295,18 +295,18 @@ for tzfile in $(find $zi -type f -regex '.*info/[ABCEIMP].*'); do grep -m1 $(basename $tzfile) $ztab - done | cut -d' ' -f1 | sort -u > $tmpcc + done | cut -d$'\t' -f1 | sort -u > $tmpcc for CC in $(cat $tmpcc); do cat << EOT $CC $CC -$(grep -m1 "$CC " ${zi}iso3166.tab | cut -d' ' -f2) +$(grep -m1 "$CC " ${zi}iso3166.tab | cut -d$'\t' -f2) EOT done | \ - yad --title="$(_ 'SliTaz TZ')" --window-icon=$icon \ - --width=500 --height=380 --on-top --center \ - --image=$icon --image-on-top \ + yad --title="$(_ 'SliTaz TZ')" --window-icon="$icon" \ + --width='500' --height='380' --on-top --center \ + --image="$icon" --image-on-top \ --text="$(_ 'TimeZone Configuration') \ \n$(_ 'Select country and press "Forward" or manually select timezone file.') \ \n\n$(_ 'Tip: manage timezones list by installing/removing locale packages.')" \ @@ -316,13 +316,13 @@ --button="$(_n 'Manual')!gtk-index:2" \ --button="gtk-go-forward:0" \ --button="gtk-cancel:1" --always-print-result \ - --print-column=2 --separator='' + --print-column='2' --separator='' ;; xindex) # manual selection of file with timezone info - yad --title="$(_ 'SliTaz TZ')" --window-icon=$icon \ - --width=500 --on-top --center \ - --image=$icon --image-on-top \ + yad --title="$(_ 'SliTaz TZ')" --window-icon="$icon" \ + --width='500' --on-top --center \ + --image="$icon" --image-on-top \ --text="$(_ 'TimeZone Configuration')\n$(_ 'Select time zone')" \ --form --field=":FL" ${zi}UTC --separator='' | \ sed "s|$zi||" @@ -330,12 +330,12 @@ *) # second pass - city/place list=$(tz_list $1) - icon=$1 + icon="$1" if [ $(echo "$list" | wc -l) != 1 ]; then echo "$list" | \ - yad --title="$(_ 'SliTaz TZ')" --window-icon=$icon \ - --width=500 --height=380 --on-top --center \ - --image=$icon --image-on-top \ + yad --title="$(_ 'SliTaz TZ')" --window-icon="$icon" \ + --width='500' --height='380' --on-top --center \ + --image="$icon" --image-on-top \ --text="$(_ 'TimeZone Configuration')\n$(_ 'Select location')" \ --list --column $(_n 'Location/City') --separator='' else @@ -347,24 +347,24 @@ tz() { - icon=clock + icon='clock' arg=$(tz_suggest) timezone=$(tz_select $arg) case $? in 1) exit 0 ;; - 0) [ x$arg == x ] && timezone=$(tz_select "$timezone") - [ x$timezone == x ] && exit 0 + 0) [ -n "$arg" ] && timezone=$(tz_select "$timezone") + [ -z "$timezone" ] && exit 0 timezone=$(find $zi -name $timezone | grep -v -E "posix|right" | \ sed "s|$zi||") ;; 2) timezone=$(tz_select "index") ;; 4) tazbox manage_i18n main;; esac - [ "x$timezone" == x ] && exit 0 + [ -z "$timezone" ] && exit 0 echo $timezone > /etc/TZ export TZ=$timezone - tazbox notify "$(_ 'TimeZone was set to $timezone')" $icon 3 + tazbox notify "$(_ 'TimeZone was set to %s' "$timezone")" $icon 3 rm -f $tmpcc } @@ -383,19 +383,17 @@ # get package's description, install flag and sizes -desc_etc() -{ - INFO="$(grep -m1 -A3 -x -F $1 /var/lib/tazpkg/packages.txt)" - DESC=$(echo "$INFO" | sed -n 3p) - if if_installed $1; then - INST="TRUE"; echo $1 >> $ORIG_LIST +desc_etc() { + if grep -q "^$1"$'\t' /var/lib/tazpkg/installed.info; then + echo 'TRUE' >> $PKGS_LIST; echo $1 >> $ORIG_LIST else - INST="FALSE" + echo 'FALSE' >> $PKGS_LIST fi - SIZES=$(echo "$INFO" | sed -n 4p) - SIZE1=${SIZES%% *} - SIZE2=$(echo $SIZES | cut -d' ' -f2 | tr -d '(') - echo -e "$INST\n$1\n$DESC\n${SIZE1//.0}\n${SIZE2//.0}" >> $PKGS_LIST + awk -F$'\t' -vp="$1" ' + ($1==p){ + split($7, s, " "); + printf "%s\n%s\n%s\n%s\n", $1, $4, s[1], s[2]; + }' /var/lib/tazpkg/packages.info >> $PKGS_LIST } @@ -417,56 +415,54 @@ NEW_LIST=$(mktemp) LIST1=$(mktemp) LIST2=$(mktemp) - PLIST=/var/lib/tazpkg/packages.list + PLIST='/var/lib/tazpkg/packages.list' + PINFO='/vat/lib/tazpkg/packages.info' - for i in $(grep -E '^locale' $PLIST | grep -v 'extra' | \ - sed 's|\(locale-[a-zA-Z_]*\).*|\1|'); do + for i in $(awk -F$'\t' '$1~/^locale-[a-z_A-Z]+$/{print $1}' $PINFO); do desc_etc $i done - if [ "x$1" != xmain ]; then - for i in $(grep -E '^locale' $PLIST | grep 'extra' | \ - sed 's|\(locale-[a-zA-Z_]*-extra\).*|\1|'); do + if [ "$1" != 'main' ]; then + for i in $(awk -F$'\t' '$1~/^locale-[a-z_A-Z]+-extra$/{print $1}' $PINFO); do desc_etc $i done + if if_installed libQtCore; then - for i in $(grep -E '^qt-locale' $PLIST | \ - sed 's|\(qt-locale-[a-zA-Z_]*\).*|\1|'); do + for i in $(awk -F$'\t' '$1~/^qt-locale/{print $1}' $PINFO); do desc_etc $i done fi + if if_installed razorqt; then - for i in $(grep -E '^razorqt-locale' $PLIST | \ - sed 's|\(razorqt-locale-[a-zA-Z_]*\).*|\1|'); do + for i in $(awk -F$'\t' '$1~/^razorqt-locale/{print $1}' $PINFO); do desc_etc $i done fi + if if_installed firefox; then - for i in $(grep -E '^firefox-langpack' $PLIST | \ - sed 's|\(firefox-langpack-[a-zA-Z_]*\).*|\1|'); do + for i in $(awk -F$'\t' '$1~/^firefox-langpack/{print $1}' $PINFO); do desc_etc $i done fi + if if_installed thunderbird; then - for i in $(grep -E '^thunderbird-langpack' $PLIST | \ - sed 's|\(thunderbird-langpack-[a-zA-Z_]*\).*|\1|'); do + for i in $(awk -F$'\t' '$1~/^thunderbird-langpack/{print $1}' $PINFO); do desc_etc $i done fi + if if_installed squirrelmail; then - for i in $(grep -E '^squirrelmail' $PLIST | \ - grep -E '^squirrelmail-[a-z][a-z][_-]' | \ - sed 's|\(squirrelmail-[a-zA-Z_]*\)-.*|\1|'); do + for i in $(awk -F$'\t' '$1~/^squirrelmail-[a-z][a-z][_-]/{print $1}' $PINFO); do desc_etc $i done fi + if if_installed aspell; then - for i in $(grep -E '^aspell' $PLIST | \ - grep -E 'aspell-[a-z][a-z][^a-z]' | \ - sed 's|\(aspell-[a-zA-Z_]*\)-.*|\1|'); do + for i in $(awk -F$'\t' '$1~/^aspell-[a-z][a-z]_?[A-Z]?[A-Z]?$/{print $1}' $PINFO); do desc_etc $i done fi + OTHER_LOCALE="gnome-commander|-i18n gnome-vfs|-i18n gpa|-langpack \ gucharmap|-i18n lxterminal|-locales lyx|-locales rox-filer|-locales \ ufraw|-locales qupzilla|-locales" @@ -478,11 +474,11 @@ icon='stock_properties' cat $PKGS_LIST | \ { - yad --title="$(_n 'Manage locale packages')" --window-icon=$icon \ - --width=600 --height=400 --on-top --center \ - --image=$icon --image-on-top \ + yad --title="$(_n 'Manage locale packages')" --window-icon="$icon" \ + --width='600' --height='400' --on-top --center \ + --image="$icon" --image-on-top \ --text="$(_n 'Check only locale packages you need and press "Install/Remove".')" \ - --list --multiple --ellipsize=END --expand-column=3 \ + --list --multiple --ellipsize='END' --expand-column='3' \ --column="$(_n 'Inst.'):CHK" --column="$(_n 'Package Name'):TEXT" \ --column="$(_n 'Description'):TEXT" --column="$(_n 'Size'):TEXT" \ --column="$(_n 'Installed'):TEXT" \ @@ -492,7 +488,7 @@ --print-all } > $ANSWER - if [ "x$?" == "x1" ]; then rm_temp; exit 0; fi + if [ "$?" -eq 1 ]; then rm_temp; exit 0; fi grep -e 'TRUE' $ANSWER | cut -d'|' -f2 > $NEW_LIST @@ -500,18 +496,18 @@ sort -o $LIST1 $ORIG_LIST sort -o $LIST2 $NEW_LIST DIFF=$(diff $LIST1 $LIST2 | sed '/---/d;/+++/d;/@@/d') - if [ "x$DIFF" == "x" ]; then rm_temp; exit 0; fi + if [ -z "$DIFF" ]; then rm_temp; exit 0; fi # output log to gtk window - title="$(_n 'TazPkg log')"; icon="tazpkg"; opts="--tail" + title="$(_n 'TazPkg log')"; icon='tazpkg'; opts='--tail' { for pkg in $(echo "$DIFF" | grep -e '^-' | sed 's|^-||g'); do - _ 'REMOVE: $pkg' - yes | tazpkg -r $pkg --output="raw" + _ 'REMOVE: %s' "$pkg" + yes | tazpkg -r $pkg --output='raw' done for pkg in $(echo "$DIFF" | grep -e '^+' | sed 's|^+||g'); do - _ 'INSTALL: $pkg' - tazpkg -gi $pkg --output="raw" + _ 'INSTALL: %s' "$pkg" + tazpkg -gi $pkg --output='raw' done echo -e "\n\n$(_n 'Done!')\n" } | output_command @@ -524,35 +520,35 @@ newfile_main() { icon='gtk-new' - yad --title="$(_n 'New file')" --window-icon=$icon \ - --width=460 --height=160 --on-top --center \ - --image=$icon --image-on-top \ - --icon=$icon \ + yad --title="$(_n 'New file')" --window-icon="$icon" \ + --width='460' --height='160' --on-top --center \ + --image="$icon" --image-on-top \ + --icon="$icon" \ --text="$(_n 'Create a new file or folder on your desktop')" \ --entry --entry-label="$(_n 'File name')" \ - --ricon=editclear \ + --ricon='editclear' \ --always-print-result \ --button="$(_n 'SHell script')!application-x-shellscript:4" \ --button="$(_n 'Folder')!folder:3" \ --button="$(_n 'File')!empty:2" \ - --button="gtk-cancel:1" + --button='gtk-cancel:1' } newfile() { file=$(newfile_main) ret=$? - [ "$file" ] || exit 0 + [ -z "$file" ] && exit 0 case $ret in 4) - cat > $HOME/Desktop/$file << EOT + cat > "$HOME/Desktop/$file" << EOT #!/bin/sh # EOT - chmod +x $HOME/Desktop/$file ;; - 3) mkdir -p $HOME/Desktop/$file ;; - 2) touch $HOME/Desktop/$file ;; + chmod +x "$HOME/Desktop/$file" ;; + 3) mkdir -p "$HOME/Desktop/$file" ;; + 2) touch "$HOME/Desktop/$file" ;; 1) exit 0 ;; esac } @@ -562,18 +558,18 @@ all_apps() { icon='stock_bookmark' - yad --title="$(_n 'All Applications')" --window-icon=$icon \ - --width=400 --height=400 \ + yad --title="$(_n 'All Applications')" --window-icon="$icon" \ + --width='400' --height='400' \ --icons --compact \ - --read-dir=/usr/share/applications \ - --button="gtk-close:0" + --read-dir='/usr/share/applications' \ + --button='gtk-close:0' } # Ask root permissions for system settings ask_root() { - if [ $(id -u) != 0 ]; then + if [ "$(id -u)" -ne 0 ]; then exec tazbox su $0 $@ exit 0 fi @@ -586,37 +582,41 @@ case "$1" in su) + shift # Don't show dialog if we are root - test $(id -u) = 0 && exec ${@:2} - SU_CMD="${@:2}" + [ "$(id -u)" -eq 0 ] && exec "$@" + SU_CMD="$@" + SUBOX_CONF="$HOME/.config/slitaz/subox.conf" # Check if a password has been saved before launching main dialog - if [ -s $HOME/.config/slitaz/subox.conf ]; then - PASSWD=$(cat $HOME/.config/slitaz/subox.conf) - CHECKED="TRUE" + if [ -s "$SUBOX_CONF" ]; then + PASSWD="$(cat $SUBOX_CONF)" + CHECKED='TRUE' fi # Display the main dialog (ask for password) - main=$(su_main $SU_CMD) + main="$(su_main "$SU_CMD")" # Deal with --button values and exit if cancelled to avoid erasing # saved password. - [ $? == 1 ] && exit 0 + [ "$?" -eq 1 ] && exit 0 # Save or erase Autosaved password - if [ $(echo $main | cut -f2 -d"|") == "TRUE" ]; then - echo $main | cut -f 1 -d "|" > $HOME/.config/slitaz/subox.conf - chmod 0600 $HOME/.config/slitaz/subox.conf + if [ $(echo "$main" | cut -d"|" -f2) == 'TRUE' ]; then + echo "$main" | cut -d"|" -f1 > $SUBOX_CONF + chmod 0600 $SUBOX_CONF else - cat /dev/null > $HOME/.config/slitaz/subox.conf + cat /dev/null > $SUBOX_CONF fi # Try to login & execute. If password is wrong execute error dialog SU_CMD_QUOTED="$(echo "dbus-launch --exit-with-session $SU_CMD" | sed 's|&|\\&|g')" - echo $main | cut -f 1 -d "|" | su -c "$SU_CMD_QUOTED &" || su_error ;; + echo $main | cut -d"|" -f1 | su -c "$SU_CMD_QUOTED &" || su_error + ;; + logout) # Logout window with actions - if [ "$oldstyle" ]; then + if [ -n "$oldstyle" ]; then answer=$(logout_oldstyle) else logout_main; answer=$? @@ -629,8 +629,8 @@ 4|*exit) case $XDG_CURRENT_DESKTOP in LXDE) - [ "$_LXSESSION_PID" ] && kill $_LXSESSION_PID - [ "$DESKTOP_SESSION" == "compiz" ] && killall compiz + [ -n "$_LXSESSION_PID" ] && kill $_LXSESSION_PID + [ "$DESKTOP_SESSION" == 'compiz' ] && killall compiz openbox --exit ;; openbox) openbox --exit ;; compiz) killall compiz ;; @@ -642,54 +642,77 @@ reboot || reboot -f ;; 2|*halt) poweroff ;; - esac ;; + esac + ;; + out) # Pipe a command into a GTK window - sed 's|\[.m||g; s|\[[0-9][0-9]*G| |g' | output_command ;; + sed 's|\[.m||g; s|\[[0-9][0-9]*G| |g' | output_command + ;; + out-dl) # A tiny GTK window for Busybox wget output - url=$2; opts="--tail --button=gtk-cancel:1" + url="$2"; opts='--tail --button=gtk-cancel:1' icon='folder-downloads'; title="$(_ 'Downloading...')" [ -d $DOWNLOADS ] || mkdir -p $DOWNLOADS busybox wget -c -P $DOWNLOADS $url 2>&1 | output_command - cancel_dl ;; + cancel_dl + ;; + locale) - ask_root $@ && locale ;; + ask_root $@ && locale + ;; + keymap) - ask_root $@ && keymap ;; + ask_root $@ && keymap + ;; + tz) - ask_root $@ && tz ;; + ask_root $@ && tz + ;; + manage_i18n) - ask_root $@ && manage_i18n $2 ;; + ask_root $@ && manage_i18n $2 + ;; + recharge) - ask_root $@; opts="--on-top"; tazpkg recharge | output_command ;; + ask_root $@; opts='--on-top'; tazpkg recharge | output_command + ;; + setup) - ask_root $@ && setup ;; + ask_root $@ && setup + ;; + new-file) - newfile ;; + newfile + ;; + all-apps) - all_apps ;; + all_apps + ;; + notify|-n) # On screen notification box. icon="$3" time="$4" - [ "$icon" ] || icon=info - [ "$time" ] || time=4 - yad --width=520 --height=80 --timeout=$time --timeout-indicator=right \ - --on-top --center --no-buttons --borders=12 --undecorated \ - --skip-taskbar --image=$icon --image-on-top --text="$2" ;; + [ -z "$icon" ] && icon='info' + [ -z "$time" ] && time='4' + yad --width='520' --height='80' --timeout="$time" --timeout-indicator='right' \ + --on-top --center --no-buttons --borders='12' --undecorated \ + --skip-taskbar --image="$icon" --image-on-top --text="$2" + ;; + tazapps) # Default applications configuration script. System wide config file # is /etc/slitaz/applications.conf and each user can have personal # settings. System wide for root and personal config for user. export CONFIG="$HOME/.config/slitaz/applications.conf" - if [ "$(id -u)" = 0 ]; then + if [ "$(id -u)" -eq 0 ]; then [ ! -f $CONFIG ] || mv -f $CONFIG /etc/slitaz/applications.conf - export CONFIG="/etc/slitaz/applications.conf" + export CONFIG='/etc/slitaz/applications.conf' fi - for a in FILE_MANAGERS BROWSERS EDITORS TERMINALS WINDOW_MANAGERS; - do + for a in FILE_MANAGERS BROWSERS EDITORS TERMINALS WINDOW_MANAGERS; do eval $(expr $a=$(echo $(LC_ALL=C tazx get-applist ${a%%S} \ only-installed yad) | sed 's/ /!/g ; s/!!//g; s/ //g')) done @@ -699,7 +722,7 @@ icon='preferences-desktop-default-applications' eval $(yad --title="$(_n 'SliTaz default applications')" \ - --window-icon=$icon --image=$icon --image-on-top \ + --window-icon="$icon" --image="$icon" --image-on-top \ --text="$(_n 'SliTaz default applications configuration')" \ --form \ --field="$(_n 'File manager:'):CBE" "$FILE_MANAGERS" \ @@ -715,17 +738,22 @@ /EDITOR=/s|"\([^"]*\)"|"'$EDITOR'"|; \ /TERMINAL=/s|"\([^"]*\)"|"'$TERMINAL'"|; \ /WINDOW_MANAGER=/s|"\([^"]*\)"|"'$WINDOW_MANAGER'"|' \ - -i $CONFIG ;; + -i $CONFIG + ;; + gpl) - yad --title="GNU General Public License" --window-icon=text-x-generic \ - --geometry="650x500" \ - --image=/usr/share/pixmaps/gpl3.png --image-on-top \ + yad --title='GNU General Public License' --window-icon='text-x-generic' \ + --geometry='650x500' \ + --image='/usr/share/pixmaps/gpl3.png' --image-on-top \ --center \ --text-info \ - --fontname=monospace \ - --button "OK" < /usr/share/licenses/gpl.txt ;; + --fontname='monospace' \ + --button 'OK' < /usr/share/licenses/gpl.txt + ;; + *) - usage ;; + usage + ;; esac exit 0 diff -r 00c7d84edcd5 -r 3be081525506 tinyutils/decode --- a/tinyutils/decode Thu May 14 12:55:55 2015 +0200 +++ b/tinyutils/decode Thu Jun 04 17:11:36 2015 +0300 @@ -50,11 +50,11 @@ dec=$1 name="$(basename "$file")" if [ ! -x /usr/bin/$1 ]; then - _ 'Missing decoder: $dec' - _ 'Skipping file: $name' + _ 'Missing decoder: %s' "$dec" + _ 'Skipping file: %s' "$name" continue else - _ 'Decoding: $name' + _ 'Decoding: %s' "$name" newline fi } @@ -65,7 +65,7 @@ decoder() { newline; separator; newline if [ ! -f "$file" ]; then - _ 'No file: $file' + _ 'No file: %s' "$file" continue fi ext=$(echo ${file##*.} | tr '[A-Z]' '[a-z]') @@ -85,9 +85,9 @@ wav|mpg|--*) # Skip decoded files and --options. name="$(basename "$file")" - _ 'Skipping file: $name' + _ 'Skipping file: %s' "$name" continue ;; - *) _ 'Unsupported file: $file' ;; + *) _ 'Unsupported file: %s' "$file" ;; esac } diff -r 00c7d84edcd5 -r 3be081525506 tinyutils/frugal --- a/tinyutils/frugal Thu May 14 12:55:55 2015 +0200 +++ b/tinyutils/frugal Thu Jun 04 17:11:36 2015 +0300 @@ -20,9 +20,7 @@ # Internationalization -. /usr/bin/gettext.sh -TEXTDOMAIN='slitaz-tools' -export TEXTDOMAIN +export TEXTDOMAIN='slitaz-tools' # @@ -36,20 +34,20 @@ name=$(basename $0) cat << EOT -$(boldify $(gettext "Usage:")) $name [iso|command] [--options] +$(boldify $(_n 'Usage:')) $name [iso|command] [--options] -$(gettext "SliTaz frugal installation") +$(_n 'SliTaz frugal installation') -$(boldify $(gettext "Commands:")) - info $(gettext "Display install path and size stats") - clean $(gettext "Remove all frugal files") - grub-ex $(gettext "Show GRUB configuration example") +$(boldify $(_n 'Commands:')) + info $(_n 'Display install path and size stats') + clean $(_n 'Remove all frugal files') + grub-ex $(_n 'Show GRUB configuration example') -$(boldify $(gettext "Options:")) - --root= $(gettext "Set root installation path") - --debug $(gettext "Display some useful debug information") +$(boldify $(_n 'Options:')) + --root= $(_n 'Set root installation path') + --debug $(_n 'Display some useful debug information') -$(boldify $(gettext "Examples:")) +$(boldify $(_n 'Examples:')) $name slitaz-rolling.iso $name slitaz-5.0.iso --root=/boot/frugal @@ -60,7 +58,7 @@ # GRUB config example. grub_example() { - cat << EOT + cat </dev/null status - gettext "Installing the Kernel..." + + _n 'Installing the Kernel...' cp -a ${loop}/boot/bzImage ${root} status - gettext "Installing the root filesystem..." + + _n 'Installing the root filesystem...' if [ -f ${loop}/boot/rootfs1.gz ]; then cd ${loop}/boot cat $(ls -r rootfs*.gz) > ${root}/rootfs.gz @@ -140,11 +134,12 @@ status # Umount the loop device - gettext "Unmounting ISO image..." + _n 'Unmounting ISO image...' sleep 1 umount ${loop} && rm -rf ${loop} status - separator && newline ;; + + footer ;; esac exit 0 diff -r 00c7d84edcd5 -r 3be081525506 tinyutils/hwsetup --- a/tinyutils/hwsetup Thu May 14 12:55:55 2015 +0200 +++ b/tinyutils/hwsetup Thu Jun 04 17:11:36 2015 +0300 @@ -101,8 +101,8 @@ untested() { newline; separator longline $(_ "Due to a lack of compatible hardware for troubleshooting, \ -this \$DEVICE device has not been properly tested. Please report any success, \ -failure, bug to SliTaz Bug tracker or Forum.") +this %s device has not been properly tested. Please report any success, \ +failure, bug to SliTaz Bug tracker or Forum." "$DEVICE") separator; newline sleep 1 } @@ -110,7 +110,7 @@ failed() { newline; separator - _ 'Failed to setup $DEVICE' + _ 'Failed to setup %s' "$DEVICE" separator; newline sleep 1 } @@ -122,7 +122,7 @@ for pkg in $1 ; do # Avoid reinstall if [ ! -d "$INSTALLED/$pkg" ]; then - _ 'Installing pkg: $pkg' + _ 'Installing pkg: %s' "$pkg" tazpkg get-install "$pkg" if tazpkg list-files "$pkg" | grep -q "/etc/udev" ; then UDEV_RULES="yes" @@ -138,7 +138,7 @@ for pkg in $1 ; do # Avoid reinstall if [ ! -d "$INSTALLED/$pkg" ]; then - _n 'Would you like to install pkg: $pkg'; confirm + _n 'Would you like to install pkg: %s' "$pkg"; confirm if [ $? == 0 ]; then tazpkg get-install "$pkg" --forced if tazpkg list-files "$pkg" | grep -q "/etc/udev" ; then @@ -156,7 +156,7 @@ for grp in $GROUP ; do for user in $USERS ; do if ! grep -q "$grp.*$user.*" /etc/group ; then - _ 'adding $user to $grp' + _ 'adding %s to %s' "$user" "$grp" addgroup "$user" "$grp" fi done @@ -190,8 +190,8 @@ vendor=$(zcat $USB_IDS | grep $vendorid | head -1) product=$(zcat $USB_IDS | grep $productid | head -2 | \ awk ' { print $1,$2,$3,$4} ' | sed -e :a -e '$!N;s/\n/ ; /;ta') - _ " $count) Vendor : $vendor " - _ " Product : $product" + _ ' %s) Vendor : %s ' "$count" "$vendor" + _ ' Product : %s' "$product" separator count=$(expr $count + 1) done @@ -202,7 +202,8 @@ confirm_device() { - _ "Which no. is your $DEVICE shown in the above lines (1,2,3,none)? "; read choice + _n 'Which no. is your %s shown in the above lines (1,2,3,none)? ' "$DEVICE" + read choice case "$choice" in 1|2|3) dev=$(echo "$DEVICES_LIST" | head -$choice | tail -1) @@ -241,8 +242,8 @@ chmod 666 /dev/bus/usb/*$busno/*$deviceno chgrp $grp /dev/bus/usb/*$busno/*$deviceno newline; separator - boldify "$(_ 'Verify $DEVICE Permissions')" - _ 'Your $DEVICE must be in $grp group with rw-rw-rw- permissions' + boldify "$(_ 'Verify %s Permissions' "$DEVICE")" + _ 'Your %s must be in %s group with rw-rw-rw- permissions' "$DEVICE" "$grp" ls -l /dev/bus/usb/*$busno/*$deviceno separator; newline fi @@ -344,7 +345,7 @@ PASSWORD="passwd" PIN="9999" [ -n "$MODEM" ] || MODEM="/dev/ttyUSB0" - cat > $CONF << EOT + cat > $CONF </etc/bluetooth') longline $(_ "You can manually edit the configuration \ -files in \$bt if need be") +files in %s if need be" "$bt") separator; newline fi else @@ -569,7 +569,7 @@ newline bt=$(emsg '/etc/bluetooth') longline $(_ "You can manually edit the configuration files \ -in \$bt if need be") +in %s if need be" "$bt") newline; separator fi ;; @@ -591,11 +591,9 @@ else #nameserver `tail -30 /var/log/messages| grep DNS| sed 's/*\([.0-9]*\)$/\1/'` >/etc/resolv.conf newline; separator - wc=$(boldify '/etc/wvdial.conf') - rc=$(boldify '/etc/resolv.conf') optlist "\ -wvdialconf $(_ 'Edit $wc for phone number, login name, password and pin') -wvdial $(_ 'Add DNS address of your provider in $rc')" +wvdialconf $(_ 'Edit %s for phone number, login name, password and pin' "$(boldify '/etc/wvdial.conf')") +wvdial $(_ 'Add DNS address of your provider in %s' "$(boldify '/etc/resolv.conf')")" separator fi else @@ -613,11 +611,11 @@ /etc/init.d/firewall start if [ -d $INSTALLED/nmap ]; then separator - _ "Probing for open ports..." + _ 'Probing for open ports...' nmap localhost separator fi - _ "Adding firewall daemon to start automatically at boot" + _ 'Adding firewall daemon to start automatically at boot' run_daemon_startup "firewall" separator fi @@ -637,8 +635,8 @@ _n 'Do you want to configure X using non-free nvidia driver'; confirm if [ $? == 0 ]; then newline - _ 'Your previous config is in $xorg60' - _ 'If nvidia fails, you can remove $xorg55 to restore previous config.' + _ 'Your previous config is in %s' "$xorg60" + _ 'If nvidia fails, you can remove %s to restore previous config.' "$xorg55" Xorg -configure :1 > /dev/null nvidia-xconfig -c /root/xorg.conf.new -o /tmp/xorg.conf.nvidia sed -e '/Section "Device"/,/EndSection/!d' -e "s/EndSection/EndSection\n/" /tmp/xorg.conf.nvidia > $xorg55 @@ -660,7 +658,7 @@ else newline; separator xcmd='Xorg -configure :1 && nvidia-xconfig -c /root/xorg.conf.new -o /tmp/xorg.conf.nvidia' - _ "Use '$xcmd' to generate a template configuration file." + _ "Use '%s' to generate a template configuration file." "$xcmd" echo 'glxinfo | grep rendering #' $(_n 'test nvidia') _ 'Use: nvidia-settings utility to configure your settings if necessary' echo 'Option "NoLogo" "True"' @@ -676,10 +674,10 @@ _n 'Do you want to configure X using free nvidia driver'; confirm if [ $? == 0 ]; then newline; separator - _ 'Your previous config is in $xorg60' - _ 'If nvidia fails, you can remove $xorg55 to restore previous config.' + _ 'Your previous config is in %s' "$xorg60" + _ 'If nvidia fails, you can remove %s to restore previous config.' "$xorg55" newline - _ 'Create $xorg55short configured with nv driver.' + _ 'Create %s configured with nv driver.' "$xorg55short" # free nvidia driver is called nv cp -a $xorg60 $xorg55 @@ -708,8 +706,8 @@ _n 'Do you want to configure X using non-free catalyst ATI (radeon) driver'; confirm if [ $? == 0 ]; then newline - _ 'Your previous config is in $xorg60' - _ 'If ati fails, you can remove $xorg55 to restore previous config.' + _ 'Your previous config is in %s' "$xorg60" + _ 'If ati fails, you can remove %s to restore previous config.' "$xorg55" # add fglrx driver to xorg.conf Xorg -configure :1 > /dev/null @@ -741,10 +739,10 @@ _n 'Do you want to configure X using free ATI (radeon) driver'; confirm if [ $? == 0 ]; then newline; separator - _ 'Your previous config is in $xorg60' - _ 'If ATI fails, you can remove $xorg55 to restore previous config.' + _ 'Your previous config is in %s' "$xorg60" + _ 'If ATI fails, you can remove %s to restore previous config.' "$xorg55" newline - _ 'Create $xorg55short configured with radeon driver.' + _ 'Create %s configured with radeon driver.' "$xorg55short" # free ati driver is called radeon cp -a /etc/X11/xorg.conf.d/60-Device.conf /etc/X11/xorg.conf.d/55-DeviceTweaks.conf @@ -787,7 +785,7 @@ device #untested - if [ ! "$NON_FREE_DEPENDS" == "" -a "$NON_FREE" == "yes" ]; then + if [ -n "$NON_FREE_DEPENDS" -a "$NON_FREE" == "yes" ]; then DEPENDS="$NON_FREE_DEPENDS" fi diff -r 00c7d84edcd5 -r 3be081525506 tinyutils/setmixer --- a/tinyutils/setmixer Thu May 14 12:55:55 2015 +0200 +++ b/tinyutils/setmixer Thu Jun 04 17:11:36 2015 +0300 @@ -7,12 +7,11 @@ # Internationalization -. /usr/bin/gettext.sh -TEXTDOMAIN='slitaz-tools' -export TEXTDOMAIN +. /lib/libtaz.sh +export TEXTDOMAIN='slitaz-tools' -gettext "Setting default mixer volumes... " +_n 'Setting default mixer volumes... ' amixer -s -q <$tmp passwd=$(cat $tmp) [ -z "$passwd" ] && return 0 @@ -67,7 +67,7 @@ [ -z "$user" ] && return 0 dialog --title "$title2" --colors \ - --inputbox "\n$(_ 'Enter password for user \Zb\Z4$user')" 12 $width 2>$tmp + --inputbox "\n$(_ 'Enter password for user \Zb\Z4%s' "$user")" 12 $width 2>$tmp passwd=$(cat $tmp) [ -z "$passwd" ] && return 0 @@ -190,7 +190,7 @@ [ -z "$essid" ] && exit 0 dialog --title "{ $(_ 'Wi-Fi Password') }" --colors \ - --inputbox "\n$(_ 'Enter Wi-Fi key (password) for \Zb\Z4$essid')" \ + --inputbox "\n$(_ 'Enter Wi-Fi key (password) for \Zb\Z4%s' "$essid")" \ 12 $width 2>$tmp key=$(cat $tmp) else @@ -201,7 +201,7 @@ if [ "$key" == "on" ]; then dialog --title "{ $(_ 'Wi-Fi Password') }" --colors \ - --inputbox "\n$(_ 'Enter Wi-Fi key (password) for \Zb\Z4$essid')" \ + --inputbox "\n$(_ 'Enter Wi-Fi key (password) for \Zb\Z4%s' "$essid")" \ 12 $width 2>$tmp key=$(cat $tmp) [ -z "$key" ] && exit 0 @@ -214,7 +214,7 @@ msg 0; stopd network.sh >/dev/null 2>&1 msg 10 - MSG="\n$(_ 'Configuring: /etc/network.conf...')" + MSG="\n$(_ 'Configuring: %s...' '/etc/network.conf')" msg 20 # WIFI_KEY_TYPE=any should work for WEP/WPA* sed -i \ @@ -232,8 +232,8 @@ msg 90; sleep 2 ip="$(ifconfig $WIFI_INTERFACE | fgrep 'inet addr' | sed 's|.*:\([^ ]*\) .*|\1|')" - if [ "$ip" ]; then - MSG="\n$(_ 'IP address: $ip')" + if [ -n "$ip" ]; then + MSG="\n$(_ 'IP address: %s' "$ip")" else MSG="\n$(_ 'Unable to connect...')" fi diff -r 00c7d84edcd5 -r 3be081525506 tinyutils/startd --- a/tinyutils/startd Thu May 14 12:55:55 2015 +0200 +++ b/tinyutils/startd Thu Jun 04 17:11:36 2015 +0300 @@ -6,7 +6,7 @@ . /lib/libtaz.sh check_root -[ ! "$1" ] && echo "Usage: startd [daemon]" && exit 0 +[ -z "$1" ] && echo "Usage: startd [daemon]" && exit 0 if [ -x /etc/init.d/$1 ]; then /etc/init.d/$1 start diff -r 00c7d84edcd5 -r 3be081525506 tinyutils/stopd --- a/tinyutils/stopd Thu May 14 12:55:55 2015 +0200 +++ b/tinyutils/stopd Thu Jun 04 17:11:36 2015 +0300 @@ -6,7 +6,7 @@ . /lib/libtaz.sh check_root -[ ! "$1" ] && echo "Usage: stopd [daemon]" && exit 0 +[ -z "$1" ] && echo "Usage: stopd [daemon]" && exit 0 if [ -x /etc/init.d/$1 ]; then /etc/init.d/$1 stop diff -r 00c7d84edcd5 -r 3be081525506 tinyutils/tazhw --- a/tinyutils/tazhw Thu May 14 12:55:55 2015 +0200 +++ b/tinyutils/tazhw Thu Jun 04 17:11:36 2015 +0300 @@ -54,7 +54,7 @@ _ '* No active connection to get and install firmware.' fi else - _ '> Firmware in use: $mod-firmware' + _ '> Firmware in use: %s' "$mod-firmware" fi fi } @@ -65,21 +65,21 @@ # Check if builtin, loaded or missing if modprobe $mod 2>/dev/null; then if zcat /proc/config.gz | fgrep -i $mod | fgrep -q '=y'; then - _ '* Builtin module : $mod' + _ '* Builtin module : %s' "$mod" unset mod else - _ "* Loaded module : $mod" + _ '* Loaded module : %s' "$mod" fi else if zcat /proc/config.gz | fgrep -i $mod | fgrep -q '=y'; then - _ '* Builtin module : $mod' + _ '* Builtin module : %s' "$mod" unset mod else - _ '! Missing module : $mod' + _ '! Missing module : %s' "$mod" fi fi else - _ '> Module in use : $mod' + _ '> Module in use : %s' "$mod" fi # Add it to load automatically at next boot. if ! echo "$LOAD_MODULES" | grep -q "$mod"; then @@ -111,7 +111,7 @@ if [ ! -s /var/lib/detected-modules ]; then . /etc/rcS.conf # We need module_name to match output of lsmod. - list=$(lspci -k | grep "driver" | cut -d ":" -f 2 | module_name) + list=$(lspci -k | grep 'driver' | cut -d: -f2 | module_name) echo "$list" > /var/lib/detected-modules for mod in $(sort < /var/lib/detected-modules | uniq) do @@ -159,25 +159,25 @@ detect_usb_devices ;; -dp|detect-pci) check_root - newline; _ 'Detected PCI devices Kernel modules'; separator + title 'Detected PCI devices Kernel modules' rm -f /var/lib/detected-modules detect_pci_devices - separator; newline ;; + footer ;; -du|detect-usb) check_root - newline; _ 'Detected USB devices Kernel modules'; separator + title 'Detected USB devices Kernel modules' rm -f /var/lib/detected-usb-modules detect_usb_devices - separator; newline ;; + footer ;; -s|setup) SETUP_OPTIONS=$(echo "$@" | sed 's/setup//') check_root hwsetup $SETUP_OPTIONS ;; -dm|detected-modules) - newline; _ 'Detected PCI and USB modules'; separator + title 'Detected PCI and USB modules' cat /var/lib/detected-modules cat /var/lib/detected-usb-modules 2>/dev/null - separator; newline ;; + footer ;; *) usage ;; esac diff -r 00c7d84edcd5 -r 3be081525506 tinyutils/tazkeymap --- a/tinyutils/tazkeymap Thu May 14 12:55:55 2015 +0200 +++ b/tinyutils/tazkeymap Thu Jun 04 17:11:36 2015 +0300 @@ -46,8 +46,8 @@ case "$1" in info) - _n 'Config file:'; echo " /etc/keymap.conf" - _n 'Current keymap:'; echo " $(cat /etc/keymap.conf)" ;; + _ 'Config file: %s' '/etc/keymap.conf' + _ 'Current keymap: %s' "$(cat /etc/keymap.conf)" ;; list) list_keymaps | sort ;; "") diff -r 00c7d84edcd5 -r 3be081525506 tinyutils/tazlocale --- a/tinyutils/tazlocale Thu May 14 12:55:55 2015 +0200 +++ b/tinyutils/tazlocale Thu Jun 04 17:11:36 2015 +0300 @@ -58,7 +58,7 @@ link_language_files() { . /etc/locale.conf LANGUAGE=${LANG%_*} - [ "$LANG" == "POSIX" ] && LANGUAGE="en" + [ "$LANG" == 'POSIX' ] && LANGUAGE='en' # Openbox menu make_i18n_link /etc/xdg/openbox/menu.%%.xml @@ -110,7 +110,7 @@ system_config() { export LC_ALL=$locale - _n "Setting system locale to: $locale" + _n 'Setting system locale to: %s' "$locale" echo -e "LANG=$locale\nLC_ALL=$locale" > /etc/locale.conf status gen_utf8_locale @@ -135,9 +135,9 @@ 1|255) exit 0 ;; esac - # Default: POSIX = English - [ "$locale" = "en" ] && locale="en_US" - [ -s /etc/locale.conf ] && RECONFIG="yes" + # Default: POSIX => English + [ "$locale" = 'en' ] && locale='en_US' + [ -s /etc/locale.conf ] && RECONFIG='yes' # If it's a reconfiguration give an info message. if [ -n "$RECONFIG" ]; then @@ -153,9 +153,8 @@ --help|-h) usage ;; info) - optlist "\ -$(_ 'Config file:') /etc/locale.conf -$(_ 'Current locale:') $LANG" + _ 'Config file: %s' '/etc/locale.conf' + _ 'Current locale: %s' "$LANG" ;; list) list= diff -r 00c7d84edcd5 -r 3be081525506 tinyutils/tazx --- a/tinyutils/tazx Thu May 14 12:55:55 2015 +0200 +++ b/tinyutils/tazx Thu Jun 04 17:11:36 2015 +0300 @@ -284,7 +284,7 @@ inst_pkg() { pkg="$@" - colorize 3 $(_ 'Installing pkg: $pkg') + colorize 3 $(_ 'Installing pkg: %s' "$pkg") case $(id -u) in 0) CMD="tazpkg -gi $@" ;; @@ -318,8 +318,8 @@ app_name_dialog only-installed ;; esac - if [ $appname != " " ]; then - if [ $appname = show_ALL ]; then + if [ "$appname" != " " ]; then + if [ "$appname" == 'show_ALL' ]; then app_name_dialog full-list inst_pkg $appname fi @@ -338,8 +338,8 @@ app_name_dialog() { case $1 in - full-list) height=24 ;; - *) height=18 ;; + full-list) height='24' ;; + *) height='18' ;; esac exec 3>&1 @@ -363,7 +363,8 @@ spacefm thunar xfe ytree" BROWSERS="arora chrome cream dillo elinks firefox firefox-official iron \ -links lynx midori netsurf opera QtWeb qupzilla retawq seamonkey surf tazweb w3m xombrero" +links lynx midori netsurf opera QtWeb qupzilla retawq seamonkey surf tazweb \ +w3m xombrero" EDITORS="adie beaver bluefish emacs geany jed joe juffed ht le leafpad \ mcedit mousepad mp-5 nano qedit SciTE tea vi vim xedit xfw zile" @@ -475,9 +476,9 @@ [ -f $apps_conf ] || inst_pkg slitaz-configs --forced - if [ "$(id -u)" = 0 ]; then - user_conf=$apps_conf - new_user_conf="/etc/skel/.config/slitaz/applications.conf" + if [ "$(id -u)" -eq 0 ]; then + user_conf="$apps_conf" + new_user_conf='/etc/skel/.config/slitaz/applications.conf' mkdir -p $(dirname $new_user_conf) cp -f $apps_conf $new_user_conf else diff -r 00c7d84edcd5 -r 3be081525506 tinyutils/terminal --- a/tinyutils/terminal Thu May 14 12:55:55 2015 +0200 +++ b/tinyutils/terminal Thu Jun 04 17:11:36 2015 +0300 @@ -13,13 +13,13 @@ $(boldify $(_n 'Recognized options:')) -v -version --version $(_n 'Print the version number') -help --help $(_n 'Print out this message') - -geometry --geometry $(_n 'Width and height of terminal window ($GEOMETRY)') --t -title -T --title $(_n 'Title name for window ("$TITLE")') + -geometry --geometry $(_n 'Width and height of terminal window (%s)' "$GEOMETRY") +-t -title -T --title $(_n 'Title name for window ("%s")' "$TITLE") -h -hold $(_n "Don't close terminal after command finished") -e --xterm-execute $(_n 'Command to execute (must be last in line)') -$(boldify $(_n 'Help for $TERMINAL:')) +$(boldify $(_n 'Help for %s:' "$TERMINAL")) EOT $TERMINAL $OPT_HELP @@ -29,16 +29,16 @@ USER_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/slitaz/applications.conf" [ -f $USER_CONFIG ] && . $USER_CONFIG -local PARAMS="" GEOMETRY="80x24" TITLE="SliTaz $(cat /etc/slitaz-release)" COMMAND +local PARAMS='' GEOMETRY='80x24' TITLE="SliTaz $(cat /etc/slitaz-release)" COMMAND case $TERMINAL in sakura) - OPT_TITLE="-t"; OPT_GEOM="--geometry"; OPT_HELP="-?"; OPT_HOLD="-h";; + OPT_TITLE='-t'; OPT_GEOM='--geometry'; OPT_HELP='-?'; OPT_HOLD='-h';; xterm|*) - OPT_TITLE="-T"; OPT_GEOM="-geometry"; OPT_HELP="-help"; OPT_HOLD="-hold";; + OPT_TITLE='-T'; OPT_GEOM='-geometry'; OPT_HELP='-help'; OPT_HOLD='-hold';; esac -until [ $# == 0 ]; do +until [ $# -eq 0 ]; do PARAM="$1" case "$PARAM" in -version|--version|-v) $TERMINAL -v; exit 0;;