slitaz-tools rev 943
Move translations to use '%s'. Fix subox icon and allow it to work with spaces in the path.
line diff
1.1 --- a/boxes/burn-box Thu May 14 12:55:55 2015 +0200 1.2 +++ b/boxes/burn-box Thu Jun 04 17:11:36 2015 +0300 1.3 @@ -73,7 +73,7 @@ 1.4 # Decode audio files with: decode [file] 1.5 1.6 decode_audio() { 1.7 - _ 'Decoding files from: $audio' 1.8 + _ 'Decoding files from: %s' "$audio" 1.9 for f in "$audio"/*.* 1.10 do 1.11 debug "handling $f" 1.12 @@ -95,7 +95,7 @@ 1.13 1.14 burn_iso() { 1.15 if [ "${iso##*.}" != "iso" ]; then 1.16 - _ 'Not an ISO image: "$iso"'; exit 1 1.17 + _ 'Not an ISO image: "%s"' "$iso"; exit 1 1.18 fi 1.19 wodim -v speed=$speed $options "$iso" 1.20 } 1.21 @@ -172,7 +172,7 @@ 1.22 # Let burn an ISO from cmdline: burn-box -i /path/to/image.iso 1.23 [ "$iso" == " " ] && iso="$2" 1.24 if [ ! -f "$iso" ]; then 1.25 - _ 'Missing ISO image "$iso"'; exit 1 1.26 + _ 'Missing ISO image "%s"' "$iso"; exit 1 1.27 fi 1.28 burn_iso ;; 1.29 audio|-a) 1.30 @@ -180,7 +180,7 @@ 1.31 [ "$2" ] && audio="$2" 1.32 [ "$audio" == "$HOME" ] && unset audio 1.33 if [ ! -d "$audio" ]; then 1.34 - _ 'Missing audio directory "$audio"'; exit 1 1.35 + _ 'Missing audio directory "%s"' "$audio"; exit 1 1.36 fi 1.37 burn_audio ;; 1.38 blank)
2.1 --- a/po/slitaz-boxes/es.po Thu May 14 12:55:55 2015 +0200 2.2 +++ b/po/slitaz-boxes/es.po Thu Jun 04 17:11:36 2015 +0300 2.3 @@ -147,14 +147,12 @@ 2.4 msgstr "Ejemplos:" 2.5 2.6 #: boxes/burn-box:64 2.7 -#, sh-format 2.8 -msgid "Decoding files from: $audio" 2.9 -msgstr "Decodificación de archivos de: $audio" 2.10 +msgid "Decoding files from: %s" 2.11 +msgstr "Decodificación de archivos de: %s" 2.12 2.13 #: boxes/burn-box:84 2.14 -#, sh-format 2.15 -msgid "Not an ISO image: \"$iso\"" 2.16 -msgstr "No es una imagen ISO: \"$iso\"" 2.17 +msgid "Not an ISO image: \"%s\"" 2.18 +msgstr "No es una imagen ISO: \"%s\"" 2.19 2.20 #: boxes/burn-box:100 2.21 msgid "Burn-box" 2.22 @@ -208,14 +206,12 @@ 2.23 msgstr "Ayuda de Wodim" 2.24 2.25 #: boxes/burn-box:154 2.26 -#, sh-format 2.27 -msgid "Missing ISO image \"$iso\"" 2.28 -msgstr "Falta la imagen ISO \"$iso\"" 2.29 +msgid "Missing ISO image \"%s\"" 2.30 +msgstr "Falta la imagen ISO \"%s\"" 2.31 2.32 #: boxes/burn-box:162 2.33 -#, sh-format 2.34 -msgid "Missing audio directory \"$audio\"" 2.35 -msgstr "Falta el directorio de audio \"$audio\"" 2.36 +msgid "Missing audio directory \"%s\"" 2.37 +msgstr "Falta el directorio de audio \"%s\"" 2.38 2.39 #: boxes/burn-box:166 2.40 #, fuzzy
3.1 --- a/po/slitaz-boxes/fa.po Thu May 14 12:55:55 2015 +0200 3.2 +++ b/po/slitaz-boxes/fa.po Thu Jun 04 17:11:36 2015 +0300 3.3 @@ -148,14 +148,12 @@ 3.4 msgstr ":مثال ها" 3.5 3.6 #: boxes/burn-box:64 3.7 -#, sh-format 3.8 -msgid "Decoding files from: $audio" 3.9 -msgstr "$audio رمز گشایی فایل ها از" 3.10 +msgid "Decoding files from: %s" 3.11 +msgstr "%s رمز گشایی فایل ها از" 3.12 3.13 #: boxes/burn-box:84 3.14 -#, sh-format 3.15 -msgid "Not an ISO image: \"$iso\"" 3.16 -msgstr "یک فایل ایزو نیست \"$iso\"" 3.17 +msgid "Not an ISO image: \"%s\"" 3.18 +msgstr "یک فایل ایزو نیست \"%s\"" 3.19 3.20 #: boxes/burn-box:100 3.21 msgid "Burn-box" 3.22 @@ -206,14 +204,12 @@ 3.23 msgstr "Wodim راهنمای" 3.24 3.25 #: boxes/burn-box:154 3.26 -#, sh-format 3.27 -msgid "Missing ISO image \"$iso\"" 3.28 -msgstr "فایل ایزو گمشده است. \"$iso\"" 3.29 +msgid "Missing ISO image \"%s\"" 3.30 +msgstr "فایل ایزو گمشده است. \"%s\"" 3.31 3.32 #: boxes/burn-box:162 3.33 -#, sh-format 3.34 -msgid "Missing audio directory \"$audio\"" 3.35 -msgstr ".دایرکتوری صوتی گمشده است \"$audio\"" 3.36 +msgid "Missing audio directory \"%s\"" 3.37 +msgstr ".دایرکتوری صوتی گمشده است \"%s\"" 3.38 3.39 #: boxes/burn-box:166 3.40 msgid "Blank disk"
4.1 --- a/po/slitaz-boxes/fr.po Thu May 14 12:55:55 2015 +0200 4.2 +++ b/po/slitaz-boxes/fr.po Thu Jun 04 17:11:36 2015 +0300 4.3 @@ -159,14 +159,12 @@ 4.4 msgstr "Exemples:" 4.5 4.6 #: boxes/burn-box:64 4.7 -#, sh-format 4.8 -msgid "Decoding files from: $audio" 4.9 -msgstr "Décodage des fichiers depuis: $audio" 4.10 +msgid "Decoding files from: %s" 4.11 +msgstr "Décodage des fichiers depuis: %s" 4.12 4.13 #: boxes/burn-box:84 4.14 -#, sh-format 4.15 -msgid "Not an ISO image: \"$iso\"" 4.16 -msgstr "Ceci n'est pas une image ISO: \"$iso\"" 4.17 +msgid "Not an ISO image: \"%s\"" 4.18 +msgstr "Ceci n'est pas une image ISO: \"%s\"" 4.19 4.20 #: boxes/burn-box:100 4.21 msgid "Burn-box" 4.22 @@ -217,14 +215,12 @@ 4.23 msgstr "Aide de Wodim" 4.24 4.25 #: boxes/burn-box:154 4.26 -#, sh-format 4.27 -msgid "Missing ISO image \"$iso\"" 4.28 -msgstr "Image ISO \"$iso\" manquante" 4.29 +msgid "Missing ISO image \"%s\"" 4.30 +msgstr "Image ISO \"%s\" manquante" 4.31 4.32 #: boxes/burn-box:162 4.33 -#, sh-format 4.34 -msgid "Missing audio directory \"$audio\"" 4.35 -msgstr "Le dossier audio \"$audio\" est manquant" 4.36 +msgid "Missing audio directory \"%s\"" 4.37 +msgstr "Le dossier audio \"%s\" est manquant" 4.38 4.39 #: boxes/burn-box:166 4.40 msgid "Blank disk"
5.1 --- a/po/slitaz-boxes/pl.po Thu May 14 12:55:55 2015 +0200 5.2 +++ b/po/slitaz-boxes/pl.po Thu Jun 04 17:11:36 2015 +0300 5.3 @@ -150,14 +150,12 @@ 5.4 msgstr "Przykłady:" 5.5 5.6 #: boxes/burn-box:64 5.7 -#, sh-format 5.8 -msgid "Decoding files from: $audio" 5.9 -msgstr "Dekodowanie plików z: $audio" 5.10 +msgid "Decoding files from: %s" 5.11 +msgstr "Dekodowanie plików z: %s" 5.12 5.13 #: boxes/burn-box:84 5.14 -#, sh-format 5.15 -msgid "Not an ISO image: \"$iso\"" 5.16 -msgstr "Niezgodny z formatem obrazu ISO: \"$iso\"" 5.17 +msgid "Not an ISO image: \"%s\"" 5.18 +msgstr "Niezgodny z formatem obrazu ISO: \"%s\"" 5.19 5.20 #: boxes/burn-box:100 5.21 #, fuzzy 5.22 @@ -209,14 +207,12 @@ 5.23 msgstr "Pomoc Wodim" 5.24 5.25 #: boxes/burn-box:154 5.26 -#, sh-format 5.27 -msgid "Missing ISO image \"$iso\"" 5.28 -msgstr "Brakujący obraz ISO \"$iso\"" 5.29 +msgid "Missing ISO image \"%s\"" 5.30 +msgstr "Brakujący obraz ISO \"%s\"" 5.31 5.32 #: boxes/burn-box:162 5.33 -#, sh-format 5.34 -msgid "Missing audio directory \"$audio\"" 5.35 -msgstr "Brakujący katalog audio \"$audio\"" 5.36 +msgid "Missing audio directory \"%s\"" 5.37 +msgstr "Brakujący katalog audio \"%s\"" 5.38 5.39 #: boxes/burn-box:166 5.40 msgid "Blank disk"
6.1 --- a/po/slitaz-boxes/pt_BR.po Thu May 14 12:55:55 2015 +0200 6.2 +++ b/po/slitaz-boxes/pt_BR.po Thu Jun 04 17:11:36 2015 +0300 6.3 @@ -146,14 +146,12 @@ 6.4 msgstr "Exemplos:" 6.5 6.6 #: boxes/burn-box:64 6.7 -#, sh-format 6.8 -msgid "Decoding files from: $audio" 6.9 -msgstr "Decodificando arquivos de: $audio" 6.10 +msgid "Decoding files from: %s" 6.11 +msgstr "Decodificando arquivos de: %s" 6.12 6.13 #: boxes/burn-box:84 6.14 -#, sh-format 6.15 -msgid "Not an ISO image: \"$iso\"" 6.16 -msgstr "Imagem ISO \"$iso\" inválida" 6.17 +msgid "Not an ISO image: \"%s\"" 6.18 +msgstr "Imagem ISO \"%s\" inválida" 6.19 6.20 #: boxes/burn-box:100 6.21 msgid "Burn-box" 6.22 @@ -204,14 +202,12 @@ 6.23 msgstr "Ajuda do Wodim" 6.24 6.25 #: boxes/burn-box:154 6.26 -#, sh-format 6.27 -msgid "Missing ISO image \"$iso\"" 6.28 -msgstr "Imagem ISO \"$iso\" não encontrada" 6.29 +msgid "Missing ISO image \"%s\"" 6.30 +msgstr "Imagem ISO \"%s\" não encontrada" 6.31 6.32 #: boxes/burn-box:162 6.33 -#, sh-format 6.34 -msgid "Missing audio directory \"$audio\"" 6.35 -msgstr "Diretório com áudio \"$audio\" não encontrado" 6.36 +msgid "Missing audio directory \"%s\"" 6.37 +msgstr "Diretório com áudio \"%s\" não encontrado" 6.38 6.39 #: boxes/burn-box:166 6.40 msgid "Blank disk"
7.1 --- a/po/slitaz-boxes/ru.po Thu May 14 12:55:55 2015 +0200 7.2 +++ b/po/slitaz-boxes/ru.po Thu Jun 04 17:11:36 2015 +0300 7.3 @@ -160,14 +160,12 @@ 7.4 msgstr "Примеры:" 7.5 7.6 #: boxes/burn-box:64 7.7 -#, sh-format 7.8 -msgid "Decoding files from: $audio" 7.9 -msgstr "Обработка файлов из папки: $audio" 7.10 +msgid "Decoding files from: %s" 7.11 +msgstr "Обработка файлов из папки: %s" 7.12 7.13 #: boxes/burn-box:84 7.14 -#, sh-format 7.15 -msgid "Not an ISO image: \"$iso\"" 7.16 -msgstr "Файл «$iso» не является образом ISO" 7.17 +msgid "Not an ISO image: \"%s\"" 7.18 +msgstr "Файл «%s» не является образом ISO" 7.19 7.20 #: boxes/burn-box:100 7.21 msgid "Burn-box" 7.22 @@ -218,14 +216,12 @@ 7.23 msgstr "Справка Wodim" 7.24 7.25 #: boxes/burn-box:154 7.26 -#, sh-format 7.27 -msgid "Missing ISO image \"$iso\"" 7.28 -msgstr "Образ ISO «$iso» не найден" 7.29 +msgid "Missing ISO image \"%s\"" 7.30 +msgstr "Образ ISO «%s» не найден" 7.31 7.32 #: boxes/burn-box:162 7.33 -#, sh-format 7.34 -msgid "Missing audio directory \"$audio\"" 7.35 -msgstr "Папка аудио «$audio» не найдена" 7.36 +msgid "Missing audio directory \"%s\"" 7.37 +msgstr "Папка аудио «%s» не найдена" 7.38 7.39 #: boxes/burn-box:166 7.40 msgid "Blank disk"
8.1 --- a/po/slitaz-boxes/slitaz-boxes.pot Thu May 14 12:55:55 2015 +0200 8.2 +++ b/po/slitaz-boxes/slitaz-boxes.pot Thu Jun 04 17:11:36 2015 +0300 8.3 @@ -146,13 +146,11 @@ 8.4 msgstr "" 8.5 8.6 #: boxes/burn-box:64 8.7 -#, sh-format 8.8 -msgid "Decoding files from: $audio" 8.9 +msgid "Decoding files from: %s" 8.10 msgstr "" 8.11 8.12 #: boxes/burn-box:84 8.13 -#, sh-format 8.14 -msgid "Not an ISO image: \"$iso\"" 8.15 +msgid "Not an ISO image: \"%s\"" 8.16 msgstr "" 8.17 8.18 #: boxes/burn-box:100 8.19 @@ -204,13 +202,11 @@ 8.20 msgstr "" 8.21 8.22 #: boxes/burn-box:154 8.23 -#, sh-format 8.24 -msgid "Missing ISO image \"$iso\"" 8.25 +msgid "Missing ISO image \"%s\"" 8.26 msgstr "" 8.27 8.28 #: boxes/burn-box:162 8.29 -#, sh-format 8.30 -msgid "Missing audio directory \"$audio\"" 8.31 +msgid "Missing audio directory \"%s\"" 8.32 msgstr "" 8.33 8.34 #: boxes/burn-box:166
9.1 --- a/po/slitaz-boxes/sv.po Thu May 14 12:55:55 2015 +0200 9.2 +++ b/po/slitaz-boxes/sv.po Thu Jun 04 17:11:36 2015 +0300 9.3 @@ -146,14 +146,12 @@ 9.4 msgstr "Exempel:" 9.5 9.6 #: boxes/burn-box:64 9.7 -#, sh-format 9.8 -msgid "Decoding files from: $audio" 9.9 -msgstr "Avkodar filer från: $audio" 9.10 +msgid "Decoding files from: %s" 9.11 +msgstr "Avkodar filer från: %s" 9.12 9.13 #: boxes/burn-box:84 9.14 -#, sh-format 9.15 -msgid "Not an ISO image: \"$iso\"" 9.16 -msgstr "Inte en ISO bild: \"$iso\"" 9.17 +msgid "Not an ISO image: \"%s\"" 9.18 +msgstr "Inte en ISO bild: \"%s\"" 9.19 9.20 #: boxes/burn-box:100 9.21 msgid "Burn-box" 9.22 @@ -204,14 +202,12 @@ 9.23 msgstr "Wodim hjälp" 9.24 9.25 #: boxes/burn-box:154 9.26 -#, sh-format 9.27 -msgid "Missing ISO image \"$iso\"" 9.28 -msgstr "Saknar ISO bild \"$iso\"" 9.29 +msgid "Missing ISO image \"%s\"" 9.30 +msgstr "Saknar ISO bild \"%s\"" 9.31 9.32 #: boxes/burn-box:162 9.33 -#, sh-format 9.34 -msgid "Missing audio directory \"$audio\"" 9.35 -msgstr "Saknar ljud mapp \"$audio\"" 9.36 +msgid "Missing audio directory \"%s\"" 9.37 +msgstr "Saknar ljud mapp \"%s\"" 9.38 9.39 #: boxes/burn-box:166 9.40 msgid "Blank disk"
10.1 --- a/po/slitaz-boxes/zh_CN.po Thu May 14 12:55:55 2015 +0200 10.2 +++ b/po/slitaz-boxes/zh_CN.po Thu Jun 04 17:11:36 2015 +0300 10.3 @@ -147,14 +147,12 @@ 10.4 msgstr "例子：" 10.5 10.6 #: boxes/burn-box:64 10.7 -#, sh-format 10.8 -msgid "Decoding files from: $audio" 10.9 -msgstr "解码文件：$audio" 10.10 +msgid "Decoding files from: %s" 10.11 +msgstr "解码文件：%s" 10.12 10.13 #: boxes/burn-box:84 10.14 -#, sh-format 10.15 -msgid "Not an ISO image: \"$iso\"" 10.16 -msgstr "不是一个ISO映像：\"$iso\"" 10.17 +msgid "Not an ISO image: \"%s\"" 10.18 +msgstr "不是一个ISO映像：\"%s\"" 10.19 10.20 #: boxes/burn-box:100 10.21 msgid "Burn-box" 10.22 @@ -205,14 +203,12 @@ 10.23 msgstr "Wodim帮助讯息" 10.24 10.25 #: boxes/burn-box:154 10.26 -#, sh-format 10.27 -msgid "Missing ISO image \"$iso\"" 10.28 -msgstr "丢失（找不到）的ISO映像\"$iso\"" 10.29 +msgid "Missing ISO image \"%s\"" 10.30 +msgstr "丢失（找不到）的ISO映像\"%s\"" 10.31 10.32 #: boxes/burn-box:162 10.33 -#, sh-format 10.34 -msgid "Missing audio directory \"$audio\"" 10.35 -msgstr "丢失（找不到）的音频目录（或文件） \"$audio\"" 10.36 +msgid "Missing audio directory \"%s\"" 10.37 +msgstr "丢失（找不到）的音频目录（或文件） \"%s\"" 10.38 10.39 #: boxes/burn-box:166 10.40 msgid "Blank disk"
11.1 --- a/po/slitaz-tools/el.po Thu May 14 12:55:55 2015 +0200 11.2 +++ b/po/slitaz-tools/el.po Thu Jun 04 17:11:36 2015 +0300 11.3 @@ -67,16 +67,16 @@ 11.4 msgstr "" 11.5 11.6 #: tinyutils/tazlocale:136 tinyutils/tazkeymap:41 11.7 -msgid "Config file:" 11.8 -msgstr "Αρχείο ρυθμίσεων:" 11.9 +msgid "Config file: %s" 11.10 +msgstr "Αρχείο ρυθμίσεων: %s" 11.11 11.12 #: tinyutils/tazlocale:137 11.13 -msgid "Current locale:" 11.14 -msgstr "Τρέχον locale:" 11.15 +msgid "Current locale: %s" 11.16 +msgstr "Τρέχον locale: %s" 11.17 11.18 #: tinyutils/tazkeymap:42 11.19 -msgid "Current keymap:" 11.20 -msgstr "Τρέχον keymap:" 11.21 +msgid "Current keymap: %s" 11.22 +msgstr "Τρέχον keymap: %s" 11.23 11.24 #: tinyutils/tazkeymap:51 11.25 #, fuzzy 11.26 @@ -132,8 +132,7 @@ 11.27 msgstr "" 11.28 11.29 #: tinyutils/tazx:289 tinyutils/hwsetup:117 11.30 -#, sh-format 11.31 -msgid "Installing pkg: $pkg" 11.32 +msgid "Installing pkg: %s" 11.33 msgstr "" 11.34 11.35 #: tinyutils/tazx:307 tinyutils/tazx:423 11.36 @@ -247,29 +246,24 @@ 11.37 msgstr "" 11.38 11.39 #: tinyutils/decode:47 11.40 -#, sh-format 11.41 -msgid "Missing decoder: $dec" 11.42 -msgstr "Λείπει ο αποκωδικοποιητής: $dec" 11.43 +msgid "Missing decoder: %s" 11.44 +msgstr "Λείπει ο αποκωδικοποιητής: %s" 11.45 11.46 #: tinyutils/decode:48 tinyutils/decode:80 11.47 -#, sh-format 11.48 -msgid "Skipping file: $name" 11.49 -msgstr "Γίνεται παράκαμψη του αρχείου: $name" 11.50 +msgid "Skipping file: %s" 11.51 +msgstr "Γίνεται παράκαμψη του αρχείου: %s" 11.52 11.53 #: tinyutils/decode:51 11.54 -#, sh-format 11.55 -msgid "Decoding: $name" 11.56 -msgstr "Γίνεται αποκωδικοποίηση: $name" 11.57 +msgid "Decoding: %s" 11.58 +msgstr "Γίνεται αποκωδικοποίηση: %s" 11.59 11.60 #: tinyutils/decode:60 11.61 -#, sh-format 11.62 -msgid "No file: $file" 11.63 -msgstr "Κανένα αρχείο: $file" 11.64 +msgid "No file: %s" 11.65 +msgstr "Κανένα αρχείο: %s" 11.66 11.67 #: tinyutils/decode:82 11.68 -#, sh-format 11.69 -msgid "Unsupported file: $file" 11.70 -msgstr "Μη υποστηριζόμενο αρχείο: $file" 11.71 +msgid "Unsupported file: %s" 11.72 +msgstr "Μη υποστηριζόμενο αρχείο: %s" 11.73 11.74 #: tinyutils/terminal:10 11.75 msgid "configurable SliTaz wrapper for terminal." 11.76 @@ -288,13 +282,11 @@ 11.77 msgstr "" 11.78 11.79 #: tinyutils/terminal:15 11.80 -#, sh-format 11.81 -msgid "Width and height of terminal window ($GEOMETRY)" 11.82 +msgid "Width and height of terminal window (%s)" 11.83 msgstr "" 11.84 11.85 #: tinyutils/terminal:16 11.86 -#, sh-format 11.87 -msgid "Title name for window (\"$TITLE\")" 11.88 +msgid "Title name for window (\"%s\")" 11.89 msgstr "" 11.90 11.91 #: tinyutils/terminal:17 11.92 @@ -306,8 +298,7 @@ 11.93 msgstr "" 11.94 11.95 #: tinyutils/terminal:21 11.96 -#, sh-format 11.97 -msgid "Help for $TERMINAL:" 11.98 +msgid "Help for %s:" 11.99 msgstr "" 11.100 11.101 #: tinyutils/hwsetup:22 11.102 @@ -367,26 +358,22 @@ 11.103 msgstr "" 11.104 11.105 #: tinyutils/hwsetup:98 11.106 -#, sh-format 11.107 msgid "" 11.108 -"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " 11.109 +"Due to a lack of compatible hardware for troubleshooting, this %s " 11.110 "device has not been properly tested. Please report any success, failure, bug " 11.111 "to SliTaz Bug tracker or Forum." 11.112 msgstr "" 11.113 11.114 #: tinyutils/hwsetup:107 11.115 -#, sh-format 11.116 -msgid "Failed to setup $DEVICE" 11.117 +msgid "Failed to setup %s" 11.118 msgstr "" 11.119 11.120 #: tinyutils/hwsetup:131 11.121 -#, sh-format 11.122 -msgid "Would you like to install pkg: $pkg" 11.123 +msgid "Would you like to install pkg: %s" 11.124 msgstr "" 11.125 11.126 #: tinyutils/hwsetup:148 11.127 -#, sh-format 11.128 -msgid "adding $user to $grp" 11.129 +msgid "adding %s to %s" 11.130 msgstr "" 11.131 11.132 #: tinyutils/hwsetup:171 11.133 @@ -398,13 +385,11 @@ 11.134 msgstr "" 11.135 11.136 #: tinyutils/hwsetup:228 11.137 -#, sh-format 11.138 -msgid "Verify $DEVICE Permissions" 11.139 +msgid "Verify %s Permissions" 11.140 msgstr "" 11.141 11.142 #: tinyutils/hwsetup:229 11.143 -#, sh-format 11.144 -msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" 11.145 +msgid "Your %s must be in %s group with rw-rw-rw- permissions" 11.146 msgstr "" 11.147 11.148 #: tinyutils/hwsetup:250 11.149 @@ -512,8 +497,7 @@ 11.150 msgstr "" 11.151 11.152 #: tinyutils/hwsetup:483 11.153 -#, sh-format 11.154 -msgid "Quick start guide: $guide_url" 11.155 +msgid "Quick start guide: %s" 11.156 msgstr "" 11.157 11.158 #: tinyutils/hwsetup:494 11.159 @@ -541,8 +525,7 @@ 11.160 msgstr "" 11.161 11.162 #: tinyutils/hwsetup:520 tinyutils/hwsetup:541 11.163 -#, sh-format 11.164 -msgid "You can manually edit the configuration files in $bt if need be" 11.165 +msgid "You can manually edit the configuration files in %s if need be" 11.166 msgstr "" 11.167 11.168 #: tinyutils/hwsetup:534 11.169 @@ -574,13 +557,11 @@ 11.170 msgstr "" 11.171 11.172 #: tinyutils/hwsetup:567 11.173 -#, sh-format 11.174 -msgid "Edit $wc for phone number, login name, password and pin" 11.175 +msgid "Edit %s for phone number, login name, password and pin" 11.176 msgstr "" 11.177 11.178 #: tinyutils/hwsetup:568 11.179 -#, sh-format 11.180 -msgid "Add DNS address of your provider in $rc" 11.181 +msgid "Add DNS address of your provider in %s" 11.182 msgstr "" 11.183 11.184 #: tinyutils/hwsetup:577 11.185 @@ -601,13 +582,11 @@ 11.186 11.187 #: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 11.188 #: tinyutils/hwsetup:714 11.189 -#, sh-format 11.190 -msgid "Your previous config is in $xorg60" 11.191 +msgid "Your previous config is in %s" 11.192 msgstr "" 11.193 11.194 #: tinyutils/hwsetup:611 tinyutils/hwsetup:650 11.195 -#, sh-format 11.196 -msgid "If nvidia fails, you can remove $xorg55 to restore previous config." 11.197 +msgid "If nvidia fails, you can remove %s to restore previous config." 11.198 msgstr "" 11.199 11.200 #: tinyutils/hwsetup:618 11.201 @@ -635,8 +614,7 @@ 11.202 msgstr "" 11.203 11.204 #: tinyutils/hwsetup:652 11.205 -#, sh-format 11.206 -msgid "Create $xorg55short configured with nv driver." 11.207 +msgid "Create %s configured with nv driver." 11.208 msgstr "" 11.209 11.210 #: tinyutils/hwsetup:678 11.211 @@ -644,8 +622,7 @@ 11.212 msgstr "" 11.213 11.214 #: tinyutils/hwsetup:682 11.215 -#, sh-format 11.216 -msgid "If ati fails, you can remove $xorg55 to restore previous config." 11.217 +msgid "If ati fails, you can remove %s to restore previous config." 11.218 msgstr "" 11.219 11.220 #: tinyutils/hwsetup:691 11.221 @@ -666,13 +643,11 @@ 11.222 msgstr "" 11.223 11.224 #: tinyutils/hwsetup:715 11.225 -#, sh-format 11.226 -msgid "If ATI fails, you can remove $xorg55 to restore previous config." 11.227 +msgid "If ATI fails, you can remove %s to restore previous config." 11.228 msgstr "" 11.229 11.230 #: tinyutils/hwsetup:717 11.231 -#, sh-format 11.232 -msgid "Create $xorg55short configured with radeon driver." 11.233 +msgid "Create %s configured with radeon driver." 11.234 msgstr "" 11.235 11.236 #: tinyutils/hwsetup:723 11.237 @@ -777,7 +752,7 @@ 11.238 msgstr "" 11.239 11.240 #: tinyutils/slitaz-config:44 11.241 -msgid "Enter new password for \\Zb\\Z1root" 11.242 +msgid "Enter new password for %s" 11.243 msgstr "" 11.244 11.245 #: tinyutils/slitaz-config:53 11.246 @@ -789,8 +764,7 @@ 11.247 msgstr "" 11.248 11.249 #: tinyutils/slitaz-config:61 11.250 -#, sh-format 11.251 -msgid "Enter password for user \\Zb\\Z4$user" 11.252 +msgid "Enter password for user \\Zb\\Z4%s" 11.253 msgstr "" 11.254 11.255 #: tinyutils/slitaz-config:121 11.256 @@ -838,8 +812,7 @@ 11.257 msgstr "" 11.258 11.259 #: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 11.260 -#, sh-format 11.261 -msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" 11.262 +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4%s" 11.263 msgstr "" 11.264 11.265 #: tinyutils/slitaz-config:197 11.266 @@ -847,7 +820,7 @@ 11.267 msgstr "" 11.268 11.269 #: tinyutils/slitaz-config:201 11.270 -msgid "Configuring: /etc/network.conf..." 11.271 +msgid "Configuring: %s..." 11.272 msgstr "" 11.273 11.274 #: tinyutils/slitaz-config:211 11.275 @@ -859,8 +832,7 @@ 11.276 msgstr "" 11.277 11.278 #: tinyutils/slitaz-config:220 11.279 -#, sh-format 11.280 -msgid "IP address: $ip" 11.281 +msgid "IP address: %s" 11.282 msgstr "" 11.283 11.284 #: tinyutils/slitaz-config:222 11.285 @@ -922,5 +894,5 @@ 11.286 #~ msgstr "" 11.287 #~ "Πρέπει να είστε διαχειριστής συστήματος για να ρυθμίσετε τον X server." 11.288 11.289 -#~ msgid "Setting system locale to: $locale" 11.290 -#~ msgstr "Ρύθμιση του locale στο: $locale" 11.291 +#~ msgid "Setting system locale to: %s" 11.292 +#~ msgstr "Ρύθμιση του locale στο: %s"
12.1 --- a/po/slitaz-tools/es.po Thu May 14 12:55:55 2015 +0200 12.2 +++ b/po/slitaz-tools/es.po Thu Jun 04 17:11:36 2015 +0300 12.3 @@ -66,15 +66,15 @@ 12.4 msgstr "" 12.5 12.6 #: tinyutils/tazlocale:136 tinyutils/tazkeymap:41 12.7 -msgid "Config file:" 12.8 +msgid "Config file: %s" 12.9 msgstr "" 12.10 12.11 #: tinyutils/tazlocale:137 12.12 -msgid "Current locale:" 12.13 +msgid "Current locale: %s" 12.14 msgstr "" 12.15 12.16 #: tinyutils/tazkeymap:42 12.17 -msgid "Current keymap:" 12.18 +msgid "Current keymap: %s" 12.19 msgstr "" 12.20 12.21 #: tinyutils/tazkeymap:51 12.22 @@ -130,8 +130,7 @@ 12.23 msgstr "" 12.24 12.25 #: tinyutils/tazx:289 tinyutils/hwsetup:117 12.26 -#, sh-format 12.27 -msgid "Installing pkg: $pkg" 12.28 +msgid "Installing pkg: %s" 12.29 msgstr "" 12.30 12.31 #: tinyutils/tazx:307 tinyutils/tazx:423 12.32 @@ -245,28 +244,23 @@ 12.33 msgstr "" 12.34 12.35 #: tinyutils/decode:47 12.36 -#, sh-format 12.37 -msgid "Missing decoder: $dec" 12.38 +msgid "Missing decoder: %s" 12.39 msgstr "" 12.40 12.41 #: tinyutils/decode:48 tinyutils/decode:80 12.42 -#, sh-format 12.43 -msgid "Skipping file: $name" 12.44 +msgid "Skipping file: %s" 12.45 msgstr "" 12.46 12.47 #: tinyutils/decode:51 12.48 -#, sh-format 12.49 -msgid "Decoding: $name" 12.50 +msgid "Decoding: %s" 12.51 msgstr "" 12.52 12.53 #: tinyutils/decode:60 12.54 -#, sh-format 12.55 -msgid "No file: $file" 12.56 +msgid "No file: %s" 12.57 msgstr "" 12.58 12.59 #: tinyutils/decode:82 12.60 -#, sh-format 12.61 -msgid "Unsupported file: $file" 12.62 +msgid "Unsupported file: %s" 12.63 msgstr "" 12.64 12.65 #: tinyutils/terminal:10 12.66 @@ -286,13 +280,11 @@ 12.67 msgstr "" 12.68 12.69 #: tinyutils/terminal:15 12.70 -#, sh-format 12.71 -msgid "Width and height of terminal window ($GEOMETRY)" 12.72 +msgid "Width and height of terminal window (%s)" 12.73 msgstr "" 12.74 12.75 #: tinyutils/terminal:16 12.76 -#, sh-format 12.77 -msgid "Title name for window (\"$TITLE\")" 12.78 +msgid "Title name for window (\"%s\")" 12.79 msgstr "" 12.80 12.81 #: tinyutils/terminal:17 12.82 @@ -304,8 +296,7 @@ 12.83 msgstr "" 12.84 12.85 #: tinyutils/terminal:21 12.86 -#, sh-format 12.87 -msgid "Help for $TERMINAL:" 12.88 +msgid "Help for %s:" 12.89 msgstr "" 12.90 12.91 #: tinyutils/hwsetup:22 12.92 @@ -365,26 +356,22 @@ 12.93 msgstr "" 12.94 12.95 #: tinyutils/hwsetup:98 12.96 -#, sh-format 12.97 msgid "" 12.98 -"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " 12.99 +"Due to a lack of compatible hardware for troubleshooting, this %s " 12.100 "device has not been properly tested. Please report any success, failure, bug " 12.101 "to SliTaz Bug tracker or Forum." 12.102 msgstr "" 12.103 12.104 #: tinyutils/hwsetup:107 12.105 -#, sh-format 12.106 -msgid "Failed to setup $DEVICE" 12.107 +msgid "Failed to setup %s" 12.108 msgstr "" 12.109 12.110 #: tinyutils/hwsetup:131 12.111 -#, sh-format 12.112 -msgid "Would you like to install pkg: $pkg" 12.113 +msgid "Would you like to install pkg: %s" 12.114 msgstr "" 12.115 12.116 #: tinyutils/hwsetup:148 12.117 -#, sh-format 12.118 -msgid "adding $user to $grp" 12.119 +msgid "adding %s to %s" 12.120 msgstr "" 12.121 12.122 #: tinyutils/hwsetup:171 12.123 @@ -396,13 +383,11 @@ 12.124 msgstr "" 12.125 12.126 #: tinyutils/hwsetup:228 12.127 -#, sh-format 12.128 -msgid "Verify $DEVICE Permissions" 12.129 +msgid "Verify %s Permissions" 12.130 msgstr "" 12.131 12.132 #: tinyutils/hwsetup:229 12.133 -#, sh-format 12.134 -msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" 12.135 +msgid "Your %s must be in %s group with rw-rw-rw- permissions" 12.136 msgstr "" 12.137 12.138 #: tinyutils/hwsetup:250 12.139 @@ -510,8 +495,7 @@ 12.140 msgstr "" 12.141 12.142 #: tinyutils/hwsetup:483 12.143 -#, sh-format 12.144 -msgid "Quick start guide: $guide_url" 12.145 +msgid "Quick start guide: %s" 12.146 msgstr "" 12.147 12.148 #: tinyutils/hwsetup:494 12.149 @@ -539,8 +523,7 @@ 12.150 msgstr "" 12.151 12.152 #: tinyutils/hwsetup:520 tinyutils/hwsetup:541 12.153 -#, sh-format 12.154 -msgid "You can manually edit the configuration files in $bt if need be" 12.155 +msgid "You can manually edit the configuration files in %s if need be" 12.156 msgstr "" 12.157 12.158 #: tinyutils/hwsetup:534 12.159 @@ -572,13 +555,11 @@ 12.160 msgstr "" 12.161 12.162 #: tinyutils/hwsetup:567 12.163 -#, sh-format 12.164 -msgid "Edit $wc for phone number, login name, password and pin" 12.165 +msgid "Edit %s for phone number, login name, password and pin" 12.166 msgstr "" 12.167 12.168 #: tinyutils/hwsetup:568 12.169 -#, sh-format 12.170 -msgid "Add DNS address of your provider in $rc" 12.171 +msgid "Add DNS address of your provider in %s" 12.172 msgstr "" 12.173 12.174 #: tinyutils/hwsetup:577 12.175 @@ -599,13 +580,11 @@ 12.176 12.177 #: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 12.178 #: tinyutils/hwsetup:714 12.179 -#, sh-format 12.180 -msgid "Your previous config is in $xorg60" 12.181 +msgid "Your previous config is in %s" 12.182 msgstr "" 12.183 12.184 #: tinyutils/hwsetup:611 tinyutils/hwsetup:650 12.185 -#, sh-format 12.186 -msgid "If nvidia fails, you can remove $xorg55 to restore previous config." 12.187 +msgid "If nvidia fails, you can remove %s to restore previous config." 12.188 msgstr "" 12.189 12.190 #: tinyutils/hwsetup:618 12.191 @@ -633,8 +612,7 @@ 12.192 msgstr "" 12.193 12.194 #: tinyutils/hwsetup:652 12.195 -#, sh-format 12.196 -msgid "Create $xorg55short configured with nv driver." 12.197 +msgid "Create %s configured with nv driver." 12.198 msgstr "" 12.199 12.200 #: tinyutils/hwsetup:678 12.201 @@ -642,8 +620,7 @@ 12.202 msgstr "" 12.203 12.204 #: tinyutils/hwsetup:682 12.205 -#, sh-format 12.206 -msgid "If ati fails, you can remove $xorg55 to restore previous config." 12.207 +msgid "If ati fails, you can remove %s to restore previous config." 12.208 msgstr "" 12.209 12.210 #: tinyutils/hwsetup:691 12.211 @@ -664,13 +641,11 @@ 12.212 msgstr "" 12.213 12.214 #: tinyutils/hwsetup:715 12.215 -#, sh-format 12.216 -msgid "If ATI fails, you can remove $xorg55 to restore previous config." 12.217 +msgid "If ATI fails, you can remove %s to restore previous config." 12.218 msgstr "" 12.219 12.220 #: tinyutils/hwsetup:717 12.221 -#, sh-format 12.222 -msgid "Create $xorg55short configured with radeon driver." 12.223 +msgid "Create %s configured with radeon driver." 12.224 msgstr "" 12.225 12.226 #: tinyutils/hwsetup:723 12.227 @@ -775,7 +750,7 @@ 12.228 msgstr "" 12.229 12.230 #: tinyutils/slitaz-config:44 12.231 -msgid "Enter new password for \\Zb\\Z1root" 12.232 +msgid "Enter new password for %s" 12.233 msgstr "" 12.234 12.235 #: tinyutils/slitaz-config:53 12.236 @@ -787,8 +762,7 @@ 12.237 msgstr "" 12.238 12.239 #: tinyutils/slitaz-config:61 12.240 -#, sh-format 12.241 -msgid "Enter password for user \\Zb\\Z4$user" 12.242 +msgid "Enter password for user \\Zb\\Z4%s" 12.243 msgstr "" 12.244 12.245 #: tinyutils/slitaz-config:121 12.246 @@ -836,8 +810,7 @@ 12.247 msgstr "" 12.248 12.249 #: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 12.250 -#, sh-format 12.251 -msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" 12.252 +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4%s" 12.253 msgstr "" 12.254 12.255 #: tinyutils/slitaz-config:197 12.256 @@ -845,7 +818,7 @@ 12.257 msgstr "" 12.258 12.259 #: tinyutils/slitaz-config:201 12.260 -msgid "Configuring: /etc/network.conf..." 12.261 +msgid "Configuring: %s..." 12.262 msgstr "" 12.263 12.264 #: tinyutils/slitaz-config:211 12.265 @@ -857,8 +830,7 @@ 12.266 msgstr "" 12.267 12.268 #: tinyutils/slitaz-config:220 12.269 -#, sh-format 12.270 -msgid "IP address: $ip" 12.271 +msgid "IP address: %s" 12.272 msgstr "" 12.273 12.274 #: tinyutils/slitaz-config:222
13.1 --- a/po/slitaz-tools/fa.po Thu May 14 12:55:55 2015 +0200 13.2 +++ b/po/slitaz-tools/fa.po Thu Jun 04 17:11:36 2015 +0300 13.3 @@ -66,16 +66,16 @@ 13.4 msgstr "اطلاعات" 13.5 13.6 #: tinyutils/tazlocale:136 tinyutils/tazkeymap:41 13.7 -msgid "Config file:" 13.8 -msgstr ":فایل پیکربندی" 13.9 +msgid "Config file: %s" 13.10 +msgstr "%s :فایل پیکربندی" 13.11 13.12 #: tinyutils/tazlocale:137 13.13 -msgid "Current locale:" 13.14 -msgstr ":منطقه فعلی" 13.15 +msgid "Current locale: %s" 13.16 +msgstr "%s :منطقه فعلی" 13.17 13.18 #: tinyutils/tazkeymap:42 13.19 -msgid "Current keymap:" 13.20 -msgstr ":فعلی Keymap" 13.21 +msgid "Current keymap: %s" 13.22 +msgstr "%s :فعلی Keymap" 13.23 13.24 #: tinyutils/tazkeymap:51 13.25 msgid "SliTaz keyboard setting" 13.26 @@ -123,16 +123,15 @@ 13.27 #: tinyutils/tazx:276 13.28 #, fuzzy 13.29 msgid "Failed to setup driver" 13.30 -msgstr "نشد $DEVICE موفق به نصب " 13.31 +msgstr "نشد %s موفق به نصب " 13.32 13.33 #: tinyutils/tazx:276 13.34 msgid "(unknown hardware)" 13.35 msgstr "" 13.36 13.37 #: tinyutils/tazx:289 tinyutils/hwsetup:117 13.38 -#, sh-format 13.39 -msgid "Installing pkg: $pkg" 13.40 -msgstr "$pkg :در حال نصب پکیج" 13.41 +msgid "Installing pkg: %s" 13.42 +msgstr "%s :در حال نصب پکیج" 13.43 13.44 #: tinyutils/tazx:307 tinyutils/tazx:423 13.45 #, fuzzy 13.46 @@ -249,29 +248,24 @@ 13.47 msgstr "/path/to/files/*" 13.48 13.49 #: tinyutils/decode:47 13.50 -#, sh-format 13.51 -msgid "Missing decoder: $dec" 13.52 -msgstr "$dec :گم شده (Decoder) رمز گشای " 13.53 +msgid "Missing decoder: %s" 13.54 +msgstr "%s :گم شده (Decoder) رمز گشای " 13.55 13.56 #: tinyutils/decode:48 tinyutils/decode:80 13.57 -#, sh-format 13.58 -msgid "Skipping file: $name" 13.59 -msgstr "$name :در حال گذر (نادیده گرفتن) از فایل" 13.60 +msgid "Skipping file: %s" 13.61 +msgstr "%s :در حال گذر (نادیده گرفتن) از فایل" 13.62 13.63 #: tinyutils/decode:51 13.64 -#, sh-format 13.65 -msgid "Decoding: $name" 13.66 -msgstr "$name :در حال رمزگشایی" 13.67 +msgid "Decoding: %s" 13.68 +msgstr "%s :در حال رمزگشایی" 13.69 13.70 #: tinyutils/decode:60 13.71 -#, sh-format 13.72 -msgid "No file: $file" 13.73 -msgstr "$file :فایل موجود نیست" 13.74 +msgid "No file: %s" 13.75 +msgstr "%s :فایل موجود نیست" 13.76 13.77 #: tinyutils/decode:82 13.78 -#, sh-format 13.79 -msgid "Unsupported file: $file" 13.80 -msgstr "$file :فایل پشتیبانی نشده" 13.81 +msgid "Unsupported file: %s" 13.82 +msgstr "%s :فایل پشتیبانی نشده" 13.83 13.84 #: tinyutils/terminal:10 13.85 msgid "configurable SliTaz wrapper for terminal." 13.86 @@ -290,14 +284,12 @@ 13.87 msgstr "چاپ این پیام" 13.88 13.89 #: tinyutils/terminal:15 13.90 -#, sh-format 13.91 -msgid "Width and height of terminal window ($GEOMETRY)" 13.92 -msgstr "($GEOMETRY) پهنا و ارتفاع پنجره ی ترمینال" 13.93 +msgid "Width and height of terminal window (%s)" 13.94 +msgstr "(%s) پهنا و ارتفاع پنجره ی ترمینال" 13.95 13.96 #: tinyutils/terminal:16 13.97 -#, sh-format 13.98 -msgid "Title name for window (\"$TITLE\")" 13.99 -msgstr "(\"$TITLE\") نام عنوان پنجره" 13.100 +msgid "Title name for window (\"%s\")" 13.101 +msgstr "(\"%s\") نام عنوان پنجره" 13.102 13.103 #: tinyutils/terminal:17 13.104 msgid "Don't close terminal after command finished" 13.105 @@ -308,9 +300,8 @@ 13.106 msgstr "فرمان برای اجرا (باید آخرین فرمان در خط باشد)" 13.107 13.108 #: tinyutils/terminal:21 13.109 -#, sh-format 13.110 -msgid "Help for $TERMINAL:" 13.111 -msgstr ":$TERMINAL راهنمایی درمورد " 13.112 +msgid "Help for %s:" 13.113 +msgstr ":%s راهنمایی درمورد " 13.114 13.115 #: tinyutils/hwsetup:22 13.116 msgid "SliTaz Setup configuration" 13.117 @@ -369,30 +360,26 @@ 13.118 msgstr ".درخواست تائید قبل از نصب وابسته های اختیاری" 13.119 13.120 #: tinyutils/hwsetup:98 13.121 -#, sh-format 13.122 msgid "" 13.123 -"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " 13.124 +"Due to a lack of compatible hardware for troubleshooting, this %s " 13.125 "device has not been properly tested. Please report any success, failure, bug " 13.126 "to SliTaz Bug tracker or Forum." 13.127 msgstr "" 13.128 ".اطلاع دهید SliTaz دستگاه به درستی تست نشده است.لطفا هرگونه موفقیت، شکست یا " 13.129 -"باگ در دستگاه را به انجمن یا پیگیری باگ های $DEVICE به علت کمبود سخت افزار " 13.130 +"باگ در دستگاه را به انجمن یا پیگیری باگ های %s به علت کمبود سخت افزار " 13.131 "هماهنگ برای عیب یابی، این" 13.132 13.133 #: tinyutils/hwsetup:107 13.134 -#, sh-format 13.135 -msgid "Failed to setup $DEVICE" 13.136 -msgstr "نشد $DEVICE موفق به نصب " 13.137 +msgid "Failed to setup %s" 13.138 +msgstr "نشد %s موفق به نصب " 13.139 13.140 #: tinyutils/hwsetup:131 13.141 -#, sh-format 13.142 -msgid "Would you like to install pkg: $pkg" 13.143 -msgstr "$pkg :آیا مایلید که این پکیج را نصب کنید" 13.144 +msgid "Would you like to install pkg: %s" 13.145 +msgstr "%s :آیا مایلید که این پکیج را نصب کنید" 13.146 13.147 #: tinyutils/hwsetup:148 13.148 -#, sh-format 13.149 -msgid "adding $user to $grp" 13.150 -msgstr "$grpبه $user در حال افزودن " 13.151 +msgid "adding %s to %s" 13.152 +msgstr "%sبه %s در حال افزودن " 13.153 13.154 #: tinyutils/hwsetup:171 13.155 msgid "Detected USB Device : Vendor : Product" 13.156 @@ -403,14 +390,12 @@ 13.157 msgstr "استفاده کنید HP آیا مایلید از ابزار نصب " 13.158 13.159 #: tinyutils/hwsetup:228 13.160 -#, sh-format 13.161 -msgid "Verify $DEVICE Permissions" 13.162 -msgstr ".را تائید کنید $DEVICE مجوز های " 13.163 +msgid "Verify %s Permissions" 13.164 +msgstr ".را تائید کنید %s مجوز های " 13.165 13.166 #: tinyutils/hwsetup:229 13.167 -#, sh-format 13.168 -msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" 13.169 -msgstr "rw-rw-rw باشد با مجوز های $grp شما باید در گروه $DEVICE" 13.170 +msgid "Your %s must be in %s group with rw-rw-rw- permissions" 13.171 +msgstr "rw-rw-rw باشد با مجوز های %s شما باید در گروه %s" 13.172 13.173 #: tinyutils/hwsetup:250 13.174 msgid "New udev rules are added by a package" 13.175 @@ -520,9 +505,8 @@ 13.176 msgstr "برای وارد کردن عکس استفاده کنید gphoto2 دوربین نصب شده است؛ لطفا از " 13.177 13.178 #: tinyutils/hwsetup:483 13.179 -#, sh-format 13.180 -msgid "Quick start guide: $guide_url" 13.181 -msgstr "$guide_url :راهنمای شروع سریع" 13.182 +msgid "Quick start guide: %s" 13.183 +msgstr "%s :راهنمای شروع سریع" 13.184 13.185 #: tinyutils/hwsetup:494 13.186 msgid "Do you want to see if the bluetooth is working" 13.187 @@ -549,10 +533,9 @@ 13.188 msgstr "...در حال جفت شدن با دستگاه بلوتوث راه دور" 13.189 13.190 #: tinyutils/hwsetup:520 tinyutils/hwsetup:541 13.191 -#, sh-format 13.192 -msgid "You can manually edit the configuration files in $bt if need be" 13.193 +msgid "You can manually edit the configuration files in %s if need be" 13.194 msgstr "" 13.195 -".به صورت دستی در صورت نیاز ویرایش کنید $bt شما میتوانید فایل های پیکربندی را " 13.196 +".به صورت دستی در صورت نیاز ویرایش کنید %s شما میتوانید فایل های پیکربندی را " 13.197 "در " 13.198 13.199 #: tinyutils/hwsetup:534 13.200 @@ -584,14 +567,12 @@ 13.201 msgstr "را پیکربندی کنید wvdial آیا میخواهید " 13.202 13.203 #: tinyutils/hwsetup:567 13.204 -#, sh-format 13.205 -msgid "Edit $wc for phone number, login name, password and pin" 13.206 -msgstr "برای شماره تلفن، نام کاربری، رمز عبور و کد پین$wc ویرایش " 13.207 +msgid "Edit %s for phone number, login name, password and pin" 13.208 +msgstr "برای شماره تلفن، نام کاربری، رمز عبور و کد پین%s ویرایش " 13.209 13.210 #: tinyutils/hwsetup:568 13.211 -#, sh-format 13.212 -msgid "Add DNS address of your provider in $rc" 13.213 -msgstr " اضافه کنید $rc ارائه دهنده خود را در DNS آدرس " 13.214 +msgid "Add DNS address of your provider in %s" 13.215 +msgstr " اضافه کنید %s ارائه دهنده خود را در DNS آدرس " 13.216 13.217 #: tinyutils/hwsetup:577 13.218 msgid "Setting IPTABLES_RULES to yes in /etc/slitaz/firewall.conf" 13.219 @@ -612,15 +593,13 @@ 13.220 13.221 #: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 13.222 #: tinyutils/hwsetup:714 13.223 -#, sh-format 13.224 -msgid "Your previous config is in $xorg60" 13.225 -msgstr "قرار دارد $xorg60 پیکربندی پیشین شما در " 13.226 +msgid "Your previous config is in %s" 13.227 +msgstr "قرار دارد %s پیکربندی پیشین شما در " 13.228 13.229 #: tinyutils/hwsetup:611 tinyutils/hwsetup:650 13.230 -#, sh-format 13.231 -msgid "If nvidia fails, you can remove $xorg55 to restore previous config." 13.232 +msgid "If nvidia fails, you can remove %s to restore previous config." 13.233 msgstr "" 13.234 -".را حذف کنید تا پیکربندی پیشین شما بازگردانی شود $xorg55 ناموفق بود، شما " 13.235 +".را حذف کنید تا پیکربندی پیشین شما بازگردانی شود %s ناموفق بود، شما " 13.236 "میتوانید Nvidia اگر " 13.237 13.238 #: tinyutils/hwsetup:618 13.239 @@ -649,9 +628,8 @@ 13.240 msgstr "پیکربندی نمایید nvidia را با استفاده از درایور آزاد X آیا میخواهید " 13.241 13.242 #: tinyutils/hwsetup:652 13.243 -#, sh-format 13.244 -msgid "Create $xorg55short configured with nv driver." 13.245 -msgstr "nv پیکربندی شده با درایور $xorg55short ایجاد " 13.246 +msgid "Create %s configured with nv driver." 13.247 +msgstr "nv پیکربندی شده با درایور %s ایجاد " 13.248 13.249 #: tinyutils/hwsetup:678 13.250 msgid "Do you want to configure X using non-free catalyst ATI (radeon) driver" 13.251 @@ -659,10 +637,9 @@ 13.252 "پیکر بندی نمایید ATI (Radeon) را با استفاده از درایور غیر آزاد X آیا مایلید " 13.253 13.254 #: tinyutils/hwsetup:682 13.255 -#, sh-format 13.256 -msgid "If ati fails, you can remove $xorg55 to restore previous config." 13.257 +msgid "If ati fails, you can remove %s to restore previous config." 13.258 msgstr "" 13.259 -".را برای بازگردانی پیکربندی قبلی حذف نمایید $xorg55 ناموفق بود، شما میتوانید " 13.260 +".را برای بازگردانی پیکربندی قبلی حذف نمایید %s ناموفق بود، شما میتوانید " 13.261 "ati اگر " 13.262 13.263 #: tinyutils/hwsetup:691 13.264 @@ -686,16 +663,14 @@ 13.265 "پیکر بندی نمایید ATI (Radeon) را با استفاده از درایور آزاد X آیا مایلید " 13.266 13.267 #: tinyutils/hwsetup:715 13.268 -#, sh-format 13.269 -msgid "If ATI fails, you can remove $xorg55 to restore previous config." 13.270 +msgid "If ATI fails, you can remove %s to restore previous config." 13.271 msgstr "" 13.272 -"را برای بازگردانی پیکربندی پیشین حذف نمایید $xorg55 ناموفق بود، شما میتوانید " 13.273 +"را برای بازگردانی پیکربندی پیشین حذف نمایید %s ناموفق بود، شما میتوانید " 13.274 "ATI اگر" 13.275 13.276 #: tinyutils/hwsetup:717 13.277 -#, sh-format 13.278 -msgid "Create $xorg55short configured with radeon driver." 13.279 -msgstr ".radeon پیکربندی شده با درایور $xorg55short ایجاد " 13.280 +msgid "Create %s configured with radeon driver." 13.281 +msgstr ".radeon پیکربندی شده با درایور %s ایجاد " 13.282 13.283 #: tinyutils/hwsetup:723 13.284 msgid "Checking if ATI radeon is working..." 13.285 @@ -802,7 +777,7 @@ 13.286 msgstr ":رمز عبور" 13.287 13.288 #: tinyutils/slitaz-config:44 13.289 -msgid "Enter new password for \\Zb\\Z1root" 13.290 +msgid "Enter new password for %s" 13.291 msgstr "" 13.292 13.293 #: tinyutils/slitaz-config:53 13.294 @@ -814,8 +789,7 @@ 13.295 msgstr "" 13.296 13.297 #: tinyutils/slitaz-config:61 13.298 -#, sh-format 13.299 -msgid "Enter password for user \\Zb\\Z4$user" 13.300 +msgid "Enter password for user \\Zb\\Z4%s" 13.301 msgstr "" 13.302 13.303 #: tinyutils/slitaz-config:121 13.304 @@ -864,8 +838,7 @@ 13.305 msgstr ":رمز عبور" 13.306 13.307 #: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 13.308 -#, sh-format 13.309 -msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" 13.310 +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4%s" 13.311 msgstr "" 13.312 13.313 #: tinyutils/slitaz-config:197 13.314 @@ -874,7 +847,7 @@ 13.315 13.316 #: tinyutils/slitaz-config:201 13.317 #, fuzzy 13.318 -msgid "Configuring: /etc/network.conf..." 13.319 +msgid "Configuring: %s..." 13.320 msgstr "Xorg در حال پیکربندی " 13.321 13.322 #: tinyutils/slitaz-config:211 13.323 @@ -886,8 +859,7 @@ 13.324 msgstr "" 13.325 13.326 #: tinyutils/slitaz-config:220 13.327 -#, sh-format 13.328 -msgid "IP address: $ip" 13.329 +msgid "IP address: %s" 13.330 msgstr "" 13.331 13.332 #: tinyutils/slitaz-config:222
14.1 --- a/po/slitaz-tools/fr.po Thu May 14 12:55:55 2015 +0200 14.2 +++ b/po/slitaz-tools/fr.po Thu Jun 04 17:11:36 2015 +0300 14.3 @@ -68,16 +68,16 @@ 14.4 msgstr "" 14.5 14.6 #: tinyutils/tazlocale:136 tinyutils/tazkeymap:41 14.7 -msgid "Config file:" 14.8 -msgstr "Fichier de config :" 14.9 +msgid "Config file: %s" 14.10 +msgstr "Fichier de config : %s" 14.11 14.12 #: tinyutils/tazlocale:137 14.13 -msgid "Current locale:" 14.14 -msgstr "Locale actuelle :" 14.15 +msgid "Current locale: %s" 14.16 +msgstr "Locale actuelle : %s" 14.17 14.18 #: tinyutils/tazkeymap:42 14.19 -msgid "Current keymap:" 14.20 -msgstr "Clavier actuel :" 14.21 +msgid "Current keymap: %s" 14.22 +msgstr "Clavier actuel : %s" 14.23 14.24 #: tinyutils/tazkeymap:51 14.25 #, fuzzy 14.26 @@ -128,16 +128,15 @@ 14.27 #: tinyutils/tazx:276 14.28 #, fuzzy 14.29 msgid "Failed to setup driver" 14.30 -msgstr "Echec de la configuration de $DEVICE" 14.31 +msgstr "Echec de la configuration de %s" 14.32 14.33 #: tinyutils/tazx:276 14.34 msgid "(unknown hardware)" 14.35 msgstr "(matériel inconnu)" 14.36 14.37 #: tinyutils/tazx:289 tinyutils/hwsetup:117 14.38 -#, sh-format 14.39 -msgid "Installing pkg: $pkg" 14.40 -msgstr "Installation du paquet : $pkg" 14.41 +msgid "Installing pkg: %s" 14.42 +msgstr "Installation du paquet : %s" 14.43 14.44 #: tinyutils/tazx:307 tinyutils/tazx:423 14.45 #, fuzzy 14.46 @@ -176,7 +175,7 @@ 14.47 14.48 #: tinyutils/tazx:422 14.49 msgid "(Re)Start Simple Login Manager now" 14.50 -msgstr "(Re)démarrer SLiM maintenant"" 14.51 +msgstr "(Re)démarrer SLiM maintenant" 14.52 14.53 #: tinyutils/tazx:424 14.54 msgid "Quit Tazx utility" 14.55 @@ -253,29 +252,24 @@ 14.56 msgstr "/chemin/vers/fichier/*" 14.57 14.58 #: tinyutils/decode:47 14.59 -#, sh-format 14.60 -msgid "Missing decoder: $dec" 14.61 -msgstr "Manque le décodeur : $dec" 14.62 +msgid "Missing decoder: %s" 14.63 +msgstr "Manque le décodeur : %s" 14.64 14.65 #: tinyutils/decode:48 tinyutils/decode:80 14.66 -#, sh-format 14.67 -msgid "Skipping file: $name" 14.68 -msgstr "Fichier ingoré : $name" 14.69 +msgid "Skipping file: %s" 14.70 +msgstr "Fichier ingoré : %s" 14.71 14.72 #: tinyutils/decode:51 14.73 -#, sh-format 14.74 -msgid "Decoding: $name" 14.75 -msgstr "Décodage de : $name" 14.76 +msgid "Decoding: %s" 14.77 +msgstr "Décodage de : %s" 14.78 14.79 #: tinyutils/decode:60 14.80 -#, sh-format 14.81 -msgid "No file: $file" 14.82 -msgstr "Pas de fichier : $file" 14.83 +msgid "No file: %s" 14.84 +msgstr "Pas de fichier : %s" 14.85 14.86 #: tinyutils/decode:82 14.87 -#, sh-format 14.88 -msgid "Unsupported file: $file" 14.89 -msgstr "Fichier pas supporté : $file" 14.90 +msgid "Unsupported file: %s" 14.91 +msgstr "Fichier pas supporté : %s" 14.92 14.93 #: tinyutils/terminal:10 14.94 msgid "configurable SliTaz wrapper for terminal." 14.95 @@ -294,14 +288,12 @@ 14.96 msgstr "Affiche ce message" 14.97 14.98 #: tinyutils/terminal:15 14.99 -#, sh-format 14.100 -msgid "Width and height of terminal window ($GEOMETRY)" 14.101 -msgstr "Largeur et hauteur du terminal ($GEOMETRY)" 14.102 +msgid "Width and height of terminal window (%s)" 14.103 +msgstr "Largeur et hauteur du terminal (%s)" 14.104 14.105 #: tinyutils/terminal:16 14.106 -#, sh-format 14.107 -msgid "Title name for window (\"$TITLE\")" 14.108 -msgstr "Titre de la fenêtre (\"$TITLE\")" 14.109 +msgid "Title name for window (\"%s\")" 14.110 +msgstr "Titre de la fenêtre (\"%s\")" 14.111 14.112 #: tinyutils/terminal:17 14.113 msgid "Don't close terminal after command finished" 14.114 @@ -312,9 +304,8 @@ 14.115 msgstr "Command à lancer (doit être la dernière ligne)" 14.116 14.117 #: tinyutils/terminal:21 14.118 -#, sh-format 14.119 -msgid "Help for $TERMINAL:" 14.120 -msgstr "Aide pour $TERMINAL:" 14.121 +msgid "Help for %s:" 14.122 +msgstr "Aide pour %s:" 14.123 14.124 #: tinyutils/hwsetup:22 14.125 msgid "SliTaz Setup configuration" 14.126 @@ -374,30 +365,26 @@ 14.127 msgstr "vous confirmez l'installtion des dépendances optionnelles" 14.128 14.129 #: tinyutils/hwsetup:98 14.130 -#, sh-format 14.131 msgid "" 14.132 -"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " 14.133 +"Due to a lack of compatible hardware for troubleshooting, this %s " 14.134 "device has not been properly tested. Please report any success, failure, bug " 14.135 "to SliTaz Bug tracker or Forum." 14.136 msgstr "" 14.137 "A cause du manque de matériels pour la mise au point, ce périphérique " 14.138 -"$DEVICE n'a pas été correctement testé. Veuillez reporter les succés, " 14.139 +"%s n'a pas été correctement testé. Veuillez reporter les succés, " 14.140 "échecs, et bugs sur les SliTaz Bug tracker ou Forum." 14.141 14.142 #: tinyutils/hwsetup:107 14.143 -#, sh-format 14.144 -msgid "Failed to setup $DEVICE" 14.145 -msgstr "Echec de la configuration de $DEVICE" 14.146 +msgid "Failed to setup %s" 14.147 +msgstr "Echec de la configuration de %s" 14.148 14.149 #: tinyutils/hwsetup:131 14.150 -#, sh-format 14.151 -msgid "Would you like to install pkg: $pkg" 14.152 -msgstr "Voulez vous installer le paquet : $pkg" 14.153 +msgid "Would you like to install pkg: %s" 14.154 +msgstr "Voulez vous installer le paquet : %s" 14.155 14.156 #: tinyutils/hwsetup:148 14.157 -#, sh-format 14.158 -msgid "adding $user to $grp" 14.159 -msgstr "ajoute $user dans $grp" 14.160 +msgid "adding %s to %s" 14.161 +msgstr "ajoute %s dans %s" 14.162 14.163 #: tinyutils/hwsetup:171 14.164 msgid "Detected USB Device : Vendor : Product" 14.165 @@ -408,14 +395,12 @@ 14.166 msgstr "Voulez vous utiliser l'utilitaire hp-setup" 14.167 14.168 #: tinyutils/hwsetup:228 14.169 -#, sh-format 14.170 -msgid "Verify $DEVICE Permissions" 14.171 -msgstr "Vérifie les permissions de $DEVICE" 14.172 +msgid "Verify %s Permissions" 14.173 +msgstr "Vérifie les permissions de %s" 14.174 14.175 #: tinyutils/hwsetup:229 14.176 -#, sh-format 14.177 -msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" 14.178 -msgstr "Votre $DEVICE doit être dans le groupe $grp avec les droits rw-rw-rw-" 14.179 +msgid "Your %s must be in %s group with rw-rw-rw- permissions" 14.180 +msgstr "Votre %s doit être dans le groupe %s avec les droits rw-rw-rw-" 14.181 14.182 #: tinyutils/hwsetup:250 14.183 msgid "New udev rules are added by a package" 14.184 @@ -525,9 +510,8 @@ 14.185 "la webcam est active ; veuillez utiliser gphoto2 pour importer des photos" 14.186 14.187 #: tinyutils/hwsetup:483 14.188 -#, sh-format 14.189 -msgid "Quick start guide: $guide_url" 14.190 -msgstr "Guide succinct : $guide_url" 14.191 +msgid "Quick start guide: %s" 14.192 +msgstr "Guide succinct : %s" 14.193 14.194 #: tinyutils/hwsetup:494 14.195 msgid "Do you want to see if the bluetooth is working" 14.196 @@ -554,9 +538,8 @@ 14.197 msgstr "Association avec les périphériques distants..." 14.198 14.199 #: tinyutils/hwsetup:520 tinyutils/hwsetup:541 14.200 -#, sh-format 14.201 -msgid "You can manually edit the configuration files in $bt if need be" 14.202 -msgstr "Vous pouvez éditer les fichiers de configuration dans $bt" 14.203 +msgid "You can manually edit the configuration files in %s if need be" 14.204 +msgstr "Vous pouvez éditer les fichiers de configuration dans %s" 14.205 14.206 #: tinyutils/hwsetup:534 14.207 msgid "for starting bluetooth daemon" 14.208 @@ -587,16 +570,14 @@ 14.209 msgstr "Voulez vous configurer wvdial" 14.210 14.211 #: tinyutils/hwsetup:567 14.212 -#, sh-format 14.213 -msgid "Edit $wc for phone number, login name, password and pin" 14.214 +msgid "Edit %s for phone number, login name, password and pin" 14.215 msgstr "" 14.216 "Edition du numéro de téléphone et des login, mot de passe et code pin dans " 14.217 -"$wc" 14.218 +"%s" 14.219 14.220 #: tinyutils/hwsetup:568 14.221 -#, sh-format 14.222 -msgid "Add DNS address of your provider in $rc" 14.223 -msgstr "Ajout de l'adresse DNS de votre provide dans $rc" 14.224 +msgid "Add DNS address of your provider in %s" 14.225 +msgstr "Ajout de l'adresse DNS de votre provide dans %s" 14.226 14.227 #: tinyutils/hwsetup:577 14.228 msgid "Setting IPTABLES_RULES to yes in /etc/slitaz/firewall.conf" 14.229 @@ -616,15 +597,13 @@ 14.230 14.231 #: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 14.232 #: tinyutils/hwsetup:714 14.233 -#, sh-format 14.234 -msgid "Your previous config is in $xorg60" 14.235 -msgstr "La config précédante est dans $xorg60" 14.236 +msgid "Your previous config is in %s" 14.237 +msgstr "La config précédante est dans %s" 14.238 14.239 #: tinyutils/hwsetup:611 tinyutils/hwsetup:650 14.240 -#, sh-format 14.241 -msgid "If nvidia fails, you can remove $xorg55 to restore previous config." 14.242 +msgid "If nvidia fails, you can remove %s to restore previous config." 14.243 msgstr "" 14.244 -"Si nvidia se plante, retirez $xorg55 pour restorer la config précédante." 14.245 +"Si nvidia se plante, retirez %s pour restorer la config précédante." 14.246 14.247 #: tinyutils/hwsetup:618 14.248 msgid "Adding to xorg.conf:" 14.249 @@ -651,9 +630,8 @@ 14.250 msgstr "Voulez vous configurer X avec le pilote nvidia libre" 14.251 14.252 #: tinyutils/hwsetup:652 14.253 -#, sh-format 14.254 -msgid "Create $xorg55short configured with nv driver." 14.255 -msgstr "Crée $xorg55short pour le pilote nv." 14.256 +msgid "Create %s configured with nv driver." 14.257 +msgstr "Crée %s pour le pilote nv." 14.258 14.259 #: tinyutils/hwsetup:678 14.260 msgid "Do you want to configure X using non-free catalyst ATI (radeon) driver" 14.261 @@ -661,9 +639,8 @@ 14.262 "Voulez vous configurer X avec le pilote catalyst ATI (radeon) non-libre" 14.263 14.264 #: tinyutils/hwsetup:682 14.265 -#, sh-format 14.266 -msgid "If ati fails, you can remove $xorg55 to restore previous config." 14.267 -msgstr "Si ATI se plante, retirez $xorg55 pour restorer la config précédante." 14.268 +msgid "If ati fails, you can remove %s to restore previous config." 14.269 +msgstr "Si ATI se plante, retirez %s pour restorer la config précédante." 14.270 14.271 #: tinyutils/hwsetup:691 14.272 msgid "Checking if ati catalyst is working..." 14.273 @@ -683,14 +660,12 @@ 14.274 msgstr "Voulez vous configurer X avec le pilote libre ATI (radeon)" 14.275 14.276 #: tinyutils/hwsetup:715 14.277 -#, sh-format 14.278 -msgid "If ATI fails, you can remove $xorg55 to restore previous config." 14.279 -msgstr "Si ATI se plante, retirez $xorg55 pour restorer la config précédante." 14.280 +msgid "If ATI fails, you can remove %s to restore previous config." 14.281 +msgstr "Si ATI se plante, retirez %s pour restorer la config précédante." 14.282 14.283 #: tinyutils/hwsetup:717 14.284 -#, sh-format 14.285 -msgid "Create $xorg55short configured with radeon driver." 14.286 -msgstr "Création de $xorg55short avec le pilote radeon." 14.287 +msgid "Create %s configured with radeon driver." 14.288 +msgstr "Création de %s avec le pilote radeon." 14.289 14.290 #: tinyutils/hwsetup:723 14.291 msgid "Checking if ATI radeon is working..." 14.292 @@ -796,8 +771,8 @@ 14.293 msgstr "Mot de passe:" 14.294 14.295 #: tinyutils/slitaz-config:44 14.296 -msgid "Enter new password for \\Zb\\Z1root" 14.297 -msgstr "Entrez le nouveau mot de passe de \\Zb\\Z1root" 14.298 +msgid "Enter new password for %s" 14.299 +msgstr "Entrez le nouveau mot de passe de %s" 14.300 14.301 #: tinyutils/slitaz-config:53 14.302 msgid "Add User" 14.303 @@ -808,9 +783,8 @@ 14.304 msgstr "Entrez l'identifiant du nouvel utilisateur \\Zb\\Z4utilisateur" 14.305 14.306 #: tinyutils/slitaz-config:61 14.307 -#, sh-format 14.308 -msgid "Enter password for user \\Zb\\Z4$user" 14.309 -msgstr "Entrez le mot de passe de l'utilisateur \\Zb\\Z4$user" 14.310 +msgid "Enter password for user \\Zb\\Z4%s" 14.311 +msgstr "Entrez le mot de passe de l'utilisateur \\Zb\\Z4%s" 14.312 14.313 #: tinyutils/slitaz-config:121 14.314 msgid "connected" 14.315 @@ -858,9 +832,8 @@ 14.316 msgstr "Mot de passe:" 14.317 14.318 #: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 14.319 -#, sh-format 14.320 -msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" 14.321 -msgstr "Enterz la clé (ou mot de passe) Wi-Fi pour \\Zb\\Z4$essid" 14.322 +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4%s" 14.323 +msgstr "Enterz la clé (ou mot de passe) Wi-Fi pour \\Zb\\Z4%s" 14.324 14.325 #: tinyutils/slitaz-config:197 14.326 msgid "Shutting down network interfaces..." 14.327 @@ -868,7 +841,7 @@ 14.328 14.329 #: tinyutils/slitaz-config:201 14.330 #, fuzzy 14.331 -msgid "Configuring: /etc/network.conf..." 14.332 +msgid "Configuring: %s..." 14.333 msgstr "Configuration de Xorg..." 14.334 14.335 #: tinyutils/slitaz-config:211 14.336 @@ -880,9 +853,8 @@ 14.337 msgstr "Vérifie la connexion..." 14.338 14.339 #: tinyutils/slitaz-config:220 14.340 -#, sh-format 14.341 -msgid "IP address: $ip" 14.342 -msgstr "Adresse IP : $ip" 14.343 +msgid "IP address: %s" 14.344 +msgstr "Adresse IP : %s" 14.345 14.346 #: tinyutils/slitaz-config:222 14.347 msgid "Unable to connect..." 14.348 @@ -944,8 +916,8 @@ 14.349 #~ msgid "You must be root to configure X server." 14.350 #~ msgstr "Vous devez être root pour configurer le serveur X." 14.351 14.352 -#~ msgid "Setting system locale to: $locale" 14.353 -#~ msgstr "Paramétrage de la langue du système : $locale" 14.354 +#~ msgid "Setting system locale to: %s" 14.355 +#~ msgstr "Paramétrage de la langue du système : %s" 14.356 14.357 #~ msgid "You must be root to run:" 14.358 #~ msgstr "Vous devez être root pour lancer:"
15.1 --- a/po/slitaz-tools/pl.po Thu May 14 12:55:55 2015 +0200 15.2 +++ b/po/slitaz-tools/pl.po Thu Jun 04 17:11:36 2015 +0300 15.3 @@ -71,16 +71,16 @@ 15.4 msgstr "" 15.5 15.6 #: tinyutils/tazlocale:136 tinyutils/tazkeymap:41 15.7 -msgid "Config file:" 15.8 -msgstr "Plik konfiguracyjny:" 15.9 +msgid "Config file: %s" 15.10 +msgstr "Plik konfiguracyjny: %s" 15.11 15.12 #: tinyutils/tazlocale:137 15.13 -msgid "Current locale:" 15.14 -msgstr "Aktualne ustawienia regionalne:" 15.15 +msgid "Current locale: %s" 15.16 +msgstr "Aktualne ustawienia regionalne: %s" 15.17 15.18 #: tinyutils/tazkeymap:42 15.19 -msgid "Current keymap:" 15.20 -msgstr "Aktualny układ klawiatury:" 15.21 +msgid "Current keymap: %s" 15.22 +msgstr "Aktualny układ klawiatury: %s" 15.23 15.24 #: tinyutils/tazkeymap:51 15.25 #, fuzzy 15.26 @@ -135,8 +135,7 @@ 15.27 msgstr "" 15.28 15.29 #: tinyutils/tazx:289 tinyutils/hwsetup:117 15.30 -#, sh-format 15.31 -msgid "Installing pkg: $pkg" 15.32 +msgid "Installing pkg: %s" 15.33 msgstr "" 15.34 15.35 #: tinyutils/tazx:307 tinyutils/tazx:423 15.36 @@ -250,29 +249,24 @@ 15.37 msgstr "" 15.38 15.39 #: tinyutils/decode:47 15.40 -#, sh-format 15.41 -msgid "Missing decoder: $dec" 15.42 -msgstr "Brakujący dekoder: $dec" 15.43 +msgid "Missing decoder: %s" 15.44 +msgstr "Brakujący dekoder: %s" 15.45 15.46 #: tinyutils/decode:48 tinyutils/decode:80 15.47 -#, sh-format 15.48 -msgid "Skipping file: $name" 15.49 -msgstr "Pomijanie pliku: $name" 15.50 +msgid "Skipping file: %s" 15.51 +msgstr "Pomijanie pliku: %s" 15.52 15.53 #: tinyutils/decode:51 15.54 -#, sh-format 15.55 -msgid "Decoding: $name" 15.56 -msgstr "Dekodowanie: $name" 15.57 +msgid "Decoding: %s" 15.58 +msgstr "Dekodowanie: %s" 15.59 15.60 #: tinyutils/decode:60 15.61 -#, sh-format 15.62 -msgid "No file: $file" 15.63 -msgstr "Brak pliku: $file" 15.64 +msgid "No file: %s" 15.65 +msgstr "Brak pliku: %s" 15.66 15.67 #: tinyutils/decode:82 15.68 -#, sh-format 15.69 -msgid "Unsupported file: $file" 15.70 -msgstr "Nieobsługiwany plik: $file" 15.71 +msgid "Unsupported file: %s" 15.72 +msgstr "Nieobsługiwany plik: %s" 15.73 15.74 #: tinyutils/terminal:10 15.75 msgid "configurable SliTaz wrapper for terminal." 15.76 @@ -291,14 +285,12 @@ 15.77 msgstr "Wyświetl tą wiadomość" 15.78 15.79 #: tinyutils/terminal:15 15.80 -#, sh-format 15.81 -msgid "Width and height of terminal window ($GEOMETRY)" 15.82 -msgstr "Szerokość i wysokość okna terminala ($GEOMETRY)" 15.83 +msgid "Width and height of terminal window (%s)" 15.84 +msgstr "Szerokość i wysokość okna terminala (%s)" 15.85 15.86 #: tinyutils/terminal:16 15.87 -#, sh-format 15.88 -msgid "Title name for window (\"$TITLE\")" 15.89 -msgstr "Pasek tytułu dla okna (\"$TITLE\")" 15.90 +msgid "Title name for window (\"%s\")" 15.91 +msgstr "Pasek tytułu dla okna (\"%s\")" 15.92 15.93 #: tinyutils/terminal:17 15.94 msgid "Don't close terminal after command finished" 15.95 @@ -309,9 +301,8 @@ 15.96 msgstr "Polecenie do wykonania (musi być ostatnie w lini)" 15.97 15.98 #: tinyutils/terminal:21 15.99 -#, sh-format 15.100 -msgid "Help for $TERMINAL:" 15.101 -msgstr "Pomoc dla $TERMINAL:" 15.102 +msgid "Help for %s:" 15.103 +msgstr "Pomoc dla %s:" 15.104 15.105 #: tinyutils/hwsetup:22 15.106 msgid "SliTaz Setup configuration" 15.107 @@ -370,26 +361,22 @@ 15.108 msgstr "" 15.109 15.110 #: tinyutils/hwsetup:98 15.111 -#, sh-format 15.112 msgid "" 15.113 -"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " 15.114 +"Due to a lack of compatible hardware for troubleshooting, this %s " 15.115 "device has not been properly tested. Please report any success, failure, bug " 15.116 "to SliTaz Bug tracker or Forum." 15.117 msgstr "" 15.118 15.119 #: tinyutils/hwsetup:107 15.120 -#, sh-format 15.121 -msgid "Failed to setup $DEVICE" 15.122 +msgid "Failed to setup %s" 15.123 msgstr "" 15.124 15.125 #: tinyutils/hwsetup:131 15.126 -#, sh-format 15.127 -msgid "Would you like to install pkg: $pkg" 15.128 +msgid "Would you like to install pkg: %s" 15.129 msgstr "" 15.130 15.131 #: tinyutils/hwsetup:148 15.132 -#, sh-format 15.133 -msgid "adding $user to $grp" 15.134 +msgid "adding %s to %s" 15.135 msgstr "" 15.136 15.137 #: tinyutils/hwsetup:171 15.138 @@ -401,13 +388,11 @@ 15.139 msgstr "" 15.140 15.141 #: tinyutils/hwsetup:228 15.142 -#, sh-format 15.143 -msgid "Verify $DEVICE Permissions" 15.144 +msgid "Verify %s Permissions" 15.145 msgstr "" 15.146 15.147 #: tinyutils/hwsetup:229 15.148 -#, sh-format 15.149 -msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" 15.150 +msgid "Your %s must be in %s group with rw-rw-rw- permissions" 15.151 msgstr "" 15.152 15.153 #: tinyutils/hwsetup:250 15.154 @@ -515,8 +500,7 @@ 15.155 msgstr "" 15.156 15.157 #: tinyutils/hwsetup:483 15.158 -#, sh-format 15.159 -msgid "Quick start guide: $guide_url" 15.160 +msgid "Quick start guide: %s" 15.161 msgstr "" 15.162 15.163 #: tinyutils/hwsetup:494 15.164 @@ -544,8 +528,7 @@ 15.165 msgstr "" 15.166 15.167 #: tinyutils/hwsetup:520 tinyutils/hwsetup:541 15.168 -#, sh-format 15.169 -msgid "You can manually edit the configuration files in $bt if need be" 15.170 +msgid "You can manually edit the configuration files in %s if need be" 15.171 msgstr "" 15.172 15.173 #: tinyutils/hwsetup:534 15.174 @@ -577,13 +560,11 @@ 15.175 msgstr "" 15.176 15.177 #: tinyutils/hwsetup:567 15.178 -#, sh-format 15.179 -msgid "Edit $wc for phone number, login name, password and pin" 15.180 +msgid "Edit %s for phone number, login name, password and pin" 15.181 msgstr "" 15.182 15.183 #: tinyutils/hwsetup:568 15.184 -#, sh-format 15.185 -msgid "Add DNS address of your provider in $rc" 15.186 +msgid "Add DNS address of your provider in %s" 15.187 msgstr "" 15.188 15.189 #: tinyutils/hwsetup:577 15.190 @@ -604,13 +585,11 @@ 15.191 15.192 #: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 15.193 #: tinyutils/hwsetup:714 15.194 -#, sh-format 15.195 -msgid "Your previous config is in $xorg60" 15.196 +msgid "Your previous config is in %s" 15.197 msgstr "" 15.198 15.199 #: tinyutils/hwsetup:611 tinyutils/hwsetup:650 15.200 -#, sh-format 15.201 -msgid "If nvidia fails, you can remove $xorg55 to restore previous config." 15.202 +msgid "If nvidia fails, you can remove %s to restore previous config." 15.203 msgstr "" 15.204 15.205 #: tinyutils/hwsetup:618 15.206 @@ -638,8 +617,7 @@ 15.207 msgstr "" 15.208 15.209 #: tinyutils/hwsetup:652 15.210 -#, sh-format 15.211 -msgid "Create $xorg55short configured with nv driver." 15.212 +msgid "Create %s configured with nv driver." 15.213 msgstr "" 15.214 15.215 #: tinyutils/hwsetup:678 15.216 @@ -647,8 +625,7 @@ 15.217 msgstr "" 15.218 15.219 #: tinyutils/hwsetup:682 15.220 -#, sh-format 15.221 -msgid "If ati fails, you can remove $xorg55 to restore previous config." 15.222 +msgid "If ati fails, you can remove %s to restore previous config." 15.223 msgstr "" 15.224 15.225 #: tinyutils/hwsetup:691 15.226 @@ -669,13 +646,11 @@ 15.227 msgstr "" 15.228 15.229 #: tinyutils/hwsetup:715 15.230 -#, sh-format 15.231 -msgid "If ATI fails, you can remove $xorg55 to restore previous config." 15.232 +msgid "If ATI fails, you can remove %s to restore previous config." 15.233 msgstr "" 15.234 15.235 #: tinyutils/hwsetup:717 15.236 -#, sh-format 15.237 -msgid "Create $xorg55short configured with radeon driver." 15.238 +msgid "Create %s configured with radeon driver." 15.239 msgstr "" 15.240 15.241 #: tinyutils/hwsetup:723 15.242 @@ -780,7 +755,7 @@ 15.243 msgstr "" 15.244 15.245 #: tinyutils/slitaz-config:44 15.246 -msgid "Enter new password for \\Zb\\Z1root" 15.247 +msgid "Enter new password for %s" 15.248 msgstr "" 15.249 15.250 #: tinyutils/slitaz-config:53 15.251 @@ -792,8 +767,7 @@ 15.252 msgstr "" 15.253 15.254 #: tinyutils/slitaz-config:61 15.255 -#, sh-format 15.256 -msgid "Enter password for user \\Zb\\Z4$user" 15.257 +msgid "Enter password for user \\Zb\\Z4%s" 15.258 msgstr "" 15.259 15.260 #: tinyutils/slitaz-config:121 15.261 @@ -841,8 +815,7 @@ 15.262 msgstr "" 15.263 15.264 #: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 15.265 -#, sh-format 15.266 -msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" 15.267 +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4%s" 15.268 msgstr "" 15.269 15.270 #: tinyutils/slitaz-config:197 15.271 @@ -850,7 +823,7 @@ 15.272 msgstr "" 15.273 15.274 #: tinyutils/slitaz-config:201 15.275 -msgid "Configuring: /etc/network.conf..." 15.276 +msgid "Configuring: %s..." 15.277 msgstr "" 15.278 15.279 #: tinyutils/slitaz-config:211 15.280 @@ -862,8 +835,7 @@ 15.281 msgstr "" 15.282 15.283 #: tinyutils/slitaz-config:220 15.284 -#, sh-format 15.285 -msgid "IP address: $ip" 15.286 +msgid "IP address: %s" 15.287 msgstr "" 15.288 15.289 #: tinyutils/slitaz-config:222 15.290 @@ -923,5 +895,5 @@ 15.291 #~ msgid "You must be root to configure X server." 15.292 #~ msgstr "Aby konfigurować serwer X wymagane są uprawnienia administratora." 15.293 15.294 -#~ msgid "Setting system locale to: $locale" 15.295 -#~ msgstr "Zmienianie ustawień regionalnych systemu na: $locale" 15.296 +#~ msgid "Setting system locale to: %s" 15.297 +#~ msgstr "Zmienianie ustawień regionalnych systemu na: %s"
16.1 --- a/po/slitaz-tools/pt_BR.po Thu May 14 12:55:55 2015 +0200 16.2 +++ b/po/slitaz-tools/pt_BR.po Thu Jun 04 17:11:36 2015 +0300 16.3 @@ -68,16 +68,16 @@ 16.4 msgstr "Informação" 16.5 16.6 #: tinyutils/tazlocale:136 tinyutils/tazkeymap:41 16.7 -msgid "Config file:" 16.8 -msgstr "Arquivo de configuração:" 16.9 +msgid "Config file: %s" 16.10 +msgstr "Arquivo de configuração: %s" 16.11 16.12 #: tinyutils/tazlocale:137 16.13 -msgid "Current locale:" 16.14 -msgstr "Linguagem atual:" 16.15 +msgid "Current locale: %s" 16.16 +msgstr "Linguagem atual: %s" 16.17 16.18 #: tinyutils/tazkeymap:42 16.19 -msgid "Current keymap:" 16.20 -msgstr "Mapa de teclado atual:" 16.21 +msgid "Current keymap: %s" 16.22 +msgstr "Mapa de teclado atual: %s" 16.23 16.24 #: tinyutils/tazkeymap:51 16.25 msgid "SliTaz keyboard setting" 16.26 @@ -126,16 +126,15 @@ 16.27 #: tinyutils/tazx:276 16.28 #, fuzzy 16.29 msgid "Failed to setup driver" 16.30 -msgstr "Falha ao configurar $DEVICE" 16.31 +msgstr "Falha ao configurar %s" 16.32 16.33 #: tinyutils/tazx:276 16.34 msgid "(unknown hardware)" 16.35 msgstr "" 16.36 16.37 #: tinyutils/tazx:289 tinyutils/hwsetup:117 16.38 -#, sh-format 16.39 -msgid "Installing pkg: $pkg" 16.40 -msgstr "Instalando pacote: $pkg" 16.41 +msgid "Installing pkg: %s" 16.42 +msgstr "Instalando pacote: %s" 16.43 16.44 #: tinyutils/tazx:307 tinyutils/tazx:423 16.45 #, fuzzy 16.46 @@ -252,29 +251,24 @@ 16.47 msgstr "/caminho/para/arquivos/*" 16.48 16.49 #: tinyutils/decode:47 16.50 -#, sh-format 16.51 -msgid "Missing decoder: $dec" 16.52 -msgstr "Decodificador não encontrado: $dec" 16.53 +msgid "Missing decoder: %s" 16.54 +msgstr "Decodificador não encontrado: %s" 16.55 16.56 #: tinyutils/decode:48 tinyutils/decode:80 16.57 -#, sh-format 16.58 -msgid "Skipping file: $name" 16.59 -msgstr "Ignorando arquivo: $name" 16.60 +msgid "Skipping file: %s" 16.61 +msgstr "Ignorando arquivo: %s" 16.62 16.63 #: tinyutils/decode:51 16.64 -#, sh-format 16.65 -msgid "Decoding: $name" 16.66 -msgstr "Decodificando: $name" 16.67 +msgid "Decoding: %s" 16.68 +msgstr "Decodificando: %s" 16.69 16.70 #: tinyutils/decode:60 16.71 -#, sh-format 16.72 -msgid "No file: $file" 16.73 -msgstr "Nenhum arquivo: $file" 16.74 +msgid "No file: %s" 16.75 +msgstr "Nenhum arquivo: %s" 16.76 16.77 #: tinyutils/decode:82 16.78 -#, sh-format 16.79 -msgid "Unsupported file: $file" 16.80 -msgstr "Arquivo não suportado: $file" 16.81 +msgid "Unsupported file: %s" 16.82 +msgstr "Arquivo não suportado: %s" 16.83 16.84 #: tinyutils/terminal:10 16.85 msgid "configurable SliTaz wrapper for terminal." 16.86 @@ -293,14 +287,12 @@ 16.87 msgstr "Mostra esta mensagem" 16.88 16.89 #: tinyutils/terminal:15 16.90 -#, sh-format 16.91 -msgid "Width and height of terminal window ($GEOMETRY)" 16.92 -msgstr "Largura e altura da janela de terminal ($GEOMETRY)" 16.93 +msgid "Width and height of terminal window (%s)" 16.94 +msgstr "Largura e altura da janela de terminal (%s)" 16.95 16.96 #: tinyutils/terminal:16 16.97 -#, sh-format 16.98 -msgid "Title name for window (\"$TITLE\")" 16.99 -msgstr "Título para a janela (\"$TITLE\")" 16.100 +msgid "Title name for window (\"%s\")" 16.101 +msgstr "Título para a janela (\"%s\")" 16.102 16.103 #: tinyutils/terminal:17 16.104 msgid "Don't close terminal after command finished" 16.105 @@ -311,9 +303,8 @@ 16.106 msgstr "Comando para executar (deve estar por último na linha)" 16.107 16.108 #: tinyutils/terminal:21 16.109 -#, sh-format 16.110 -msgid "Help for $TERMINAL:" 16.111 -msgstr "Ajuda para $TERMINAL:" 16.112 +msgid "Help for %s:" 16.113 +msgstr "Ajuda para %s:" 16.114 16.115 #: tinyutils/hwsetup:22 16.116 msgid "SliTaz Setup configuration" 16.117 @@ -372,30 +363,26 @@ 16.118 msgstr "confirmar antes de instalar dependências opcionais" 16.119 16.120 #: tinyutils/hwsetup:98 16.121 -#, sh-format 16.122 msgid "" 16.123 -"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " 16.124 +"Due to a lack of compatible hardware for troubleshooting, this %s " 16.125 "device has not been properly tested. Please report any success, failure, bug " 16.126 "to SliTaz Bug tracker or Forum." 16.127 msgstr "" 16.128 -"Devido à falta de hardware compatível para testes, este dispositivo $DEVICE " 16.129 +"Devido à falta de hardware compatível para testes, este dispositivo %s " 16.130 "não foi testado adequadamente. Por favor reportar qualquer sucesso, falha ou " 16.131 "bug no fórum ou no SliTaz Bug tracker." 16.132 16.133 #: tinyutils/hwsetup:107 16.134 -#, sh-format 16.135 -msgid "Failed to setup $DEVICE" 16.136 -msgstr "Falha ao configurar $DEVICE" 16.137 +msgid "Failed to setup %s" 16.138 +msgstr "Falha ao configurar %s" 16.139 16.140 #: tinyutils/hwsetup:131 16.141 -#, sh-format 16.142 -msgid "Would you like to install pkg: $pkg" 16.143 -msgstr "Você gostaria de instalar o pacote: $pkg" 16.144 +msgid "Would you like to install pkg: %s" 16.145 +msgstr "Você gostaria de instalar o pacote: %s" 16.146 16.147 #: tinyutils/hwsetup:148 16.148 -#, sh-format 16.149 -msgid "adding $user to $grp" 16.150 -msgstr "adicionando $user para $grp" 16.151 +msgid "adding %s to %s" 16.152 +msgstr "adicionando %s para %s" 16.153 16.154 #: tinyutils/hwsetup:171 16.155 msgid "Detected USB Device : Vendor : Product" 16.156 @@ -406,14 +393,12 @@ 16.157 msgstr "Você gostaria de usar o utilitário hp-setup" 16.158 16.159 #: tinyutils/hwsetup:228 16.160 -#, sh-format 16.161 -msgid "Verify $DEVICE Permissions" 16.162 -msgstr "Verificar permissões de $DEVICE" 16.163 +msgid "Verify %s Permissions" 16.164 +msgstr "Verificar permissões de %s" 16.165 16.166 #: tinyutils/hwsetup:229 16.167 -#, sh-format 16.168 -msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" 16.169 -msgstr "Seu $DEVICE deve estar no grupo $grp com permissão rw-rw-rw-" 16.170 +msgid "Your %s must be in %s group with rw-rw-rw- permissions" 16.171 +msgstr "Seu %s deve estar no grupo %s com permissão rw-rw-rw-" 16.172 16.173 #: tinyutils/hwsetup:250 16.174 msgid "New udev rules are added by a package" 16.175 @@ -522,9 +507,8 @@ 16.176 msgstr "A câmera está configurada; utilize gphoto2 para importar fotos" 16.177 16.178 #: tinyutils/hwsetup:483 16.179 -#, sh-format 16.180 -msgid "Quick start guide: $guide_url" 16.181 -msgstr "Guia de início rápido: $guide_url" 16.182 +msgid "Quick start guide: %s" 16.183 +msgstr "Guia de início rápido: %s" 16.184 16.185 #: tinyutils/hwsetup:494 16.186 msgid "Do you want to see if the bluetooth is working" 16.187 @@ -551,10 +535,9 @@ 16.188 msgstr "pareando com dispositivo bluetooth remoto..." 16.189 16.190 #: tinyutils/hwsetup:520 tinyutils/hwsetup:541 16.191 -#, sh-format 16.192 -msgid "You can manually edit the configuration files in $bt if need be" 16.193 +msgid "You can manually edit the configuration files in %s if need be" 16.194 msgstr "" 16.195 -"Você pode editar o arquivo de configuração manualmente em $bt se necessário" 16.196 +"Você pode editar o arquivo de configuração manualmente em %s se necessário" 16.197 16.198 #: tinyutils/hwsetup:534 16.199 msgid "for starting bluetooth daemon" 16.200 @@ -585,14 +568,12 @@ 16.201 msgstr "Você gostaria de configurar o wvdial" 16.202 16.203 #: tinyutils/hwsetup:567 16.204 -#, sh-format 16.205 -msgid "Edit $wc for phone number, login name, password and pin" 16.206 -msgstr "Editar $wc para número de telefone, login, senha e pin" 16.207 +msgid "Edit %s for phone number, login name, password and pin" 16.208 +msgstr "Editar %s para número de telefone, login, senha e pin" 16.209 16.210 #: tinyutils/hwsetup:568 16.211 -#, sh-format 16.212 -msgid "Add DNS address of your provider in $rc" 16.213 -msgstr "Adicionar endereço DNS de seu provedor em $rc" 16.214 +msgid "Add DNS address of your provider in %s" 16.215 +msgstr "Adicionar endereço DNS de seu provedor em %s" 16.216 16.217 #: tinyutils/hwsetup:577 16.218 msgid "Setting IPTABLES_RULES to yes in /etc/slitaz/firewall.conf" 16.219 @@ -613,15 +594,13 @@ 16.220 16.221 #: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 16.222 #: tinyutils/hwsetup:714 16.223 -#, sh-format 16.224 -msgid "Your previous config is in $xorg60" 16.225 -msgstr "Sua configuração anterior está em $xorg60" 16.226 +msgid "Your previous config is in %s" 16.227 +msgstr "Sua configuração anterior está em %s" 16.228 16.229 #: tinyutils/hwsetup:611 tinyutils/hwsetup:650 16.230 -#, sh-format 16.231 -msgid "If nvidia fails, you can remove $xorg55 to restore previous config." 16.232 +msgid "If nvidia fails, you can remove %s to restore previous config." 16.233 msgstr "" 16.234 -"Se o nvidia falhar, você pode remover $xorg55 para restaurar configuração " 16.235 +"Se o nvidia falhar, você pode remover %s para restaurar configuração " 16.236 "anterior." 16.237 16.238 #: tinyutils/hwsetup:618 16.239 @@ -649,19 +628,17 @@ 16.240 msgstr "Você gostaria de configurar o X usando o driver livre da nvidia" 16.241 16.242 #: tinyutils/hwsetup:652 16.243 -#, sh-format 16.244 -msgid "Create $xorg55short configured with nv driver." 16.245 -msgstr "Criando $xorg55short configurado com o driver nv." 16.246 +msgid "Create %s configured with nv driver." 16.247 +msgstr "Criando %s configurado com o driver nv." 16.248 16.249 #: tinyutils/hwsetup:678 16.250 msgid "Do you want to configure X using non-free catalyst ATI (radeon) driver" 16.251 msgstr "Você gostaria de configurar o X usando o driver não-livre ATI (radeon)" 16.252 16.253 #: tinyutils/hwsetup:682 16.254 -#, sh-format 16.255 -msgid "If ati fails, you can remove $xorg55 to restore previous config." 16.256 +msgid "If ati fails, you can remove %s to restore previous config." 16.257 msgstr "" 16.258 -"Se o ATI falhar, você pode remover $xorg55 para restaurar configuração " 16.259 +"Se o ATI falhar, você pode remover %s para restaurar configuração " 16.260 "anterior." 16.261 16.262 #: tinyutils/hwsetup:691 16.263 @@ -684,16 +661,14 @@ 16.264 msgstr "Você gostaria de configurar o X usando o driver ATI (radeon) livre" 16.265 16.266 #: tinyutils/hwsetup:715 16.267 -#, sh-format 16.268 -msgid "If ATI fails, you can remove $xorg55 to restore previous config." 16.269 +msgid "If ATI fails, you can remove %s to restore previous config." 16.270 msgstr "" 16.271 -"Se o ATI falhar, você pode remover $xorg55 para restaurar configuração " 16.272 +"Se o ATI falhar, você pode remover %s para restaurar configuração " 16.273 "anterior." 16.274 16.275 #: tinyutils/hwsetup:717 16.276 -#, sh-format 16.277 -msgid "Create $xorg55short configured with radeon driver." 16.278 -msgstr "Criar $xorg55short configurado com o driver radeon." 16.279 +msgid "Create %s configured with radeon driver." 16.280 +msgstr "Criar %s configurado com o driver radeon." 16.281 16.282 #: tinyutils/hwsetup:723 16.283 msgid "Checking if ATI radeon is working..." 16.284 @@ -799,7 +774,7 @@ 16.285 msgstr "Senha:" 16.286 16.287 #: tinyutils/slitaz-config:44 16.288 -msgid "Enter new password for \\Zb\\Z1root" 16.289 +msgid "Enter new password for %s" 16.290 msgstr "" 16.291 16.292 #: tinyutils/slitaz-config:53 16.293 @@ -811,8 +786,7 @@ 16.294 msgstr "" 16.295 16.296 #: tinyutils/slitaz-config:61 16.297 -#, sh-format 16.298 -msgid "Enter password for user \\Zb\\Z4$user" 16.299 +msgid "Enter password for user \\Zb\\Z4%s" 16.300 msgstr "" 16.301 16.302 #: tinyutils/slitaz-config:121 16.303 @@ -861,8 +835,7 @@ 16.304 msgstr "Senha:" 16.305 16.306 #: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 16.307 -#, sh-format 16.308 -msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" 16.309 +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4%s" 16.310 msgstr "" 16.311 16.312 #: tinyutils/slitaz-config:197 16.313 @@ -871,7 +844,7 @@ 16.314 16.315 #: tinyutils/slitaz-config:201 16.316 #, fuzzy 16.317 -msgid "Configuring: /etc/network.conf..." 16.318 +msgid "Configuring: %s..." 16.319 msgstr "Configurando Xorg..." 16.320 16.321 #: tinyutils/slitaz-config:211 16.322 @@ -883,8 +856,7 @@ 16.323 msgstr "" 16.324 16.325 #: tinyutils/slitaz-config:220 16.326 -#, sh-format 16.327 -msgid "IP address: $ip" 16.328 +msgid "IP address: %s" 16.329 msgstr "" 16.330 16.331 #: tinyutils/slitaz-config:222 16.332 @@ -947,8 +919,8 @@ 16.333 #~ msgid "You must be root to configure X server." 16.334 #~ msgstr "Você deve ser root para configurar o servidor gráfico." 16.335 16.336 -#~ msgid "Setting system locale to: $locale" 16.337 -#~ msgstr "Definido linguagem do sistema para: $locale" 16.338 +#~ msgid "Setting system locale to: %s" 16.339 +#~ msgstr "Definido linguagem do sistema para: %s" 16.340 16.341 #~ msgid "You must be root to run:" 16.342 #~ msgstr "Você deve ser root para executar:"
17.1 --- a/po/slitaz-tools/ru.po Thu May 14 12:55:55 2015 +0200 17.2 +++ b/po/slitaz-tools/ru.po Thu Jun 04 17:11:36 2015 +0300 17.3 @@ -71,16 +71,16 @@ 17.4 msgstr "Информация" 17.5 17.6 #: tinyutils/tazlocale:136 tinyutils/tazkeymap:41 17.7 -msgid "Config file:" 17.8 -msgstr "Файл настроек:" 17.9 +msgid "Config file: %s" 17.10 +msgstr "Файл настроек: %s" 17.11 17.12 #: tinyutils/tazlocale:137 17.13 -msgid "Current locale:" 17.14 -msgstr "Текущая локаль:" 17.15 +msgid "Current locale: %s" 17.16 +msgstr "Текущая локаль: %s" 17.17 17.18 #: tinyutils/tazkeymap:42 17.19 -msgid "Current keymap:" 17.20 -msgstr "Текущая раскладка:" 17.21 +msgid "Current keymap: %s" 17.22 +msgstr "Текущая раскладка: %s" 17.23 17.24 #: tinyutils/tazkeymap:51 17.25 msgid "SliTaz keyboard setting" 17.26 @@ -134,9 +134,8 @@ 17.27 msgstr "(неизвестное оборудование)" 17.28 17.29 #: tinyutils/tazx:289 tinyutils/hwsetup:117 17.30 -#, sh-format 17.31 -msgid "Installing pkg: $pkg" 17.32 -msgstr "Установка пакета «$pkg»" 17.33 +msgid "Installing pkg: %s" 17.34 +msgstr "Установка пакета «%s»" 17.35 17.36 #: tinyutils/tazx:307 tinyutils/tazx:423 17.37 msgid "Install Window Manager and applications" 17.38 @@ -247,29 +246,24 @@ 17.39 msgstr "/путь/к/файлам/*" 17.40 17.41 #: tinyutils/decode:47 17.42 -#, sh-format 17.43 -msgid "Missing decoder: $dec" 17.44 -msgstr "Отсутствует декодер «$dec»" 17.45 +msgid "Missing decoder: %s" 17.46 +msgstr "Отсутствует декодер «%s»" 17.47 17.48 #: tinyutils/decode:48 tinyutils/decode:80 17.49 -#, sh-format 17.50 -msgid "Skipping file: $name" 17.51 -msgstr "Файл «$name» не обработан" 17.52 +msgid "Skipping file: %s" 17.53 +msgstr "Файл «%s» не обработан" 17.54 17.55 #: tinyutils/decode:51 17.56 -#, sh-format 17.57 -msgid "Decoding: $name" 17.58 -msgstr "Преобразование «$name»" 17.59 +msgid "Decoding: %s" 17.60 +msgstr "Преобразование «%s»" 17.61 17.62 #: tinyutils/decode:60 17.63 -#, sh-format 17.64 -msgid "No file: $file" 17.65 -msgstr "Файл «$file» отсутствует" 17.66 +msgid "No file: %s" 17.67 +msgstr "Файл «%s» отсутствует" 17.68 17.69 #: tinyutils/decode:82 17.70 -#, sh-format 17.71 -msgid "Unsupported file: $file" 17.72 -msgstr "Файл «$file» не поддерживается" 17.73 +msgid "Unsupported file: %s" 17.74 +msgstr "Файл «%s» не поддерживается" 17.75 17.76 #: tinyutils/terminal:10 17.77 msgid "configurable SliTaz wrapper for terminal." 17.78 @@ -288,14 +282,12 @@ 17.79 msgstr "Вывести эту справку" 17.80 17.81 #: tinyutils/terminal:15 17.82 -#, sh-format 17.83 -msgid "Width and height of terminal window ($GEOMETRY)" 17.84 -msgstr "Ширина и высота окна терминала ($GEOMETRY)" 17.85 +msgid "Width and height of terminal window (%s)" 17.86 +msgstr "Ширина и высота окна терминала (%s)" 17.87 17.88 #: tinyutils/terminal:16 17.89 -#, sh-format 17.90 -msgid "Title name for window (\"$TITLE\")" 17.91 -msgstr "Заголовок окна (\"$TITLE\")" 17.92 +msgid "Title name for window (\"%s\")" 17.93 +msgstr "Заголовок окна (\"%s\")" 17.94 17.95 #: tinyutils/terminal:17 17.96 msgid "Don't close terminal after command finished" 17.97 @@ -306,9 +298,8 @@ 17.98 msgstr "Выполнить команду (должна быть последней в строке)" 17.99 17.100 #: tinyutils/terminal:21 17.101 -#, sh-format 17.102 -msgid "Help for $TERMINAL:" 17.103 -msgstr "Справка программы $TERMINAL:" 17.104 +msgid "Help for %s:" 17.105 +msgstr "Справка программы %s:" 17.106 17.107 #: tinyutils/hwsetup:22 17.108 msgid "SliTaz Setup configuration" 17.109 @@ -367,30 +358,26 @@ 17.110 msgstr "подтверждать установку дополнительных зависимостей" 17.111 17.112 #: tinyutils/hwsetup:98 17.113 -#, sh-format 17.114 msgid "" 17.115 -"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " 17.116 +"Due to a lack of compatible hardware for troubleshooting, this %s " 17.117 "device has not been properly tested. Please report any success, failure, bug " 17.118 "to SliTaz Bug tracker or Forum." 17.119 msgstr "" 17.120 -"Работа этого устройства $DEVICE не проверялась, его нет у разработчиков " 17.121 +"Работа этого устройства %s не проверялась, его нет у разработчиков " 17.122 "SliTaz. Сообщите о ваших успехах, неудачах, ошибках в баг-трекер SliTaz или " 17.123 "на форум." 17.124 17.125 #: tinyutils/hwsetup:107 17.126 -#, sh-format 17.127 -msgid "Failed to setup $DEVICE" 17.128 -msgstr "Не удалось настроить $DEVICE" 17.129 +msgid "Failed to setup %s" 17.130 +msgstr "Не удалось настроить %s" 17.131 17.132 #: tinyutils/hwsetup:131 17.133 -#, sh-format 17.134 -msgid "Would you like to install pkg: $pkg" 17.135 -msgstr "Установить пакет «$pkg»" 17.136 +msgid "Would you like to install pkg: %s" 17.137 +msgstr "Установить пакет «%s»" 17.138 17.139 #: tinyutils/hwsetup:148 17.140 -#, sh-format 17.141 -msgid "adding $user to $grp" 17.142 -msgstr "пользователь «$user» добавляется в группу «$grp»" 17.143 +msgid "adding %s to %s" 17.144 +msgstr "пользователь «%s» добавляется в группу «%s»" 17.145 17.146 #: tinyutils/hwsetup:171 17.147 msgid "Detected USB Device : Vendor : Product" 17.148 @@ -401,16 +388,13 @@ 17.149 msgstr "Использовать утилиту hp-setup" 17.150 17.151 #: tinyutils/hwsetup:228 17.152 -#, sh-format 17.153 -msgid "Verify $DEVICE Permissions" 17.154 -msgstr "Проверка прав доступа «$DEVICE»" 17.155 +msgid "Verify %s Permissions" 17.156 +msgstr "Проверка прав доступа «%s»" 17.157 17.158 #: tinyutils/hwsetup:229 17.159 -#, sh-format 17.160 -msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" 17.161 +msgid "Your %s must be in %s group with rw-rw-rw- permissions" 17.162 msgstr "" 17.163 -"Устройство «$DEVICE» должно принадлежать группе $grp и иметь права доступа " 17.164 -"rw-rw-rw-" 17.165 +"Устройство «%s» должно принадлежать группе %s и иметь права доступа rw-rw-rw-" 17.166 17.167 #: tinyutils/hwsetup:250 17.168 msgid "New udev rules are added by a package" 17.169 @@ -519,9 +503,8 @@ 17.170 msgstr "Камера настроена; запустите gphoto2 для импорта фотографий" 17.171 17.172 #: tinyutils/hwsetup:483 17.173 -#, sh-format 17.174 -msgid "Quick start guide: $guide_url" 17.175 -msgstr "Краткое руководство: $guide_url" 17.176 +msgid "Quick start guide: %s" 17.177 +msgstr "Краткое руководство: %s" 17.178 17.179 #: tinyutils/hwsetup:494 17.180 msgid "Do you want to see if the bluetooth is working" 17.181 @@ -548,10 +531,9 @@ 17.182 msgstr "сопряжение с устройством Bluetooth…" 17.183 17.184 #: tinyutils/hwsetup:520 tinyutils/hwsetup:541 17.185 -#, sh-format 17.186 -msgid "You can manually edit the configuration files in $bt if need be" 17.187 +msgid "You can manually edit the configuration files in %s if need be" 17.188 msgstr "" 17.189 -"Если понадобится, вы можете самостоятельно править файлы настроек в $bt" 17.190 +"Если понадобится, вы можете самостоятельно править файлы настроек в %s" 17.191 17.192 #: tinyutils/hwsetup:534 17.193 msgid "for starting bluetooth daemon" 17.194 @@ -582,14 +564,12 @@ 17.195 msgstr "Хотите ли вы настроить wvdial" 17.196 17.197 #: tinyutils/hwsetup:567 17.198 -#, sh-format 17.199 -msgid "Edit $wc for phone number, login name, password and pin" 17.200 -msgstr "В файле $wc вы можете изменить номер дозвона, логин, пароль и PIN" 17.201 +msgid "Edit %s for phone number, login name, password and pin" 17.202 +msgstr "В файле %s вы можете изменить номер дозвона, логин, пароль и PIN" 17.203 17.204 #: tinyutils/hwsetup:568 17.205 -#, sh-format 17.206 -msgid "Add DNS address of your provider in $rc" 17.207 -msgstr "Добавьте адрес DNS-сервера вашего провайдера в файл $rc" 17.208 +msgid "Add DNS address of your provider in %s" 17.209 +msgstr "Добавьте адрес DNS-сервера вашего провайдера в файл %s" 17.210 17.211 #: tinyutils/hwsetup:577 17.212 msgid "Setting IPTABLES_RULES to yes in /etc/slitaz/firewall.conf" 17.213 @@ -611,15 +591,13 @@ 17.214 17.215 #: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 17.216 #: tinyutils/hwsetup:714 17.217 -#, sh-format 17.218 -msgid "Your previous config is in $xorg60" 17.219 -msgstr "Предыдущие настройки находятся в файле $xorg60" 17.220 +msgid "Your previous config is in %s" 17.221 +msgstr "Предыдущие настройки находятся в файле %s" 17.222 17.223 #: tinyutils/hwsetup:611 tinyutils/hwsetup:650 17.224 -#, sh-format 17.225 -msgid "If nvidia fails, you can remove $xorg55 to restore previous config." 17.226 +msgid "If nvidia fails, you can remove %s to restore previous config." 17.227 msgstr "" 17.228 -"Если драйвер ATI не будет корректно работать, вы можете удалить $xorg55, " 17.229 +"Если драйвер ATI не будет корректно работать, вы можете удалить %s, " 17.230 "чтобы вернуться к предыдущим настройкам." 17.231 17.232 #: tinyutils/hwsetup:618 17.233 @@ -648,19 +626,17 @@ 17.234 msgstr "Настроить Xorg, используя свободный драйвер nVidia" 17.235 17.236 #: tinyutils/hwsetup:652 17.237 -#, sh-format 17.238 -msgid "Create $xorg55short configured with nv driver." 17.239 -msgstr "Создание файла «$xorg55short», содержащего настройки драйвера Radeon." 17.240 +msgid "Create %s configured with nv driver." 17.241 +msgstr "Создание файла «%s», содержащего настройки драйвера Radeon." 17.242 17.243 #: tinyutils/hwsetup:678 17.244 msgid "Do you want to configure X using non-free catalyst ATI (radeon) driver" 17.245 msgstr "Настроить Xorg, используя несвободный драйвер ATI Catalyst (Radeon)" 17.246 17.247 #: tinyutils/hwsetup:682 17.248 -#, sh-format 17.249 -msgid "If ati fails, you can remove $xorg55 to restore previous config." 17.250 +msgid "If ati fails, you can remove %s to restore previous config." 17.251 msgstr "" 17.252 -"Если драйвер ATI не будет корректно работать, вы можете удалить $xorg55, " 17.253 +"Если драйвер ATI не будет корректно работать, вы можете удалить %s, " 17.254 "чтобы вернуться к предыдущим настройкам." 17.255 17.256 #: tinyutils/hwsetup:691 17.257 @@ -683,16 +659,14 @@ 17.258 msgstr "Настроить Xorg, используя свободный драйвер ATI (Radeon)" 17.259 17.260 #: tinyutils/hwsetup:715 17.261 -#, sh-format 17.262 -msgid "If ATI fails, you can remove $xorg55 to restore previous config." 17.263 +msgid "If ATI fails, you can remove %s to restore previous config." 17.264 msgstr "" 17.265 -"Если драйвер ATI не будет корректно работать, вы можете удалить $xorg55, " 17.266 +"Если драйвер ATI не будет корректно работать, вы можете удалить %s, " 17.267 "чтобы вернуться к предыдущим настройкам." 17.268 17.269 #: tinyutils/hwsetup:717 17.270 -#, sh-format 17.271 -msgid "Create $xorg55short configured with radeon driver." 17.272 -msgstr "Создание файла «$xorg55short», содержащего настройки драйвера Radeon." 17.273 +msgid "Create %s configured with radeon driver." 17.274 +msgstr "Создание файла «%s», содержащего настройки драйвера Radeon." 17.275 17.276 #: tinyutils/hwsetup:723 17.277 msgid "Checking if ATI radeon is working..." 17.278 @@ -796,8 +770,8 @@ 17.279 msgstr "Пароль root" 17.280 17.281 #: tinyutils/slitaz-config:44 17.282 -msgid "Enter new password for \\Zb\\Z1root" 17.283 -msgstr "Введите новый пароль для \\Zb\\Z1root" 17.284 +msgid "Enter new password for %s" 17.285 +msgstr "Введите новый пароль для %s" 17.286 17.287 #: tinyutils/slitaz-config:53 17.288 msgid "Add User" 17.289 @@ -808,9 +782,8 @@ 17.290 msgstr "Введите логин нового \\Zb\\Z4пользователя" 17.291 17.292 #: tinyutils/slitaz-config:61 17.293 -#, sh-format 17.294 -msgid "Enter password for user \\Zb\\Z4$user" 17.295 -msgstr "Введите пароль для пользователя \\Zb\\Z4$user" 17.296 +msgid "Enter password for user \\Zb\\Z4%s" 17.297 +msgstr "Введите пароль для пользователя \\Zb\\Z4%s" 17.298 17.299 #: tinyutils/slitaz-config:121 17.300 msgid "connected" 17.301 @@ -857,17 +830,16 @@ 17.302 msgstr "Пароль Wi-Fi" 17.303 17.304 #: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 17.305 -#, sh-format 17.306 -msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" 17.307 -msgstr "Введите пароль Wi-Fi для \\Zb\\Z4$essid" 17.308 +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4%s" 17.309 +msgstr "Введите пароль Wi-Fi для \\Zb\\Z4%s" 17.310 17.311 #: tinyutils/slitaz-config:197 17.312 msgid "Shutting down network interfaces..." 17.313 msgstr "Выключение сетевых интерфейсов…" 17.314 17.315 #: tinyutils/slitaz-config:201 17.316 -msgid "Configuring: /etc/network.conf..." 17.317 -msgstr "Настройка /etc/network.conf…" 17.318 +msgid "Configuring: %s..." 17.319 +msgstr "Настройка %s…" 17.320 17.321 #: tinyutils/slitaz-config:211 17.322 msgid "Restarting Wi-Fi interface..." 17.323 @@ -878,9 +850,8 @@ 17.324 msgstr "Проверка соединения…" 17.325 17.326 #: tinyutils/slitaz-config:220 17.327 -#, sh-format 17.328 -msgid "IP address: $ip" 17.329 -msgstr "IP-адрес: $ip" 17.330 +msgid "IP address: %s" 17.331 +msgstr "IP-адрес: %s" 17.332 17.333 #: tinyutils/slitaz-config:222 17.334 msgid "Unable to connect..."
18.1 --- a/po/slitaz-tools/slitaz-tools.pot Thu May 14 12:55:55 2015 +0200 18.2 +++ b/po/slitaz-tools/slitaz-tools.pot Thu Jun 04 17:11:36 2015 +0300 18.3 @@ -64,15 +64,15 @@ 18.4 msgstr "" 18.5 18.6 #: tinyutils/tazlocale:136 tinyutils/tazkeymap:41 18.7 -msgid "Config file:" 18.8 +msgid "Config file: %s" 18.9 msgstr "" 18.10 18.11 #: tinyutils/tazlocale:137 18.12 -msgid "Current locale:" 18.13 +msgid "Current locale: %s" 18.14 msgstr "" 18.15 18.16 #: tinyutils/tazkeymap:42 18.17 -msgid "Current keymap:" 18.18 +msgid "Current keymap: %s" 18.19 msgstr "" 18.20 18.21 #: tinyutils/tazkeymap:51 18.22 @@ -125,8 +125,7 @@ 18.23 msgstr "" 18.24 18.25 #: tinyutils/tazx:289 tinyutils/hwsetup:117 18.26 -#, sh-format 18.27 -msgid "Installing pkg: $pkg" 18.28 +msgid "Installing pkg: %s" 18.29 msgstr "" 18.30 18.31 #: tinyutils/tazx:307 tinyutils/tazx:423 18.32 @@ -238,28 +237,23 @@ 18.33 msgstr "" 18.34 18.35 #: tinyutils/decode:47 18.36 -#, sh-format 18.37 -msgid "Missing decoder: $dec" 18.38 +msgid "Missing decoder: %s" 18.39 msgstr "" 18.40 18.41 #: tinyutils/decode:48 tinyutils/decode:80 18.42 -#, sh-format 18.43 -msgid "Skipping file: $name" 18.44 +msgid "Skipping file: %s" 18.45 msgstr "" 18.46 18.47 #: tinyutils/decode:51 18.48 -#, sh-format 18.49 -msgid "Decoding: $name" 18.50 +msgid "Decoding: %s" 18.51 msgstr "" 18.52 18.53 #: tinyutils/decode:60 18.54 -#, sh-format 18.55 -msgid "No file: $file" 18.56 +msgid "No file: %s" 18.57 msgstr "" 18.58 18.59 #: tinyutils/decode:82 18.60 -#, sh-format 18.61 -msgid "Unsupported file: $file" 18.62 +msgid "Unsupported file: %s" 18.63 msgstr "" 18.64 18.65 #: tinyutils/terminal:10 18.66 @@ -279,13 +273,11 @@ 18.67 msgstr "" 18.68 18.69 #: tinyutils/terminal:15 18.70 -#, sh-format 18.71 -msgid "Width and height of terminal window ($GEOMETRY)" 18.72 +msgid "Width and height of terminal window (%s)" 18.73 msgstr "" 18.74 18.75 #: tinyutils/terminal:16 18.76 -#, sh-format 18.77 -msgid "Title name for window (\"$TITLE\")" 18.78 +msgid "Title name for window (\"%s\")" 18.79 msgstr "" 18.80 18.81 #: tinyutils/terminal:17 18.82 @@ -297,8 +289,7 @@ 18.83 msgstr "" 18.84 18.85 #: tinyutils/terminal:21 18.86 -#, sh-format 18.87 -msgid "Help for $TERMINAL:" 18.88 +msgid "Help for %s:" 18.89 msgstr "" 18.90 18.91 #: tinyutils/hwsetup:22 18.92 @@ -358,26 +349,22 @@ 18.93 msgstr "" 18.94 18.95 #: tinyutils/hwsetup:98 18.96 -#, sh-format 18.97 msgid "" 18.98 -"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " 18.99 +"Due to a lack of compatible hardware for troubleshooting, this %s " 18.100 "device has not been properly tested. Please report any success, failure, bug " 18.101 "to SliTaz Bug tracker or Forum." 18.102 msgstr "" 18.103 18.104 #: tinyutils/hwsetup:107 18.105 -#, sh-format 18.106 -msgid "Failed to setup $DEVICE" 18.107 +msgid "Failed to setup %s" 18.108 msgstr "" 18.109 18.110 #: tinyutils/hwsetup:131 18.111 -#, sh-format 18.112 -msgid "Would you like to install pkg: $pkg" 18.113 +msgid "Would you like to install pkg: %s" 18.114 msgstr "" 18.115 18.116 #: tinyutils/hwsetup:148 18.117 -#, sh-format 18.118 -msgid "adding $user to $grp" 18.119 +msgid "adding %s to %s" 18.120 msgstr "" 18.121 18.122 #: tinyutils/hwsetup:171 18.123 @@ -389,13 +376,11 @@ 18.124 msgstr "" 18.125 18.126 #: tinyutils/hwsetup:228 18.127 -#, sh-format 18.128 -msgid "Verify $DEVICE Permissions" 18.129 +msgid "Verify %s Permissions" 18.130 msgstr "" 18.131 18.132 #: tinyutils/hwsetup:229 18.133 -#, sh-format 18.134 -msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" 18.135 +msgid "Your %s must be in %s group with rw-rw-rw- permissions" 18.136 msgstr "" 18.137 18.138 #: tinyutils/hwsetup:250 18.139 @@ -503,8 +488,7 @@ 18.140 msgstr "" 18.141 18.142 #: tinyutils/hwsetup:483 18.143 -#, sh-format 18.144 -msgid "Quick start guide: $guide_url" 18.145 +msgid "Quick start guide: %s" 18.146 msgstr "" 18.147 18.148 #: tinyutils/hwsetup:494 18.149 @@ -532,8 +516,7 @@ 18.150 msgstr "" 18.151 18.152 #: tinyutils/hwsetup:520 tinyutils/hwsetup:541 18.153 -#, sh-format 18.154 -msgid "You can manually edit the configuration files in $bt if need be" 18.155 +msgid "You can manually edit the configuration files in %s if need be" 18.156 msgstr "" 18.157 18.158 #: tinyutils/hwsetup:534 18.159 @@ -565,13 +548,11 @@ 18.160 msgstr "" 18.161 18.162 #: tinyutils/hwsetup:567 18.163 -#, sh-format 18.164 -msgid "Edit $wc for phone number, login name, password and pin" 18.165 +msgid "Edit %s for phone number, login name, password and pin" 18.166 msgstr "" 18.167 18.168 #: tinyutils/hwsetup:568 18.169 -#, sh-format 18.170 -msgid "Add DNS address of your provider in $rc" 18.171 +msgid "Add DNS address of your provider in %s" 18.172 msgstr "" 18.173 18.174 #: tinyutils/hwsetup:577 18.175 @@ -592,13 +573,11 @@ 18.176 18.177 #: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 18.178 #: tinyutils/hwsetup:714 18.179 -#, sh-format 18.180 -msgid "Your previous config is in $xorg60" 18.181 +msgid "Your previous config is in %s" 18.182 msgstr "" 18.183 18.184 #: tinyutils/hwsetup:611 tinyutils/hwsetup:650 18.185 -#, sh-format 18.186 -msgid "If nvidia fails, you can remove $xorg55 to restore previous config." 18.187 +msgid "If nvidia fails, you can remove %s to restore previous config." 18.188 msgstr "" 18.189 18.190 #: tinyutils/hwsetup:618 18.191 @@ -626,8 +605,7 @@ 18.192 msgstr "" 18.193 18.194 #: tinyutils/hwsetup:652 18.195 -#, sh-format 18.196 -msgid "Create $xorg55short configured with nv driver." 18.197 +msgid "Create %s configured with nv driver." 18.198 msgstr "" 18.199 18.200 #: tinyutils/hwsetup:678 18.201 @@ -635,8 +613,7 @@ 18.202 msgstr "" 18.203 18.204 #: tinyutils/hwsetup:682 18.205 -#, sh-format 18.206 -msgid "If ati fails, you can remove $xorg55 to restore previous config." 18.207 +msgid "If ati fails, you can remove %s to restore previous config." 18.208 msgstr "" 18.209 18.210 #: tinyutils/hwsetup:691 18.211 @@ -657,13 +634,11 @@ 18.212 msgstr "" 18.213 18.214 #: tinyutils/hwsetup:715 18.215 -#, sh-format 18.216 -msgid "If ATI fails, you can remove $xorg55 to restore previous config." 18.217 +msgid "If ATI fails, you can remove %s to restore previous config." 18.218 msgstr "" 18.219 18.220 #: tinyutils/hwsetup:717 18.221 -#, sh-format 18.222 -msgid "Create $xorg55short configured with radeon driver." 18.223 +msgid "Create %s configured with radeon driver." 18.224 msgstr "" 18.225 18.226 #: tinyutils/hwsetup:723 18.227 @@ -767,7 +742,7 @@ 18.228 msgstr "" 18.229 18.230 #: tinyutils/slitaz-config:44 18.231 -msgid "Enter new password for \\Zb\\Z1root" 18.232 +msgid "Enter new password for %s" 18.233 msgstr "" 18.234 18.235 #: tinyutils/slitaz-config:53 18.236 @@ -779,8 +754,7 @@ 18.237 msgstr "" 18.238 18.239 #: tinyutils/slitaz-config:61 18.240 -#, sh-format 18.241 -msgid "Enter password for user \\Zb\\Z4$user" 18.242 +msgid "Enter password for user \\Zb\\Z4%s" 18.243 msgstr "" 18.244 18.245 #: tinyutils/slitaz-config:121 18.246 @@ -828,8 +802,7 @@ 18.247 msgstr "" 18.248 18.249 #: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 18.250 -#, sh-format 18.251 -msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" 18.252 +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4%s" 18.253 msgstr "" 18.254 18.255 #: tinyutils/slitaz-config:197 18.256 @@ -837,7 +810,7 @@ 18.257 msgstr "" 18.258 18.259 #: tinyutils/slitaz-config:201 18.260 -msgid "Configuring: /etc/network.conf..." 18.261 +msgid "Configuring: %s..." 18.262 msgstr "" 18.263 18.264 #: tinyutils/slitaz-config:211 18.265 @@ -849,8 +822,7 @@ 18.266 msgstr "" 18.267 18.268 #: tinyutils/slitaz-config:220 18.269 -#, sh-format 18.270 -msgid "IP address: $ip" 18.271 +msgid "IP address: %s" 18.272 msgstr "" 18.273 18.274 #: tinyutils/slitaz-config:222
19.1 --- a/po/slitaz-tools/sv.po Thu May 14 12:55:55 2015 +0200 19.2 +++ b/po/slitaz-tools/sv.po Thu Jun 04 17:11:36 2015 +0300 19.3 @@ -67,16 +67,16 @@ 19.4 msgstr "" 19.5 19.6 #: tinyutils/tazlocale:136 tinyutils/tazkeymap:41 19.7 -msgid "Config file:" 19.8 -msgstr "Konfigurations fil:" 19.9 +msgid "Config file: %s" 19.10 +msgstr "Konfigurations fil: %s" 19.11 19.12 #: tinyutils/tazlocale:137 19.13 -msgid "Current locale:" 19.14 -msgstr "Nuvarande språk:" 19.15 +msgid "Current locale: %s" 19.16 +msgstr "Nuvarande språk: %s" 19.17 19.18 #: tinyutils/tazkeymap:42 19.19 -msgid "Current keymap:" 19.20 -msgstr "Nuvarande tangentbords layout:" 19.21 +msgid "Current keymap: %s" 19.22 +msgstr "Nuvarande tangentbords layout: %s" 19.23 19.24 #: tinyutils/tazkeymap:51 19.25 #, fuzzy 19.26 @@ -131,8 +131,7 @@ 19.27 msgstr "" 19.28 19.29 #: tinyutils/tazx:289 tinyutils/hwsetup:117 19.30 -#, sh-format 19.31 -msgid "Installing pkg: $pkg" 19.32 +msgid "Installing pkg: %s" 19.33 msgstr "" 19.34 19.35 #: tinyutils/tazx:307 tinyutils/tazx:423 19.36 @@ -246,29 +245,24 @@ 19.37 msgstr "" 19.38 19.39 #: tinyutils/decode:47 19.40 -#, sh-format 19.41 -msgid "Missing decoder: $dec" 19.42 -msgstr "Saknar avkodare: $dec" 19.43 +msgid "Missing decoder: %s" 19.44 +msgstr "Saknar avkodare: %s" 19.45 19.46 #: tinyutils/decode:48 tinyutils/decode:80 19.47 -#, sh-format 19.48 -msgid "Skipping file: $name" 19.49 -msgstr "Saknar fil: $name" 19.50 +msgid "Skipping file: %s" 19.51 +msgstr "Saknar fil: %s" 19.52 19.53 #: tinyutils/decode:51 19.54 -#, sh-format 19.55 -msgid "Decoding: $name" 19.56 -msgstr "Avkodning: $name" 19.57 +msgid "Decoding: %s" 19.58 +msgstr "Avkodning: %s" 19.59 19.60 #: tinyutils/decode:60 19.61 -#, sh-format 19.62 -msgid "No file: $file" 19.63 -msgstr "Ingen fil: $file" 19.64 +msgid "No file: %s" 19.65 +msgstr "Ingen fil: %s" 19.66 19.67 #: tinyutils/decode:82 19.68 -#, sh-format 19.69 -msgid "Unsupported file: $file" 19.70 -msgstr "Ostödd filtyp: $file" 19.71 +msgid "Unsupported file: %s" 19.72 +msgstr "Ostödd filtyp: %s" 19.73 19.74 #: tinyutils/terminal:10 19.75 msgid "configurable SliTaz wrapper for terminal." 19.76 @@ -287,13 +281,11 @@ 19.77 msgstr "" 19.78 19.79 #: tinyutils/terminal:15 19.80 -#, sh-format 19.81 -msgid "Width and height of terminal window ($GEOMETRY)" 19.82 +msgid "Width and height of terminal window (%s)" 19.83 msgstr "" 19.84 19.85 #: tinyutils/terminal:16 19.86 -#, sh-format 19.87 -msgid "Title name for window (\"$TITLE\")" 19.88 +msgid "Title name for window (\"%s\")" 19.89 msgstr "" 19.90 19.91 #: tinyutils/terminal:17 19.92 @@ -305,8 +297,7 @@ 19.93 msgstr "" 19.94 19.95 #: tinyutils/terminal:21 19.96 -#, sh-format 19.97 -msgid "Help for $TERMINAL:" 19.98 +msgid "Help for %s:" 19.99 msgstr "" 19.100 19.101 #: tinyutils/hwsetup:22 19.102 @@ -366,26 +357,22 @@ 19.103 msgstr "" 19.104 19.105 #: tinyutils/hwsetup:98 19.106 -#, sh-format 19.107 msgid "" 19.108 -"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " 19.109 +"Due to a lack of compatible hardware for troubleshooting, this %s " 19.110 "device has not been properly tested. Please report any success, failure, bug " 19.111 "to SliTaz Bug tracker or Forum." 19.112 msgstr "" 19.113 19.114 #: tinyutils/hwsetup:107 19.115 -#, sh-format 19.116 -msgid "Failed to setup $DEVICE" 19.117 +msgid "Failed to setup %s" 19.118 msgstr "" 19.119 19.120 #: tinyutils/hwsetup:131 19.121 -#, sh-format 19.122 -msgid "Would you like to install pkg: $pkg" 19.123 +msgid "Would you like to install pkg: %s" 19.124 msgstr "" 19.125 19.126 #: tinyutils/hwsetup:148 19.127 -#, sh-format 19.128 -msgid "adding $user to $grp" 19.129 +msgid "adding %s to %s" 19.130 msgstr "" 19.131 19.132 #: tinyutils/hwsetup:171 19.133 @@ -397,13 +384,11 @@ 19.134 msgstr "" 19.135 19.136 #: tinyutils/hwsetup:228 19.137 -#, sh-format 19.138 -msgid "Verify $DEVICE Permissions" 19.139 +msgid "Verify %s Permissions" 19.140 msgstr "" 19.141 19.142 #: tinyutils/hwsetup:229 19.143 -#, sh-format 19.144 -msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" 19.145 +msgid "Your %s must be in %s group with rw-rw-rw- permissions" 19.146 msgstr "" 19.147 19.148 #: tinyutils/hwsetup:250 19.149 @@ -511,8 +496,7 @@ 19.150 msgstr "" 19.151 19.152 #: tinyutils/hwsetup:483 19.153 -#, sh-format 19.154 -msgid "Quick start guide: $guide_url" 19.155 +msgid "Quick start guide: %s" 19.156 msgstr "" 19.157 19.158 #: tinyutils/hwsetup:494 19.159 @@ -540,8 +524,7 @@ 19.160 msgstr "" 19.161 19.162 #: tinyutils/hwsetup:520 tinyutils/hwsetup:541 19.163 -#, sh-format 19.164 -msgid "You can manually edit the configuration files in $bt if need be" 19.165 +msgid "You can manually edit the configuration files in %s if need be" 19.166 msgstr "" 19.167 19.168 #: tinyutils/hwsetup:534 19.169 @@ -573,13 +556,11 @@ 19.170 msgstr "" 19.171 19.172 #: tinyutils/hwsetup:567 19.173 -#, sh-format 19.174 -msgid "Edit $wc for phone number, login name, password and pin" 19.175 +msgid "Edit %s for phone number, login name, password and pin" 19.176 msgstr "" 19.177 19.178 #: tinyutils/hwsetup:568 19.179 -#, sh-format 19.180 -msgid "Add DNS address of your provider in $rc" 19.181 +msgid "Add DNS address of your provider in %s" 19.182 msgstr "" 19.183 19.184 #: tinyutils/hwsetup:577 19.185 @@ -600,13 +581,11 @@ 19.186 19.187 #: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 19.188 #: tinyutils/hwsetup:714 19.189 -#, sh-format 19.190 -msgid "Your previous config is in $xorg60" 19.191 +msgid "Your previous config is in %s" 19.192 msgstr "" 19.193 19.194 #: tinyutils/hwsetup:611 tinyutils/hwsetup:650 19.195 -#, sh-format 19.196 -msgid "If nvidia fails, you can remove $xorg55 to restore previous config." 19.197 +msgid "If nvidia fails, you can remove %s to restore previous config." 19.198 msgstr "" 19.199 19.200 #: tinyutils/hwsetup:618 19.201 @@ -634,8 +613,7 @@ 19.202 msgstr "" 19.203 19.204 #: tinyutils/hwsetup:652 19.205 -#, sh-format 19.206 -msgid "Create $xorg55short configured with nv driver." 19.207 +msgid "Create %s configured with nv driver." 19.208 msgstr "" 19.209 19.210 #: tinyutils/hwsetup:678 19.211 @@ -643,8 +621,7 @@ 19.212 msgstr "" 19.213 19.214 #: tinyutils/hwsetup:682 19.215 -#, sh-format 19.216 -msgid "If ati fails, you can remove $xorg55 to restore previous config." 19.217 +msgid "If ati fails, you can remove %s to restore previous config." 19.218 msgstr "" 19.219 19.220 #: tinyutils/hwsetup:691 19.221 @@ -665,13 +642,11 @@ 19.222 msgstr "" 19.223 19.224 #: tinyutils/hwsetup:715 19.225 -#, sh-format 19.226 -msgid "If ATI fails, you can remove $xorg55 to restore previous config." 19.227 +msgid "If ATI fails, you can remove %s to restore previous config." 19.228 msgstr "" 19.229 19.230 #: tinyutils/hwsetup:717 19.231 -#, sh-format 19.232 -msgid "Create $xorg55short configured with radeon driver." 19.233 +msgid "Create %s configured with radeon driver." 19.234 msgstr "" 19.235 19.236 #: tinyutils/hwsetup:723 19.237 @@ -776,7 +751,7 @@ 19.238 msgstr "" 19.239 19.240 #: tinyutils/slitaz-config:44 19.241 -msgid "Enter new password for \\Zb\\Z1root" 19.242 +msgid "Enter new password for %s" 19.243 msgstr "" 19.244 19.245 #: tinyutils/slitaz-config:53 19.246 @@ -788,8 +763,7 @@ 19.247 msgstr "" 19.248 19.249 #: tinyutils/slitaz-config:61 19.250 -#, sh-format 19.251 -msgid "Enter password for user \\Zb\\Z4$user" 19.252 +msgid "Enter password for user \\Zb\\Z4%s" 19.253 msgstr "" 19.254 19.255 #: tinyutils/slitaz-config:121 19.256 @@ -837,8 +811,7 @@ 19.257 msgstr "" 19.258 19.259 #: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 19.260 -#, sh-format 19.261 -msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" 19.262 +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4%s" 19.263 msgstr "" 19.264 19.265 #: tinyutils/slitaz-config:197 19.266 @@ -846,7 +819,7 @@ 19.267 msgstr "" 19.268 19.269 #: tinyutils/slitaz-config:201 19.270 -msgid "Configuring: /etc/network.conf..." 19.271 +msgid "Configuring: %s..." 19.272 msgstr "" 19.273 19.274 #: tinyutils/slitaz-config:211 19.275 @@ -858,8 +831,7 @@ 19.276 msgstr "" 19.277 19.278 #: tinyutils/slitaz-config:220 19.279 -#, sh-format 19.280 -msgid "IP address: $ip" 19.281 +msgid "IP address: %s" 19.282 msgstr "" 19.283 19.284 #: tinyutils/slitaz-config:222 19.285 @@ -919,5 +891,5 @@ 19.286 #~ msgid "You must be root to configure X server." 19.287 #~ msgstr "Du måste vara root får att konfigurera X server" 19.288 19.289 -#~ msgid "Setting system locale to: $locale" 19.290 -#~ msgstr "Ställer in systemspråket till: $locale" 19.291 +#~ msgid "Setting system locale to: %s" 19.292 +#~ msgstr "Ställer in systemspråket till: %s"
20.1 --- a/po/slitaz-tools/zh_CN.po Thu May 14 12:55:55 2015 +0200 20.2 +++ b/po/slitaz-tools/zh_CN.po Thu Jun 04 17:11:36 2015 +0300 20.3 @@ -65,16 +65,16 @@ 20.4 msgstr "信息" 20.5 20.6 #: tinyutils/tazlocale:136 tinyutils/tazkeymap:41 20.7 -msgid "Config file:" 20.8 -msgstr "配置文件：" 20.9 +msgid "Config file: %s" 20.10 +msgstr "配置文件：%s" 20.11 20.12 #: tinyutils/tazlocale:137 20.13 -msgid "Current locale:" 20.14 -msgstr "区域设置：" 20.15 +msgid "Current locale: %s" 20.16 +msgstr "区域设置：%s" 20.17 20.18 #: tinyutils/tazkeymap:42 20.19 -msgid "Current keymap:" 20.20 -msgstr "键盘映射：" 20.21 +msgid "Current keymap: %s" 20.22 +msgstr "键盘映射：%s" 20.23 20.24 #: tinyutils/tazkeymap:51 20.25 msgid "SliTaz keyboard setting" 20.26 @@ -121,16 +121,15 @@ 20.27 #: tinyutils/tazx:276 20.28 #, fuzzy 20.29 msgid "Failed to setup driver" 20.30 -msgstr "未能设置$DEVICE" 20.31 +msgstr "未能设置%s" 20.32 20.33 #: tinyutils/tazx:276 20.34 msgid "(unknown hardware)" 20.35 msgstr "" 20.36 20.37 #: tinyutils/tazx:289 tinyutils/hwsetup:117 20.38 -#, sh-format 20.39 -msgid "Installing pkg: $pkg" 20.40 -msgstr "安装 $pkg包" 20.41 +msgid "Installing pkg: %s" 20.42 +msgstr "安装 %s包" 20.43 20.44 #: tinyutils/tazx:307 tinyutils/tazx:423 20.45 #, fuzzy 20.46 @@ -245,29 +244,24 @@ 20.47 msgstr "/path/to/files/*" 20.48 20.49 #: tinyutils/decode:47 20.50 -#, sh-format 20.51 -msgid "Missing decoder: $dec" 20.52 -msgstr "欠缺解码器: $dec" 20.53 +msgid "Missing decoder: %s" 20.54 +msgstr "欠缺解码器: %s" 20.55 20.56 #: tinyutils/decode:48 tinyutils/decode:80 20.57 -#, sh-format 20.58 -msgid "Skipping file: $name" 20.59 -msgstr "跳过文件：$name" 20.60 +msgid "Skipping file: %s" 20.61 +msgstr "跳过文件：%s" 20.62 20.63 #: tinyutils/decode:51 20.64 -#, sh-format 20.65 -msgid "Decoding: $name" 20.66 -msgstr "解码$name中" 20.67 +msgid "Decoding: %s" 20.68 +msgstr "解码%s中" 20.69 20.70 #: tinyutils/decode:60 20.71 -#, sh-format 20.72 -msgid "No file: $file" 20.73 -msgstr "没有文件：$file" 20.74 +msgid "No file: %s" 20.75 +msgstr "没有文件：%s" 20.76 20.77 #: tinyutils/decode:82 20.78 -#, sh-format 20.79 -msgid "Unsupported file: $file" 20.80 -msgstr "不支持的文件：$file" 20.81 +msgid "Unsupported file: %s" 20.82 +msgstr "不支持的文件：%s" 20.83 20.84 #: tinyutils/terminal:10 20.85 msgid "configurable SliTaz wrapper for terminal." 20.86 @@ -286,14 +280,12 @@ 20.87 msgstr "打印此信息" 20.88 20.89 #: tinyutils/terminal:15 20.90 -#, sh-format 20.91 -msgid "Width and height of terminal window ($GEOMETRY)" 20.92 -msgstr "终端窗口的宽度和高度($GEOMETRY)" 20.93 +msgid "Width and height of terminal window (%s)" 20.94 +msgstr "终端窗口的宽度和高度(%s)" 20.95 20.96 #: tinyutils/terminal:16 20.97 -#, sh-format 20.98 -msgid "Title name for window (\"$TITLE\")" 20.99 -msgstr "在窗口的标题名称 (\"$TITLE\")" 20.100 +msgid "Title name for window (\"%s\")" 20.101 +msgstr "在窗口的标题名称 (\"%s\")" 20.102 20.103 #: tinyutils/terminal:17 20.104 msgid "Don't close terminal after command finished" 20.105 @@ -304,9 +296,8 @@ 20.106 msgstr "要执行的命令（必须在最后一行）" 20.107 20.108 #: tinyutils/terminal:21 20.109 -#, sh-format 20.110 -msgid "Help for $TERMINAL:" 20.111 -msgstr "$TERMINAL的帮助：" 20.112 +msgid "Help for %s:" 20.113 +msgstr "%s的帮助：" 20.114 20.115 #: tinyutils/hwsetup:22 20.116 msgid "SliTaz Setup configuration" 20.117 @@ -365,29 +356,25 @@ 20.118 msgstr "在安装可选的相关性确认" 20.119 20.120 #: tinyutils/hwsetup:98 20.121 -#, sh-format 20.122 msgid "" 20.123 -"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " 20.124 +"Due to a lack of compatible hardware for troubleshooting, this %s " 20.125 "device has not been properly tested. Please report any success, failure, bug " 20.126 "to SliTaz Bug tracker or Forum." 20.127 msgstr "" 20.128 -"由于不兼容的硬件故障，这个 $DEVICE 设备没有得到正确的测试。请报告任何成功，失" 20.129 +"由于不兼容的硬件故障，这个 %s 设备没有得到正确的测试。请报告任何成功，失" 20.130 "败，错误SliTaz bug跟踪或论坛。" 20.131 20.132 #: tinyutils/hwsetup:107 20.133 -#, sh-format 20.134 -msgid "Failed to setup $DEVICE" 20.135 -msgstr "未能设置$DEVICE" 20.136 +msgid "Failed to setup %s" 20.137 +msgstr "未能设置%s" 20.138 20.139 #: tinyutils/hwsetup:131 20.140 -#, sh-format 20.141 -msgid "Would you like to install pkg: $pkg" 20.142 -msgstr "要安装PKG：$pkg 吗" 20.143 +msgid "Would you like to install pkg: %s" 20.144 +msgstr "要安装PKG：%s 吗" 20.145 20.146 #: tinyutils/hwsetup:148 20.147 -#, sh-format 20.148 -msgid "adding $user to $grp" 20.149 -msgstr "正在加入$user用户到$grp组" 20.150 +msgid "adding %s to %s" 20.151 +msgstr "正在加入%s用户到%s组" 20.152 20.153 #: tinyutils/hwsetup:171 20.154 msgid "Detected USB Device : Vendor : Product" 20.155 @@ -398,14 +385,12 @@ 20.156 msgstr "你想使用惠普设置实用程序吗" 20.157 20.158 #: tinyutils/hwsetup:228 20.159 -#, sh-format 20.160 -msgid "Verify $DEVICE Permissions" 20.161 -msgstr "验证$DEVICE权限" 20.162 +msgid "Verify %s Permissions" 20.163 +msgstr "验证%s权限" 20.164 20.165 #: tinyutils/hwsetup:229 20.166 -#, sh-format 20.167 -msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" 20.168 -msgstr "你必须在$grp和拥有rw-rw-rw-权限，才能使用$DEVICE" 20.169 +msgid "Your %s must be in %s group with rw-rw-rw- permissions" 20.170 +msgstr "你必须在%s和拥有rw-rw-rw-权限，才能使用%s" 20.171 20.172 #: tinyutils/hwsetup:250 20.173 msgid "New udev rules are added by a package" 20.174 @@ -512,9 +497,8 @@ 20.175 msgstr "请检查相机设置，使用gphoto2" 20.176 20.177 #: tinyutils/hwsetup:483 20.178 -#, sh-format 20.179 -msgid "Quick start guide: $guide_url" 20.180 -msgstr "快速启动指南：$guide_url" 20.181 +msgid "Quick start guide: %s" 20.182 +msgstr "快速启动指南：%s" 20.183 20.184 #: tinyutils/hwsetup:494 20.185 msgid "Do you want to see if the bluetooth is working" 20.186 @@ -541,9 +525,8 @@ 20.187 msgstr "配对与远程蓝牙设备中…" 20.188 20.189 #: tinyutils/hwsetup:520 tinyutils/hwsetup:541 20.190 -#, sh-format 20.191 -msgid "You can manually edit the configuration files in $bt if need be" 20.192 -msgstr "您可以手动编辑配置文件中的$bt ，如果需要" 20.193 +msgid "You can manually edit the configuration files in %s if need be" 20.194 +msgstr "您可以手动编辑配置文件中的%s ，如果需要" 20.195 20.196 #: tinyutils/hwsetup:534 20.197 msgid "for starting bluetooth daemon" 20.198 @@ -574,14 +557,12 @@ 20.199 msgstr "你要想要配置软件吗？" 20.200 20.201 #: tinyutils/hwsetup:567 20.202 -#, sh-format 20.203 -msgid "Edit $wc for phone number, login name, password and pin" 20.204 -msgstr "编辑为$wc的电话号码，用户名，密码和PIN" 20.205 +msgid "Edit %s for phone number, login name, password and pin" 20.206 +msgstr "编辑为%s的电话号码，用户名，密码和PIN" 20.207 20.208 #: tinyutils/hwsetup:568 20.209 -#, sh-format 20.210 -msgid "Add DNS address of your provider in $rc" 20.211 -msgstr "添加您的供应商DNS地址在$rc" 20.212 +msgid "Add DNS address of your provider in %s" 20.213 +msgstr "添加您的供应商DNS地址在%s" 20.214 20.215 #: tinyutils/hwsetup:577 20.216 #, fuzzy 20.217 @@ -602,14 +583,12 @@ 20.218 20.219 #: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 20.220 #: tinyutils/hwsetup:714 20.221 -#, sh-format 20.222 -msgid "Your previous config is in $xorg60" 20.223 -msgstr "你以前的配置是$xorg60" 20.224 +msgid "Your previous config is in %s" 20.225 +msgstr "你以前的配置是%s" 20.226 20.227 #: tinyutils/hwsetup:611 tinyutils/hwsetup:650 20.228 -#, sh-format 20.229 -msgid "If nvidia fails, you can remove $xorg55 to restore previous config." 20.230 -msgstr "如果nvidia失败，您可以删除$xorg55恢复到以前的配置。" 20.231 +msgid "If nvidia fails, you can remove %s to restore previous config." 20.232 +msgstr "如果nvidia失败，您可以删除%s恢复到以前的配置。" 20.233 20.234 #: tinyutils/hwsetup:618 20.235 msgid "Adding to xorg.conf:" 20.236 @@ -636,20 +615,17 @@ 20.237 msgstr "你要配置X使用免费的驱动程序吗" 20.238 20.239 #: tinyutils/hwsetup:652 20.240 -#, sh-format 20.241 -msgid "Create $xorg55short configured with nv driver." 20.242 +msgid "Create %s configured with nv driver." 20.243 msgstr "" 20.244 -"创建$xorg55short配置nvidia显卡驱动。（原文：Create $xorg55short configured " 20.245 -"with nv driver.）" 20.246 +"创建%s配置nvidia显卡驱动。（原文：Create configured with nv driver.）" 20.247 20.248 #: tinyutils/hwsetup:678 20.249 msgid "Do you want to configure X using non-free catalyst ATI (radeon) driver" 20.250 msgstr "你要配置X使用非自由的催化剂（ATI 显卡）驱动程序吗？" 20.251 20.252 #: tinyutils/hwsetup:682 20.253 -#, sh-format 20.254 -msgid "If ati fails, you can remove $xorg55 to restore previous config." 20.255 -msgstr "如果ATI失败，您可以删除$xorg55恢复到以前的配置。" 20.256 +msgid "If ati fails, you can remove %s to restore previous config." 20.257 +msgstr "如果ATI失败，您可以删除%s恢复到以前的配置。" 20.258 20.259 #: tinyutils/hwsetup:691 20.260 msgid "Checking if ati catalyst is working..." 20.261 @@ -669,16 +645,13 @@ 20.262 msgstr "你要配置X使用免费的ATI显卡驱动吗？" 20.263 20.264 #: tinyutils/hwsetup:715 20.265 -#, sh-format 20.266 -msgid "If ATI fails, you can remove $xorg55 to restore previous config." 20.267 -msgstr "如果ATI失败，您可以删除$xorg55恢复到以前的配置。" 20.268 +msgid "If ATI fails, you can remove %s to restore previous config." 20.269 +msgstr "如果ATI失败，您可以删除%s恢复到以前的配置。" 20.270 20.271 #: tinyutils/hwsetup:717 20.272 -#, sh-format 20.273 -msgid "Create $xorg55short configured with radeon driver." 20.274 +msgid "Create %s configured with radeon driver." 20.275 msgstr "" 20.276 -"创建$xorg55short配置显卡驱动。（原文：Create $xorg55short configured with " 20.277 -"radeon driver.）" 20.278 +"创建%s配置显卡驱动。（原文：Create configured with radeon driver.）" 20.279 20.280 #: tinyutils/hwsetup:723 20.281 msgid "Checking if ATI radeon is working..." 20.282 @@ -784,7 +757,7 @@ 20.283 msgstr "密码:" 20.284 20.285 #: tinyutils/slitaz-config:44 20.286 -msgid "Enter new password for \\Zb\\Z1root" 20.287 +msgid "Enter new password for %s" 20.288 msgstr "" 20.289 20.290 #: tinyutils/slitaz-config:53 20.291 @@ -796,8 +769,7 @@ 20.292 msgstr "" 20.293 20.294 #: tinyutils/slitaz-config:61 20.295 -#, sh-format 20.296 -msgid "Enter password for user \\Zb\\Z4$user" 20.297 +msgid "Enter password for user \\Zb\\Z4%s" 20.298 msgstr "" 20.299 20.300 #: tinyutils/slitaz-config:121 20.301 @@ -846,8 +818,7 @@ 20.302 msgstr "密码:" 20.303 20.304 #: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 20.305 -#, sh-format 20.306 -msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" 20.307 +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4%s" 20.308 msgstr "" 20.309 20.310 #: tinyutils/slitaz-config:197 20.311 @@ -856,7 +827,7 @@ 20.312 20.313 #: tinyutils/slitaz-config:201 20.314 #, fuzzy 20.315 -msgid "Configuring: /etc/network.conf..." 20.316 +msgid "Configuring: %s..." 20.317 msgstr "配置Xorg中…" 20.318 20.319 #: tinyutils/slitaz-config:211 20.320 @@ -868,8 +839,7 @@ 20.321 msgstr "" 20.322 20.323 #: tinyutils/slitaz-config:220 20.324 -#, sh-format 20.325 -msgid "IP address: $ip" 20.326 +msgid "IP address: %s" 20.327 msgstr "" 20.328 20.329 #: tinyutils/slitaz-config:222
21.1 --- a/po/tazbox/el.po Thu May 14 12:55:55 2015 +0200 21.2 +++ b/po/tazbox/el.po Thu Jun 04 17:11:36 2015 +0300 21.3 @@ -193,8 +193,7 @@ 21.4 msgstr "" 21.5 21.6 #: tazbox/tazbox:189 21.7 -#, sh-format 21.8 -msgid "Locale was set to $locale" 21.9 +msgid "Locale was set to %s" 21.10 msgstr "" 21.11 21.12 #: tazbox/tazbox:202 21.13 @@ -258,8 +257,7 @@ 21.14 msgstr "" 21.15 21.16 #: tazbox/tazbox:331 21.17 -#, sh-format 21.18 -msgid "TimeZone was set to $timezone" 21.19 +msgid "TimeZone was set to %s" 21.20 msgstr "" 21.21 21.22 #: tazbox/tazbox:367 21.23 @@ -303,13 +301,11 @@ 21.24 msgstr "" 21.25 21.26 #: tazbox/tazbox:464 21.27 -#, sh-format 21.28 -msgid "REMOVE: $pkg" 21.29 +msgid "REMOVE: %s" 21.30 msgstr "" 21.31 21.32 #: tazbox/tazbox:468 21.33 -#, sh-format 21.34 -msgid "INSTALL: $pkg" 21.35 +msgid "INSTALL: %s" 21.36 msgstr "" 21.37 21.38 #: tazbox/tazbox:471
22.1 --- a/po/tazbox/es.po Thu May 14 12:55:55 2015 +0200 22.2 +++ b/po/tazbox/es.po Thu Jun 04 17:11:36 2015 +0300 22.3 @@ -192,8 +192,7 @@ 22.4 msgstr "" 22.5 22.6 #: tazbox/tazbox:189 22.7 -#, sh-format 22.8 -msgid "Locale was set to $locale" 22.9 +msgid "Locale was set to %s" 22.10 msgstr "" 22.11 22.12 #: tazbox/tazbox:202 22.13 @@ -257,8 +256,7 @@ 22.14 msgstr "" 22.15 22.16 #: tazbox/tazbox:331 22.17 -#, sh-format 22.18 -msgid "TimeZone was set to $timezone" 22.19 +msgid "TimeZone was set to %s" 22.20 msgstr "" 22.21 22.22 #: tazbox/tazbox:367 22.23 @@ -302,13 +300,11 @@ 22.24 msgstr "" 22.25 22.26 #: tazbox/tazbox:464 22.27 -#, sh-format 22.28 -msgid "REMOVE: $pkg" 22.29 +msgid "REMOVE: %s" 22.30 msgstr "" 22.31 22.32 #: tazbox/tazbox:468 22.33 -#, sh-format 22.34 -msgid "INSTALL: $pkg" 22.35 +msgid "INSTALL: %s" 22.36 msgstr "" 22.37 22.38 #: tazbox/tazbox:471
23.1 --- a/po/tazbox/fa.po Thu May 14 12:55:55 2015 +0200 23.2 +++ b/po/tazbox/fa.po Thu Jun 04 17:11:36 2015 +0300 23.3 @@ -190,9 +190,8 @@ 23.4 msgstr "مدیریت" 23.5 23.6 #: tazbox/tazbox:189 23.7 -#, sh-format 23.8 -msgid "Locale was set to $locale" 23.9 -msgstr "تنظیم شد $locale منطقه به" 23.10 +msgid "Locale was set to %s" 23.11 +msgstr "تنظیم شد %s منطقه به" 23.12 23.13 #: tazbox/tazbox:202 23.14 msgid "SliTaz keymap" 23.15 @@ -258,9 +257,8 @@ 23.16 msgstr "محل سکونت/شهر" 23.17 23.18 #: tazbox/tazbox:331 23.19 -#, sh-format 23.20 -msgid "TimeZone was set to $timezone" 23.21 -msgstr "$timezone منطقه زمانی تنظیم شد به" 23.22 +msgid "TimeZone was set to %s" 23.23 +msgstr "%s منطقه زمانی تنظیم شد به" 23.24 23.25 #: tazbox/tazbox:367 23.26 msgid "Please wait" 23.27 @@ -304,14 +302,12 @@ 23.28 msgstr "TazPKG فایل لوگ " 23.29 23.30 #: tazbox/tazbox:464 23.31 -#, sh-format 23.32 -msgid "REMOVE: $pkg" 23.33 -msgstr "$pkg :حذف" 23.34 +msgid "REMOVE: %s" 23.35 +msgstr "%s :حذف" 23.36 23.37 #: tazbox/tazbox:468 23.38 -#, sh-format 23.39 -msgid "INSTALL: $pkg" 23.40 -msgstr "$pkg :نصب" 23.41 +msgid "INSTALL: %s" 23.42 +msgstr "%s :نصب" 23.43 23.44 #: tazbox/tazbox:471 23.45 msgid "Done!"
24.1 --- a/po/tazbox/fr.po Thu May 14 12:55:55 2015 +0200 24.2 +++ b/po/tazbox/fr.po Thu Jun 04 17:11:36 2015 +0300 24.3 @@ -192,8 +192,7 @@ 24.4 msgstr "Gère" 24.5 24.6 #: tazbox/tazbox:189 24.7 -#, sh-format 24.8 -msgid "Locale was set to $locale" 24.9 +msgid "Locale was set to %s" 24.10 msgstr "" 24.11 24.12 #: tazbox/tazbox:202 24.13 @@ -259,9 +258,8 @@ 24.14 msgstr "Location/Ville" 24.15 24.16 #: tazbox/tazbox:331 24.17 -#, sh-format 24.18 -msgid "TimeZone was set to $timezone" 24.19 -msgstr "Le fuseau horaire était $timezone" 24.20 +msgid "TimeZone was set to %s" 24.21 +msgstr "Le fuseau horaire était %s" 24.22 24.23 #: tazbox/tazbox:367 24.24 msgid "Please wait" 24.25 @@ -305,14 +303,12 @@ 24.26 msgstr "" 24.27 24.28 #: tazbox/tazbox:464 24.29 -#, sh-format 24.30 -msgid "REMOVE: $pkg" 24.31 -msgstr "RETIRE: $pkg" 24.32 +msgid "REMOVE: %s" 24.33 +msgstr "RETIRE: %s" 24.34 24.35 #: tazbox/tazbox:468 24.36 -#, sh-format 24.37 -msgid "INSTALL: $pkg" 24.38 -msgstr "AJOUTE: $pkg" 24.39 +msgid "INSTALL: %s" 24.40 +msgstr "AJOUTE: %s" 24.41 24.42 #: tazbox/tazbox:471 24.43 msgid "Done!"
25.1 --- a/po/tazbox/pl.po Thu May 14 12:55:55 2015 +0200 25.2 +++ b/po/tazbox/pl.po Thu Jun 04 17:11:36 2015 +0300 25.3 @@ -194,8 +194,7 @@ 25.4 msgstr "" 25.5 25.6 #: tazbox/tazbox:189 25.7 -#, sh-format 25.8 -msgid "Locale was set to $locale" 25.9 +msgid "Locale was set to %s" 25.10 msgstr "" 25.11 25.12 #: tazbox/tazbox:202 25.13 @@ -259,8 +258,7 @@ 25.14 msgstr "" 25.15 25.16 #: tazbox/tazbox:331 25.17 -#, sh-format 25.18 -msgid "TimeZone was set to $timezone" 25.19 +msgid "TimeZone was set to %s" 25.20 msgstr "" 25.21 25.22 #: tazbox/tazbox:367 25.23 @@ -304,13 +302,11 @@ 25.24 msgstr "" 25.25 25.26 #: tazbox/tazbox:464 25.27 -#, sh-format 25.28 -msgid "REMOVE: $pkg" 25.29 +msgid "REMOVE: %s" 25.30 msgstr "" 25.31 25.32 #: tazbox/tazbox:468 25.33 -#, sh-format 25.34 -msgid "INSTALL: $pkg" 25.35 +msgid "INSTALL: %s" 25.36 msgstr "" 25.37 25.38 #: tazbox/tazbox:471
26.1 --- a/po/tazbox/pt_BR.po Thu May 14 12:55:55 2015 +0200 26.2 +++ b/po/tazbox/pt_BR.po Thu Jun 04 17:11:36 2015 +0300 26.3 @@ -190,9 +190,8 @@ 26.4 msgstr "Gerencie" 26.5 26.6 #: tazbox/tazbox:189 26.7 -#, sh-format 26.8 -msgid "Locale was set to $locale" 26.9 -msgstr "Locale foi definido para $locale" 26.10 +msgid "Locale was set to %s" 26.11 +msgstr "Locale foi definido para %s" 26.12 26.13 #: tazbox/tazbox:202 26.14 msgid "SliTaz keymap" 26.15 @@ -259,9 +258,8 @@ 26.16 msgstr "Localidade/Cidade" 26.17 26.18 #: tazbox/tazbox:331 26.19 -#, sh-format 26.20 -msgid "TimeZone was set to $timezone" 26.21 -msgstr "Zona horária foi definida para $timezone" 26.22 +msgid "TimeZone was set to %s" 26.23 +msgstr "Zona horária foi definida para %s" 26.24 26.25 #: tazbox/tazbox:367 26.26 msgid "Please wait" 26.27 @@ -306,14 +304,12 @@ 26.28 msgstr "Log do TazPKG" 26.29 26.30 #: tazbox/tazbox:464 26.31 -#, sh-format 26.32 -msgid "REMOVE: $pkg" 26.33 -msgstr "REMOVER: $pkg" 26.34 +msgid "REMOVE: %s" 26.35 +msgstr "REMOVER: %s" 26.36 26.37 #: tazbox/tazbox:468 26.38 -#, sh-format 26.39 -msgid "INSTALL: $pkg" 26.40 -msgstr "INSTALAR: $pkg" 26.41 +msgid "INSTALL: %s" 26.42 +msgstr "INSTALAR: %s" 26.43 26.44 #: tazbox/tazbox:471 26.45 msgid "Done!"
27.1 --- a/po/tazbox/ru.po Thu May 14 12:55:55 2015 +0200 27.2 +++ b/po/tazbox/ru.po Thu Jun 04 17:11:36 2015 +0300 27.3 @@ -198,9 +198,8 @@ 27.4 msgstr "Пакеты" 27.5 27.6 #: tazbox/tazbox:189 27.7 -#, sh-format 27.8 -msgid "Locale was set to $locale" 27.9 -msgstr "Установлена локаль «$locale»" 27.10 +msgid "Locale was set to %s" 27.11 +msgstr "Установлена локаль «%s»" 27.12 27.13 #: tazbox/tazbox:202 27.14 msgid "SliTaz keymap" 27.15 @@ -266,9 +265,8 @@ 27.16 msgstr "местность/город" 27.17 27.18 #: tazbox/tazbox:331 27.19 -#, sh-format 27.20 -msgid "TimeZone was set to $timezone" 27.21 -msgstr "Установлен часовой пояс «$timezone»" 27.22 +msgid "TimeZone was set to %s" 27.23 +msgstr "Установлен часовой пояс «%s»" 27.24 27.25 #: tazbox/tazbox:367 27.26 msgid "Please wait" 27.27 @@ -312,14 +310,12 @@ 27.28 msgstr "Журнал TazPkg" 27.29 27.30 #: tazbox/tazbox:464 27.31 -#, sh-format 27.32 -msgid "REMOVE: $pkg" 27.33 -msgstr "УДАЛЕНИЕ $pkg" 27.34 +msgid "REMOVE: %s" 27.35 +msgstr "УДАЛЕНИЕ %s" 27.36 27.37 #: tazbox/tazbox:468 27.38 -#, sh-format 27.39 -msgid "INSTALL: $pkg" 27.40 -msgstr "УСТАНОВКА $pkg" 27.41 +msgid "INSTALL: %s" 27.42 +msgstr "УСТАНОВКА %s" 27.43 27.44 #: tazbox/tazbox:471 27.45 msgid "Done!"
28.1 --- a/po/tazbox/sv.po Thu May 14 12:55:55 2015 +0200 28.2 +++ b/po/tazbox/sv.po Thu Jun 04 17:11:36 2015 +0300 28.3 @@ -190,8 +190,7 @@ 28.4 msgstr "" 28.5 28.6 #: tazbox/tazbox:189 28.7 -#, sh-format 28.8 -msgid "Locale was set to $locale" 28.9 +msgid "Locale was set to %s" 28.10 msgstr "" 28.11 28.12 #: tazbox/tazbox:202 28.13 @@ -255,8 +254,7 @@ 28.14 msgstr "" 28.15 28.16 #: tazbox/tazbox:331 28.17 -#, sh-format 28.18 -msgid "TimeZone was set to $timezone" 28.19 +msgid "TimeZone was set to %s" 28.20 msgstr "" 28.21 28.22 #: tazbox/tazbox:367 28.23 @@ -300,13 +298,11 @@ 28.24 msgstr "" 28.25 28.26 #: tazbox/tazbox:464 28.27 -#, sh-format 28.28 -msgid "REMOVE: $pkg" 28.29 +msgid "REMOVE: %s" 28.30 msgstr "" 28.31 28.32 #: tazbox/tazbox:468 28.33 -#, sh-format 28.34 -msgid "INSTALL: $pkg" 28.35 +msgid "INSTALL: %s" 28.36 msgstr "" 28.37 28.38 #: tazbox/tazbox:471
29.1 --- a/po/tazbox/tazbox.pot Thu May 14 12:55:55 2015 +0200 29.2 +++ b/po/tazbox/tazbox.pot Thu Jun 04 17:11:36 2015 +0300 29.3 @@ -187,8 +187,7 @@ 29.4 msgstr "" 29.5 29.6 #: tazbox/tazbox:189 29.7 -#, sh-format 29.8 -msgid "Locale was set to $locale" 29.9 +msgid "Locale was set to %s" 29.10 msgstr "" 29.11 29.12 #: tazbox/tazbox:202 29.13 @@ -252,8 +251,7 @@ 29.14 msgstr "" 29.15 29.16 #: tazbox/tazbox:331 29.17 -#, sh-format 29.18 -msgid "TimeZone was set to $timezone" 29.19 +msgid "TimeZone was set to %s" 29.20 msgstr "" 29.21 29.22 #: tazbox/tazbox:367 29.23 @@ -297,13 +295,11 @@ 29.24 msgstr "" 29.25 29.26 #: tazbox/tazbox:464 29.27 -#, sh-format 29.28 -msgid "REMOVE: $pkg" 29.29 +msgid "REMOVE: %s" 29.30 msgstr "" 29.31 29.32 #: tazbox/tazbox:468 29.33 -#, sh-format 29.34 -msgid "INSTALL: $pkg" 29.35 +msgid "INSTALL: %s" 29.36 msgstr "" 29.37 29.38 #: tazbox/tazbox:471
30.1 --- a/po/tazbox/zh_CN.po Thu May 14 12:55:55 2015 +0200 30.2 +++ b/po/tazbox/zh_CN.po Thu Jun 04 17:11:36 2015 +0300 30.3 @@ -188,9 +188,8 @@ 30.4 msgstr "管理" 30.5 30.6 #: tazbox/tazbox:189 30.7 -#, sh-format 30.8 -msgid "Locale was set to $locale" 30.9 -msgstr "Locale已设為 $locale" 30.10 +msgid "Locale was set to %s" 30.11 +msgstr "Locale已设為 %s" 30.12 30.13 #: tazbox/tazbox:202 30.14 msgid "SliTaz keymap" 30.15 @@ -253,9 +252,8 @@ 30.16 msgstr "所在地/城市" 30.17 30.18 #: tazbox/tazbox:331 30.19 -#, sh-format 30.20 -msgid "TimeZone was set to $timezone" 30.21 -msgstr "时区已设為 $timezone" 30.22 +msgid "TimeZone was set to %s" 30.23 +msgstr "时区已设為 %s" 30.24 30.25 #: tazbox/tazbox:367 30.26 msgid "Please wait" 30.27 @@ -298,14 +296,12 @@ 30.28 msgstr "TazPkg 纪录" 30.29 30.30 #: tazbox/tazbox:464 30.31 -#, sh-format 30.32 -msgid "REMOVE: $pkg" 30.33 -msgstr "移除: $pkg" 30.34 +msgid "REMOVE: %s" 30.35 +msgstr "移除: %s" 30.36 30.37 #: tazbox/tazbox:468 30.38 -#, sh-format 30.39 -msgid "INSTALL: $pkg" 30.40 -msgstr "安装: $pkg" 30.41 +msgid "INSTALL: %s" 30.42 +msgstr "安装: %s" 30.43 30.44 #: tazbox/tazbox:471 30.45 msgid "Done!"
31.1 --- a/po/tazbox/zh_TW.po Thu May 14 12:55:55 2015 +0200 31.2 +++ b/po/tazbox/zh_TW.po Thu Jun 04 17:11:36 2015 +0300 31.3 @@ -187,9 +187,8 @@ 31.4 msgstr "管理" 31.5 31.6 #: tazbox/tazbox:189 31.7 -#, sh-format 31.8 -msgid "Locale was set to $locale" 31.9 -msgstr "Locale已設為 $locale" 31.10 +msgid "Locale was set to %s" 31.11 +msgstr "Locale已設為 %s" 31.12 31.13 #: tazbox/tazbox:202 31.14 msgid "SliTaz keymap" 31.15 @@ -252,9 +251,8 @@ 31.16 msgstr "所在地/城市" 31.17 31.18 #: tazbox/tazbox:331 31.19 -#, sh-format 31.20 -msgid "TimeZone was set to $timezone" 31.21 -msgstr "時區已設為 $timezone" 31.22 +msgid "TimeZone was set to %s" 31.23 +msgstr "時區已設為 %s" 31.24 31.25 #: tazbox/tazbox:367 31.26 msgid "Please wait" 31.27 @@ -297,14 +295,12 @@ 31.28 msgstr "TazPkg 紀錄" 31.29 31.30 #: tazbox/tazbox:464 31.31 -#, sh-format 31.32 -msgid "REMOVE: $pkg" 31.33 -msgstr "移除: $pkg" 31.34 +msgid "REMOVE: %s" 31.35 +msgstr "移除: %s" 31.36 31.37 #: tazbox/tazbox:468 31.38 -#, sh-format 31.39 -msgid "INSTALL: $pkg" 31.40 -msgstr "安裝: $pkg" 31.41 +msgid "INSTALL: %s" 31.42 +msgstr "安裝: %s" 31.43 31.44 #: tazbox/tazbox:471 31.45 msgid "Done!"
32.1 --- a/tazbox/tazbox Thu May 14 12:55:55 2015 +0200 32.2 +++ b/tazbox/tazbox Thu Jun 04 17:11:36 2015 +0300 32.3 @@ -14,16 +14,16 @@ 32.4 32.5 # download dir (may be in a config file) 32.6 32.7 -DOWNLOADS=$HOME/Downloads 32.8 +DOWNLOADS="$HOME/Downloads" 32.9 32.10 32.11 # some constants to be used inside functions 32.12 32.13 -tmp=/tmp/keymap.list 32.14 -db=/usr/share/i18n/locales 32.15 -zi=/usr/share/zoneinfo/ 32.16 -ztab=${zi}zone-mini.tab 32.17 -csv=/tmp/freegeoip.csv 32.18 +tmp='/tmp/keymap.list' 32.19 +db='/usr/share/i18n/locales' 32.20 +zi='/usr/share/zoneinfo/' 32.21 +ztab="${zi}zone-mini.tab" 32.22 +csv='/tmp/freegeoip.csv' 32.23 32.24 32.25 # 32.26 @@ -58,7 +58,7 @@ 32.27 # try to find icon in .desktop files 32.28 32.29 find_icon() { 32.30 - local_desktop=$(find $HOME/.local/share/applications 32.31 + local_desktop=$(find $HOME/.local/share/applications \ 32.32 -name ${1##*/}.desktop 2&>/dev/null | head -n1) 32.33 system_desktop=$(find /usr/share/applications \ 32.34 -name ${1##*/}.desktop 2&>/dev/null | head -n1) 32.35 @@ -71,7 +71,7 @@ 32.36 # su frontend GUIs 32.37 32.38 su_main() { 32.39 - CMD1="$1"; shift; CMD2="$(echo $@ | sed 's|&|&|g')" 32.40 + CMD1="${1%% *}"; CMD2="$(echo "${1#* }" | sed 's|&|&|g')" 32.41 : ${icon=$(find_icon $CMD1)} 32.42 icon="${icon:-dialog-password}" 32.43 32.44 @@ -99,7 +99,7 @@ 32.45 # user may press cancel on download. 32.46 32.47 cancel_dl() { 32.48 - if [ "$?" == 1 ]; then 32.49 + if [ "$?" -eq 1 ]; then 32.50 _ "CANCEL" 32.51 rm -f $DOWNLOADS/$(basename $url) 32.52 fi 32.53 @@ -112,10 +112,10 @@ 32.54 : ${title=$(_n 'TazBox Output')} 32.55 : ${icon=dialog-information} 32.56 32.57 - yad --title="$title" --window-icon=$icon \ 32.58 - --geometry="600x220+0-24" --fore="#ffffff" --back="#000000" \ 32.59 + yad --title="$title" --window-icon="$icon" \ 32.60 + --geometry='600x220+0-24' --fore='#ffffff' --back='#000000' \ 32.61 --text-info --fontname=monospace --wrap $opts \ 32.62 - --button="gtk-close:1" 32.63 + --button='gtk-close:1' 32.64 } 32.65 32.66 32.67 @@ -123,9 +123,9 @@ 32.68 32.69 logout_main() { 32.70 icon='/usr/share/pixmaps/slitaz-icon.png' 32.71 - yad --title="$(_n 'SliTaz Logout')" --window-icon=$icon \ 32.72 - --on-top --center --height=130 \ 32.73 - --image=$icon --image-on-top \ 32.74 + yad --title="$(_n 'SliTaz Logout')" --window-icon="$icon" \ 32.75 + --on-top --center --height='130' \ 32.76 + --image="$icon" --image-on-top \ 32.77 --text="<b>$(_n 'SliTaz Logout - Please choose an action:')</b>" \ 32.78 --always-print-result \ 32.79 --button "$(_n 'Close X session')!system-log-out:4" \ 32.80 @@ -155,8 +155,8 @@ 32.81 keymap=$(cat $tmp | sort | tr "\n" "!") 32.82 timezone=$(find $zi -type f | sed s,$zi,,g | grep -v -F '.tab' | tr "\n" "!") 32.83 yad --title="$(_n 'SliTaz Initial Setup')" --window-icon=$icon \ 32.84 - --width=500 \ 32.85 - --image=$icon --image-on-top \ 32.86 + --width='500' \ 32.87 + --image="$icon" --image-on-top \ 32.88 --text="<big>$(_n 'Here you can set your preferences \n for <b>locale, keymap and timezone</b>.')</big>" \ 32.89 --form \ 32.90 --field "$(_n 'Locale'):CB" $locale \ 32.91 @@ -167,12 +167,12 @@ 32.92 32.93 setup() { 32.94 choices=$(setup_main) 32.95 - locale=$(echo $choices | cut -d"|" -f1) 32.96 - keymap=$(echo $choices | cut -d"|" -f2) 32.97 - timezone=$(echo $choices | cut -d"|" -f3) 32.98 - [ $locale ] && tazlocale init $locale 32.99 - [ $keymap ] && tazkeymap init $keymap 32.100 - [ $timezone ] && echo $timezone > /etc/TZ 32.101 + locale=$( echo $choices | cut -d'|' -f1) 32.102 + keymap=$( echo $choices | cut -d'|' -f2) 32.103 + timezone=$(echo $choices | cut -d'|' -f3) 32.104 + [ -n "$locale" ] && tazlocale init $locale 32.105 + [ -n "$keymap" ] && tazkeymap init $keymap 32.106 + [ -n "$timezone" ] && echo $timezone > /etc/TZ 32.107 } 32.108 32.109 32.110 @@ -187,14 +187,14 @@ 32.111 ll_CC=${locale%%@*} 32.112 echo -e "${ll_CC##*_}\n$locale\n$desc" 32.113 done | \ 32.114 - yad --title="$(_n 'SliTaz locale')" --window-icon=$icon \ 32.115 - --width=600 --height=380 --sticky --on-top --center \ 32.116 - --image=$icon --image-on-top \ 32.117 + yad --title="$(_n 'SliTaz locale')" --window-icon="$icon" \ 32.118 + --width='600' --height='380' --sticky --on-top --center \ 32.119 + --image="$icon" --image-on-top \ 32.120 --text="<b>$(_n 'Language configuration')</b> \ 32.121 \n\n$(_ 'Tip: manage locales list by installing/removing locale packages.')" \ 32.122 --list --column="$(_n 'Flag'):IMG" --column $(_n 'Name') \ 32.123 --column $(_n 'Description') \ 32.124 - --print-column=2 --separator='' \ 32.125 + --print-column='2' --separator='' \ 32.126 --button="$(_n 'Manage')!stock_properties:2" \ 32.127 --button="gtk-cancel:1" --button="gtk-ok:0" 32.128 } 32.129 @@ -211,7 +211,7 @@ 32.130 # System language configuration. 32.131 if [ "$locale" ]; then 32.132 tazlocale $locale 32.133 - tazbox notify "$(_ 'Locale was set to $locale')" \ 32.134 + tazbox notify "$(_ 'Locale was set to %s' "$locale")" \ 32.135 preferences-desktop-locale 3 32.136 fi 32.137 } 32.138 @@ -238,9 +238,9 @@ 32.139 keymap() { 32.140 keymap=$(keymap_main) 32.141 # Deal with --button values 32.142 - [ x$? == x1 ] && exit 0 32.143 + [ "$?" -eq 1 ] && exit 0 32.144 # System keymap configuration 32.145 - [ "$keymap" ] && tazkeymap $keymap 32.146 + [ -n "$keymap" ] && tazkeymap $keymap 32.147 } 32.148 32.149 32.150 @@ -272,16 +272,16 @@ 32.151 32.152 tz_suggest() { 32.153 CountryCode=$(geoip) 32.154 - if [ "x$CountryCode" != x ]; then 32.155 - if [ "x$(tz_list $CountryCode)" != x ]; then 32.156 + if [ -n "$CountryCode" ]; then 32.157 + if [ -n "$(tz_list $CountryCode)" ]; then 32.158 CountryName=$(cut -d, -f3 $csv) 32.159 - yad --title="$(_ 'SliTaz TZ')" --window-icon=$icon \ 32.160 + yad --title="$(_ 'SliTaz TZ')" --window-icon="$icon" \ 32.161 --on-top --center \ 32.162 - --image=$CountryCode --image-on-top \ 32.163 + --image="$CountryCode" --image-on-top \ 32.164 --text="$(_ 'Suggested location:') <b>$CountryName</b>\n 32.165 $(_ 'Are you agreed?')" \ 32.166 - --button="gtk-yes:0" --button="gtk-no:1" 32.167 - [ $? == 0 ] && echo $CountryCode 32.168 + --button='gtk-yes:0' --button='gtk-no:1' 32.169 + [ "$?" -eq 0 ] && echo $CountryCode 32.170 fi 32.171 fi 32.172 } 32.173 @@ -295,18 +295,18 @@ 32.174 32.175 for tzfile in $(find $zi -type f -regex '.*info/[ABCEIMP].*'); do 32.176 grep -m1 $(basename $tzfile) $ztab 32.177 - done | cut -d' ' -f1 | sort -u > $tmpcc 32.178 + done | cut -d$'\t' -f1 | sort -u > $tmpcc 32.179 32.180 for CC in $(cat $tmpcc); do 32.181 cat << EOT 32.182 $CC 32.183 $CC 32.184 -$(grep -m1 "$CC " ${zi}iso3166.tab | cut -d' ' -f2) 32.185 +$(grep -m1 "$CC " ${zi}iso3166.tab | cut -d$'\t' -f2) 32.186 EOT 32.187 done | \ 32.188 - yad --title="$(_ 'SliTaz TZ')" --window-icon=$icon \ 32.189 - --width=500 --height=380 --on-top --center \ 32.190 - --image=$icon --image-on-top \ 32.191 + yad --title="$(_ 'SliTaz TZ')" --window-icon="$icon" \ 32.192 + --width='500' --height='380' --on-top --center \ 32.193 + --image="$icon" --image-on-top \ 32.194 --text="<b>$(_ 'TimeZone Configuration')</b> \ 32.195 \n$(_ 'Select country and press "Forward" or manually select timezone file.') \ 32.196 \n\n$(_ 'Tip: manage timezones list by installing/removing locale packages.')" \ 32.197 @@ -316,13 +316,13 @@ 32.198 --button="$(_n 'Manual')!gtk-index:2" \ 32.199 --button="gtk-go-forward:0" \ 32.200 --button="gtk-cancel:1" --always-print-result \ 32.201 - --print-column=2 --separator='' 32.202 + --print-column='2' --separator='' 32.203 ;; 32.204 xindex) 32.205 # manual selection of file with timezone info 32.206 - yad --title="$(_ 'SliTaz TZ')" --window-icon=$icon \ 32.207 - --width=500 --on-top --center \ 32.208 - --image=$icon --image-on-top \ 32.209 + yad --title="$(_ 'SliTaz TZ')" --window-icon="$icon" \ 32.210 + --width='500' --on-top --center \ 32.211 + --image="$icon" --image-on-top \ 32.212 --text="<b>$(_ 'TimeZone Configuration')</b>\n$(_ 'Select time zone')" \ 32.213 --form --field=":FL" ${zi}UTC --separator='' | \ 32.214 sed "s|$zi||" 32.215 @@ -330,12 +330,12 @@ 32.216 *) 32.217 # second pass - city/place 32.218 list=$(tz_list $1) 32.219 - icon=$1 32.220 + icon="$1" 32.221 if [ $(echo "$list" | wc -l) != 1 ]; then 32.222 echo "$list" | \ 32.223 - yad --title="$(_ 'SliTaz TZ')" --window-icon=$icon \ 32.224 - --width=500 --height=380 --on-top --center \ 32.225 - --image=$icon --image-on-top \ 32.226 + yad --title="$(_ 'SliTaz TZ')" --window-icon="$icon" \ 32.227 + --width='500' --height='380' --on-top --center \ 32.228 + --image="$icon" --image-on-top \ 32.229 --text="<b>$(_ 'TimeZone Configuration')</b>\n$(_ 'Select location')" \ 32.230 --list --column $(_n 'Location/City') --separator='' 32.231 else 32.232 @@ -347,24 +347,24 @@ 32.233 32.234 32.235 tz() { 32.236 - icon=clock 32.237 + icon='clock' 32.238 arg=$(tz_suggest) 32.239 32.240 timezone=$(tz_select $arg) 32.241 case $? in 32.242 1) exit 0 ;; 32.243 - 0) [ x$arg == x ] && timezone=$(tz_select "$timezone") 32.244 - [ x$timezone == x ] && exit 0 32.245 + 0) [ -n "$arg" ] && timezone=$(tz_select "$timezone") 32.246 + [ -z "$timezone" ] && exit 0 32.247 timezone=$(find $zi -name $timezone | grep -v -E "posix|right" | \ 32.248 sed "s|$zi||") ;; 32.249 2) timezone=$(tz_select "index") ;; 32.250 4) tazbox manage_i18n main;; 32.251 esac 32.252 32.253 - [ "x$timezone" == x ] && exit 0 32.254 + [ -z "$timezone" ] && exit 0 32.255 echo $timezone > /etc/TZ 32.256 export TZ=$timezone 32.257 - tazbox notify "$(_ 'TimeZone was set to $timezone')" $icon 3 32.258 + tazbox notify "$(_ 'TimeZone was set to %s' "$timezone")" $icon 3 32.259 rm -f $tmpcc 32.260 } 32.261 32.262 @@ -383,19 +383,17 @@ 32.263 32.264 # get package's description, install flag and sizes 32.265 32.266 -desc_etc() 32.267 -{ 32.268 - INFO="$(grep -m1 -A3 -x -F $1 /var/lib/tazpkg/packages.txt)" 32.269 - DESC=$(echo "$INFO" | sed -n 3p) 32.270 - if if_installed $1; then 32.271 - INST="TRUE"; echo $1 >> $ORIG_LIST 32.272 +desc_etc() { 32.273 + if grep -q "^$1"$'\t' /var/lib/tazpkg/installed.info; then 32.274 + echo 'TRUE' >> $PKGS_LIST; echo $1 >> $ORIG_LIST 32.275 else 32.276 - INST="FALSE" 32.277 + echo 'FALSE' >> $PKGS_LIST 32.278 fi 32.279 - SIZES=$(echo "$INFO" | sed -n 4p) 32.280 - SIZE1=${SIZES%% *} 32.281 - SIZE2=$(echo $SIZES | cut -d' ' -f2 | tr -d '(') 32.282 - echo -e "$INST\n$1\n$DESC\n${SIZE1//.0}\n${SIZE2//.0}" >> $PKGS_LIST 32.283 + awk -F$'\t' -vp="$1" ' 32.284 + ($1==p){ 32.285 + split($7, s, " "); 32.286 + printf "%s\n%s\n%s\n%s\n", $1, $4, s[1], s[2]; 32.287 + }' /var/lib/tazpkg/packages.info >> $PKGS_LIST 32.288 } 32.289 32.290 32.291 @@ -417,56 +415,54 @@ 32.292 NEW_LIST=$(mktemp) 32.293 LIST1=$(mktemp) 32.294 LIST2=$(mktemp) 32.295 - PLIST=/var/lib/tazpkg/packages.list 32.296 + PLIST='/var/lib/tazpkg/packages.list' 32.297 + PINFO='/vat/lib/tazpkg/packages.info' 32.298 32.299 - for i in $(grep -E '^locale' $PLIST | grep -v 'extra' | \ 32.300 - sed 's|\(locale-[a-zA-Z_]*\).*|\1|'); do 32.301 + for i in $(awk -F$'\t' '$1~/^locale-[a-z_A-Z]+$/{print $1}' $PINFO); do 32.302 desc_etc $i 32.303 done 32.304 32.305 - if [ "x$1" != xmain ]; then 32.306 - for i in $(grep -E '^locale' $PLIST | grep 'extra' | \ 32.307 - sed 's|\(locale-[a-zA-Z_]*-extra\).*|\1|'); do 32.308 + if [ "$1" != 'main' ]; then 32.309 + for i in $(awk -F$'\t' '$1~/^locale-[a-z_A-Z]+-extra$/{print $1}' $PINFO); do 32.310 desc_etc $i 32.311 done 32.312 + 32.313 if if_installed libQtCore; then 32.314 - for i in $(grep -E '^qt-locale' $PLIST | \ 32.315 - sed 's|\(qt-locale-[a-zA-Z_]*\).*|\1|'); do 32.316 + for i in $(awk -F$'\t' '$1~/^qt-locale/{print $1}' $PINFO); do 32.317 desc_etc $i 32.318 done 32.319 fi 32.320 + 32.321 if if_installed razorqt; then 32.322 - for i in $(grep -E '^razorqt-locale' $PLIST | \ 32.323 - sed 's|\(razorqt-locale-[a-zA-Z_]*\).*|\1|'); do 32.324 + for i in $(awk -F$'\t' '$1~/^razorqt-locale/{print $1}' $PINFO); do 32.325 desc_etc $i 32.326 done 32.327 fi 32.328 + 32.329 if if_installed firefox; then 32.330 - for i in $(grep -E '^firefox-langpack' $PLIST | \ 32.331 - sed 's|\(firefox-langpack-[a-zA-Z_]*\).*|\1|'); do 32.332 + for i in $(awk -F$'\t' '$1~/^firefox-langpack/{print $1}' $PINFO); do 32.333 desc_etc $i 32.334 done 32.335 fi 32.336 + 32.337 if if_installed thunderbird; then 32.338 - for i in $(grep -E '^thunderbird-langpack' $PLIST | \ 32.339 - sed 's|\(thunderbird-langpack-[a-zA-Z_]*\).*|\1|'); do 32.340 + for i in $(awk -F$'\t' '$1~/^thunderbird-langpack/{print $1}' $PINFO); do 32.341 desc_etc $i 32.342 done 32.343 fi 32.344 + 32.345 if if_installed squirrelmail; then 32.346 - for i in $(grep -E '^squirrelmail' $PLIST | \ 32.347 - grep -E '^squirrelmail-[a-z][a-z][_-]' | \ 32.348 - sed 's|\(squirrelmail-[a-zA-Z_]*\)-.*|\1|'); do 32.349 + for i in $(awk -F$'\t' '$1~/^squirrelmail-[a-z][a-z][_-]/{print $1}' $PINFO); do 32.350 desc_etc $i 32.351 done 32.352 fi 32.353 + 32.354 if if_installed aspell; then 32.355 - for i in $(grep -E '^aspell' $PLIST | \ 32.356 - grep -E 'aspell-[a-z][a-z][^a-z]' | \ 32.357 - sed 's|\(aspell-[a-zA-Z_]*\)-.*|\1|'); do 32.358 + for i in $(awk -F$'\t' '$1~/^aspell-[a-z][a-z]_?[A-Z]?[A-Z]?$/{print $1}' $PINFO); do 32.359 desc_etc $i 32.360 done 32.361 fi 32.362 + 32.363 OTHER_LOCALE="gnome-commander|-i18n gnome-vfs|-i18n gpa|-langpack \ 32.364 gucharmap|-i18n lxterminal|-locales lyx|-locales rox-filer|-locales \ 32.365 ufraw|-locales qupzilla|-locales" 32.366 @@ -478,11 +474,11 @@ 32.367 icon='stock_properties' 32.368 cat $PKGS_LIST | \ 32.369 { 32.370 - yad --title="$(_n 'Manage locale packages')" --window-icon=$icon \ 32.371 - --width=600 --height=400 --on-top --center \ 32.372 - --image=$icon --image-on-top \ 32.373 + yad --title="$(_n 'Manage locale packages')" --window-icon="$icon" \ 32.374 + --width='600' --height='400' --on-top --center \ 32.375 + --image="$icon" --image-on-top \ 32.376 --text="$(_n 'Check only locale packages you need and press "Install/Remove".')" \ 32.377 - --list --multiple --ellipsize=END --expand-column=3 \ 32.378 + --list --multiple --ellipsize='END' --expand-column='3' \ 32.379 --column="$(_n 'Inst.'):CHK" --column="$(_n 'Package Name'):TEXT" \ 32.380 --column="$(_n 'Description'):TEXT" --column="$(_n 'Size'):TEXT" \ 32.381 --column="$(_n 'Installed'):TEXT" \ 32.382 @@ -492,7 +488,7 @@ 32.383 --print-all 32.384 } > $ANSWER 32.385 32.386 - if [ "x$?" == "x1" ]; then rm_temp; exit 0; fi 32.387 + if [ "$?" -eq 1 ]; then rm_temp; exit 0; fi 32.388 32.389 grep -e 'TRUE' $ANSWER | cut -d'|' -f2 > $NEW_LIST 32.390 32.391 @@ -500,18 +496,18 @@ 32.392 sort -o $LIST1 $ORIG_LIST 32.393 sort -o $LIST2 $NEW_LIST 32.394 DIFF=$(diff $LIST1 $LIST2 | sed '/---/d;/+++/d;/@@/d') 32.395 - if [ "x$DIFF" == "x" ]; then rm_temp; exit 0; fi 32.396 + if [ -z "$DIFF" ]; then rm_temp; exit 0; fi 32.397 32.398 # output log to gtk window 32.399 - title="$(_n 'TazPkg log')"; icon="tazpkg"; opts="--tail" 32.400 + title="$(_n 'TazPkg log')"; icon='tazpkg'; opts='--tail' 32.401 { 32.402 for pkg in $(echo "$DIFF" | grep -e '^-' | sed 's|^-||g'); do 32.403 - _ 'REMOVE: $pkg' 32.404 - yes | tazpkg -r $pkg --output="raw" 32.405 + _ 'REMOVE: %s' "$pkg" 32.406 + yes | tazpkg -r $pkg --output='raw' 32.407 done 32.408 for pkg in $(echo "$DIFF" | grep -e '^+' | sed 's|^+||g'); do 32.409 - _ 'INSTALL: $pkg' 32.410 - tazpkg -gi $pkg --output="raw" 32.411 + _ 'INSTALL: %s' "$pkg" 32.412 + tazpkg -gi $pkg --output='raw' 32.413 done 32.414 echo -e "\n\n$(_n 'Done!')\n" 32.415 } | output_command 32.416 @@ -524,35 +520,35 @@ 32.417 32.418 newfile_main() { 32.419 icon='gtk-new' 32.420 - yad --title="$(_n 'New file')" --window-icon=$icon \ 32.421 - --width=460 --height=160 --on-top --center \ 32.422 - --image=$icon --image-on-top \ 32.423 - --icon=$icon \ 32.424 + yad --title="$(_n 'New file')" --window-icon="$icon" \ 32.425 + --width='460' --height='160' --on-top --center \ 32.426 + --image="$icon" --image-on-top \ 32.427 + --icon="$icon" \ 32.428 --text="<b>$(_n 'Create a new file or folder on your desktop')</b>" \ 32.429 --entry --entry-label="$(_n 'File name')" \ 32.430 - --ricon=editclear \ 32.431 + --ricon='editclear' \ 32.432 --always-print-result \ 32.433 --button="$(_n 'SHell script')!application-x-shellscript:4" \ 32.434 --button="$(_n 'Folder')!folder:3" \ 32.435 --button="$(_n 'File')!empty:2" \ 32.436 - --button="gtk-cancel:1" 32.437 + --button='gtk-cancel:1' 32.438 } 32.439 32.440 32.441 newfile() { 32.442 file=$(newfile_main) 32.443 ret=$? 32.444 - [ "$file" ] || exit 0 32.445 + [ -z "$file" ] && exit 0 32.446 case $ret in 32.447 4) 32.448 - cat > $HOME/Desktop/$file << EOT 32.449 + cat > "$HOME/Desktop/$file" << EOT 32.450 #!/bin/sh 32.451 # 32.452 32.453 EOT 32.454 - chmod +x $HOME/Desktop/$file ;; 32.455 - 3) mkdir -p $HOME/Desktop/$file ;; 32.456 - 2) touch $HOME/Desktop/$file ;; 32.457 + chmod +x "$HOME/Desktop/$file" ;; 32.458 + 3) mkdir -p "$HOME/Desktop/$file" ;; 32.459 + 2) touch "$HOME/Desktop/$file" ;; 32.460 1) exit 0 ;; 32.461 esac 32.462 } 32.463 @@ -562,18 +558,18 @@ 32.464 32.465 all_apps() { 32.466 icon='stock_bookmark' 32.467 - yad --title="$(_n 'All Applications')" --window-icon=$icon \ 32.468 - --width=400 --height=400 \ 32.469 + yad --title="$(_n 'All Applications')" --window-icon="$icon" \ 32.470 + --width='400' --height='400' \ 32.471 --icons --compact \ 32.472 - --read-dir=/usr/share/applications \ 32.473 - --button="gtk-close:0" 32.474 + --read-dir='/usr/share/applications' \ 32.475 + --button='gtk-close:0' 32.476 } 32.477 32.478 32.479 # Ask root permissions for system settings 32.480 32.481 ask_root() { 32.482 - if [ $(id -u) != 0 ]; then 32.483 + if [ "$(id -u)" -ne 0 ]; then 32.484 exec tazbox su $0 $@ 32.485 exit 0 32.486 fi 32.487 @@ -586,37 +582,41 @@ 32.488 32.489 case "$1" in 32.490 su) 32.491 + shift 32.492 # Don't show dialog if we are root 32.493 - test $(id -u) = 0 && exec ${@:2} 32.494 - SU_CMD="${@:2}" 32.495 + [ "$(id -u)" -eq 0 ] && exec "$@" 32.496 + SU_CMD="$@" 32.497 + SUBOX_CONF="$HOME/.config/slitaz/subox.conf" 32.498 32.499 # Check if a password has been saved before launching main dialog 32.500 - if [ -s $HOME/.config/slitaz/subox.conf ]; then 32.501 - PASSWD=$(cat $HOME/.config/slitaz/subox.conf) 32.502 - CHECKED="TRUE" 32.503 + if [ -s "$SUBOX_CONF" ]; then 32.504 + PASSWD="$(cat $SUBOX_CONF)" 32.505 + CHECKED='TRUE' 32.506 fi 32.507 32.508 # Display the main dialog (ask for password) 32.509 - main=$(su_main $SU_CMD) 32.510 + main="$(su_main "$SU_CMD")" 32.511 32.512 # Deal with --button values and exit if cancelled to avoid erasing 32.513 # saved password. 32.514 - [ $? == 1 ] && exit 0 32.515 + [ "$?" -eq 1 ] && exit 0 32.516 32.517 # Save or erase Autosaved password 32.518 - if [ $(echo $main | cut -f2 -d"|") == "TRUE" ]; then 32.519 - echo $main | cut -f 1 -d "|" > $HOME/.config/slitaz/subox.conf 32.520 - chmod 0600 $HOME/.config/slitaz/subox.conf 32.521 + if [ $(echo "$main" | cut -d"|" -f2) == 'TRUE' ]; then 32.522 + echo "$main" | cut -d"|" -f1 > $SUBOX_CONF 32.523 + chmod 0600 $SUBOX_CONF 32.524 else 32.525 - cat /dev/null > $HOME/.config/slitaz/subox.conf 32.526 + cat /dev/null > $SUBOX_CONF 32.527 fi 32.528 32.529 # Try to login & execute. If password is wrong execute error dialog 32.530 SU_CMD_QUOTED="$(echo "dbus-launch --exit-with-session $SU_CMD" | sed 's|&|\\&|g')" 32.531 - echo $main | cut -f 1 -d "|" | su -c "$SU_CMD_QUOTED &" || su_error ;; 32.532 + echo $main | cut -d"|" -f1 | su -c "$SU_CMD_QUOTED &" || su_error 32.533 + ;; 32.534 + 32.535 logout) 32.536 # Logout window with actions 32.537 - if [ "$oldstyle" ]; then 32.538 + if [ -n "$oldstyle" ]; then 32.539 answer=$(logout_oldstyle) 32.540 else 32.541 logout_main; answer=$? 32.542 @@ -629,8 +629,8 @@ 32.543 4|*exit) 32.544 case $XDG_CURRENT_DESKTOP in 32.545 LXDE) 32.546 - [ "$_LXSESSION_PID" ] && kill $_LXSESSION_PID 32.547 - [ "$DESKTOP_SESSION" == "compiz" ] && killall compiz 32.548 + [ -n "$_LXSESSION_PID" ] && kill $_LXSESSION_PID 32.549 + [ "$DESKTOP_SESSION" == 'compiz' ] && killall compiz 32.550 openbox --exit ;; 32.551 openbox) openbox --exit ;; 32.552 compiz) killall compiz ;; 32.553 @@ -642,54 +642,77 @@ 32.554 reboot || reboot -f ;; 32.555 2|*halt) 32.556 poweroff ;; 32.557 - esac ;; 32.558 + esac 32.559 + ;; 32.560 + 32.561 out) 32.562 # Pipe a command into a GTK window 32.563 - sed 's|\[.m||g; s|\[[0-9][0-9]*G| |g' | output_command ;; 32.564 + sed 's|\[.m||g; s|\[[0-9][0-9]*G| |g' | output_command 32.565 + ;; 32.566 + 32.567 out-dl) 32.568 # A tiny GTK window for Busybox wget output 32.569 - url=$2; opts="--tail --button=gtk-cancel:1" 32.570 + url="$2"; opts='--tail --button=gtk-cancel:1' 32.571 icon='folder-downloads'; title="$(_ 'Downloading...')" 32.572 [ -d $DOWNLOADS ] || mkdir -p $DOWNLOADS 32.573 busybox wget -c -P $DOWNLOADS $url 2>&1 | output_command 32.574 - cancel_dl ;; 32.575 + cancel_dl 32.576 + ;; 32.577 + 32.578 locale) 32.579 - ask_root $@ && locale ;; 32.580 + ask_root $@ && locale 32.581 + ;; 32.582 + 32.583 keymap) 32.584 - ask_root $@ && keymap ;; 32.585 + ask_root $@ && keymap 32.586 + ;; 32.587 + 32.588 tz) 32.589 - ask_root $@ && tz ;; 32.590 + ask_root $@ && tz 32.591 + ;; 32.592 + 32.593 manage_i18n) 32.594 - ask_root $@ && manage_i18n $2 ;; 32.595 + ask_root $@ && manage_i18n $2 32.596 + ;; 32.597 + 32.598 recharge) 32.599 - ask_root $@; opts="--on-top"; tazpkg recharge | output_command ;; 32.600 + ask_root $@; opts='--on-top'; tazpkg recharge | output_command 32.601 + ;; 32.602 + 32.603 setup) 32.604 - ask_root $@ && setup ;; 32.605 + ask_root $@ && setup 32.606 + ;; 32.607 + 32.608 new-file) 32.609 - newfile ;; 32.610 + newfile 32.611 + ;; 32.612 + 32.613 all-apps) 32.614 - all_apps ;; 32.615 + all_apps 32.616 + ;; 32.617 + 32.618 notify|-n) 32.619 # On screen notification box. 32.620 icon="$3" 32.621 time="$4" 32.622 - [ "$icon" ] || icon=info 32.623 - [ "$time" ] || time=4 32.624 - yad --width=520 --height=80 --timeout=$time --timeout-indicator=right \ 32.625 - --on-top --center --no-buttons --borders=12 --undecorated \ 32.626 - --skip-taskbar --image=$icon --image-on-top --text="<b>$2</b>" ;; 32.627 + [ -z "$icon" ] && icon='info' 32.628 + [ -z "$time" ] && time='4' 32.629 + yad --width='520' --height='80' --timeout="$time" --timeout-indicator='right' \ 32.630 + --on-top --center --no-buttons --borders='12' --undecorated \ 32.631 + --skip-taskbar --image="$icon" --image-on-top --text="<b>$2</b>" 32.632 + ;; 32.633 + 32.634 tazapps) 32.635 # Default applications configuration script. System wide config file 32.636 # is /etc/slitaz/applications.conf and each user can have personal 32.637 # settings. System wide for root and personal config for user. 32.638 export CONFIG="$HOME/.config/slitaz/applications.conf" 32.639 - if [ "$(id -u)" = 0 ]; then 32.640 + if [ "$(id -u)" -eq 0 ]; then 32.641 [ ! -f $CONFIG ] || mv -f $CONFIG /etc/slitaz/applications.conf 32.642 - export CONFIG="/etc/slitaz/applications.conf" 32.643 + export CONFIG='/etc/slitaz/applications.conf' 32.644 fi 32.645 32.646 - for a in FILE_MANAGERS BROWSERS EDITORS TERMINALS WINDOW_MANAGERS; 32.647 - do 32.648 + for a in FILE_MANAGERS BROWSERS EDITORS TERMINALS WINDOW_MANAGERS; do 32.649 eval $(expr $a=$(echo $(LC_ALL=C tazx get-applist ${a%%S} \ 32.650 only-installed yad) | sed 's/ /!/g ; s/!!//g; s/ //g')) 32.651 done 32.652 @@ -699,7 +722,7 @@ 32.653 32.654 icon='preferences-desktop-default-applications' 32.655 eval $(yad --title="$(_n 'SliTaz default applications')" \ 32.656 - --window-icon=$icon --image=$icon --image-on-top \ 32.657 + --window-icon="$icon" --image="$icon" --image-on-top \ 32.658 --text="<b>$(_n 'SliTaz default applications configuration')</b>" \ 32.659 --form \ 32.660 --field="$(_n 'File manager:'):CBE" "$FILE_MANAGERS" \ 32.661 @@ -715,17 +738,22 @@ 32.662 /EDITOR=/s|"\([^"]*\)"|"'$EDITOR'"|; \ 32.663 /TERMINAL=/s|"\([^"]*\)"|"'$TERMINAL'"|; \ 32.664 /WINDOW_MANAGER=/s|"\([^"]*\)"|"'$WINDOW_MANAGER'"|' \ 32.665 - -i $CONFIG ;; 32.666 + -i $CONFIG 32.667 + ;; 32.668 + 32.669 gpl) 32.670 - yad --title="GNU General Public License" --window-icon=text-x-generic \ 32.671 - --geometry="650x500" \ 32.672 - --image=/usr/share/pixmaps/gpl3.png --image-on-top \ 32.673 + yad --title='GNU General Public License' --window-icon='text-x-generic' \ 32.674 + --geometry='650x500' \ 32.675 + --image='/usr/share/pixmaps/gpl3.png' --image-on-top \ 32.676 --center \ 32.677 --text-info \ 32.678 - --fontname=monospace \ 32.679 - --button "OK" < /usr/share/licenses/gpl.txt ;; 32.680 + --fontname='monospace' \ 32.681 + --button 'OK' < /usr/share/licenses/gpl.txt 32.682 + ;; 32.683 + 32.684 *) 32.685 - usage ;; 32.686 + usage 32.687 + ;; 32.688 esac 32.689 32.690 exit 0
33.1 --- a/tinyutils/decode Thu May 14 12:55:55 2015 +0200 33.2 +++ b/tinyutils/decode Thu Jun 04 17:11:36 2015 +0300 33.3 @@ -50,11 +50,11 @@ 33.4 dec=$1 33.5 name="$(basename "$file")" 33.6 if [ ! -x /usr/bin/$1 ]; then 33.7 - _ 'Missing decoder: $dec' 33.8 - _ 'Skipping file: $name' 33.9 + _ 'Missing decoder: %s' "$dec" 33.10 + _ 'Skipping file: %s' "$name" 33.11 continue 33.12 else 33.13 - _ 'Decoding: $name' 33.14 + _ 'Decoding: %s' "$name" 33.15 newline 33.16 fi 33.17 } 33.18 @@ -65,7 +65,7 @@ 33.19 decoder() { 33.20 newline; separator; newline 33.21 if [ ! -f "$file" ]; then 33.22 - _ 'No file: $file' 33.23 + _ 'No file: %s' "$file" 33.24 continue 33.25 fi 33.26 ext=$(echo ${file##*.} | tr '[A-Z]' '[a-z]') 33.27 @@ -85,9 +85,9 @@ 33.28 wav|mpg|--*) 33.29 # Skip decoded files and --options. 33.30 name="$(basename "$file")" 33.31 - _ 'Skipping file: $name' 33.32 + _ 'Skipping file: %s' "$name" 33.33 continue ;; 33.34 - *) _ 'Unsupported file: $file' ;; 33.35 + *) _ 'Unsupported file: %s' "$file" ;; 33.36 esac 33.37 } 33.38
34.1 --- a/tinyutils/frugal Thu May 14 12:55:55 2015 +0200 34.2 +++ b/tinyutils/frugal Thu Jun 04 17:11:36 2015 +0300 34.3 @@ -20,9 +20,7 @@ 34.4 34.5 # Internationalization 34.6 34.7 -. /usr/bin/gettext.sh 34.8 -TEXTDOMAIN='slitaz-tools' 34.9 -export TEXTDOMAIN 34.10 +export TEXTDOMAIN='slitaz-tools' 34.11 34.12 34.13 # 34.14 @@ -36,20 +34,20 @@ 34.15 name=$(basename $0) 34.16 cat << EOT 34.17 34.18 -$(boldify $(gettext "Usage:")) $name [iso|command] [--options] 34.19 +$(boldify $(_n 'Usage:')) $name [iso|command] [--options] 34.20 34.21 -$(gettext "SliTaz frugal installation") 34.22 +$(_n 'SliTaz frugal installation') 34.23 34.24 -$(boldify $(gettext "Commands:")) 34.25 - info $(gettext "Display install path and size stats") 34.26 - clean $(gettext "Remove all frugal files") 34.27 - grub-ex $(gettext "Show GRUB configuration example") 34.28 +$(boldify $(_n 'Commands:')) 34.29 + info $(_n 'Display install path and size stats') 34.30 + clean $(_n 'Remove all frugal files') 34.31 + grub-ex $(_n 'Show GRUB configuration example') 34.32 34.33 -$(boldify $(gettext "Options:")) 34.34 - --root= $(gettext "Set root installation path") 34.35 - --debug $(gettext "Display some useful debug information") 34.36 +$(boldify $(_n 'Options:')) 34.37 + --root= $(_n 'Set root installation path') 34.38 + --debug $(_n 'Display some useful debug information') 34.39 34.40 -$(boldify $(gettext "Examples:")) 34.41 +$(boldify $(_n 'Examples:')) 34.42 $name slitaz-rolling.iso 34.43 $name slitaz-5.0.iso --root=/boot/frugal 34.44 34.45 @@ -60,7 +58,7 @@ 34.46 # GRUB config example. 34.47 34.48 grub_example() { 34.49 - cat << EOT 34.50 + cat <<EOT 34.51 title SliTaz GNU/Linux (frugal) 34.52 root (hd0,0) 34.53 kernel /boot/frugal/bzImage root=/dev/null lang=en kmap=us 34.54 @@ -76,60 +74,56 @@ 34.55 case "$1" in 34.56 "") usage ;; 34.57 info) 34.58 - newline 34.59 - boldify "Frugal info" 34.60 - separator 34.61 + title 'Frugal info' 34.62 34.63 # First check if we are running in frugal mode 34.64 if fgrep -q 'root=/dev/null' /proc/cmdline; then 34.65 - gettext "Frugal system running detected"; newline 34.66 - separator && newline && exit 0 34.67 + _ 'Frugal system running detected' 34.68 + footer; exit 0 34.69 fi 34.70 - gettext "Installation directory:"; indent 30 $(colorize 36 "$root") 34.71 - gettext "Kernel size:" 34.72 + _n 'Installation directory:'; indent 30 $(colorize 36 "$root") 34.73 + _n 'Kernel size:' 34.74 if [ -f "${root}/bzImage" ]; then 34.75 indent 30 $(du -sh ${root}/bzImage | awk '{print $1}') 34.76 else 34.77 - indent 30 $(boldify "N/A") 34.78 + indent 30 $(boldify 'N/A') 34.79 fi 34.80 - gettext "Rootfs size:" 34.81 + _n 'Rootfs size:' 34.82 if [ -f "${root}/rootfs.gz" ]; then 34.83 indent 30 $(du -sh ${root}/rootfs.gz | awk '{print $1}') 34.84 else 34.85 - indent 30 $(boldify "N/A") 34.86 + indent 30 $(boldify 'N/A') 34.87 fi 34.88 - separator && newline ;; 34.89 + footer ;; 34.90 clean) 34.91 check_root 34.92 - gettext "Cleaning:"; echo " $root" 34.93 + _n 'Cleaning:'; echo " $root" 34.94 rm -rf ${root}/* ;; 34.95 grub-ex) 34.96 - newline 34.97 - boldify "GRUB config example" 34.98 - separator 34.99 + title 'GRUB config example' 34.100 grub_example 34.101 - separator && newline ;; 34.102 + footer ;; 34.103 *) 34.104 iso="$1" 34.105 loop="/tmp/frugal-$$" 34.106 check_root 34.107 - newline 34.108 - boldify "SliTaz Frugal" 34.109 - separator 34.110 + title 'SliTaz Frugal' 34.111 if [ ! -f "$iso" ]; then 34.112 - gettext "Unable to find ISO image:"; colorize 31 " $iso" 34.113 - newline && return 1 34.114 + _n 'Unable to find ISO image:'; colorize 31 " $iso" 34.115 + newline; return 1 34.116 fi 34.117 mkdir -p ${root} 34.118 debug "$iso $root" 34.119 - gettext "Mounting ISO image..." 34.120 + _n 'Mounting ISO image...' 34.121 mkdir -p ${loop} 34.122 mount -o loop "$iso" ${loop} 2>/dev/null 34.123 status 34.124 - gettext "Installing the Kernel..." 34.125 + 34.126 + _n 'Installing the Kernel...' 34.127 cp -a ${loop}/boot/bzImage ${root} 34.128 status 34.129 - gettext "Installing the root filesystem..." 34.130 + 34.131 + _n 'Installing the root filesystem...' 34.132 if [ -f ${loop}/boot/rootfs1.gz ]; then 34.133 cd ${loop}/boot 34.134 cat $(ls -r rootfs*.gz) > ${root}/rootfs.gz 34.135 @@ -140,11 +134,12 @@ 34.136 status 34.137 34.138 # Umount the loop device 34.139 - gettext "Unmounting ISO image..." 34.140 + _n 'Unmounting ISO image...' 34.141 sleep 1 34.142 umount ${loop} && rm -rf ${loop} 34.143 status 34.144 - separator && newline ;; 34.145 + 34.146 + footer ;; 34.147 esac 34.148 34.149 exit 0
35.1 --- a/tinyutils/hwsetup Thu May 14 12:55:55 2015 +0200 35.2 +++ b/tinyutils/hwsetup Thu Jun 04 17:11:36 2015 +0300 35.3 @@ -101,8 +101,8 @@ 35.4 untested() { 35.5 newline; separator 35.6 longline $(_ "Due to a lack of compatible hardware for troubleshooting, \ 35.7 -this \$DEVICE device has not been properly tested. Please report any success, \ 35.8 -failure, bug to SliTaz Bug tracker or Forum.") 35.9 +this %s device has not been properly tested. Please report any success, \ 35.10 +failure, bug to SliTaz Bug tracker or Forum." "$DEVICE") 35.11 separator; newline 35.12 sleep 1 35.13 } 35.14 @@ -110,7 +110,7 @@ 35.15 35.16 failed() { 35.17 newline; separator 35.18 - _ 'Failed to setup $DEVICE' 35.19 + _ 'Failed to setup %s' "$DEVICE" 35.20 separator; newline 35.21 sleep 1 35.22 } 35.23 @@ -122,7 +122,7 @@ 35.24 for pkg in $1 ; do 35.25 # Avoid reinstall 35.26 if [ ! -d "$INSTALLED/$pkg" ]; then 35.27 - _ 'Installing pkg: $pkg' 35.28 + _ 'Installing pkg: %s' "$pkg" 35.29 tazpkg get-install "$pkg" 35.30 if tazpkg list-files "$pkg" | grep -q "/etc/udev" ; then 35.31 UDEV_RULES="yes" 35.32 @@ -138,7 +138,7 @@ 35.33 for pkg in $1 ; do 35.34 # Avoid reinstall 35.35 if [ ! -d "$INSTALLED/$pkg" ]; then 35.36 - _n 'Would you like to install pkg: $pkg'; confirm 35.37 + _n 'Would you like to install pkg: %s' "$pkg"; confirm 35.38 if [ $? == 0 ]; then 35.39 tazpkg get-install "$pkg" --forced 35.40 if tazpkg list-files "$pkg" | grep -q "/etc/udev" ; then 35.41 @@ -156,7 +156,7 @@ 35.42 for grp in $GROUP ; do 35.43 for user in $USERS ; do 35.44 if ! grep -q "$grp.*$user.*" /etc/group ; then 35.45 - _ 'adding $user to $grp' 35.46 + _ 'adding %s to %s' "$user" "$grp" 35.47 addgroup "$user" "$grp" 35.48 fi 35.49 done 35.50 @@ -190,8 +190,8 @@ 35.51 vendor=$(zcat $USB_IDS | grep $vendorid | head -1) 35.52 product=$(zcat $USB_IDS | grep $productid | head -2 | \ 35.53 awk ' { print $1,$2,$3,$4} ' | sed -e :a -e '$!N;s/\n/ ; /;ta') 35.54 - _ " $count) Vendor : $vendor " 35.55 - _ " Product : $product" 35.56 + _ ' %s) Vendor : %s ' "$count" "$vendor" 35.57 + _ ' Product : %s' "$product" 35.58 separator 35.59 count=$(expr $count + 1) 35.60 done 35.61 @@ -202,7 +202,8 @@ 35.62 35.63 35.64 confirm_device() { 35.65 - _ "Which no. is your $DEVICE shown in the above lines (1,2,3,none)? "; read choice 35.66 + _n 'Which no. is your %s shown in the above lines (1,2,3,none)? ' "$DEVICE" 35.67 + read choice 35.68 case "$choice" in 35.69 1|2|3) 35.70 dev=$(echo "$DEVICES_LIST" | head -$choice | tail -1) 35.71 @@ -241,8 +242,8 @@ 35.72 chmod 666 /dev/bus/usb/*$busno/*$deviceno 35.73 chgrp $grp /dev/bus/usb/*$busno/*$deviceno 35.74 newline; separator 35.75 - boldify "$(_ 'Verify $DEVICE Permissions')" 35.76 - _ 'Your $DEVICE must be in $grp group with rw-rw-rw- permissions' 35.77 + boldify "$(_ 'Verify %s Permissions' "$DEVICE")" 35.78 + _ 'Your %s must be in %s group with rw-rw-rw- permissions' "$DEVICE" "$grp" 35.79 ls -l /dev/bus/usb/*$busno/*$deviceno 35.80 separator; newline 35.81 fi 35.82 @@ -344,7 +345,7 @@ 35.83 PASSWORD="passwd" 35.84 PIN="9999" 35.85 [ -n "$MODEM" ] || MODEM="/dev/ttyUSB0" 35.86 - cat > $CONF << EOT 35.87 + cat > $CONF <<EOT 35.88 [Dialer slitaz] 35.89 Phone = $PHONE 35.90 Username = $USERNAME 35.91 @@ -506,8 +507,7 @@ 35.92 else 35.93 newline; separator 35.94 _ 'Camera is set up; please use gphoto2 to import photos' 35.95 - guide_url='http://www.gphoto.org/doc/manual/using-gphoto2.html' 35.96 - _ 'Quick start guide: $guide_url' 35.97 + _ 'Quick start guide: %s' 'http://www.gphoto.org/doc/manual/using-gphoto2.html' 35.98 separator; newline 35.99 fi 35.100 else 35.101 @@ -548,7 +548,7 @@ 35.102 newline 35.103 bt=$(emsg '<b>/etc/bluetooth</b>') 35.104 longline $(_ "You can manually edit the configuration \ 35.105 -files in \$bt if need be") 35.106 +files in %s if need be" "$bt") 35.107 separator; newline 35.108 fi 35.109 else 35.110 @@ -569,7 +569,7 @@ 35.111 newline 35.112 bt=$(emsg '<b>/etc/bluetooth</b>') 35.113 longline $(_ "You can manually edit the configuration files \ 35.114 -in \$bt if need be") 35.115 +in %s if need be" "$bt") 35.116 newline; separator 35.117 fi 35.118 ;; 35.119 @@ -591,11 +591,9 @@ 35.120 else 35.121 #nameserver `tail -30 /var/log/messages| grep DNS| sed 's/*\([.0-9]*\)$/\1/'` >/etc/resolv.conf 35.122 newline; separator 35.123 - wc=$(boldify '/etc/wvdial.conf') 35.124 - rc=$(boldify '/etc/resolv.conf') 35.125 optlist "\ 35.126 -wvdialconf $(_ 'Edit $wc for phone number, login name, password and pin') 35.127 -wvdial $(_ 'Add DNS address of your provider in $rc')" 35.128 +wvdialconf $(_ 'Edit %s for phone number, login name, password and pin' "$(boldify '/etc/wvdial.conf')") 35.129 +wvdial $(_ 'Add DNS address of your provider in %s' "$(boldify '/etc/resolv.conf')")" 35.130 separator 35.131 fi 35.132 else 35.133 @@ -613,11 +611,11 @@ 35.134 /etc/init.d/firewall start 35.135 if [ -d $INSTALLED/nmap ]; then 35.136 separator 35.137 - _ "Probing for open ports..." 35.138 + _ 'Probing for open ports...' 35.139 nmap localhost 35.140 separator 35.141 fi 35.142 - _ "Adding firewall daemon to start automatically at boot" 35.143 + _ 'Adding firewall daemon to start automatically at boot' 35.144 run_daemon_startup "firewall" 35.145 separator 35.146 fi 35.147 @@ -637,8 +635,8 @@ 35.148 _n 'Do you want to configure X using non-free nvidia driver'; confirm 35.149 if [ $? == 0 ]; then 35.150 newline 35.151 - _ 'Your previous config is in $xorg60' 35.152 - _ 'If nvidia fails, you can remove $xorg55 to restore previous config.' 35.153 + _ 'Your previous config is in %s' "$xorg60" 35.154 + _ 'If nvidia fails, you can remove %s to restore previous config.' "$xorg55" 35.155 Xorg -configure :1 > /dev/null 35.156 nvidia-xconfig -c /root/xorg.conf.new -o /tmp/xorg.conf.nvidia 35.157 sed -e '/Section "Device"/,/EndSection/!d' -e "s/EndSection/EndSection\n/" /tmp/xorg.conf.nvidia > $xorg55 35.158 @@ -660,7 +658,7 @@ 35.159 else 35.160 newline; separator 35.161 xcmd='Xorg -configure :1 && nvidia-xconfig -c /root/xorg.conf.new -o /tmp/xorg.conf.nvidia' 35.162 - _ "Use '$xcmd' to generate a template configuration file." 35.163 + _ "Use '%s' to generate a template configuration file." "$xcmd" 35.164 echo 'glxinfo | grep rendering #' $(_n 'test nvidia') 35.165 _ 'Use: nvidia-settings utility to configure your settings if necessary' 35.166 echo 'Option "NoLogo" "True"' 35.167 @@ -676,10 +674,10 @@ 35.168 _n 'Do you want to configure X using free nvidia driver'; confirm 35.169 if [ $? == 0 ]; then 35.170 newline; separator 35.171 - _ 'Your previous config is in $xorg60' 35.172 - _ 'If nvidia fails, you can remove $xorg55 to restore previous config.' 35.173 + _ 'Your previous config is in %s' "$xorg60" 35.174 + _ 'If nvidia fails, you can remove %s to restore previous config.' "$xorg55" 35.175 newline 35.176 - _ 'Create $xorg55short configured with nv driver.' 35.177 + _ 'Create %s configured with nv driver.' "$xorg55short" 35.178 35.179 # free nvidia driver is called nv 35.180 cp -a $xorg60 $xorg55 35.181 @@ -708,8 +706,8 @@ 35.182 _n 'Do you want to configure X using non-free catalyst ATI (radeon) driver'; confirm 35.183 if [ $? == 0 ]; then 35.184 newline 35.185 - _ 'Your previous config is in $xorg60' 35.186 - _ 'If ati fails, you can remove $xorg55 to restore previous config.' 35.187 + _ 'Your previous config is in %s' "$xorg60" 35.188 + _ 'If ati fails, you can remove %s to restore previous config.' "$xorg55" 35.189 35.190 # add fglrx driver to xorg.conf 35.191 Xorg -configure :1 > /dev/null 35.192 @@ -741,10 +739,10 @@ 35.193 _n 'Do you want to configure X using free ATI (radeon) driver'; confirm 35.194 if [ $? == 0 ]; then 35.195 newline; separator 35.196 - _ 'Your previous config is in $xorg60' 35.197 - _ 'If ATI fails, you can remove $xorg55 to restore previous config.' 35.198 + _ 'Your previous config is in %s' "$xorg60" 35.199 + _ 'If ATI fails, you can remove %s to restore previous config.' "$xorg55" 35.200 newline 35.201 - _ 'Create $xorg55short configured with radeon driver.' 35.202 + _ 'Create %s configured with radeon driver.' "$xorg55short" 35.203 35.204 # free ati driver is called radeon 35.205 cp -a /etc/X11/xorg.conf.d/60-Device.conf /etc/X11/xorg.conf.d/55-DeviceTweaks.conf 35.206 @@ -787,7 +785,7 @@ 35.207 35.208 device 35.209 #untested 35.210 - if [ ! "$NON_FREE_DEPENDS" == "" -a "$NON_FREE" == "yes" ]; then 35.211 + if [ -n "$NON_FREE_DEPENDS" -a "$NON_FREE" == "yes" ]; then 35.212 DEPENDS="$NON_FREE_DEPENDS" 35.213 fi 35.214
36.1 --- a/tinyutils/setmixer Thu May 14 12:55:55 2015 +0200 36.2 +++ b/tinyutils/setmixer Thu Jun 04 17:11:36 2015 +0300 36.3 @@ -7,12 +7,11 @@ 36.4 36.5 # Internationalization 36.6 36.7 -. /usr/bin/gettext.sh 36.8 -TEXTDOMAIN='slitaz-tools' 36.9 -export TEXTDOMAIN 36.10 +. /lib/libtaz.sh 36.11 +export TEXTDOMAIN='slitaz-tools' 36.12 36.13 36.14 -gettext "Setting default mixer volumes... " 36.15 +_n 'Setting default mixer volumes... ' 36.16 36.17 amixer -s -q <<EOF 36.18 set Master 75% unmute 36.19 @@ -61,7 +60,7 @@ 36.20 set "Audigy Analog/Digital Output Jack" off 36.21 EOF 36.22 36.23 -gettext "Done"; echo 36.24 +status 36.25 36.26 # Store config 36.27 alsactl store
37.1 --- a/tinyutils/slitaz-config Thu May 14 12:55:55 2015 +0200 37.2 +++ b/tinyutils/slitaz-config Thu Jun 04 17:11:36 2015 +0300 37.3 @@ -13,11 +13,11 @@ 37.4 check_root 37.5 37.6 title="{ $(_ 'SliTaz Config') }" 37.7 -about="/usr/share/doc/slitaz/post-install.txt" 37.8 +about='/usr/share/doc/slitaz/post-install.txt' 37.9 tmpdir="/tmp/$(basename $0)" 37.10 tmp="$tmpdir/$$" 37.11 -height="20" 37.12 -width="72" 37.13 +height='20' 37.14 +width='72' 37.15 37.16 37.17 # Use a tmp directory 37.18 @@ -48,7 +48,7 @@ 37.19 37.20 root_passwd() { 37.21 dialog --title "{ $(_ 'Root Password') }" --colors \ 37.22 - --inputbox "\n$(_ 'Enter new password for \Zb\Z1root')" \ 37.23 + --inputbox "\n$(_ 'Enter new password for %s' '\Zb\Z1root')" \ 37.24 12 $width 2>$tmp 37.25 passwd=$(cat $tmp) 37.26 [ -z "$passwd" ] && return 0 37.27 @@ -67,7 +67,7 @@ 37.28 [ -z "$user" ] && return 0 37.29 37.30 dialog --title "$title2" --colors \ 37.31 - --inputbox "\n$(_ 'Enter password for user \Zb\Z4$user')" 12 $width 2>$tmp 37.32 + --inputbox "\n$(_ 'Enter password for user \Zb\Z4%s' "$user")" 12 $width 2>$tmp 37.33 passwd=$(cat $tmp) 37.34 [ -z "$passwd" ] && return 0 37.35 37.36 @@ -190,7 +190,7 @@ 37.37 [ -z "$essid" ] && exit 0 37.38 37.39 dialog --title "{ $(_ 'Wi-Fi Password') }" --colors \ 37.40 - --inputbox "\n$(_ 'Enter Wi-Fi key (password) for \Zb\Z4$essid')" \ 37.41 + --inputbox "\n$(_ 'Enter Wi-Fi key (password) for \Zb\Z4%s' "$essid")" \ 37.42 12 $width 2>$tmp 37.43 key=$(cat $tmp) 37.44 else 37.45 @@ -201,7 +201,7 @@ 37.46 37.47 if [ "$key" == "on" ]; then 37.48 dialog --title "{ $(_ 'Wi-Fi Password') }" --colors \ 37.49 - --inputbox "\n$(_ 'Enter Wi-Fi key (password) for \Zb\Z4$essid')" \ 37.50 + --inputbox "\n$(_ 'Enter Wi-Fi key (password) for \Zb\Z4%s' "$essid")" \ 37.51 12 $width 2>$tmp 37.52 key=$(cat $tmp) 37.53 [ -z "$key" ] && exit 0 37.54 @@ -214,7 +214,7 @@ 37.55 msg 0; stopd network.sh >/dev/null 2>&1 37.56 msg 10 37.57 37.58 - MSG="\n$(_ 'Configuring: /etc/network.conf...')" 37.59 + MSG="\n$(_ 'Configuring: %s...' '/etc/network.conf')" 37.60 msg 20 37.61 # WIFI_KEY_TYPE=any should work for WEP/WPA* 37.62 sed -i \ 37.63 @@ -232,8 +232,8 @@ 37.64 msg 90; sleep 2 37.65 ip="$(ifconfig $WIFI_INTERFACE | fgrep 'inet addr' | sed 's|.*:\([^ ]*\) .*|\1|')" 37.66 37.67 - if [ "$ip" ]; then 37.68 - MSG="\n$(_ 'IP address: $ip')" 37.69 + if [ -n "$ip" ]; then 37.70 + MSG="\n$(_ 'IP address: %s' "$ip")" 37.71 else 37.72 MSG="\n$(_ 'Unable to connect...')" 37.73 fi
38.1 --- a/tinyutils/startd Thu May 14 12:55:55 2015 +0200 38.2 +++ b/tinyutils/startd Thu Jun 04 17:11:36 2015 +0300 38.3 @@ -6,7 +6,7 @@ 38.4 . /lib/libtaz.sh 38.5 check_root 38.6 38.7 -[ ! "$1" ] && echo "Usage: startd [daemon]" && exit 0 38.8 +[ -z "$1" ] && echo "Usage: startd [daemon]" && exit 0 38.9 38.10 if [ -x /etc/init.d/$1 ]; then 38.11 /etc/init.d/$1 start
39.1 --- a/tinyutils/stopd Thu May 14 12:55:55 2015 +0200 39.2 +++ b/tinyutils/stopd Thu Jun 04 17:11:36 2015 +0300 39.3 @@ -6,7 +6,7 @@ 39.4 . /lib/libtaz.sh 39.5 check_root 39.6 39.7 -[ ! "$1" ] && echo "Usage: stopd [daemon]" && exit 0 39.8 +[ -z "$1" ] && echo "Usage: stopd [daemon]" && exit 0 39.9 39.10 if [ -x /etc/init.d/$1 ]; then 39.11 /etc/init.d/$1 stop
40.1 --- a/tinyutils/tazhw Thu May 14 12:55:55 2015 +0200 40.2 +++ b/tinyutils/tazhw Thu Jun 04 17:11:36 2015 +0300 40.3 @@ -54,7 +54,7 @@ 40.4 _ '* No active connection to get and install firmware.' 40.5 fi 40.6 else 40.7 - _ '> Firmware in use: $mod-firmware' 40.8 + _ '> Firmware in use: %s' "$mod-firmware" 40.9 fi 40.10 fi 40.11 } 40.12 @@ -65,21 +65,21 @@ 40.13 # Check if builtin, loaded or missing 40.14 if modprobe $mod 2>/dev/null; then 40.15 if zcat /proc/config.gz | fgrep -i $mod | fgrep -q '=y'; then 40.16 - _ '* Builtin module : $mod' 40.17 + _ '* Builtin module : %s' "$mod" 40.18 unset mod 40.19 else 40.20 - _ "* Loaded module : $mod" 40.21 + _ '* Loaded module : %s' "$mod" 40.22 fi 40.23 else 40.24 if zcat /proc/config.gz | fgrep -i $mod | fgrep -q '=y'; then 40.25 - _ '* Builtin module : $mod' 40.26 + _ '* Builtin module : %s' "$mod" 40.27 unset mod 40.28 else 40.29 - _ '! Missing module : $mod' 40.30 + _ '! Missing module : %s' "$mod" 40.31 fi 40.32 fi 40.33 else 40.34 - _ '> Module in use : $mod' 40.35 + _ '> Module in use : %s' "$mod" 40.36 fi 40.37 # Add it to load automatically at next boot. 40.38 if ! echo "$LOAD_MODULES" | grep -q "$mod"; then 40.39 @@ -111,7 +111,7 @@ 40.40 if [ ! -s /var/lib/detected-modules ]; then 40.41 . /etc/rcS.conf 40.42 # We need module_name to match output of lsmod. 40.43 - list=$(lspci -k | grep "driver" | cut -d ":" -f 2 | module_name) 40.44 + list=$(lspci -k | grep 'driver' | cut -d: -f2 | module_name) 40.45 echo "$list" > /var/lib/detected-modules 40.46 for mod in $(sort < /var/lib/detected-modules | uniq) 40.47 do 40.48 @@ -159,25 +159,25 @@ 40.49 detect_usb_devices ;; 40.50 -dp|detect-pci) 40.51 check_root 40.52 - newline; _ 'Detected PCI devices Kernel modules'; separator 40.53 + title 'Detected PCI devices Kernel modules' 40.54 rm -f /var/lib/detected-modules 40.55 detect_pci_devices 40.56 - separator; newline ;; 40.57 + footer ;; 40.58 -du|detect-usb) 40.59 check_root 40.60 - newline; _ 'Detected USB devices Kernel modules'; separator 40.61 + title 'Detected USB devices Kernel modules' 40.62 rm -f /var/lib/detected-usb-modules 40.63 detect_usb_devices 40.64 - separator; newline ;; 40.65 + footer ;; 40.66 -s|setup) 40.67 SETUP_OPTIONS=$(echo "$@" | sed 's/setup//') 40.68 check_root 40.69 hwsetup $SETUP_OPTIONS ;; 40.70 -dm|detected-modules) 40.71 - newline; _ 'Detected PCI and USB modules'; separator 40.72 + title 'Detected PCI and USB modules' 40.73 cat /var/lib/detected-modules 40.74 cat /var/lib/detected-usb-modules 2>/dev/null 40.75 - separator; newline ;; 40.76 + footer ;; 40.77 *) 40.78 usage ;; 40.79 esac
41.1 --- a/tinyutils/tazkeymap Thu May 14 12:55:55 2015 +0200 41.2 +++ b/tinyutils/tazkeymap Thu Jun 04 17:11:36 2015 +0300 41.3 @@ -46,8 +46,8 @@ 41.4 41.5 case "$1" in 41.6 info) 41.7 - _n 'Config file:'; echo " /etc/keymap.conf" 41.8 - _n 'Current keymap:'; echo " $(cat /etc/keymap.conf)" ;; 41.9 + _ 'Config file: %s' '/etc/keymap.conf' 41.10 + _ 'Current keymap: %s' "$(cat /etc/keymap.conf)" ;; 41.11 list) 41.12 list_keymaps | sort ;; 41.13 "")
42.1 --- a/tinyutils/tazlocale Thu May 14 12:55:55 2015 +0200 42.2 +++ b/tinyutils/tazlocale Thu Jun 04 17:11:36 2015 +0300 42.3 @@ -58,7 +58,7 @@ 42.4 link_language_files() { 42.5 . /etc/locale.conf 42.6 LANGUAGE=${LANG%_*} 42.7 - [ "$LANG" == "POSIX" ] && LANGUAGE="en" 42.8 + [ "$LANG" == 'POSIX' ] && LANGUAGE='en' 42.9 42.10 # Openbox menu 42.11 make_i18n_link /etc/xdg/openbox/menu.%%.xml 42.12 @@ -110,7 +110,7 @@ 42.13 42.14 system_config() { 42.15 export LC_ALL=$locale 42.16 - _n "Setting system locale to: $locale" 42.17 + _n 'Setting system locale to: %s' "$locale" 42.18 echo -e "LANG=$locale\nLC_ALL=$locale" > /etc/locale.conf 42.19 status 42.20 gen_utf8_locale 42.21 @@ -135,9 +135,9 @@ 42.22 1|255) exit 0 ;; 42.23 esac 42.24 42.25 - # Default: POSIX = English 42.26 - [ "$locale" = "en" ] && locale="en_US" 42.27 - [ -s /etc/locale.conf ] && RECONFIG="yes" 42.28 + # Default: POSIX => English 42.29 + [ "$locale" = 'en' ] && locale='en_US' 42.30 + [ -s /etc/locale.conf ] && RECONFIG='yes' 42.31 42.32 # If it's a reconfiguration give an info message. 42.33 if [ -n "$RECONFIG" ]; then 42.34 @@ -153,9 +153,8 @@ 42.35 --help|-h) 42.36 usage ;; 42.37 info) 42.38 - optlist "\ 42.39 -$(_ 'Config file:') /etc/locale.conf 42.40 -$(_ 'Current locale:') $LANG" 42.41 + _ 'Config file: %s' '/etc/locale.conf' 42.42 + _ 'Current locale: %s' "$LANG" 42.43 ;; 42.44 list) 42.45 list=
43.1 --- a/tinyutils/tazx Thu May 14 12:55:55 2015 +0200 43.2 +++ b/tinyutils/tazx Thu Jun 04 17:11:36 2015 +0300 43.3 @@ -284,7 +284,7 @@ 43.4 43.5 inst_pkg() { 43.6 pkg="$@" 43.7 - colorize 3 $(_ 'Installing pkg: $pkg') 43.8 + colorize 3 $(_ 'Installing pkg: %s' "$pkg") 43.9 43.10 case $(id -u) in 43.11 0) CMD="tazpkg -gi $@" ;; 43.12 @@ -318,8 +318,8 @@ 43.13 app_name_dialog only-installed ;; 43.14 esac 43.15 43.16 - if [ $appname != " " ]; then 43.17 - if [ $appname = show_ALL ]; then 43.18 + if [ "$appname" != " " ]; then 43.19 + if [ "$appname" == 'show_ALL' ]; then 43.20 app_name_dialog full-list 43.21 inst_pkg $appname 43.22 fi 43.23 @@ -338,8 +338,8 @@ 43.24 43.25 app_name_dialog() { 43.26 case $1 in 43.27 - full-list) height=24 ;; 43.28 - *) height=18 ;; 43.29 + full-list) height='24' ;; 43.30 + *) height='18' ;; 43.31 esac 43.32 43.33 exec 3>&1 43.34 @@ -363,7 +363,8 @@ 43.35 spacefm thunar xfe ytree" 43.36 43.37 BROWSERS="arora chrome cream dillo elinks firefox firefox-official iron \ 43.38 -links lynx midori netsurf opera QtWeb qupzilla retawq seamonkey surf tazweb w3m xombrero" 43.39 +links lynx midori netsurf opera QtWeb qupzilla retawq seamonkey surf tazweb \ 43.40 +w3m xombrero" 43.41 43.42 EDITORS="adie beaver bluefish emacs geany jed joe juffed ht le leafpad \ 43.43 mcedit mousepad mp-5 nano qedit SciTE tea vi vim xedit xfw zile" 43.44 @@ -475,9 +476,9 @@ 43.45 43.46 [ -f $apps_conf ] || inst_pkg slitaz-configs --forced 43.47 43.48 - if [ "$(id -u)" = 0 ]; then 43.49 - user_conf=$apps_conf 43.50 - new_user_conf="/etc/skel/.config/slitaz/applications.conf" 43.51 + if [ "$(id -u)" -eq 0 ]; then 43.52 + user_conf="$apps_conf" 43.53 + new_user_conf='/etc/skel/.config/slitaz/applications.conf' 43.54 mkdir -p $(dirname $new_user_conf) 43.55 cp -f $apps_conf $new_user_conf 43.56 else
44.1 --- a/tinyutils/terminal Thu May 14 12:55:55 2015 +0200 44.2 +++ b/tinyutils/terminal Thu Jun 04 17:11:36 2015 +0300 44.3 @@ -13,13 +13,13 @@ 44.4 $(boldify $(_n 'Recognized options:')) 44.5 -v -version --version $(_n 'Print the version number') 44.6 -help --help $(_n 'Print out this message') 44.7 - -geometry --geometry $(_n 'Width and height of terminal window ($GEOMETRY)') 44.8 --t -title -T --title $(_n 'Title name for window ("$TITLE")') 44.9 + -geometry --geometry $(_n 'Width and height of terminal window (%s)' "$GEOMETRY") 44.10 +-t -title -T --title $(_n 'Title name for window ("%s")' "$TITLE") 44.11 -h -hold $(_n "Don't close terminal after command finished") 44.12 -e --xterm-execute $(_n 'Command to execute (must be last in line)') 44.13 44.14 44.15 -$(boldify $(_n 'Help for $TERMINAL:')) 44.16 +$(boldify $(_n 'Help for %s:' "$TERMINAL")) 44.17 44.18 EOT 44.19 $TERMINAL $OPT_HELP 44.20 @@ -29,16 +29,16 @@ 44.21 USER_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/slitaz/applications.conf" 44.22 [ -f $USER_CONFIG ] && . $USER_CONFIG 44.23 44.24 -local PARAMS="" GEOMETRY="80x24" TITLE="SliTaz $(cat /etc/slitaz-release)" COMMAND 44.25 +local PARAMS='' GEOMETRY='80x24' TITLE="SliTaz $(cat /etc/slitaz-release)" COMMAND 44.26 44.27 case $TERMINAL in 44.28 sakura) 44.29 - OPT_TITLE="-t"; OPT_GEOM="--geometry"; OPT_HELP="-?"; OPT_HOLD="-h";; 44.30 + OPT_TITLE='-t'; OPT_GEOM='--geometry'; OPT_HELP='-?'; OPT_HOLD='-h';; 44.31 xterm|*) 44.32 - OPT_TITLE="-T"; OPT_GEOM="-geometry"; OPT_HELP="-help"; OPT_HOLD="-hold";; 44.33 + OPT_TITLE='-T'; OPT_GEOM='-geometry'; OPT_HELP='-help'; OPT_HOLD='-hold';; 44.34 esac 44.35 44.36 -until [ $# == 0 ]; do 44.37 +until [ $# -eq 0 ]; do 44.38 PARAM="$1" 44.39 case "$PARAM" in 44.40 -version|--version|-v) $TERMINAL -v; exit 0;;