slitaz-tools rev 926 5.8.14
slitaz-config: connect to hidden Wi-Fi; browser, editor, file-manager, terminal: use XDG variable if possible; tazx: code simplification and many small improvements; translations: make pot, msgmerge.
line diff
1.1 --- a/Makefile Sat Nov 15 06:45:42 2014 +0200 1.2 +++ b/Makefile Thu Nov 20 06:04:24 2014 +0200 1.3 @@ -23,7 +23,7 @@ 1.4 --package-name="SliTaz Tools" \ 1.5 ./tinyutils/tazlocale ./tinyutils/tazkeymap ./tinyutils/setmixer \ 1.6 ./tinyutils/tazx ./tinyutils/decode ./tinyutils/terminal \ 1.7 - ./tinyutils/hwsetup ./tinyutils/frugal 1.8 + ./tinyutils/hwsetup ./tinyutils/frugal ./tinyutils/slitaz-config 1.9 @echo "done" 1.10 1.11 boxes-pot:
2.1 --- a/po/slitaz-boxes/slitaz-boxes.pot Sat Nov 15 06:45:42 2014 +0200 2.2 +++ b/po/slitaz-boxes/slitaz-boxes.pot Thu Nov 20 06:04:24 2014 +0200 2.3 @@ -8,7 +8,7 @@ 2.4 msgstr "" 2.5 "Project-Id-Version: SliTaz Boxes\n" 2.6 "Report-Msgid-Bugs-To: \n" 2.7 -"POT-Creation-Date: 2014-05-23 03:33+0300\n" 2.8 +"POT-Creation-Date: 2014-11-20 05:38+0200\n" 2.9 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 2.10 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 2.11 "Language-Team: LANGUAGE <LL@li.org>\n"
3.1 --- a/po/slitaz-tools/el.po Sat Nov 15 06:45:42 2014 +0200 3.2 +++ b/po/slitaz-tools/el.po Thu Nov 20 06:04:24 2014 +0200 3.3 @@ -6,7 +6,7 @@ 3.4 msgstr "" 3.5 "Project-Id-Version: SliTaz Tools\n" 3.6 "Report-Msgid-Bugs-To: \n" 3.7 -"POT-Creation-Date: 2014-11-14 21:22+0000\n" 3.8 +"POT-Creation-Date: 2014-11-20 05:20+0200\n" 3.9 "PO-Revision-Date: 2012-12-18 22:06+0300\n" 3.10 "Last-Translator: Constantine Mousafiris <kvisitor@gnugr.org>\n" 3.11 "Language-Team: Kostis Mousafiris\n" 3.12 @@ -21,8 +21,8 @@ 3.13 msgid "SliTaz GNU/Linux locale setting using dialog boxes." 3.14 msgstr "" 3.15 3.16 -#: tinyutils/tazlocale:17 tinyutils/decode:30 tinyutils/hwsetup:24 3.17 -#: tinyutils/frugal:32 3.18 +#: tinyutils/tazlocale:17 tinyutils/tazx:553 tinyutils/decode:30 3.19 +#: tinyutils/hwsetup:24 tinyutils/frugal:32 3.20 msgid "Usage:" 3.21 msgstr "Χρήση:" 3.22 3.23 @@ -98,75 +98,131 @@ 3.24 msgid "Done" 3.25 msgstr "Ολοκληρώθηκε" 3.26 3.27 -#: tinyutils/tazx:26 3.28 -msgid "Window Manager:" 3.29 -msgstr "Διαχειριστής παραθύρων:" 3.30 +#: tinyutils/tazx:141 3.31 +msgid "Creating:" 3.32 +msgstr "" 3.33 3.34 -#: tinyutils/tazx:27 tinyutils/tazx:152 3.35 +#: tinyutils/tazx:242 3.36 msgid "Install Xorg" 3.37 msgstr "Εγκατάσταση του Xorg" 3.38 3.39 -#: tinyutils/tazx:63 3.40 -msgid "Creating:" 3.41 -msgstr "" 3.42 - 3.43 -#: tinyutils/tazx:153 3.44 +#: tinyutils/tazx:243 3.45 msgid "Tazx helps you to select your X driver." 3.46 msgstr "Ο Tazx σας βοηθά να επιλέξετε τον οδηγό (driver) για το Χ." 3.47 3.48 -#: tinyutils/tazx:154 tinyutils/hwsetup:258 3.49 -msgid "Auto configuring Xorg..." 3.50 -msgstr "" 3.51 +#: tinyutils/tazx:244 3.52 +#, fuzzy 3.53 +msgid "Auto configuring" 3.54 +msgstr "Αρχείο ρυθμίσεων:" 3.55 3.56 -#: tinyutils/tazx:156 tinyutils/tazx:184 3.57 +#: tinyutils/tazx:246 3.58 msgid "driver" 3.59 msgstr "" 3.60 3.61 -#: tinyutils/tazx:157 3.62 +#: tinyutils/tazx:247 tinyutils/slitaz-config:233 3.63 msgid "Quit" 3.64 msgstr "" 3.65 3.66 -#: tinyutils/tazx:186 tinyutils/hwsetup:107 3.67 -#, sh-format 3.68 -msgid "Failed to setup $DEVICE" 3.69 +#: tinyutils/tazx:276 3.70 +msgid "Failed to setup driver" 3.71 msgstr "" 3.72 3.73 -#: tinyutils/tazx:192 tinyutils/hwsetup:117 3.74 +#: tinyutils/tazx:276 3.75 +msgid "(unknown hardware)" 3.76 +msgstr "" 3.77 + 3.78 +#: tinyutils/tazx:289 tinyutils/hwsetup:117 3.79 #, sh-format 3.80 msgid "Installing pkg: $pkg" 3.81 msgstr "" 3.82 3.83 -#: tinyutils/tazx:202 tinyutils/tazx:276 3.84 -#, sh-format 3.85 -msgid "${INST_i18n}: ${WM_i18n} + applications" 3.86 +#: tinyutils/tazx:307 tinyutils/tazx:423 3.87 +msgid "Install Window Manager and applications" 3.88 msgstr "" 3.89 3.90 -#: tinyutils/tazx:270 3.91 +#: tinyutils/tazx:393 tinyutils/tazx:399 3.92 +#, fuzzy 3.93 +msgid "Install" 3.94 +msgstr "Εγκατάσταση του Xorg" 3.95 + 3.96 +#: tinyutils/tazx:409 3.97 +msgid "ON" 3.98 +msgstr "" 3.99 + 3.100 +#: tinyutils/tazx:410 tinyutils/tazx:441 3.101 +msgid "OFF" 3.102 +msgstr "" 3.103 + 3.104 +#: tinyutils/tazx:417 3.105 #, fuzzy 3.106 msgid "SliTaz Xorg config" 3.107 msgstr "Ρύθμιση γλώσσας του SliTaz" 3.108 3.109 -#: tinyutils/tazx:272 3.110 +#: tinyutils/tazx:419 3.111 msgid "Install or reconfigure Xorg" 3.112 msgstr "Εγκατάσταση ή επαναρύθμιση του X org" 3.113 3.114 -#: tinyutils/tazx:273 3.115 +#: tinyutils/tazx:420 3.116 msgid "Install Xorg server (light version)" 3.117 msgstr "" 3.118 3.119 -#: tinyutils/tazx:274 3.120 +#: tinyutils/tazx:421 3.121 msgid "AutoStart Xorg by SLiM on boot" 3.122 msgstr "" 3.123 3.124 -#: tinyutils/tazx:275 3.125 +#: tinyutils/tazx:422 3.126 msgid "(Re)Start Simple Login Manager now" 3.127 msgstr "" 3.128 3.129 -#: tinyutils/tazx:277 3.130 +#: tinyutils/tazx:424 3.131 msgid "Quit Tazx utility" 3.132 msgstr "Κλείστε το βοηθητικό πρόγραμμα Tazx" 3.133 3.134 -#: tinyutils/tazx:384 3.135 +#: tinyutils/tazx:449 3.136 +msgid "Start X on boot:" 3.137 +msgstr "" 3.138 + 3.139 +#: tinyutils/tazx:551 3.140 +msgid "configuration tool for SliTaz GNU/Linux" 3.141 +msgstr "" 3.142 + 3.143 +#: tinyutils/tazx:553 tinyutils/hwsetup:25 3.144 +msgid "command" 3.145 +msgstr "" 3.146 + 3.147 +#: tinyutils/tazx:553 3.148 +msgid "parameter" 3.149 +msgstr "" 3.150 + 3.151 +#: tinyutils/tazx:555 tinyutils/hwsetup:27 tinyutils/frugal:36 3.152 +msgid "Commands:" 3.153 +msgstr "" 3.154 + 3.155 +#: tinyutils/tazx:556 3.156 +msgid "Install Xorg and selected Xorg driver" 3.157 +msgstr "" 3.158 + 3.159 +#: tinyutils/tazx:557 3.160 +msgid "Configure Xorg, generate configuration files" 3.161 +msgstr "" 3.162 + 3.163 +#: tinyutils/tazx:558 3.164 +msgid "Set monitor default depth (valid parameters: 8, 15, 16 or 24)" 3.165 +msgstr "" 3.166 + 3.167 +#: tinyutils/tazx:559 3.168 +msgid "Auto-select and install Xorg driver" 3.169 +msgstr "" 3.170 + 3.171 +#: tinyutils/tazx:560 3.172 +msgid "Get files for starting an X session and config the keyboard" 3.173 +msgstr "" 3.174 + 3.175 +#: tinyutils/tazx:561 3.176 +msgid "Generate or regenerate Xorg keyboard config" 3.177 +msgstr "" 3.178 + 3.179 +#: tinyutils/tazx:572 3.180 msgid "Run tazx as root if you need to configure xorg" 3.181 msgstr "" 3.182 3.183 @@ -258,14 +314,6 @@ 3.184 msgid "SliTaz Setup configuration" 3.185 msgstr "" 3.186 3.187 -#: tinyutils/hwsetup:25 3.188 -msgid "command" 3.189 -msgstr "" 3.190 - 3.191 -#: tinyutils/hwsetup:27 tinyutils/frugal:36 3.192 -msgid "Commands:" 3.193 -msgstr "" 3.194 - 3.195 #: tinyutils/hwsetup:29 3.196 msgid "Print this short usage." 3.197 msgstr "" 3.198 @@ -326,6 +374,11 @@ 3.199 "to SliTaz Bug tracker or Forum." 3.200 msgstr "" 3.201 3.202 +#: tinyutils/hwsetup:107 3.203 +#, sh-format 3.204 +msgid "Failed to setup $DEVICE" 3.205 +msgstr "" 3.206 + 3.207 #: tinyutils/hwsetup:131 3.208 #, sh-format 3.209 msgid "Would you like to install pkg: $pkg" 3.210 @@ -358,6 +411,10 @@ 3.211 msgid "New udev rules are added by a package" 3.212 msgstr "" 3.213 3.214 +#: tinyutils/hwsetup:258 3.215 +msgid "Auto configuring Xorg..." 3.216 +msgstr "" 3.217 + 3.218 #: tinyutils/hwsetup:261 3.219 msgid "Configuring Xorg..." 3.220 msgstr "" 3.221 @@ -702,6 +759,155 @@ 3.222 msgid "Unmounting ISO image..." 3.223 msgstr "" 3.224 3.225 +#: tinyutils/slitaz-config:14 3.226 +#, fuzzy 3.227 +msgid "SliTaz Config" 3.228 +msgstr "Ρύθμιση γλώσσας του SliTaz" 3.229 + 3.230 +#: tinyutils/slitaz-config:36 3.231 +msgid "Post Installation" 3.232 +msgstr "" 3.233 + 3.234 +#: tinyutils/slitaz-config:37 3.235 +msgid "Continue" 3.236 +msgstr "" 3.237 + 3.238 +#: tinyutils/slitaz-config:43 3.239 +msgid "Root Password" 3.240 +msgstr "" 3.241 + 3.242 +#: tinyutils/slitaz-config:44 3.243 +msgid "Enter new password for \\Zb\\Z1root" 3.244 +msgstr "" 3.245 + 3.246 +#: tinyutils/slitaz-config:53 3.247 +msgid "Add User" 3.248 +msgstr "" 3.249 + 3.250 +#: tinyutils/slitaz-config:56 3.251 +msgid "Enter login name for the new \\Zb\\Z4user" 3.252 +msgstr "" 3.253 + 3.254 +#: tinyutils/slitaz-config:61 3.255 +#, sh-format 3.256 +msgid "Enter password for user \\Zb\\Z4$user" 3.257 +msgstr "" 3.258 + 3.259 +#: tinyutils/slitaz-config:121 3.260 +msgid "connected" 3.261 +msgstr "" 3.262 + 3.263 +#: tinyutils/slitaz-config:136 3.264 +msgid "Quality" 3.265 +msgstr "" 3.266 + 3.267 +#: tinyutils/slitaz-config:136 3.268 +msgid "Key" 3.269 +msgstr "" 3.270 + 3.271 +#: tinyutils/slitaz-config:140 tinyutils/slitaz-config:169 3.272 +msgid "hidden.network" 3.273 +msgstr "" 3.274 + 3.275 +#: tinyutils/slitaz-config:140 3.276 +msgid "Connect.to.a.hidden.network" 3.277 +msgstr "" 3.278 + 3.279 +#: tinyutils/slitaz-config:156 3.280 +msgid "Select" 3.281 +msgstr "" 3.282 + 3.283 +#: tinyutils/slitaz-config:157 3.284 +msgid "Connect to a Wi-Fi network" 3.285 +msgstr "" 3.286 + 3.287 +#: tinyutils/slitaz-config:159 3.288 +msgid "Connect.to.any.network" 3.289 +msgstr "" 3.290 + 3.291 +#: tinyutils/slitaz-config:170 3.292 +msgid "Wi-Fi ESSID" 3.293 +msgstr "" 3.294 + 3.295 +#: tinyutils/slitaz-config:171 3.296 +msgid "Enter Wi-Fi access point ESSID (name)" 3.297 +msgstr "" 3.298 + 3.299 +#: tinyutils/slitaz-config:176 tinyutils/slitaz-config:187 3.300 +msgid "Wi-Fi Password" 3.301 +msgstr "" 3.302 + 3.303 +#: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 3.304 +#, sh-format 3.305 +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" 3.306 +msgstr "" 3.307 + 3.308 +#: tinyutils/slitaz-config:197 3.309 +msgid "Shutting down network interfaces..." 3.310 +msgstr "" 3.311 + 3.312 +#: tinyutils/slitaz-config:201 3.313 +msgid "Configuring: /etc/network.conf..." 3.314 +msgstr "" 3.315 + 3.316 +#: tinyutils/slitaz-config:211 3.317 +msgid "Restarting Wi-Fi interface..." 3.318 +msgstr "" 3.319 + 3.320 +#: tinyutils/slitaz-config:215 3.321 +msgid "Checking connection..." 3.322 +msgstr "" 3.323 + 3.324 +#: tinyutils/slitaz-config:220 3.325 +#, sh-format 3.326 +msgid "IP address: $ip" 3.327 +msgstr "" 3.328 + 3.329 +#: tinyutils/slitaz-config:222 3.330 +msgid "Unable to connect..." 3.331 +msgstr "" 3.332 + 3.333 +#: tinyutils/slitaz-config:226 3.334 +msgid "Wi-Fi Config" 3.335 +msgstr "" 3.336 + 3.337 +#: tinyutils/slitaz-config:233 3.338 +msgid "Exec" 3.339 +msgstr "" 3.340 + 3.341 +#: tinyutils/slitaz-config:235 3.342 +#, fuzzy 3.343 +msgid "System keyboard setting" 3.344 +msgstr "Ρύθμιση του keymap στο SliTaz" 3.345 + 3.346 +#: tinyutils/slitaz-config:236 3.347 +#, fuzzy 3.348 +msgid "System language setting" 3.349 +msgstr "Ρύθμιση γλώσσας του SliTaz" 3.350 + 3.351 +#: tinyutils/slitaz-config:237 3.352 +msgid "Wi-Fi network settings" 3.353 +msgstr "" 3.354 + 3.355 +#: tinyutils/slitaz-config:238 3.356 +msgid "Add a new user" 3.357 +msgstr "" 3.358 + 3.359 +#: tinyutils/slitaz-config:239 3.360 +msgid "Change root password" 3.361 +msgstr "" 3.362 + 3.363 +#: tinyutils/slitaz-config:240 3.364 +msgid "Set system date from the web" 3.365 +msgstr "" 3.366 + 3.367 +#: tinyutils/slitaz-config:241 3.368 +msgid "Exit from SliTaz Config" 3.369 +msgstr "" 3.370 + 3.371 +#~ msgid "Window Manager:" 3.372 +#~ msgstr "Διαχειριστής παραθύρων:" 3.373 + 3.374 #~ msgid "Tazx dialog helps you to configure your Xorg server." 3.375 #~ msgstr "" 3.376 #~ "Το παράθυρο διαλόγου του Tazx σας βοηθά να ρυθμίσετε τον διακομιστή Xorg."
4.1 --- a/po/slitaz-tools/es.po Sat Nov 15 06:45:42 2014 +0200 4.2 +++ b/po/slitaz-tools/es.po Thu Nov 20 06:04:24 2014 +0200 4.3 @@ -7,7 +7,7 @@ 4.4 msgstr "" 4.5 "Project-Id-Version: SliTaz Tools\n" 4.6 "Report-Msgid-Bugs-To: \n" 4.7 -"POT-Creation-Date: 2014-11-14 21:22+0000\n" 4.8 +"POT-Creation-Date: 2014-11-20 05:20+0200\n" 4.9 "PO-Revision-Date: 2011-08-11 00:08-0300\n" 4.10 "Last-Translator: Lucas Gioia <lucas.lucas.lucas24@gmail.com>\n" 4.11 "Language-Team: \n" 4.12 @@ -20,8 +20,8 @@ 4.13 msgid "SliTaz GNU/Linux locale setting using dialog boxes." 4.14 msgstr "" 4.15 4.16 -#: tinyutils/tazlocale:17 tinyutils/decode:30 tinyutils/hwsetup:24 4.17 -#: tinyutils/frugal:32 4.18 +#: tinyutils/tazlocale:17 tinyutils/tazx:553 tinyutils/decode:30 4.19 +#: tinyutils/hwsetup:24 tinyutils/frugal:32 4.20 msgid "Usage:" 4.21 msgstr "" 4.22 4.23 @@ -97,75 +97,130 @@ 4.24 msgid "Done" 4.25 msgstr "Listo" 4.26 4.27 -#: tinyutils/tazx:26 4.28 -msgid "Window Manager:" 4.29 -msgstr "Gestor de ventanas:" 4.30 +#: tinyutils/tazx:141 4.31 +msgid "Creating:" 4.32 +msgstr "" 4.33 4.34 -#: tinyutils/tazx:27 tinyutils/tazx:152 4.35 +#: tinyutils/tazx:242 4.36 msgid "Install Xorg" 4.37 msgstr "Instalar Xorg" 4.38 4.39 -#: tinyutils/tazx:63 4.40 -msgid "Creating:" 4.41 -msgstr "" 4.42 - 4.43 -#: tinyutils/tazx:153 4.44 +#: tinyutils/tazx:243 4.45 msgid "Tazx helps you to select your X driver." 4.46 msgstr "Tazx le ayudará a seleccionar su controlador X." 4.47 4.48 -#: tinyutils/tazx:154 tinyutils/hwsetup:258 4.49 -msgid "Auto configuring Xorg..." 4.50 +#: tinyutils/tazx:244 4.51 +msgid "Auto configuring" 4.52 msgstr "" 4.53 4.54 -#: tinyutils/tazx:156 tinyutils/tazx:184 4.55 +#: tinyutils/tazx:246 4.56 msgid "driver" 4.57 msgstr "" 4.58 4.59 -#: tinyutils/tazx:157 4.60 +#: tinyutils/tazx:247 tinyutils/slitaz-config:233 4.61 msgid "Quit" 4.62 msgstr "" 4.63 4.64 -#: tinyutils/tazx:186 tinyutils/hwsetup:107 4.65 -#, sh-format 4.66 -msgid "Failed to setup $DEVICE" 4.67 +#: tinyutils/tazx:276 4.68 +msgid "Failed to setup driver" 4.69 msgstr "" 4.70 4.71 -#: tinyutils/tazx:192 tinyutils/hwsetup:117 4.72 +#: tinyutils/tazx:276 4.73 +msgid "(unknown hardware)" 4.74 +msgstr "" 4.75 + 4.76 +#: tinyutils/tazx:289 tinyutils/hwsetup:117 4.77 #, sh-format 4.78 msgid "Installing pkg: $pkg" 4.79 msgstr "" 4.80 4.81 -#: tinyutils/tazx:202 tinyutils/tazx:276 4.82 -#, sh-format 4.83 -msgid "${INST_i18n}: ${WM_i18n} + applications" 4.84 +#: tinyutils/tazx:307 tinyutils/tazx:423 4.85 +msgid "Install Window Manager and applications" 4.86 msgstr "" 4.87 4.88 -#: tinyutils/tazx:270 4.89 +#: tinyutils/tazx:393 tinyutils/tazx:399 4.90 +#, fuzzy 4.91 +msgid "Install" 4.92 +msgstr "Instalar Xorg" 4.93 + 4.94 +#: tinyutils/tazx:409 4.95 +msgid "ON" 4.96 +msgstr "" 4.97 + 4.98 +#: tinyutils/tazx:410 tinyutils/tazx:441 4.99 +msgid "OFF" 4.100 +msgstr "" 4.101 + 4.102 +#: tinyutils/tazx:417 4.103 #, fuzzy 4.104 msgid "SliTaz Xorg config" 4.105 msgstr "SliTaz configuración del lenguaje" 4.106 4.107 -#: tinyutils/tazx:272 4.108 +#: tinyutils/tazx:419 4.109 msgid "Install or reconfigure Xorg" 4.110 msgstr "Instalar o reconfigurar Xorg" 4.111 4.112 -#: tinyutils/tazx:273 4.113 +#: tinyutils/tazx:420 4.114 msgid "Install Xorg server (light version)" 4.115 msgstr "" 4.116 4.117 -#: tinyutils/tazx:274 4.118 +#: tinyutils/tazx:421 4.119 msgid "AutoStart Xorg by SLiM on boot" 4.120 msgstr "" 4.121 4.122 -#: tinyutils/tazx:275 4.123 +#: tinyutils/tazx:422 4.124 msgid "(Re)Start Simple Login Manager now" 4.125 msgstr "" 4.126 4.127 -#: tinyutils/tazx:277 4.128 +#: tinyutils/tazx:424 4.129 msgid "Quit Tazx utility" 4.130 msgstr "Salir de la utilidad Tazx" 4.131 4.132 -#: tinyutils/tazx:384 4.133 +#: tinyutils/tazx:449 4.134 +msgid "Start X on boot:" 4.135 +msgstr "" 4.136 + 4.137 +#: tinyutils/tazx:551 4.138 +msgid "configuration tool for SliTaz GNU/Linux" 4.139 +msgstr "" 4.140 + 4.141 +#: tinyutils/tazx:553 tinyutils/hwsetup:25 4.142 +msgid "command" 4.143 +msgstr "" 4.144 + 4.145 +#: tinyutils/tazx:553 4.146 +msgid "parameter" 4.147 +msgstr "" 4.148 + 4.149 +#: tinyutils/tazx:555 tinyutils/hwsetup:27 tinyutils/frugal:36 4.150 +msgid "Commands:" 4.151 +msgstr "" 4.152 + 4.153 +#: tinyutils/tazx:556 4.154 +msgid "Install Xorg and selected Xorg driver" 4.155 +msgstr "" 4.156 + 4.157 +#: tinyutils/tazx:557 4.158 +msgid "Configure Xorg, generate configuration files" 4.159 +msgstr "" 4.160 + 4.161 +#: tinyutils/tazx:558 4.162 +msgid "Set monitor default depth (valid parameters: 8, 15, 16 or 24)" 4.163 +msgstr "" 4.164 + 4.165 +#: tinyutils/tazx:559 4.166 +msgid "Auto-select and install Xorg driver" 4.167 +msgstr "" 4.168 + 4.169 +#: tinyutils/tazx:560 4.170 +msgid "Get files for starting an X session and config the keyboard" 4.171 +msgstr "" 4.172 + 4.173 +#: tinyutils/tazx:561 4.174 +msgid "Generate or regenerate Xorg keyboard config" 4.175 +msgstr "" 4.176 + 4.177 +#: tinyutils/tazx:572 4.178 msgid "Run tazx as root if you need to configure xorg" 4.179 msgstr "" 4.180 4.181 @@ -257,14 +312,6 @@ 4.182 msgid "SliTaz Setup configuration" 4.183 msgstr "" 4.184 4.185 -#: tinyutils/hwsetup:25 4.186 -msgid "command" 4.187 -msgstr "" 4.188 - 4.189 -#: tinyutils/hwsetup:27 tinyutils/frugal:36 4.190 -msgid "Commands:" 4.191 -msgstr "" 4.192 - 4.193 #: tinyutils/hwsetup:29 4.194 msgid "Print this short usage." 4.195 msgstr "" 4.196 @@ -325,6 +372,11 @@ 4.197 "to SliTaz Bug tracker or Forum." 4.198 msgstr "" 4.199 4.200 +#: tinyutils/hwsetup:107 4.201 +#, sh-format 4.202 +msgid "Failed to setup $DEVICE" 4.203 +msgstr "" 4.204 + 4.205 #: tinyutils/hwsetup:131 4.206 #, sh-format 4.207 msgid "Would you like to install pkg: $pkg" 4.208 @@ -357,6 +409,10 @@ 4.209 msgid "New udev rules are added by a package" 4.210 msgstr "" 4.211 4.212 +#: tinyutils/hwsetup:258 4.213 +msgid "Auto configuring Xorg..." 4.214 +msgstr "" 4.215 + 4.216 #: tinyutils/hwsetup:261 4.217 msgid "Configuring Xorg..." 4.218 msgstr "" 4.219 @@ -701,6 +757,155 @@ 4.220 msgid "Unmounting ISO image..." 4.221 msgstr "" 4.222 4.223 +#: tinyutils/slitaz-config:14 4.224 +#, fuzzy 4.225 +msgid "SliTaz Config" 4.226 +msgstr "SliTaz configuración del lenguaje" 4.227 + 4.228 +#: tinyutils/slitaz-config:36 4.229 +msgid "Post Installation" 4.230 +msgstr "" 4.231 + 4.232 +#: tinyutils/slitaz-config:37 4.233 +msgid "Continue" 4.234 +msgstr "" 4.235 + 4.236 +#: tinyutils/slitaz-config:43 4.237 +msgid "Root Password" 4.238 +msgstr "" 4.239 + 4.240 +#: tinyutils/slitaz-config:44 4.241 +msgid "Enter new password for \\Zb\\Z1root" 4.242 +msgstr "" 4.243 + 4.244 +#: tinyutils/slitaz-config:53 4.245 +msgid "Add User" 4.246 +msgstr "" 4.247 + 4.248 +#: tinyutils/slitaz-config:56 4.249 +msgid "Enter login name for the new \\Zb\\Z4user" 4.250 +msgstr "" 4.251 + 4.252 +#: tinyutils/slitaz-config:61 4.253 +#, sh-format 4.254 +msgid "Enter password for user \\Zb\\Z4$user" 4.255 +msgstr "" 4.256 + 4.257 +#: tinyutils/slitaz-config:121 4.258 +msgid "connected" 4.259 +msgstr "" 4.260 + 4.261 +#: tinyutils/slitaz-config:136 4.262 +msgid "Quality" 4.263 +msgstr "" 4.264 + 4.265 +#: tinyutils/slitaz-config:136 4.266 +msgid "Key" 4.267 +msgstr "" 4.268 + 4.269 +#: tinyutils/slitaz-config:140 tinyutils/slitaz-config:169 4.270 +msgid "hidden.network" 4.271 +msgstr "" 4.272 + 4.273 +#: tinyutils/slitaz-config:140 4.274 +msgid "Connect.to.a.hidden.network" 4.275 +msgstr "" 4.276 + 4.277 +#: tinyutils/slitaz-config:156 4.278 +msgid "Select" 4.279 +msgstr "" 4.280 + 4.281 +#: tinyutils/slitaz-config:157 4.282 +msgid "Connect to a Wi-Fi network" 4.283 +msgstr "" 4.284 + 4.285 +#: tinyutils/slitaz-config:159 4.286 +msgid "Connect.to.any.network" 4.287 +msgstr "" 4.288 + 4.289 +#: tinyutils/slitaz-config:170 4.290 +msgid "Wi-Fi ESSID" 4.291 +msgstr "" 4.292 + 4.293 +#: tinyutils/slitaz-config:171 4.294 +msgid "Enter Wi-Fi access point ESSID (name)" 4.295 +msgstr "" 4.296 + 4.297 +#: tinyutils/slitaz-config:176 tinyutils/slitaz-config:187 4.298 +msgid "Wi-Fi Password" 4.299 +msgstr "" 4.300 + 4.301 +#: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 4.302 +#, sh-format 4.303 +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" 4.304 +msgstr "" 4.305 + 4.306 +#: tinyutils/slitaz-config:197 4.307 +msgid "Shutting down network interfaces..." 4.308 +msgstr "" 4.309 + 4.310 +#: tinyutils/slitaz-config:201 4.311 +msgid "Configuring: /etc/network.conf..." 4.312 +msgstr "" 4.313 + 4.314 +#: tinyutils/slitaz-config:211 4.315 +msgid "Restarting Wi-Fi interface..." 4.316 +msgstr "" 4.317 + 4.318 +#: tinyutils/slitaz-config:215 4.319 +msgid "Checking connection..." 4.320 +msgstr "" 4.321 + 4.322 +#: tinyutils/slitaz-config:220 4.323 +#, sh-format 4.324 +msgid "IP address: $ip" 4.325 +msgstr "" 4.326 + 4.327 +#: tinyutils/slitaz-config:222 4.328 +msgid "Unable to connect..." 4.329 +msgstr "" 4.330 + 4.331 +#: tinyutils/slitaz-config:226 4.332 +msgid "Wi-Fi Config" 4.333 +msgstr "" 4.334 + 4.335 +#: tinyutils/slitaz-config:233 4.336 +msgid "Exec" 4.337 +msgstr "" 4.338 + 4.339 +#: tinyutils/slitaz-config:235 4.340 +#, fuzzy 4.341 +msgid "System keyboard setting" 4.342 +msgstr "SliTaz configuración de teclas" 4.343 + 4.344 +#: tinyutils/slitaz-config:236 4.345 +#, fuzzy 4.346 +msgid "System language setting" 4.347 +msgstr "SliTaz configuración del lenguaje" 4.348 + 4.349 +#: tinyutils/slitaz-config:237 4.350 +msgid "Wi-Fi network settings" 4.351 +msgstr "" 4.352 + 4.353 +#: tinyutils/slitaz-config:238 4.354 +msgid "Add a new user" 4.355 +msgstr "" 4.356 + 4.357 +#: tinyutils/slitaz-config:239 4.358 +msgid "Change root password" 4.359 +msgstr "" 4.360 + 4.361 +#: tinyutils/slitaz-config:240 4.362 +msgid "Set system date from the web" 4.363 +msgstr "" 4.364 + 4.365 +#: tinyutils/slitaz-config:241 4.366 +msgid "Exit from SliTaz Config" 4.367 +msgstr "" 4.368 + 4.369 +#~ msgid "Window Manager:" 4.370 +#~ msgstr "Gestor de ventanas:" 4.371 + 4.372 #, fuzzy 4.373 #~ msgid "Tazx dialog helps you to configure your Xorg server." 4.374 #~ msgstr "Los diálogos Tazx le ayudarán a configurar su servidor Xorg."
5.1 --- a/po/slitaz-tools/fa.po Sat Nov 15 06:45:42 2014 +0200 5.2 +++ b/po/slitaz-tools/fa.po Thu Nov 20 06:04:24 2014 +0200 5.3 @@ -7,7 +7,7 @@ 5.4 msgstr "" 5.5 "Project-Id-Version: SliTaz Tools\n" 5.6 "Report-Msgid-Bugs-To: \n" 5.7 -"POT-Creation-Date: 2014-11-14 21:22+0000\n" 5.8 +"POT-Creation-Date: 2014-11-20 05:20+0200\n" 5.9 "PO-Revision-Date: 2014-06-26 16:08+0400\n" 5.10 "Last-Translator: Ali Rashidi <alirashidi17@yahoo.com>\n" 5.11 "Language-Team: LANGUAGE <LL@li.org>\n" 5.12 @@ -22,8 +22,8 @@ 5.13 msgid "SliTaz GNU/Linux locale setting using dialog boxes." 5.14 msgstr ":توسط کادر های محاوره SliTaz GNU/Linux تنظیمات منطقه ای" 5.15 5.16 -#: tinyutils/tazlocale:17 tinyutils/decode:30 tinyutils/hwsetup:24 5.17 -#: tinyutils/frugal:32 5.18 +#: tinyutils/tazlocale:17 tinyutils/tazx:553 tinyutils/decode:30 5.19 +#: tinyutils/hwsetup:24 tinyutils/frugal:32 5.20 msgid "Usage:" 5.21 msgstr ":طریقه استفاده" 5.22 5.23 @@ -95,74 +95,136 @@ 5.24 msgid "Done" 5.25 msgstr "انجام شد" 5.26 5.27 -#: tinyutils/tazx:26 5.28 -msgid "Window Manager:" 5.29 -msgstr "" 5.30 +#: tinyutils/tazx:141 5.31 +msgid "Creating:" 5.32 +msgstr ":در حال ایجاد" 5.33 5.34 -#: tinyutils/tazx:27 tinyutils/tazx:152 5.35 +#: tinyutils/tazx:242 5.36 msgid "Install Xorg" 5.37 msgstr "Xorg نصب" 5.38 5.39 -#: tinyutils/tazx:63 5.40 -msgid "Creating:" 5.41 -msgstr ":در حال ایجاد" 5.42 - 5.43 -#: tinyutils/tazx:153 5.44 +#: tinyutils/tazx:243 5.45 msgid "Tazx helps you to select your X driver." 5.46 msgstr "خود را انتخاب نمایید. X به شما کمک میکند تا درایور Tazx" 5.47 5.48 -#: tinyutils/tazx:154 tinyutils/hwsetup:258 5.49 -msgid "Auto configuring Xorg..." 5.50 +#: tinyutils/tazx:244 5.51 +#, fuzzy 5.52 +msgid "Auto configuring" 5.53 msgstr "...Xorg در حال نصب خودکار " 5.54 5.55 -#: tinyutils/tazx:156 tinyutils/tazx:184 5.56 +#: tinyutils/tazx:246 5.57 msgid "driver" 5.58 msgstr "درایور" 5.59 5.60 -#: tinyutils/tazx:157 5.61 +#: tinyutils/tazx:247 tinyutils/slitaz-config:233 5.62 msgid "Quit" 5.63 msgstr "خروج" 5.64 5.65 -#: tinyutils/tazx:186 tinyutils/hwsetup:107 5.66 -#, sh-format 5.67 -msgid "Failed to setup $DEVICE" 5.68 +#: tinyutils/tazx:276 5.69 +#, fuzzy 5.70 +msgid "Failed to setup driver" 5.71 msgstr "نشد $DEVICE موفق به نصب " 5.72 5.73 -#: tinyutils/tazx:192 tinyutils/hwsetup:117 5.74 +#: tinyutils/tazx:276 5.75 +msgid "(unknown hardware)" 5.76 +msgstr "" 5.77 + 5.78 +#: tinyutils/tazx:289 tinyutils/hwsetup:117 5.79 #, sh-format 5.80 msgid "Installing pkg: $pkg" 5.81 msgstr "$pkg :در حال نصب پکیج" 5.82 5.83 -#: tinyutils/tazx:202 tinyutils/tazx:276 5.84 -#, sh-format 5.85 -msgid "${INST_i18n}: ${WM_i18n} + applications" 5.86 +#: tinyutils/tazx:307 tinyutils/tazx:423 5.87 +#, fuzzy 5.88 +msgid "Install Window Manager and applications" 5.89 +msgstr "نرم افزار اسکنر" 5.90 + 5.91 +#: tinyutils/tazx:393 tinyutils/tazx:399 5.92 +#, fuzzy 5.93 +msgid "Install" 5.94 +msgstr "Xorg نصب" 5.95 + 5.96 +#: tinyutils/tazx:409 5.97 +msgid "ON" 5.98 msgstr "" 5.99 5.100 -#: tinyutils/tazx:270 5.101 +#: tinyutils/tazx:410 tinyutils/tazx:441 5.102 +msgid "OFF" 5.103 +msgstr "" 5.104 + 5.105 +#: tinyutils/tazx:417 5.106 msgid "SliTaz Xorg config" 5.107 msgstr "SliTaz Xorg پیکربندی" 5.108 5.109 -#: tinyutils/tazx:272 5.110 +#: tinyutils/tazx:419 5.111 msgid "Install or reconfigure Xorg" 5.112 msgstr "Xorg نصب یا پیکربندی مجدد" 5.113 5.114 -#: tinyutils/tazx:273 5.115 +#: tinyutils/tazx:420 5.116 msgid "Install Xorg server (light version)" 5.117 msgstr "(نسخه کم حجم) Xorg server نصب" 5.118 5.119 -#: tinyutils/tazx:274 5.120 +#: tinyutils/tazx:421 5.121 msgid "AutoStart Xorg by SLiM on boot" 5.122 msgstr "" 5.123 5.124 -#: tinyutils/tazx:275 5.125 +#: tinyutils/tazx:422 5.126 msgid "(Re)Start Simple Login Manager now" 5.127 msgstr "" 5.128 5.129 -#: tinyutils/tazx:277 5.130 +#: tinyutils/tazx:424 5.131 msgid "Quit Tazx utility" 5.132 msgstr "Tazx خروج از ابزار" 5.133 5.134 -#: tinyutils/tazx:384 5.135 +#: tinyutils/tazx:449 5.136 +msgid "Start X on boot:" 5.137 +msgstr "" 5.138 + 5.139 +#: tinyutils/tazx:551 5.140 +msgid "configuration tool for SliTaz GNU/Linux" 5.141 +msgstr "" 5.142 + 5.143 +#: tinyutils/tazx:553 tinyutils/hwsetup:25 5.144 +msgid "command" 5.145 +msgstr "فرمان" 5.146 + 5.147 +#: tinyutils/tazx:553 5.148 +msgid "parameter" 5.149 +msgstr "" 5.150 + 5.151 +#: tinyutils/tazx:555 tinyutils/hwsetup:27 tinyutils/frugal:36 5.152 +msgid "Commands:" 5.153 +msgstr ":فرامین" 5.154 + 5.155 +#: tinyutils/tazx:556 5.156 +#, fuzzy 5.157 +msgid "Install Xorg and selected Xorg driver" 5.158 +msgstr "(نسخه کم حجم) Xorg server نصب" 5.159 + 5.160 +#: tinyutils/tazx:557 5.161 +#, fuzzy 5.162 +msgid "Configure Xorg, generate configuration files" 5.163 +msgstr "" 5.164 +"برای تولید یک فایل قالب پیکربندی در صورت نیاز استفاده کنید aticonfig :از " 5.165 +"ابزار" 5.166 + 5.167 +#: tinyutils/tazx:558 5.168 +msgid "Set monitor default depth (valid parameters: 8, 15, 16 or 24)" 5.169 +msgstr "" 5.170 + 5.171 +#: tinyutils/tazx:559 5.172 +msgid "Auto-select and install Xorg driver" 5.173 +msgstr "" 5.174 + 5.175 +#: tinyutils/tazx:560 5.176 +msgid "Get files for starting an X session and config the keyboard" 5.177 +msgstr "" 5.178 + 5.179 +#: tinyutils/tazx:561 5.180 +msgid "Generate or regenerate Xorg keyboard config" 5.181 +msgstr "" 5.182 + 5.183 +#: tinyutils/tazx:572 5.184 msgid "Run tazx as root if you need to configure xorg" 5.185 msgstr "" 5.186 5.187 @@ -254,14 +316,6 @@ 5.188 msgid "SliTaz Setup configuration" 5.189 msgstr "SliTaz پیکربندی نصب " 5.190 5.191 -#: tinyutils/hwsetup:25 5.192 -msgid "command" 5.193 -msgstr "فرمان" 5.194 - 5.195 -#: tinyutils/hwsetup:27 tinyutils/frugal:36 5.196 -msgid "Commands:" 5.197 -msgstr ":فرامین" 5.198 - 5.199 #: tinyutils/hwsetup:29 5.200 msgid "Print this short usage." 5.201 msgstr ".چاپ این طریقه استفاده کوتاه" 5.202 @@ -325,6 +379,11 @@ 5.203 "باگ در دستگاه را به انجمن یا پیگیری باگ های $DEVICE به علت کمبود سخت افزار " 5.204 "هماهنگ برای عیب یابی، این" 5.205 5.206 +#: tinyutils/hwsetup:107 5.207 +#, sh-format 5.208 +msgid "Failed to setup $DEVICE" 5.209 +msgstr "نشد $DEVICE موفق به نصب " 5.210 + 5.211 #: tinyutils/hwsetup:131 5.212 #, sh-format 5.213 msgid "Would you like to install pkg: $pkg" 5.214 @@ -357,6 +416,10 @@ 5.215 msgid "New udev rules are added by a package" 5.216 msgstr ".توسط یک پکیج افزوده شدند udev قواعد جدید " 5.217 5.218 +#: tinyutils/hwsetup:258 5.219 +msgid "Auto configuring Xorg..." 5.220 +msgstr "...Xorg در حال نصب خودکار " 5.221 + 5.222 #: tinyutils/hwsetup:261 5.223 msgid "Configuring Xorg..." 5.224 msgstr "Xorg در حال پیکربندی " 5.225 @@ -718,3 +781,153 @@ 5.226 #: tinyutils/frugal:131 5.227 msgid "Unmounting ISO image..." 5.228 msgstr "...ISO در حال جداسازی فایل " 5.229 + 5.230 +#: tinyutils/slitaz-config:14 5.231 +#, fuzzy 5.232 +msgid "SliTaz Config" 5.233 +msgstr "SliTaz Xorg پیکربندی" 5.234 + 5.235 +#: tinyutils/slitaz-config:36 5.236 +#, fuzzy 5.237 +msgid "Post Installation" 5.238 +msgstr "(root) نمایش مسیر نصب ریشه" 5.239 + 5.240 +#: tinyutils/slitaz-config:37 5.241 +msgid "Continue" 5.242 +msgstr "" 5.243 + 5.244 +#: tinyutils/slitaz-config:43 5.245 +#, fuzzy 5.246 +msgid "Root Password" 5.247 +msgstr ":رمز عبور" 5.248 + 5.249 +#: tinyutils/slitaz-config:44 5.250 +msgid "Enter new password for \\Zb\\Z1root" 5.251 +msgstr "" 5.252 + 5.253 +#: tinyutils/slitaz-config:53 5.254 +msgid "Add User" 5.255 +msgstr "" 5.256 + 5.257 +#: tinyutils/slitaz-config:56 5.258 +msgid "Enter login name for the new \\Zb\\Z4user" 5.259 +msgstr "" 5.260 + 5.261 +#: tinyutils/slitaz-config:61 5.262 +#, sh-format 5.263 +msgid "Enter password for user \\Zb\\Z4$user" 5.264 +msgstr "" 5.265 + 5.266 +#: tinyutils/slitaz-config:121 5.267 +msgid "connected" 5.268 +msgstr "" 5.269 + 5.270 +#: tinyutils/slitaz-config:136 5.271 +msgid "Quality" 5.272 +msgstr "" 5.273 + 5.274 +#: tinyutils/slitaz-config:136 5.275 +msgid "Key" 5.276 +msgstr "" 5.277 + 5.278 +#: tinyutils/slitaz-config:140 tinyutils/slitaz-config:169 5.279 +msgid "hidden.network" 5.280 +msgstr "" 5.281 + 5.282 +#: tinyutils/slitaz-config:140 5.283 +msgid "Connect.to.a.hidden.network" 5.284 +msgstr "" 5.285 + 5.286 +#: tinyutils/slitaz-config:156 5.287 +msgid "Select" 5.288 +msgstr "" 5.289 + 5.290 +#: tinyutils/slitaz-config:157 5.291 +msgid "Connect to a Wi-Fi network" 5.292 +msgstr "" 5.293 + 5.294 +#: tinyutils/slitaz-config:159 5.295 +msgid "Connect.to.any.network" 5.296 +msgstr "" 5.297 + 5.298 +#: tinyutils/slitaz-config:170 5.299 +msgid "Wi-Fi ESSID" 5.300 +msgstr "" 5.301 + 5.302 +#: tinyutils/slitaz-config:171 5.303 +msgid "Enter Wi-Fi access point ESSID (name)" 5.304 +msgstr "" 5.305 + 5.306 +#: tinyutils/slitaz-config:176 tinyutils/slitaz-config:187 5.307 +#, fuzzy 5.308 +msgid "Wi-Fi Password" 5.309 +msgstr ":رمز عبور" 5.310 + 5.311 +#: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 5.312 +#, sh-format 5.313 +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" 5.314 +msgstr "" 5.315 + 5.316 +#: tinyutils/slitaz-config:197 5.317 +msgid "Shutting down network interfaces..." 5.318 +msgstr "" 5.319 + 5.320 +#: tinyutils/slitaz-config:201 5.321 +#, fuzzy 5.322 +msgid "Configuring: /etc/network.conf..." 5.323 +msgstr "Xorg در حال پیکربندی " 5.324 + 5.325 +#: tinyutils/slitaz-config:211 5.326 +msgid "Restarting Wi-Fi interface..." 5.327 +msgstr "" 5.328 + 5.329 +#: tinyutils/slitaz-config:215 5.330 +msgid "Checking connection..." 5.331 +msgstr "" 5.332 + 5.333 +#: tinyutils/slitaz-config:220 5.334 +#, sh-format 5.335 +msgid "IP address: $ip" 5.336 +msgstr "" 5.337 + 5.338 +#: tinyutils/slitaz-config:222 5.339 +msgid "Unable to connect..." 5.340 +msgstr "" 5.341 + 5.342 +#: tinyutils/slitaz-config:226 5.343 +msgid "Wi-Fi Config" 5.344 +msgstr "" 5.345 + 5.346 +#: tinyutils/slitaz-config:233 5.347 +msgid "Exec" 5.348 +msgstr "" 5.349 + 5.350 +#: tinyutils/slitaz-config:235 5.351 +#, fuzzy 5.352 +msgid "System keyboard setting" 5.353 +msgstr "SliTaz تنظیمات صفحه کلید" 5.354 + 5.355 +#: tinyutils/slitaz-config:236 5.356 +#, fuzzy 5.357 +msgid "System language setting" 5.358 +msgstr "SliTaz تنظیمات زبان" 5.359 + 5.360 +#: tinyutils/slitaz-config:237 5.361 +msgid "Wi-Fi network settings" 5.362 +msgstr "" 5.363 + 5.364 +#: tinyutils/slitaz-config:238 5.365 +msgid "Add a new user" 5.366 +msgstr "" 5.367 + 5.368 +#: tinyutils/slitaz-config:239 5.369 +msgid "Change root password" 5.370 +msgstr "" 5.371 + 5.372 +#: tinyutils/slitaz-config:240 5.373 +msgid "Set system date from the web" 5.374 +msgstr "" 5.375 + 5.376 +#: tinyutils/slitaz-config:241 5.377 +msgid "Exit from SliTaz Config" 5.378 +msgstr ""
6.1 --- a/po/slitaz-tools/fr.po Sat Nov 15 06:45:42 2014 +0200 6.2 +++ b/po/slitaz-tools/fr.po Thu Nov 20 06:04:24 2014 +0200 6.3 @@ -7,7 +7,7 @@ 6.4 msgstr "" 6.5 "Project-Id-Version: SliTaz Tools\n" 6.6 "Report-Msgid-Bugs-To: \n" 6.7 -"POT-Creation-Date: 2014-11-14 21:22+0000\n" 6.8 +"POT-Creation-Date: 2014-11-20 05:20+0200\n" 6.9 "PO-Revision-Date: 2014-01-02 19:14+0100\n" 6.10 "Last-Translator: Christophe Lincoln <pankso@slitaz.org>\n" 6.11 "Language-Team: French\n" 6.12 @@ -22,8 +22,8 @@ 6.13 msgid "SliTaz GNU/Linux locale setting using dialog boxes." 6.14 msgstr "Configuration de la langue via des boîtes GTK" 6.15 6.16 -#: tinyutils/tazlocale:17 tinyutils/decode:30 tinyutils/hwsetup:24 6.17 -#: tinyutils/frugal:32 6.18 +#: tinyutils/tazlocale:17 tinyutils/tazx:553 tinyutils/decode:30 6.19 +#: tinyutils/hwsetup:24 tinyutils/frugal:32 6.20 msgid "Usage:" 6.21 msgstr "Utilisation :" 6.22 6.23 @@ -99,76 +99,136 @@ 6.24 msgid "Done" 6.25 msgstr "Fait" 6.26 6.27 -#: tinyutils/tazx:26 6.28 -msgid "Window Manager:" 6.29 -msgstr "Gestionnaire de fenêtres :" 6.30 - 6.31 -#: tinyutils/tazx:27 tinyutils/tazx:152 6.32 -msgid "Install Xorg" 6.33 -msgstr "Installer Xorg" 6.34 - 6.35 -#: tinyutils/tazx:63 6.36 +#: tinyutils/tazx:141 6.37 #, fuzzy 6.38 msgid "Creating:" 6.39 msgstr "Nettoyage de:" 6.40 6.41 -#: tinyutils/tazx:153 6.42 +#: tinyutils/tazx:242 6.43 +msgid "Install Xorg" 6.44 +msgstr "Installer Xorg" 6.45 + 6.46 +#: tinyutils/tazx:243 6.47 msgid "Tazx helps you to select your X driver." 6.48 msgstr "Tazx vous aide à sélectionner votre pilote Xorg." 6.49 6.50 -#: tinyutils/tazx:154 tinyutils/hwsetup:258 6.51 -msgid "Auto configuring Xorg..." 6.52 +#: tinyutils/tazx:244 6.53 +#, fuzzy 6.54 +msgid "Auto configuring" 6.55 msgstr "Auto configuration de Xorg..." 6.56 6.57 -#: tinyutils/tazx:156 tinyutils/tazx:184 6.58 +#: tinyutils/tazx:246 6.59 msgid "driver" 6.60 msgstr "pilote" 6.61 6.62 -#: tinyutils/tazx:157 6.63 +#: tinyutils/tazx:247 tinyutils/slitaz-config:233 6.64 msgid "Quit" 6.65 msgstr "Quitter" 6.66 6.67 -#: tinyutils/tazx:186 tinyutils/hwsetup:107 6.68 -#, sh-format 6.69 -msgid "Failed to setup $DEVICE" 6.70 +#: tinyutils/tazx:276 6.71 +#, fuzzy 6.72 +msgid "Failed to setup driver" 6.73 msgstr "Echec de la configuration de $DEVICE" 6.74 6.75 -#: tinyutils/tazx:192 tinyutils/hwsetup:117 6.76 +#: tinyutils/tazx:276 6.77 +msgid "(unknown hardware)" 6.78 +msgstr "" 6.79 + 6.80 +#: tinyutils/tazx:289 tinyutils/hwsetup:117 6.81 #, sh-format 6.82 msgid "Installing pkg: $pkg" 6.83 msgstr "Installation du paquet : $pkg" 6.84 6.85 -#: tinyutils/tazx:202 tinyutils/tazx:276 6.86 -#, sh-format 6.87 -msgid "${INST_i18n}: ${WM_i18n} + applications" 6.88 +#: tinyutils/tazx:307 tinyutils/tazx:423 6.89 +#, fuzzy 6.90 +msgid "Install Window Manager and applications" 6.91 +msgstr "application scanner" 6.92 + 6.93 +#: tinyutils/tazx:393 tinyutils/tazx:399 6.94 +#, fuzzy 6.95 +msgid "Install" 6.96 +msgstr "Installer Xorg" 6.97 + 6.98 +#: tinyutils/tazx:409 6.99 +msgid "ON" 6.100 msgstr "" 6.101 6.102 -#: tinyutils/tazx:270 6.103 +#: tinyutils/tazx:410 tinyutils/tazx:441 6.104 +msgid "OFF" 6.105 +msgstr "" 6.106 + 6.107 +#: tinyutils/tazx:417 6.108 #, fuzzy 6.109 msgid "SliTaz Xorg config" 6.110 msgstr "Configuration de la langue" 6.111 6.112 -#: tinyutils/tazx:272 6.113 +#: tinyutils/tazx:419 6.114 msgid "Install or reconfigure Xorg" 6.115 msgstr "Installer ou reconfigurer Xorg" 6.116 6.117 -#: tinyutils/tazx:273 6.118 +#: tinyutils/tazx:420 6.119 msgid "Install Xorg server (light version)" 6.120 msgstr "Installer le serveur Xorg (version light)" 6.121 6.122 -#: tinyutils/tazx:274 6.123 +#: tinyutils/tazx:421 6.124 msgid "AutoStart Xorg by SLiM on boot" 6.125 msgstr "" 6.126 6.127 -#: tinyutils/tazx:275 6.128 +#: tinyutils/tazx:422 6.129 msgid "(Re)Start Simple Login Manager now" 6.130 msgstr "" 6.131 6.132 -#: tinyutils/tazx:277 6.133 +#: tinyutils/tazx:424 6.134 msgid "Quit Tazx utility" 6.135 msgstr "Quitter l'utilitaire Tazx" 6.136 6.137 -#: tinyutils/tazx:384 6.138 +#: tinyutils/tazx:449 6.139 +msgid "Start X on boot:" 6.140 +msgstr "" 6.141 + 6.142 +#: tinyutils/tazx:551 6.143 +msgid "configuration tool for SliTaz GNU/Linux" 6.144 +msgstr "" 6.145 + 6.146 +#: tinyutils/tazx:553 tinyutils/hwsetup:25 6.147 +msgid "command" 6.148 +msgstr "commande" 6.149 + 6.150 +#: tinyutils/tazx:553 6.151 +msgid "parameter" 6.152 +msgstr "" 6.153 + 6.154 +#: tinyutils/tazx:555 tinyutils/hwsetup:27 tinyutils/frugal:36 6.155 +msgid "Commands:" 6.156 +msgstr "Commandes:" 6.157 + 6.158 +#: tinyutils/tazx:556 6.159 +#, fuzzy 6.160 +msgid "Install Xorg and selected Xorg driver" 6.161 +msgstr "Installer le serveur Xorg (version light)" 6.162 + 6.163 +#: tinyutils/tazx:557 6.164 +#, fuzzy 6.165 +msgid "Configure Xorg, generate configuration files" 6.166 +msgstr "Utilise: aticonfig pour créer un modèle de fichier de config si besion" 6.167 + 6.168 +#: tinyutils/tazx:558 6.169 +msgid "Set monitor default depth (valid parameters: 8, 15, 16 or 24)" 6.170 +msgstr "" 6.171 + 6.172 +#: tinyutils/tazx:559 6.173 +msgid "Auto-select and install Xorg driver" 6.174 +msgstr "" 6.175 + 6.176 +#: tinyutils/tazx:560 6.177 +msgid "Get files for starting an X session and config the keyboard" 6.178 +msgstr "" 6.179 + 6.180 +#: tinyutils/tazx:561 6.181 +msgid "Generate or regenerate Xorg keyboard config" 6.182 +msgstr "" 6.183 + 6.184 +#: tinyutils/tazx:572 6.185 msgid "Run tazx as root if you need to configure xorg" 6.186 msgstr "" 6.187 6.188 @@ -260,14 +320,6 @@ 6.189 msgid "SliTaz Setup configuration" 6.190 msgstr "Configuration de SliTaz" 6.191 6.192 -#: tinyutils/hwsetup:25 6.193 -msgid "command" 6.194 -msgstr "commande" 6.195 - 6.196 -#: tinyutils/hwsetup:27 tinyutils/frugal:36 6.197 -msgid "Commands:" 6.198 -msgstr "Commandes:" 6.199 - 6.200 #: tinyutils/hwsetup:29 6.201 #, fuzzy 6.202 msgid "Print this short usage." 6.203 @@ -332,6 +384,11 @@ 6.204 "$DEVICE n'a pas été correctement testé. Veuillez reporter les succés, " 6.205 "échecs, et bugs sur les SliTaz Bug tracker ou Forum." 6.206 6.207 +#: tinyutils/hwsetup:107 6.208 +#, sh-format 6.209 +msgid "Failed to setup $DEVICE" 6.210 +msgstr "Echec de la configuration de $DEVICE" 6.211 + 6.212 #: tinyutils/hwsetup:131 6.213 #, sh-format 6.214 msgid "Would you like to install pkg: $pkg" 6.215 @@ -364,6 +421,10 @@ 6.216 msgid "New udev rules are added by a package" 6.217 msgstr "Des nouvelles régles sont ajoutées par le paquet" 6.218 6.219 +#: tinyutils/hwsetup:258 6.220 +msgid "Auto configuring Xorg..." 6.221 +msgstr "Auto configuration de Xorg..." 6.222 + 6.223 #: tinyutils/hwsetup:261 6.224 msgid "Configuring Xorg..." 6.225 msgstr "Configuration de Xorg..." 6.226 @@ -715,6 +776,159 @@ 6.227 msgid "Unmounting ISO image..." 6.228 msgstr "Démontage de l'image ISO..." 6.229 6.230 +#: tinyutils/slitaz-config:14 6.231 +#, fuzzy 6.232 +msgid "SliTaz Config" 6.233 +msgstr "Configuration de la langue" 6.234 + 6.235 +#: tinyutils/slitaz-config:36 6.236 +#, fuzzy 6.237 +msgid "Post Installation" 6.238 +msgstr "Défini le chemin d'installation" 6.239 + 6.240 +#: tinyutils/slitaz-config:37 6.241 +msgid "Continue" 6.242 +msgstr "" 6.243 + 6.244 +#: tinyutils/slitaz-config:43 6.245 +#, fuzzy 6.246 +msgid "Root Password" 6.247 +msgstr "Mot de passe:" 6.248 + 6.249 +#: tinyutils/slitaz-config:44 6.250 +msgid "Enter new password for \\Zb\\Z1root" 6.251 +msgstr "" 6.252 + 6.253 +#: tinyutils/slitaz-config:53 6.254 +msgid "Add User" 6.255 +msgstr "" 6.256 + 6.257 +#: tinyutils/slitaz-config:56 6.258 +msgid "Enter login name for the new \\Zb\\Z4user" 6.259 +msgstr "" 6.260 + 6.261 +#: tinyutils/slitaz-config:61 6.262 +#, sh-format 6.263 +msgid "Enter password for user \\Zb\\Z4$user" 6.264 +msgstr "" 6.265 + 6.266 +#: tinyutils/slitaz-config:121 6.267 +msgid "connected" 6.268 +msgstr "" 6.269 + 6.270 +#: tinyutils/slitaz-config:136 6.271 +msgid "Quality" 6.272 +msgstr "" 6.273 + 6.274 +#: tinyutils/slitaz-config:136 6.275 +msgid "Key" 6.276 +msgstr "" 6.277 + 6.278 +#: tinyutils/slitaz-config:140 tinyutils/slitaz-config:169 6.279 +msgid "hidden.network" 6.280 +msgstr "" 6.281 + 6.282 +#: tinyutils/slitaz-config:140 6.283 +msgid "Connect.to.a.hidden.network" 6.284 +msgstr "" 6.285 + 6.286 +#: tinyutils/slitaz-config:156 6.287 +msgid "Select" 6.288 +msgstr "" 6.289 + 6.290 +#: tinyutils/slitaz-config:157 6.291 +msgid "Connect to a Wi-Fi network" 6.292 +msgstr "" 6.293 + 6.294 +#: tinyutils/slitaz-config:159 6.295 +msgid "Connect.to.any.network" 6.296 +msgstr "" 6.297 + 6.298 +#: tinyutils/slitaz-config:170 6.299 +msgid "Wi-Fi ESSID" 6.300 +msgstr "" 6.301 + 6.302 +#: tinyutils/slitaz-config:171 6.303 +msgid "Enter Wi-Fi access point ESSID (name)" 6.304 +msgstr "" 6.305 + 6.306 +#: tinyutils/slitaz-config:176 tinyutils/slitaz-config:187 6.307 +#, fuzzy 6.308 +msgid "Wi-Fi Password" 6.309 +msgstr "Mot de passe:" 6.310 + 6.311 +#: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 6.312 +#, sh-format 6.313 +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" 6.314 +msgstr "" 6.315 + 6.316 +#: tinyutils/slitaz-config:197 6.317 +msgid "Shutting down network interfaces..." 6.318 +msgstr "" 6.319 + 6.320 +#: tinyutils/slitaz-config:201 6.321 +#, fuzzy 6.322 +msgid "Configuring: /etc/network.conf..." 6.323 +msgstr "Configuration de Xorg..." 6.324 + 6.325 +#: tinyutils/slitaz-config:211 6.326 +msgid "Restarting Wi-Fi interface..." 6.327 +msgstr "" 6.328 + 6.329 +#: tinyutils/slitaz-config:215 6.330 +msgid "Checking connection..." 6.331 +msgstr "" 6.332 + 6.333 +#: tinyutils/slitaz-config:220 6.334 +#, sh-format 6.335 +msgid "IP address: $ip" 6.336 +msgstr "" 6.337 + 6.338 +#: tinyutils/slitaz-config:222 6.339 +msgid "Unable to connect..." 6.340 +msgstr "" 6.341 + 6.342 +#: tinyutils/slitaz-config:226 6.343 +msgid "Wi-Fi Config" 6.344 +msgstr "" 6.345 + 6.346 +#: tinyutils/slitaz-config:233 6.347 +msgid "Exec" 6.348 +msgstr "" 6.349 + 6.350 +#: tinyutils/slitaz-config:235 6.351 +#, fuzzy 6.352 +msgid "System keyboard setting" 6.353 +msgstr "Configuration du clavier" 6.354 + 6.355 +#: tinyutils/slitaz-config:236 6.356 +#, fuzzy 6.357 +msgid "System language setting" 6.358 +msgstr "Configuration de la langue" 6.359 + 6.360 +#: tinyutils/slitaz-config:237 6.361 +msgid "Wi-Fi network settings" 6.362 +msgstr "" 6.363 + 6.364 +#: tinyutils/slitaz-config:238 6.365 +msgid "Add a new user" 6.366 +msgstr "" 6.367 + 6.368 +#: tinyutils/slitaz-config:239 6.369 +msgid "Change root password" 6.370 +msgstr "" 6.371 + 6.372 +#: tinyutils/slitaz-config:240 6.373 +msgid "Set system date from the web" 6.374 +msgstr "" 6.375 + 6.376 +#: tinyutils/slitaz-config:241 6.377 +msgid "Exit from SliTaz Config" 6.378 +msgstr "" 6.379 + 6.380 +#~ msgid "Window Manager:" 6.381 +#~ msgstr "Gestionnaire de fenêtres :" 6.382 + 6.383 #~ msgid "Configure X" 6.384 #~ msgstr "Configurer X" 6.385
7.1 --- a/po/slitaz-tools/pl.po Sat Nov 15 06:45:42 2014 +0200 7.2 +++ b/po/slitaz-tools/pl.po Thu Nov 20 06:04:24 2014 +0200 7.3 @@ -7,7 +7,7 @@ 7.4 msgstr "" 7.5 "Project-Id-Version: SliTaz Tools\n" 7.6 "Report-Msgid-Bugs-To: \n" 7.7 -"POT-Creation-Date: 2014-11-14 21:22+0000\n" 7.8 +"POT-Creation-Date: 2014-11-20 05:20+0200\n" 7.9 "PO-Revision-Date: 2013-07-23 12:35+0100\n" 7.10 "Last-Translator: Paweł Pyrczak <tkr.tkr.pl@gmail.com>\n" 7.11 "Language-Team: Paweł Pyrczak <support@pyrczak.pl>\n" 7.12 @@ -25,8 +25,8 @@ 7.13 msgid "SliTaz GNU/Linux locale setting using dialog boxes." 7.14 msgstr "" 7.15 7.16 -#: tinyutils/tazlocale:17 tinyutils/decode:30 tinyutils/hwsetup:24 7.17 -#: tinyutils/frugal:32 7.18 +#: tinyutils/tazlocale:17 tinyutils/tazx:553 tinyutils/decode:30 7.19 +#: tinyutils/hwsetup:24 tinyutils/frugal:32 7.20 msgid "Usage:" 7.21 msgstr "Użycie:" 7.22 7.23 @@ -102,75 +102,130 @@ 7.24 msgid "Done" 7.25 msgstr "Zakończono" 7.26 7.27 -#: tinyutils/tazx:26 7.28 -msgid "Window Manager:" 7.29 -msgstr "Menadżer okien:" 7.30 +#: tinyutils/tazx:141 7.31 +msgid "Creating:" 7.32 +msgstr "" 7.33 7.34 -#: tinyutils/tazx:27 tinyutils/tazx:152 7.35 +#: tinyutils/tazx:242 7.36 msgid "Install Xorg" 7.37 msgstr "Zainstaluj Xorg" 7.38 7.39 -#: tinyutils/tazx:63 7.40 -msgid "Creating:" 7.41 -msgstr "" 7.42 - 7.43 -#: tinyutils/tazx:153 7.44 +#: tinyutils/tazx:243 7.45 msgid "Tazx helps you to select your X driver." 7.46 msgstr "Tazx pomaga w wybraniu właściwego sterownika X" 7.47 7.48 -#: tinyutils/tazx:154 tinyutils/hwsetup:258 7.49 -msgid "Auto configuring Xorg..." 7.50 +#: tinyutils/tazx:244 7.51 +msgid "Auto configuring" 7.52 msgstr "" 7.53 7.54 -#: tinyutils/tazx:156 tinyutils/tazx:184 7.55 +#: tinyutils/tazx:246 7.56 msgid "driver" 7.57 msgstr "" 7.58 7.59 -#: tinyutils/tazx:157 7.60 +#: tinyutils/tazx:247 tinyutils/slitaz-config:233 7.61 msgid "Quit" 7.62 msgstr "" 7.63 7.64 -#: tinyutils/tazx:186 tinyutils/hwsetup:107 7.65 -#, sh-format 7.66 -msgid "Failed to setup $DEVICE" 7.67 +#: tinyutils/tazx:276 7.68 +msgid "Failed to setup driver" 7.69 msgstr "" 7.70 7.71 -#: tinyutils/tazx:192 tinyutils/hwsetup:117 7.72 +#: tinyutils/tazx:276 7.73 +msgid "(unknown hardware)" 7.74 +msgstr "" 7.75 + 7.76 +#: tinyutils/tazx:289 tinyutils/hwsetup:117 7.77 #, sh-format 7.78 msgid "Installing pkg: $pkg" 7.79 msgstr "" 7.80 7.81 -#: tinyutils/tazx:202 tinyutils/tazx:276 7.82 -#, sh-format 7.83 -msgid "${INST_i18n}: ${WM_i18n} + applications" 7.84 +#: tinyutils/tazx:307 tinyutils/tazx:423 7.85 +msgid "Install Window Manager and applications" 7.86 msgstr "" 7.87 7.88 -#: tinyutils/tazx:270 7.89 +#: tinyutils/tazx:393 tinyutils/tazx:399 7.90 +#, fuzzy 7.91 +msgid "Install" 7.92 +msgstr "Zainstaluj Xorg" 7.93 + 7.94 +#: tinyutils/tazx:409 7.95 +msgid "ON" 7.96 +msgstr "" 7.97 + 7.98 +#: tinyutils/tazx:410 tinyutils/tazx:441 7.99 +msgid "OFF" 7.100 +msgstr "" 7.101 + 7.102 +#: tinyutils/tazx:417 7.103 #, fuzzy 7.104 msgid "SliTaz Xorg config" 7.105 msgstr "Konfiguracja języka SliTaz" 7.106 7.107 -#: tinyutils/tazx:272 7.108 +#: tinyutils/tazx:419 7.109 msgid "Install or reconfigure Xorg" 7.110 msgstr "Zainstaluj i skonfiguruj Xorg" 7.111 7.112 -#: tinyutils/tazx:273 7.113 +#: tinyutils/tazx:420 7.114 msgid "Install Xorg server (light version)" 7.115 msgstr "" 7.116 7.117 -#: tinyutils/tazx:274 7.118 +#: tinyutils/tazx:421 7.119 msgid "AutoStart Xorg by SLiM on boot" 7.120 msgstr "" 7.121 7.122 -#: tinyutils/tazx:275 7.123 +#: tinyutils/tazx:422 7.124 msgid "(Re)Start Simple Login Manager now" 7.125 msgstr "" 7.126 7.127 -#: tinyutils/tazx:277 7.128 +#: tinyutils/tazx:424 7.129 msgid "Quit Tazx utility" 7.130 msgstr "Zamknij narzędzie Tazx" 7.131 7.132 -#: tinyutils/tazx:384 7.133 +#: tinyutils/tazx:449 7.134 +msgid "Start X on boot:" 7.135 +msgstr "" 7.136 + 7.137 +#: tinyutils/tazx:551 7.138 +msgid "configuration tool for SliTaz GNU/Linux" 7.139 +msgstr "" 7.140 + 7.141 +#: tinyutils/tazx:553 tinyutils/hwsetup:25 7.142 +msgid "command" 7.143 +msgstr "" 7.144 + 7.145 +#: tinyutils/tazx:553 7.146 +msgid "parameter" 7.147 +msgstr "" 7.148 + 7.149 +#: tinyutils/tazx:555 tinyutils/hwsetup:27 tinyutils/frugal:36 7.150 +msgid "Commands:" 7.151 +msgstr "" 7.152 + 7.153 +#: tinyutils/tazx:556 7.154 +msgid "Install Xorg and selected Xorg driver" 7.155 +msgstr "" 7.156 + 7.157 +#: tinyutils/tazx:557 7.158 +msgid "Configure Xorg, generate configuration files" 7.159 +msgstr "" 7.160 + 7.161 +#: tinyutils/tazx:558 7.162 +msgid "Set monitor default depth (valid parameters: 8, 15, 16 or 24)" 7.163 +msgstr "" 7.164 + 7.165 +#: tinyutils/tazx:559 7.166 +msgid "Auto-select and install Xorg driver" 7.167 +msgstr "" 7.168 + 7.169 +#: tinyutils/tazx:560 7.170 +msgid "Get files for starting an X session and config the keyboard" 7.171 +msgstr "" 7.172 + 7.173 +#: tinyutils/tazx:561 7.174 +msgid "Generate or regenerate Xorg keyboard config" 7.175 +msgstr "" 7.176 + 7.177 +#: tinyutils/tazx:572 7.178 msgid "Run tazx as root if you need to configure xorg" 7.179 msgstr "" 7.180 7.181 @@ -262,14 +317,6 @@ 7.182 msgid "SliTaz Setup configuration" 7.183 msgstr "" 7.184 7.185 -#: tinyutils/hwsetup:25 7.186 -msgid "command" 7.187 -msgstr "" 7.188 - 7.189 -#: tinyutils/hwsetup:27 tinyutils/frugal:36 7.190 -msgid "Commands:" 7.191 -msgstr "" 7.192 - 7.193 #: tinyutils/hwsetup:29 7.194 msgid "Print this short usage." 7.195 msgstr "" 7.196 @@ -330,6 +377,11 @@ 7.197 "to SliTaz Bug tracker or Forum." 7.198 msgstr "" 7.199 7.200 +#: tinyutils/hwsetup:107 7.201 +#, sh-format 7.202 +msgid "Failed to setup $DEVICE" 7.203 +msgstr "" 7.204 + 7.205 #: tinyutils/hwsetup:131 7.206 #, sh-format 7.207 msgid "Would you like to install pkg: $pkg" 7.208 @@ -362,6 +414,10 @@ 7.209 msgid "New udev rules are added by a package" 7.210 msgstr "" 7.211 7.212 +#: tinyutils/hwsetup:258 7.213 +msgid "Auto configuring Xorg..." 7.214 +msgstr "" 7.215 + 7.216 #: tinyutils/hwsetup:261 7.217 msgid "Configuring Xorg..." 7.218 msgstr "" 7.219 @@ -706,6 +762,155 @@ 7.220 msgid "Unmounting ISO image..." 7.221 msgstr "" 7.222 7.223 +#: tinyutils/slitaz-config:14 7.224 +#, fuzzy 7.225 +msgid "SliTaz Config" 7.226 +msgstr "Konfiguracja języka SliTaz" 7.227 + 7.228 +#: tinyutils/slitaz-config:36 7.229 +msgid "Post Installation" 7.230 +msgstr "" 7.231 + 7.232 +#: tinyutils/slitaz-config:37 7.233 +msgid "Continue" 7.234 +msgstr "" 7.235 + 7.236 +#: tinyutils/slitaz-config:43 7.237 +msgid "Root Password" 7.238 +msgstr "" 7.239 + 7.240 +#: tinyutils/slitaz-config:44 7.241 +msgid "Enter new password for \\Zb\\Z1root" 7.242 +msgstr "" 7.243 + 7.244 +#: tinyutils/slitaz-config:53 7.245 +msgid "Add User" 7.246 +msgstr "" 7.247 + 7.248 +#: tinyutils/slitaz-config:56 7.249 +msgid "Enter login name for the new \\Zb\\Z4user" 7.250 +msgstr "" 7.251 + 7.252 +#: tinyutils/slitaz-config:61 7.253 +#, sh-format 7.254 +msgid "Enter password for user \\Zb\\Z4$user" 7.255 +msgstr "" 7.256 + 7.257 +#: tinyutils/slitaz-config:121 7.258 +msgid "connected" 7.259 +msgstr "" 7.260 + 7.261 +#: tinyutils/slitaz-config:136 7.262 +msgid "Quality" 7.263 +msgstr "" 7.264 + 7.265 +#: tinyutils/slitaz-config:136 7.266 +msgid "Key" 7.267 +msgstr "" 7.268 + 7.269 +#: tinyutils/slitaz-config:140 tinyutils/slitaz-config:169 7.270 +msgid "hidden.network" 7.271 +msgstr "" 7.272 + 7.273 +#: tinyutils/slitaz-config:140 7.274 +msgid "Connect.to.a.hidden.network" 7.275 +msgstr "" 7.276 + 7.277 +#: tinyutils/slitaz-config:156 7.278 +msgid "Select" 7.279 +msgstr "" 7.280 + 7.281 +#: tinyutils/slitaz-config:157 7.282 +msgid "Connect to a Wi-Fi network" 7.283 +msgstr "" 7.284 + 7.285 +#: tinyutils/slitaz-config:159 7.286 +msgid "Connect.to.any.network" 7.287 +msgstr "" 7.288 + 7.289 +#: tinyutils/slitaz-config:170 7.290 +msgid "Wi-Fi ESSID" 7.291 +msgstr "" 7.292 + 7.293 +#: tinyutils/slitaz-config:171 7.294 +msgid "Enter Wi-Fi access point ESSID (name)" 7.295 +msgstr "" 7.296 + 7.297 +#: tinyutils/slitaz-config:176 tinyutils/slitaz-config:187 7.298 +msgid "Wi-Fi Password" 7.299 +msgstr "" 7.300 + 7.301 +#: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 7.302 +#, sh-format 7.303 +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" 7.304 +msgstr "" 7.305 + 7.306 +#: tinyutils/slitaz-config:197 7.307 +msgid "Shutting down network interfaces..." 7.308 +msgstr "" 7.309 + 7.310 +#: tinyutils/slitaz-config:201 7.311 +msgid "Configuring: /etc/network.conf..." 7.312 +msgstr "" 7.313 + 7.314 +#: tinyutils/slitaz-config:211 7.315 +msgid "Restarting Wi-Fi interface..." 7.316 +msgstr "" 7.317 + 7.318 +#: tinyutils/slitaz-config:215 7.319 +msgid "Checking connection..." 7.320 +msgstr "" 7.321 + 7.322 +#: tinyutils/slitaz-config:220 7.323 +#, sh-format 7.324 +msgid "IP address: $ip" 7.325 +msgstr "" 7.326 + 7.327 +#: tinyutils/slitaz-config:222 7.328 +msgid "Unable to connect..." 7.329 +msgstr "" 7.330 + 7.331 +#: tinyutils/slitaz-config:226 7.332 +msgid "Wi-Fi Config" 7.333 +msgstr "" 7.334 + 7.335 +#: tinyutils/slitaz-config:233 7.336 +msgid "Exec" 7.337 +msgstr "" 7.338 + 7.339 +#: tinyutils/slitaz-config:235 7.340 +#, fuzzy 7.341 +msgid "System keyboard setting" 7.342 +msgstr "Konfiguracja układu klawiatury SliTaz" 7.343 + 7.344 +#: tinyutils/slitaz-config:236 7.345 +#, fuzzy 7.346 +msgid "System language setting" 7.347 +msgstr "Konfiguracja języka SliTaz" 7.348 + 7.349 +#: tinyutils/slitaz-config:237 7.350 +msgid "Wi-Fi network settings" 7.351 +msgstr "" 7.352 + 7.353 +#: tinyutils/slitaz-config:238 7.354 +msgid "Add a new user" 7.355 +msgstr "" 7.356 + 7.357 +#: tinyutils/slitaz-config:239 7.358 +msgid "Change root password" 7.359 +msgstr "" 7.360 + 7.361 +#: tinyutils/slitaz-config:240 7.362 +msgid "Set system date from the web" 7.363 +msgstr "" 7.364 + 7.365 +#: tinyutils/slitaz-config:241 7.366 +msgid "Exit from SliTaz Config" 7.367 +msgstr "" 7.368 + 7.369 +#~ msgid "Window Manager:" 7.370 +#~ msgstr "Menadżer okien:" 7.371 + 7.372 #~ msgid "Tazx dialog helps you to configure your Xorg server." 7.373 #~ msgstr "Dialog Tazx pomaga w konfiguracji serwera Xorg." 7.374
8.1 --- a/po/slitaz-tools/pt_BR.po Sat Nov 15 06:45:42 2014 +0200 8.2 +++ b/po/slitaz-tools/pt_BR.po Thu Nov 20 06:04:24 2014 +0200 8.3 @@ -7,7 +7,7 @@ 8.4 msgstr "" 8.5 "Project-Id-Version: SliTaz Tools\n" 8.6 "Report-Msgid-Bugs-To: \n" 8.7 -"POT-Creation-Date: 2014-11-14 21:22+0000\n" 8.8 +"POT-Creation-Date: 2014-11-20 05:20+0200\n" 8.9 "PO-Revision-Date: 2014-06-16 20:11-0300\n" 8.10 "Last-Translator: Claudinei Pereira <claudinei@slitaz.org>\n" 8.11 "Language-Team: Portuguese <i18n@slitaz.org>\n" 8.12 @@ -22,8 +22,8 @@ 8.13 msgstr "" 8.14 "Configuração de locale do SliTaz GNU/Linux utilizando caixas de diálogo." 8.15 8.16 -#: tinyutils/tazlocale:17 tinyutils/decode:30 tinyutils/hwsetup:24 8.17 -#: tinyutils/frugal:32 8.18 +#: tinyutils/tazlocale:17 tinyutils/tazx:553 tinyutils/decode:30 8.19 +#: tinyutils/hwsetup:24 tinyutils/frugal:32 8.20 msgid "Usage:" 8.21 msgstr "Utilização" 8.22 8.23 @@ -98,74 +98,136 @@ 8.24 msgid "Done" 8.25 msgstr "Feito" 8.26 8.27 -#: tinyutils/tazx:26 8.28 -msgid "Window Manager:" 8.29 -msgstr "Gerenciador de janelas:" 8.30 +#: tinyutils/tazx:141 8.31 +msgid "Creating:" 8.32 +msgstr "Criando:" 8.33 8.34 -#: tinyutils/tazx:27 tinyutils/tazx:152 8.35 +#: tinyutils/tazx:242 8.36 msgid "Install Xorg" 8.37 msgstr "Instalar Xorg" 8.38 8.39 -#: tinyutils/tazx:63 8.40 -msgid "Creating:" 8.41 -msgstr "Criando:" 8.42 - 8.43 -#: tinyutils/tazx:153 8.44 +#: tinyutils/tazx:243 8.45 msgid "Tazx helps you to select your X driver." 8.46 msgstr "O Tazx ajuda a selecionar o driver gráfico." 8.47 8.48 -#: tinyutils/tazx:154 tinyutils/hwsetup:258 8.49 -msgid "Auto configuring Xorg..." 8.50 +#: tinyutils/tazx:244 8.51 +#, fuzzy 8.52 +msgid "Auto configuring" 8.53 msgstr "Auto configurando Xorg..." 8.54 8.55 -#: tinyutils/tazx:156 tinyutils/tazx:184 8.56 +#: tinyutils/tazx:246 8.57 msgid "driver" 8.58 msgstr "driver" 8.59 8.60 -#: tinyutils/tazx:157 8.61 +#: tinyutils/tazx:247 tinyutils/slitaz-config:233 8.62 msgid "Quit" 8.63 msgstr "Sair" 8.64 8.65 -#: tinyutils/tazx:186 tinyutils/hwsetup:107 8.66 -#, sh-format 8.67 -msgid "Failed to setup $DEVICE" 8.68 +#: tinyutils/tazx:276 8.69 +#, fuzzy 8.70 +msgid "Failed to setup driver" 8.71 msgstr "Falha ao configurar $DEVICE" 8.72 8.73 -#: tinyutils/tazx:192 tinyutils/hwsetup:117 8.74 +#: tinyutils/tazx:276 8.75 +msgid "(unknown hardware)" 8.76 +msgstr "" 8.77 + 8.78 +#: tinyutils/tazx:289 tinyutils/hwsetup:117 8.79 #, sh-format 8.80 msgid "Installing pkg: $pkg" 8.81 msgstr "Instalando pacote: $pkg" 8.82 8.83 -#: tinyutils/tazx:202 tinyutils/tazx:276 8.84 -#, sh-format 8.85 -msgid "${INST_i18n}: ${WM_i18n} + applications" 8.86 +#: tinyutils/tazx:307 tinyutils/tazx:423 8.87 +#, fuzzy 8.88 +msgid "Install Window Manager and applications" 8.89 +msgstr "aplicativo do scanner" 8.90 + 8.91 +#: tinyutils/tazx:393 tinyutils/tazx:399 8.92 +#, fuzzy 8.93 +msgid "Install" 8.94 +msgstr "Instalar Xorg" 8.95 + 8.96 +#: tinyutils/tazx:409 8.97 +msgid "ON" 8.98 msgstr "" 8.99 8.100 -#: tinyutils/tazx:270 8.101 +#: tinyutils/tazx:410 tinyutils/tazx:441 8.102 +msgid "OFF" 8.103 +msgstr "" 8.104 + 8.105 +#: tinyutils/tazx:417 8.106 msgid "SliTaz Xorg config" 8.107 msgstr "Configuraçãdo Xorg do SliTaz" 8.108 8.109 -#: tinyutils/tazx:272 8.110 +#: tinyutils/tazx:419 8.111 msgid "Install or reconfigure Xorg" 8.112 msgstr "Instale ou reconfigure o Xorg" 8.113 8.114 -#: tinyutils/tazx:273 8.115 +#: tinyutils/tazx:420 8.116 msgid "Install Xorg server (light version)" 8.117 msgstr "Instalar o servidor Xorg (versão leve)" 8.118 8.119 -#: tinyutils/tazx:274 8.120 +#: tinyutils/tazx:421 8.121 msgid "AutoStart Xorg by SLiM on boot" 8.122 msgstr "" 8.123 8.124 -#: tinyutils/tazx:275 8.125 +#: tinyutils/tazx:422 8.126 msgid "(Re)Start Simple Login Manager now" 8.127 msgstr "" 8.128 8.129 -#: tinyutils/tazx:277 8.130 +#: tinyutils/tazx:424 8.131 msgid "Quit Tazx utility" 8.132 msgstr "Sair do utilitário Tazx" 8.133 8.134 -#: tinyutils/tazx:384 8.135 +#: tinyutils/tazx:449 8.136 +msgid "Start X on boot:" 8.137 +msgstr "" 8.138 + 8.139 +#: tinyutils/tazx:551 8.140 +msgid "configuration tool for SliTaz GNU/Linux" 8.141 +msgstr "" 8.142 + 8.143 +#: tinyutils/tazx:553 tinyutils/hwsetup:25 8.144 +msgid "command" 8.145 +msgstr "comando" 8.146 + 8.147 +#: tinyutils/tazx:553 8.148 +msgid "parameter" 8.149 +msgstr "" 8.150 + 8.151 +#: tinyutils/tazx:555 tinyutils/hwsetup:27 tinyutils/frugal:36 8.152 +msgid "Commands:" 8.153 +msgstr "Comandos:" 8.154 + 8.155 +#: tinyutils/tazx:556 8.156 +#, fuzzy 8.157 +msgid "Install Xorg and selected Xorg driver" 8.158 +msgstr "Instalar o servidor Xorg (versão leve)" 8.159 + 8.160 +#: tinyutils/tazx:557 8.161 +#, fuzzy 8.162 +msgid "Configure Xorg, generate configuration files" 8.163 +msgstr "" 8.164 +"Usar: utilitário aticonfig para gerar template de arquivo de configuração se " 8.165 +"necessário" 8.166 + 8.167 +#: tinyutils/tazx:558 8.168 +msgid "Set monitor default depth (valid parameters: 8, 15, 16 or 24)" 8.169 +msgstr "" 8.170 + 8.171 +#: tinyutils/tazx:559 8.172 +msgid "Auto-select and install Xorg driver" 8.173 +msgstr "" 8.174 + 8.175 +#: tinyutils/tazx:560 8.176 +msgid "Get files for starting an X session and config the keyboard" 8.177 +msgstr "" 8.178 + 8.179 +#: tinyutils/tazx:561 8.180 +msgid "Generate or regenerate Xorg keyboard config" 8.181 +msgstr "" 8.182 + 8.183 +#: tinyutils/tazx:572 8.184 msgid "Run tazx as root if you need to configure xorg" 8.185 msgstr "" 8.186 8.187 @@ -257,14 +319,6 @@ 8.188 msgid "SliTaz Setup configuration" 8.189 msgstr "Configuração do SliTaz" 8.190 8.191 -#: tinyutils/hwsetup:25 8.192 -msgid "command" 8.193 -msgstr "comando" 8.194 - 8.195 -#: tinyutils/hwsetup:27 tinyutils/frugal:36 8.196 -msgid "Commands:" 8.197 -msgstr "Comandos:" 8.198 - 8.199 #: tinyutils/hwsetup:29 8.200 msgid "Print this short usage." 8.201 msgstr "Mostra esta utilização." 8.202 @@ -328,6 +382,11 @@ 8.203 "não foi testado adequadamente. Por favor reportar qualquer sucesso, falha ou " 8.204 "bug no fórum ou no SliTaz Bug tracker." 8.205 8.206 +#: tinyutils/hwsetup:107 8.207 +#, sh-format 8.208 +msgid "Failed to setup $DEVICE" 8.209 +msgstr "Falha ao configurar $DEVICE" 8.210 + 8.211 #: tinyutils/hwsetup:131 8.212 #, sh-format 8.213 msgid "Would you like to install pkg: $pkg" 8.214 @@ -360,6 +419,10 @@ 8.215 msgid "New udev rules are added by a package" 8.216 msgstr "Novas regras do udev foram adicionadas para o pacote" 8.217 8.218 +#: tinyutils/hwsetup:258 8.219 +msgid "Auto configuring Xorg..." 8.220 +msgstr "Auto configurando Xorg..." 8.221 + 8.222 #: tinyutils/hwsetup:261 8.223 msgid "Configuring Xorg..." 8.224 msgstr "Configurando Xorg..." 8.225 @@ -716,6 +779,159 @@ 8.226 msgid "Unmounting ISO image..." 8.227 msgstr "Desmontando imagem ISO..." 8.228 8.229 +#: tinyutils/slitaz-config:14 8.230 +#, fuzzy 8.231 +msgid "SliTaz Config" 8.232 +msgstr "Configuraçãdo Xorg do SliTaz" 8.233 + 8.234 +#: tinyutils/slitaz-config:36 8.235 +#, fuzzy 8.236 +msgid "Post Installation" 8.237 +msgstr "Definir caminho de instalação raiz" 8.238 + 8.239 +#: tinyutils/slitaz-config:37 8.240 +msgid "Continue" 8.241 +msgstr "" 8.242 + 8.243 +#: tinyutils/slitaz-config:43 8.244 +#, fuzzy 8.245 +msgid "Root Password" 8.246 +msgstr "Senha:" 8.247 + 8.248 +#: tinyutils/slitaz-config:44 8.249 +msgid "Enter new password for \\Zb\\Z1root" 8.250 +msgstr "" 8.251 + 8.252 +#: tinyutils/slitaz-config:53 8.253 +msgid "Add User" 8.254 +msgstr "" 8.255 + 8.256 +#: tinyutils/slitaz-config:56 8.257 +msgid "Enter login name for the new \\Zb\\Z4user" 8.258 +msgstr "" 8.259 + 8.260 +#: tinyutils/slitaz-config:61 8.261 +#, sh-format 8.262 +msgid "Enter password for user \\Zb\\Z4$user" 8.263 +msgstr "" 8.264 + 8.265 +#: tinyutils/slitaz-config:121 8.266 +msgid "connected" 8.267 +msgstr "" 8.268 + 8.269 +#: tinyutils/slitaz-config:136 8.270 +msgid "Quality" 8.271 +msgstr "" 8.272 + 8.273 +#: tinyutils/slitaz-config:136 8.274 +msgid "Key" 8.275 +msgstr "" 8.276 + 8.277 +#: tinyutils/slitaz-config:140 tinyutils/slitaz-config:169 8.278 +msgid "hidden.network" 8.279 +msgstr "" 8.280 + 8.281 +#: tinyutils/slitaz-config:140 8.282 +msgid "Connect.to.a.hidden.network" 8.283 +msgstr "" 8.284 + 8.285 +#: tinyutils/slitaz-config:156 8.286 +msgid "Select" 8.287 +msgstr "" 8.288 + 8.289 +#: tinyutils/slitaz-config:157 8.290 +msgid "Connect to a Wi-Fi network" 8.291 +msgstr "" 8.292 + 8.293 +#: tinyutils/slitaz-config:159 8.294 +msgid "Connect.to.any.network" 8.295 +msgstr "" 8.296 + 8.297 +#: tinyutils/slitaz-config:170 8.298 +msgid "Wi-Fi ESSID" 8.299 +msgstr "" 8.300 + 8.301 +#: tinyutils/slitaz-config:171 8.302 +msgid "Enter Wi-Fi access point ESSID (name)" 8.303 +msgstr "" 8.304 + 8.305 +#: tinyutils/slitaz-config:176 tinyutils/slitaz-config:187 8.306 +#, fuzzy 8.307 +msgid "Wi-Fi Password" 8.308 +msgstr "Senha:" 8.309 + 8.310 +#: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 8.311 +#, sh-format 8.312 +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" 8.313 +msgstr "" 8.314 + 8.315 +#: tinyutils/slitaz-config:197 8.316 +msgid "Shutting down network interfaces..." 8.317 +msgstr "" 8.318 + 8.319 +#: tinyutils/slitaz-config:201 8.320 +#, fuzzy 8.321 +msgid "Configuring: /etc/network.conf..." 8.322 +msgstr "Configurando Xorg..." 8.323 + 8.324 +#: tinyutils/slitaz-config:211 8.325 +msgid "Restarting Wi-Fi interface..." 8.326 +msgstr "" 8.327 + 8.328 +#: tinyutils/slitaz-config:215 8.329 +msgid "Checking connection..." 8.330 +msgstr "" 8.331 + 8.332 +#: tinyutils/slitaz-config:220 8.333 +#, sh-format 8.334 +msgid "IP address: $ip" 8.335 +msgstr "" 8.336 + 8.337 +#: tinyutils/slitaz-config:222 8.338 +msgid "Unable to connect..." 8.339 +msgstr "" 8.340 + 8.341 +#: tinyutils/slitaz-config:226 8.342 +msgid "Wi-Fi Config" 8.343 +msgstr "" 8.344 + 8.345 +#: tinyutils/slitaz-config:233 8.346 +msgid "Exec" 8.347 +msgstr "" 8.348 + 8.349 +#: tinyutils/slitaz-config:235 8.350 +#, fuzzy 8.351 +msgid "System keyboard setting" 8.352 +msgstr "ConfiguraçaoTeclado do SliTaz" 8.353 + 8.354 +#: tinyutils/slitaz-config:236 8.355 +#, fuzzy 8.356 +msgid "System language setting" 8.357 +msgstr "Configuração de Linguagem do SliTaz" 8.358 + 8.359 +#: tinyutils/slitaz-config:237 8.360 +msgid "Wi-Fi network settings" 8.361 +msgstr "" 8.362 + 8.363 +#: tinyutils/slitaz-config:238 8.364 +msgid "Add a new user" 8.365 +msgstr "" 8.366 + 8.367 +#: tinyutils/slitaz-config:239 8.368 +msgid "Change root password" 8.369 +msgstr "" 8.370 + 8.371 +#: tinyutils/slitaz-config:240 8.372 +msgid "Set system date from the web" 8.373 +msgstr "" 8.374 + 8.375 +#: tinyutils/slitaz-config:241 8.376 +msgid "Exit from SliTaz Config" 8.377 +msgstr "" 8.378 + 8.379 +#~ msgid "Window Manager:" 8.380 +#~ msgstr "Gerenciador de janelas:" 8.381 + 8.382 #~ msgid "Configure X" 8.383 #~ msgstr "Configurar X" 8.384
9.1 --- a/po/slitaz-tools/ru.po Sat Nov 15 06:45:42 2014 +0200 9.2 +++ b/po/slitaz-tools/ru.po Thu Nov 20 06:04:24 2014 +0200 9.3 @@ -7,8 +7,8 @@ 9.4 msgstr "" 9.5 "Project-Id-Version: SliTaz Tools\n" 9.6 "Report-Msgid-Bugs-To: \n" 9.7 -"POT-Creation-Date: 2014-11-14 21:22+0000\n" 9.8 -"PO-Revision-Date: 2014-05-23 03:28+0300\n" 9.9 +"POT-Creation-Date: 2014-11-20 05:20+0200\n" 9.10 +"PO-Revision-Date: 2014-11-20 05:30+0300\n" 9.11 "Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n" 9.12 "Language-Team: \n" 9.13 "Language: Russian\n" 9.14 @@ -23,8 +23,8 @@ 9.15 msgid "SliTaz GNU/Linux locale setting using dialog boxes." 9.16 msgstr "Настройка локали SliTaz GNU/Linux с использованием dialog." 9.17 9.18 -#: tinyutils/tazlocale:17 tinyutils/decode:30 tinyutils/hwsetup:24 9.19 -#: tinyutils/frugal:32 9.20 +#: tinyutils/tazlocale:17 tinyutils/tazx:553 tinyutils/decode:30 9.21 +#: tinyutils/hwsetup:24 tinyutils/frugal:32 9.22 msgid "Usage:" 9.23 msgstr "Использование:" 9.24 9.25 @@ -101,76 +101,130 @@ 9.26 msgid "Done" 9.27 msgstr "Готово" 9.28 9.29 -#: tinyutils/tazx:26 9.30 -msgid "Window Manager:" 9.31 -msgstr "Менеджер окон:" 9.32 - 9.33 -#: tinyutils/tazx:27 tinyutils/tazx:152 9.34 -msgid "Install Xorg" 9.35 -msgstr "Установка X.org" 9.36 - 9.37 -#: tinyutils/tazx:63 9.38 +#: tinyutils/tazx:141 9.39 msgid "Creating:" 9.40 msgstr "Создается:" 9.41 9.42 -#: tinyutils/tazx:153 9.43 +#: tinyutils/tazx:242 9.44 +msgid "Install Xorg" 9.45 +msgstr "Установка Xorg" 9.46 + 9.47 +#: tinyutils/tazx:243 9.48 msgid "Tazx helps you to select your X driver." 9.49 -msgstr "Tazx поможет вам выбрать драйвер для X.Org." 9.50 +msgstr "Tazx поможет вам выбрать драйвер для Xorg." 9.51 9.52 -#: tinyutils/tazx:154 tinyutils/hwsetup:258 9.53 -msgid "Auto configuring Xorg..." 9.54 -msgstr "Авто-настройка Xorg…" 9.55 +#: tinyutils/tazx:244 9.56 +msgid "Auto configuring" 9.57 +msgstr "Авто-настройка" 9.58 9.59 -#: tinyutils/tazx:156 tinyutils/tazx:184 9.60 +#: tinyutils/tazx:246 9.61 msgid "driver" 9.62 msgstr "драйвер" 9.63 9.64 -#: tinyutils/tazx:157 9.65 +#: tinyutils/tazx:247 tinyutils/slitaz-config:233 9.66 msgid "Quit" 9.67 msgstr "Выход" 9.68 9.69 -#: tinyutils/tazx:186 tinyutils/hwsetup:107 9.70 -#, sh-format 9.71 -msgid "Failed to setup $DEVICE" 9.72 -msgstr "Не удалось настроить $DEVICE" 9.73 +#: tinyutils/tazx:276 9.74 +msgid "Failed to setup driver" 9.75 +msgstr "Не удалось установить драйвер" 9.76 9.77 -#: tinyutils/tazx:192 tinyutils/hwsetup:117 9.78 +#: tinyutils/tazx:276 9.79 +msgid "(unknown hardware)" 9.80 +msgstr "(неизвестное оборудование)" 9.81 + 9.82 +#: tinyutils/tazx:289 tinyutils/hwsetup:117 9.83 #, sh-format 9.84 msgid "Installing pkg: $pkg" 9.85 msgstr "Установка пакета «$pkg»" 9.86 9.87 -#: tinyutils/tazx:202 tinyutils/tazx:276 9.88 -#, sh-format 9.89 -msgid "${INST_i18n}: ${WM_i18n} + applications" 9.90 -msgstr "${INST_i18n}: ${WM_i18n}+программы" 9.91 +#: tinyutils/tazx:307 tinyutils/tazx:423 9.92 +msgid "Install Window Manager and applications" 9.93 +msgstr "Установка менеджера окон и приложений" 9.94 9.95 -#: tinyutils/tazx:270 9.96 +#: tinyutils/tazx:393 tinyutils/tazx:399 9.97 +msgid "Install" 9.98 +msgstr "Установить" 9.99 + 9.100 +#: tinyutils/tazx:409 9.101 +msgid "ON" 9.102 +msgstr "ВКЛ" 9.103 + 9.104 +#: tinyutils/tazx:410 tinyutils/tazx:441 9.105 +msgid "OFF" 9.106 +msgstr "ОТКЛ" 9.107 + 9.108 +#: tinyutils/tazx:417 9.109 msgid "SliTaz Xorg config" 9.110 -msgstr "Настройка X.Org в SliTaz" 9.111 +msgstr "Настройка Xorg в SliTaz" 9.112 9.113 -#: tinyutils/tazx:272 9.114 +#: tinyutils/tazx:419 9.115 msgid "Install or reconfigure Xorg" 9.116 -msgstr "Установить или перенастроить X.org" 9.117 +msgstr "Установить или перенастроить Xorg" 9.118 9.119 -#: tinyutils/tazx:273 9.120 +#: tinyutils/tazx:420 9.121 msgid "Install Xorg server (light version)" 9.122 -msgstr "Установка облегченного сервера X.Org" 9.123 +msgstr "Установить облегченный сервер Xorg" 9.124 9.125 -#: tinyutils/tazx:274 9.126 +#: tinyutils/tazx:421 9.127 msgid "AutoStart Xorg by SLiM on boot" 9.128 -msgstr "" 9.129 +msgstr "Автозапуск Xorg через SLiM при старте системы" 9.130 9.131 -#: tinyutils/tazx:275 9.132 +#: tinyutils/tazx:422 9.133 msgid "(Re)Start Simple Login Manager now" 9.134 -msgstr "" 9.135 +msgstr "(Пере)запустить простой менеджер входа SLiM сейчас" 9.136 9.137 -#: tinyutils/tazx:277 9.138 +#: tinyutils/tazx:424 9.139 msgid "Quit Tazx utility" 9.140 msgstr "Выйти из утилиты Tazx" 9.141 9.142 -#: tinyutils/tazx:384 9.143 +#: tinyutils/tazx:449 9.144 +msgid "Start X on boot:" 9.145 +msgstr "Запуск X при старте системы:" 9.146 + 9.147 +#: tinyutils/tazx:551 9.148 +msgid "configuration tool for SliTaz GNU/Linux" 9.149 +msgstr "утилита настройки SliTaz GNU/Linux" 9.150 + 9.151 +#: tinyutils/tazx:553 tinyutils/hwsetup:25 9.152 +msgid "command" 9.153 +msgstr "команда" 9.154 + 9.155 +#: tinyutils/tazx:553 9.156 +msgid "parameter" 9.157 +msgstr "параметр" 9.158 + 9.159 +#: tinyutils/tazx:555 tinyutils/hwsetup:27 tinyutils/frugal:36 9.160 +msgid "Commands:" 9.161 +msgstr "Команды:" 9.162 + 9.163 +#: tinyutils/tazx:556 9.164 +msgid "Install Xorg and selected Xorg driver" 9.165 +msgstr "Установить Xorg и выбранный драйвер Xorg" 9.166 + 9.167 +#: tinyutils/tazx:557 9.168 +msgid "Configure Xorg, generate configuration files" 9.169 +msgstr "Настроить Xorg, создать конфигурационные файлы" 9.170 + 9.171 +#: tinyutils/tazx:558 9.172 +msgid "Set monitor default depth (valid parameters: 8, 15, 16 or 24)" 9.173 +msgstr "Установить глубину цвета монитора (параметр: 8, 15, 16 или 24)" 9.174 + 9.175 +#: tinyutils/tazx:559 9.176 +msgid "Auto-select and install Xorg driver" 9.177 +msgstr "Автоматически выбрать и установить драйвер Xorg" 9.178 + 9.179 +#: tinyutils/tazx:560 9.180 +msgid "Get files for starting an X session and config the keyboard" 9.181 +msgstr "Создать файлы для запуска X-сессии и настроить клавиатуру" 9.182 + 9.183 +#: tinyutils/tazx:561 9.184 +msgid "Generate or regenerate Xorg keyboard config" 9.185 +msgstr "Создать конфигурационный файл клавиатуры для Xorg" 9.186 + 9.187 +#: tinyutils/tazx:572 9.188 msgid "Run tazx as root if you need to configure xorg" 9.189 -msgstr "" 9.190 +msgstr "Если нужно настроить Xorg — запустите tazx от имени root" 9.191 9.192 #: tinyutils/decode:28 9.193 msgid "Decode audio and video files" 9.194 @@ -260,14 +314,6 @@ 9.195 msgid "SliTaz Setup configuration" 9.196 msgstr "Настройка оборудования SliTaz" 9.197 9.198 -#: tinyutils/hwsetup:25 9.199 -msgid "command" 9.200 -msgstr "команда" 9.201 - 9.202 -#: tinyutils/hwsetup:27 tinyutils/frugal:36 9.203 -msgid "Commands:" 9.204 -msgstr "Команды:" 9.205 - 9.206 #: tinyutils/hwsetup:29 9.207 msgid "Print this short usage." 9.208 msgstr "Вывести эту справку" 9.209 @@ -302,7 +348,7 @@ 9.210 9.211 #: tinyutils/hwsetup:37 9.212 msgid "Nvidia (non-free/free) setup." 9.213 -msgstr "Настройка видео-карты Nvidia (свободные и несвободные драйверы)." 9.214 +msgstr "Настройка видео-карты nVidia (свободные и несвободные драйверы)." 9.215 9.216 #: tinyutils/hwsetup:38 9.217 msgid "ATI (non-free/free) setup." 9.218 @@ -331,6 +377,11 @@ 9.219 "SliTaz. Сообщите о ваших успехах, неудачах, ошибках в баг-трекер SliTaz или " 9.220 "на форум." 9.221 9.222 +#: tinyutils/hwsetup:107 9.223 +#, sh-format 9.224 +msgid "Failed to setup $DEVICE" 9.225 +msgstr "Не удалось настроить $DEVICE" 9.226 + 9.227 #: tinyutils/hwsetup:131 9.228 #, sh-format 9.229 msgid "Would you like to install pkg: $pkg" 9.230 @@ -365,6 +416,10 @@ 9.231 msgid "New udev rules are added by a package" 9.232 msgstr "При установке пакета добавлены новые правила UDEV" 9.233 9.234 +#: tinyutils/hwsetup:258 9.235 +msgid "Auto configuring Xorg..." 9.236 +msgstr "Авто-настройка Xorg…" 9.237 + 9.238 #: tinyutils/hwsetup:261 9.239 msgid "Configuring Xorg..." 9.240 msgstr "Настройка X.Org…" 9.241 @@ -590,7 +645,7 @@ 9.242 9.243 #: tinyutils/hwsetup:646 9.244 msgid "Do you want to configure X using free nvidia driver" 9.245 -msgstr "Настроить X.Org, используя свободный драйвер Nvidia" 9.246 +msgstr "Настроить Xorg, используя свободный драйвер nVidia" 9.247 9.248 #: tinyutils/hwsetup:652 9.249 #, sh-format 9.250 @@ -599,7 +654,7 @@ 9.251 9.252 #: tinyutils/hwsetup:678 9.253 msgid "Do you want to configure X using non-free catalyst ATI (radeon) driver" 9.254 -msgstr "Настроить X.Org, используя несвободный драйвер ATI Catalyst (Radeon)" 9.255 +msgstr "Настроить Xorg, используя несвободный драйвер ATI Catalyst (Radeon)" 9.256 9.257 #: tinyutils/hwsetup:682 9.258 #, sh-format 9.259 @@ -625,7 +680,7 @@ 9.260 9.261 #: tinyutils/hwsetup:711 9.262 msgid "Do you want to configure X using free ATI (radeon) driver" 9.263 -msgstr "Настроить X.Org, используя свободный драйвер ATI (Radeon)" 9.264 +msgstr "Настроить Xorg, используя свободный драйвер ATI (Radeon)" 9.265 9.266 #: tinyutils/hwsetup:715 9.267 #, sh-format 9.268 @@ -724,45 +779,145 @@ 9.269 msgid "Unmounting ISO image..." 9.270 msgstr "Отключение образа ISO…" 9.271 9.272 -#~ msgid "Configure X" 9.273 -#~ msgstr "Настройка XOrg" 9.274 +#: tinyutils/slitaz-config:14 9.275 +msgid "SliTaz Config" 9.276 +msgstr "Настройка SliTaz" 9.277 9.278 -#~ msgid "Tazx dialog helps you to configure your Xorg server." 9.279 -#~ msgstr "Диалог Tazx поможет вам настроить сервер Xorg." 9.280 +#: tinyutils/slitaz-config:36 9.281 +msgid "Post Installation" 9.282 +msgstr "После установки" 9.283 9.284 -#~ msgid "X server:" 9.285 -#~ msgstr "X-сервер:" 9.286 +#: tinyutils/slitaz-config:37 9.287 +msgid "Continue" 9.288 +msgstr "Продолжить" 9.289 9.290 -#~ msgid "Install TinyX server Xfbdev" 9.291 -#~ msgstr "Установить сервер TinyX: Xfbdev" 9.292 +#: tinyutils/slitaz-config:43 9.293 +msgid "Root Password" 9.294 +msgstr "Пароль root" 9.295 9.296 -#~ msgid "You must be root to configure X server." 9.297 -#~ msgstr "Вы должны быть администратором для настройки X-сервера." 9.298 +#: tinyutils/slitaz-config:44 9.299 +msgid "Enter new password for \\Zb\\Z1root" 9.300 +msgstr "Введите новый пароль для \\Zb\\Z1root" 9.301 9.302 -#~ msgid "" 9.303 -#~ "Your previous config is in /etc/X11/xorg.conf.d/60-Device.conf\n" 9.304 -#~ "If nvidia fails, you can remove /etc/X11/xorg.conf.d/55-DeviceTweaks.conf " 9.305 -#~ "to restore previous config." 9.306 -#~ msgstr "" 9.307 -#~ "Предыдущие настройки находятся в файле /etc/X11/xorg.conf.d/60-Device." 9.308 -#~ "conf\n" 9.309 -#~ "Если драйвер nvidia не будет корректно работать, вы можете удалить /etc/" 9.310 -#~ "X11/xorg.conf.d/55-DeviceTweaks.conf, чтобы вернуться к предыдущим " 9.311 -#~ "настройкам." 9.312 +#: tinyutils/slitaz-config:53 9.313 +msgid "Add User" 9.314 +msgstr "Добавить пользователя" 9.315 9.316 -#~ msgid "" 9.317 -#~ "Quick start guide: http://www.gphoto.org/doc/manual/using-gphoto2.html" 9.318 -#~ msgstr "" 9.319 -#~ "Краткое руководство пользователя: http://www.gphoto.org/doc/manual/using-" 9.320 -#~ "gphoto2.html" 9.321 +#: tinyutils/slitaz-config:56 9.322 +msgid "Enter login name for the new \\Zb\\Z4user" 9.323 +msgstr "Введите логин нового \\Zb\\Z4пользователя" 9.324 9.325 -#~ msgid "You must be root to run $command with this option." 9.326 -#~ msgstr "" 9.327 -#~ "Вы должны быть администратором, чтобы запустить $command с этим " 9.328 -#~ "параметром." 9.329 +#: tinyutils/slitaz-config:61 9.330 +#, sh-format 9.331 +msgid "Enter password for user \\Zb\\Z4$user" 9.332 +msgstr "Введите пароль для пользователя \\Zb\\Z4$user" 9.333 9.334 -#~ msgid "Please use 'su' and root password to become super-user." 9.335 -#~ msgstr "Введите «su» и пароль root, чтобы стать администратором." 9.336 +#: tinyutils/slitaz-config:121 9.337 +msgid "connected" 9.338 +msgstr "подключено" 9.339 9.340 -#~ msgid "Setting system locale to: $locale" 9.341 -#~ msgstr "Установка системной локали «$locale»" 9.342 +#: tinyutils/slitaz-config:136 9.343 +msgid "Quality" 9.344 +msgstr "Уровень" 9.345 + 9.346 +#: tinyutils/slitaz-config:136 9.347 +msgid "Key" 9.348 +msgstr "Безопасность" 9.349 + 9.350 +#: tinyutils/slitaz-config:140 tinyutils/slitaz-config:169 9.351 +msgid "hidden.network" 9.352 +msgstr "скрытая.сеть" 9.353 + 9.354 +#: tinyutils/slitaz-config:140 9.355 +msgid "Connect.to.a.hidden.network" 9.356 +msgstr "Соединиться.со.скрытой.сетью" 9.357 + 9.358 +#: tinyutils/slitaz-config:156 9.359 +msgid "Select" 9.360 +msgstr "Выбрать" 9.361 + 9.362 +#: tinyutils/slitaz-config:157 9.363 +msgid "Connect to a Wi-Fi network" 9.364 +msgstr "Соединение с сетью Wi-Fi" 9.365 + 9.366 +#: tinyutils/slitaz-config:159 9.367 +msgid "Connect.to.any.network" 9.368 +msgstr "Соединиться.с.любой.сетью" 9.369 + 9.370 +#: tinyutils/slitaz-config:170 9.371 +msgid "Wi-Fi ESSID" 9.372 +msgstr "ESSID Wi-Fi" 9.373 + 9.374 +#: tinyutils/slitaz-config:171 9.375 +msgid "Enter Wi-Fi access point ESSID (name)" 9.376 +msgstr "Введите ESSID (имя) точки доступа Wi-Fi" 9.377 + 9.378 +#: tinyutils/slitaz-config:176 tinyutils/slitaz-config:187 9.379 +msgid "Wi-Fi Password" 9.380 +msgstr "Пароль Wi-Fi" 9.381 + 9.382 +#: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 9.383 +#, sh-format 9.384 +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" 9.385 +msgstr "Введите пароль Wi-Fi для \\Zb\\Z4$essid" 9.386 + 9.387 +#: tinyutils/slitaz-config:197 9.388 +msgid "Shutting down network interfaces..." 9.389 +msgstr "Выключение сетевых интерфейсов…" 9.390 + 9.391 +#: tinyutils/slitaz-config:201 9.392 +msgid "Configuring: /etc/network.conf..." 9.393 +msgstr "Настройка /etc/network.conf…" 9.394 + 9.395 +#: tinyutils/slitaz-config:211 9.396 +msgid "Restarting Wi-Fi interface..." 9.397 +msgstr "Перезапуск интерфейса Wi-Fi…" 9.398 + 9.399 +#: tinyutils/slitaz-config:215 9.400 +msgid "Checking connection..." 9.401 +msgstr "Проверка соединения…" 9.402 + 9.403 +#: tinyutils/slitaz-config:220 9.404 +#, sh-format 9.405 +msgid "IP address: $ip" 9.406 +msgstr "IP-адрес: $ip" 9.407 + 9.408 +#: tinyutils/slitaz-config:222 9.409 +msgid "Unable to connect..." 9.410 +msgstr "Не удалось соединиться…" 9.411 + 9.412 +#: tinyutils/slitaz-config:226 9.413 +msgid "Wi-Fi Config" 9.414 +msgstr "Параметры Wi-Fi" 9.415 + 9.416 +#: tinyutils/slitaz-config:233 9.417 +msgid "Exec" 9.418 +msgstr "Пуск" 9.419 + 9.420 +#: tinyutils/slitaz-config:235 9.421 +msgid "System keyboard setting" 9.422 +msgstr "Настройка клавиатурной раскладки" 9.423 + 9.424 +#: tinyutils/slitaz-config:236 9.425 +msgid "System language setting" 9.426 +msgstr "Настройка языка системы" 9.427 + 9.428 +#: tinyutils/slitaz-config:237 9.429 +msgid "Wi-Fi network settings" 9.430 +msgstr "Настройка подключения Wi-Fi" 9.431 + 9.432 +#: tinyutils/slitaz-config:238 9.433 +msgid "Add a new user" 9.434 +msgstr "Добавить пользователя" 9.435 + 9.436 +#: tinyutils/slitaz-config:239 9.437 +msgid "Change root password" 9.438 +msgstr "Изменить пароль root" 9.439 + 9.440 +#: tinyutils/slitaz-config:240 9.441 +msgid "Set system date from the web" 9.442 +msgstr "Установить системную дату по интернету" 9.443 + 9.444 +#: tinyutils/slitaz-config:241 9.445 +msgid "Exit from SliTaz Config" 9.446 +msgstr "Выйти из настройки SliTaz"
10.1 --- a/po/slitaz-tools/slitaz-tools.pot Sat Nov 15 06:45:42 2014 +0200 10.2 +++ b/po/slitaz-tools/slitaz-tools.pot Thu Nov 20 06:04:24 2014 +0200 10.3 @@ -8,7 +8,7 @@ 10.4 msgstr "" 10.5 "Project-Id-Version: SliTaz Tools\n" 10.6 "Report-Msgid-Bugs-To: \n" 10.7 -"POT-Creation-Date: 2014-11-14 21:22+0000\n" 10.8 +"POT-Creation-Date: 2014-11-20 05:38+0200\n" 10.9 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 10.10 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 10.11 "Language-Team: LANGUAGE <LL@li.org>\n" 10.12 @@ -21,8 +21,8 @@ 10.13 msgid "SliTaz GNU/Linux locale setting using dialog boxes." 10.14 msgstr "" 10.15 10.16 -#: tinyutils/tazlocale:17 tinyutils/decode:30 tinyutils/hwsetup:24 10.17 -#: tinyutils/frugal:32 10.18 +#: tinyutils/tazlocale:17 tinyutils/tazx:553 tinyutils/decode:30 10.19 +#: tinyutils/hwsetup:24 tinyutils/frugal:32 10.20 msgid "Usage:" 10.21 msgstr "" 10.22 10.23 @@ -92,74 +92,128 @@ 10.24 msgid "Done" 10.25 msgstr "" 10.26 10.27 -#: tinyutils/tazx:26 10.28 -msgid "Window Manager:" 10.29 +#: tinyutils/tazx:141 10.30 +msgid "Creating:" 10.31 msgstr "" 10.32 10.33 -#: tinyutils/tazx:27 tinyutils/tazx:152 10.34 +#: tinyutils/tazx:242 10.35 msgid "Install Xorg" 10.36 msgstr "" 10.37 10.38 -#: tinyutils/tazx:63 10.39 -msgid "Creating:" 10.40 -msgstr "" 10.41 - 10.42 -#: tinyutils/tazx:153 10.43 +#: tinyutils/tazx:243 10.44 msgid "Tazx helps you to select your X driver." 10.45 msgstr "" 10.46 10.47 -#: tinyutils/tazx:154 tinyutils/hwsetup:258 10.48 -msgid "Auto configuring Xorg..." 10.49 +#: tinyutils/tazx:244 10.50 +msgid "Auto configuring" 10.51 msgstr "" 10.52 10.53 -#: tinyutils/tazx:156 tinyutils/tazx:184 10.54 +#: tinyutils/tazx:246 10.55 msgid "driver" 10.56 msgstr "" 10.57 10.58 -#: tinyutils/tazx:157 10.59 +#: tinyutils/tazx:247 tinyutils/slitaz-config:233 10.60 msgid "Quit" 10.61 msgstr "" 10.62 10.63 -#: tinyutils/tazx:186 tinyutils/hwsetup:107 10.64 -#, sh-format 10.65 -msgid "Failed to setup $DEVICE" 10.66 +#: tinyutils/tazx:276 10.67 +msgid "Failed to setup driver" 10.68 msgstr "" 10.69 10.70 -#: tinyutils/tazx:192 tinyutils/hwsetup:117 10.71 +#: tinyutils/tazx:276 10.72 +msgid "(unknown hardware)" 10.73 +msgstr "" 10.74 + 10.75 +#: tinyutils/tazx:289 tinyutils/hwsetup:117 10.76 #, sh-format 10.77 msgid "Installing pkg: $pkg" 10.78 msgstr "" 10.79 10.80 -#: tinyutils/tazx:202 tinyutils/tazx:276 10.81 -#, sh-format 10.82 -msgid "${INST_i18n}: ${WM_i18n} + applications" 10.83 +#: tinyutils/tazx:307 tinyutils/tazx:423 10.84 +msgid "Install Window Manager and applications" 10.85 msgstr "" 10.86 10.87 -#: tinyutils/tazx:270 10.88 +#: tinyutils/tazx:393 tinyutils/tazx:399 10.89 +msgid "Install" 10.90 +msgstr "" 10.91 + 10.92 +#: tinyutils/tazx:409 10.93 +msgid "ON" 10.94 +msgstr "" 10.95 + 10.96 +#: tinyutils/tazx:410 tinyutils/tazx:441 10.97 +msgid "OFF" 10.98 +msgstr "" 10.99 + 10.100 +#: tinyutils/tazx:417 10.101 msgid "SliTaz Xorg config" 10.102 msgstr "" 10.103 10.104 -#: tinyutils/tazx:272 10.105 +#: tinyutils/tazx:419 10.106 msgid "Install or reconfigure Xorg" 10.107 msgstr "" 10.108 10.109 -#: tinyutils/tazx:273 10.110 +#: tinyutils/tazx:420 10.111 msgid "Install Xorg server (light version)" 10.112 msgstr "" 10.113 10.114 -#: tinyutils/tazx:274 10.115 +#: tinyutils/tazx:421 10.116 msgid "AutoStart Xorg by SLiM on boot" 10.117 msgstr "" 10.118 10.119 -#: tinyutils/tazx:275 10.120 +#: tinyutils/tazx:422 10.121 msgid "(Re)Start Simple Login Manager now" 10.122 msgstr "" 10.123 10.124 -#: tinyutils/tazx:277 10.125 +#: tinyutils/tazx:424 10.126 msgid "Quit Tazx utility" 10.127 msgstr "" 10.128 10.129 -#: tinyutils/tazx:384 10.130 +#: tinyutils/tazx:449 10.131 +msgid "Start X on boot:" 10.132 +msgstr "" 10.133 + 10.134 +#: tinyutils/tazx:551 10.135 +msgid "configuration tool for SliTaz GNU/Linux" 10.136 +msgstr "" 10.137 + 10.138 +#: tinyutils/tazx:553 tinyutils/hwsetup:25 10.139 +msgid "command" 10.140 +msgstr "" 10.141 + 10.142 +#: tinyutils/tazx:553 10.143 +msgid "parameter" 10.144 +msgstr "" 10.145 + 10.146 +#: tinyutils/tazx:555 tinyutils/hwsetup:27 tinyutils/frugal:36 10.147 +msgid "Commands:" 10.148 +msgstr "" 10.149 + 10.150 +#: tinyutils/tazx:556 10.151 +msgid "Install Xorg and selected Xorg driver" 10.152 +msgstr "" 10.153 + 10.154 +#: tinyutils/tazx:557 10.155 +msgid "Configure Xorg, generate configuration files" 10.156 +msgstr "" 10.157 + 10.158 +#: tinyutils/tazx:558 10.159 +msgid "Set monitor default depth (valid parameters: 8, 15, 16 or 24)" 10.160 +msgstr "" 10.161 + 10.162 +#: tinyutils/tazx:559 10.163 +msgid "Auto-select and install Xorg driver" 10.164 +msgstr "" 10.165 + 10.166 +#: tinyutils/tazx:560 10.167 +msgid "Get files for starting an X session and config the keyboard" 10.168 +msgstr "" 10.169 + 10.170 +#: tinyutils/tazx:561 10.171 +msgid "Generate or regenerate Xorg keyboard config" 10.172 +msgstr "" 10.173 + 10.174 +#: tinyutils/tazx:572 10.175 msgid "Run tazx as root if you need to configure xorg" 10.176 msgstr "" 10.177 10.178 @@ -251,14 +305,6 @@ 10.179 msgid "SliTaz Setup configuration" 10.180 msgstr "" 10.181 10.182 -#: tinyutils/hwsetup:25 10.183 -msgid "command" 10.184 -msgstr "" 10.185 - 10.186 -#: tinyutils/hwsetup:27 tinyutils/frugal:36 10.187 -msgid "Commands:" 10.188 -msgstr "" 10.189 - 10.190 #: tinyutils/hwsetup:29 10.191 msgid "Print this short usage." 10.192 msgstr "" 10.193 @@ -319,6 +365,11 @@ 10.194 "to SliTaz Bug tracker or Forum." 10.195 msgstr "" 10.196 10.197 +#: tinyutils/hwsetup:107 10.198 +#, sh-format 10.199 +msgid "Failed to setup $DEVICE" 10.200 +msgstr "" 10.201 + 10.202 #: tinyutils/hwsetup:131 10.203 #, sh-format 10.204 msgid "Would you like to install pkg: $pkg" 10.205 @@ -351,6 +402,10 @@ 10.206 msgid "New udev rules are added by a package" 10.207 msgstr "" 10.208 10.209 +#: tinyutils/hwsetup:258 10.210 +msgid "Auto configuring Xorg..." 10.211 +msgstr "" 10.212 + 10.213 #: tinyutils/hwsetup:261 10.214 msgid "Configuring Xorg..." 10.215 msgstr "" 10.216 @@ -694,3 +749,146 @@ 10.217 #: tinyutils/frugal:131 10.218 msgid "Unmounting ISO image..." 10.219 msgstr "" 10.220 + 10.221 +#: tinyutils/slitaz-config:14 10.222 +msgid "SliTaz Config" 10.223 +msgstr "" 10.224 + 10.225 +#: tinyutils/slitaz-config:36 10.226 +msgid "Post Installation" 10.227 +msgstr "" 10.228 + 10.229 +#: tinyutils/slitaz-config:37 10.230 +msgid "Continue" 10.231 +msgstr "" 10.232 + 10.233 +#: tinyutils/slitaz-config:43 10.234 +msgid "Root Password" 10.235 +msgstr "" 10.236 + 10.237 +#: tinyutils/slitaz-config:44 10.238 +msgid "Enter new password for \\Zb\\Z1root" 10.239 +msgstr "" 10.240 + 10.241 +#: tinyutils/slitaz-config:53 10.242 +msgid "Add User" 10.243 +msgstr "" 10.244 + 10.245 +#: tinyutils/slitaz-config:56 10.246 +msgid "Enter login name for the new \\Zb\\Z4user" 10.247 +msgstr "" 10.248 + 10.249 +#: tinyutils/slitaz-config:61 10.250 +#, sh-format 10.251 +msgid "Enter password for user \\Zb\\Z4$user" 10.252 +msgstr "" 10.253 + 10.254 +#: tinyutils/slitaz-config:121 10.255 +msgid "connected" 10.256 +msgstr "" 10.257 + 10.258 +#: tinyutils/slitaz-config:136 10.259 +msgid "Quality" 10.260 +msgstr "" 10.261 + 10.262 +#: tinyutils/slitaz-config:136 10.263 +msgid "Key" 10.264 +msgstr "" 10.265 + 10.266 +#: tinyutils/slitaz-config:140 tinyutils/slitaz-config:169 10.267 +msgid "hidden.network" 10.268 +msgstr "" 10.269 + 10.270 +#: tinyutils/slitaz-config:140 10.271 +msgid "Connect.to.a.hidden.network" 10.272 +msgstr "" 10.273 + 10.274 +#: tinyutils/slitaz-config:156 10.275 +msgid "Select" 10.276 +msgstr "" 10.277 + 10.278 +#: tinyutils/slitaz-config:157 10.279 +msgid "Connect to a Wi-Fi network" 10.280 +msgstr "" 10.281 + 10.282 +#: tinyutils/slitaz-config:159 10.283 +msgid "Connect.to.any.network" 10.284 +msgstr "" 10.285 + 10.286 +#: tinyutils/slitaz-config:170 10.287 +msgid "Wi-Fi ESSID" 10.288 +msgstr "" 10.289 + 10.290 +#: tinyutils/slitaz-config:171 10.291 +msgid "Enter Wi-Fi access point ESSID (name)" 10.292 +msgstr "" 10.293 + 10.294 +#: tinyutils/slitaz-config:176 tinyutils/slitaz-config:187 10.295 +msgid "Wi-Fi Password" 10.296 +msgstr "" 10.297 + 10.298 +#: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 10.299 +#, sh-format 10.300 +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" 10.301 +msgstr "" 10.302 + 10.303 +#: tinyutils/slitaz-config:197 10.304 +msgid "Shutting down network interfaces..." 10.305 +msgstr "" 10.306 + 10.307 +#: tinyutils/slitaz-config:201 10.308 +msgid "Configuring: /etc/network.conf..." 10.309 +msgstr "" 10.310 + 10.311 +#: tinyutils/slitaz-config:211 10.312 +msgid "Restarting Wi-Fi interface..." 10.313 +msgstr "" 10.314 + 10.315 +#: tinyutils/slitaz-config:215 10.316 +msgid "Checking connection..." 10.317 +msgstr "" 10.318 + 10.319 +#: tinyutils/slitaz-config:220 10.320 +#, sh-format 10.321 +msgid "IP address: $ip" 10.322 +msgstr "" 10.323 + 10.324 +#: tinyutils/slitaz-config:222 10.325 +msgid "Unable to connect..." 10.326 +msgstr "" 10.327 + 10.328 +#: tinyutils/slitaz-config:226 10.329 +msgid "Wi-Fi Config" 10.330 +msgstr "" 10.331 + 10.332 +#: tinyutils/slitaz-config:233 10.333 +msgid "Exec" 10.334 +msgstr "" 10.335 + 10.336 +#: tinyutils/slitaz-config:235 10.337 +msgid "System keyboard setting" 10.338 +msgstr "" 10.339 + 10.340 +#: tinyutils/slitaz-config:236 10.341 +msgid "System language setting" 10.342 +msgstr "" 10.343 + 10.344 +#: tinyutils/slitaz-config:237 10.345 +msgid "Wi-Fi network settings" 10.346 +msgstr "" 10.347 + 10.348 +#: tinyutils/slitaz-config:238 10.349 +msgid "Add a new user" 10.350 +msgstr "" 10.351 + 10.352 +#: tinyutils/slitaz-config:239 10.353 +msgid "Change root password" 10.354 +msgstr "" 10.355 + 10.356 +#: tinyutils/slitaz-config:240 10.357 +msgid "Set system date from the web" 10.358 +msgstr "" 10.359 + 10.360 +#: tinyutils/slitaz-config:241 10.361 +msgid "Exit from SliTaz Config" 10.362 +msgstr ""
11.1 --- a/po/slitaz-tools/sv.po Sat Nov 15 06:45:42 2014 +0200 11.2 +++ b/po/slitaz-tools/sv.po Thu Nov 20 06:04:24 2014 +0200 11.3 @@ -7,7 +7,7 @@ 11.4 msgstr "" 11.5 "Project-Id-Version: SliTaz Tools\n" 11.6 "Report-Msgid-Bugs-To: \n" 11.7 -"POT-Creation-Date: 2014-11-14 21:22+0000\n" 11.8 +"POT-Creation-Date: 2014-11-20 05:20+0200\n" 11.9 "PO-Revision-Date: 2012-07-12 12:59-0000\n" 11.10 "Last-Translator: Emil Eklund <emileklund123@gmail.com>\n" 11.11 "Language-Team: Swedish\n" 11.12 @@ -21,8 +21,8 @@ 11.13 msgid "SliTaz GNU/Linux locale setting using dialog boxes." 11.14 msgstr "" 11.15 11.16 -#: tinyutils/tazlocale:17 tinyutils/decode:30 tinyutils/hwsetup:24 11.17 -#: tinyutils/frugal:32 11.18 +#: tinyutils/tazlocale:17 tinyutils/tazx:553 tinyutils/decode:30 11.19 +#: tinyutils/hwsetup:24 tinyutils/frugal:32 11.20 msgid "Usage:" 11.21 msgstr "Användning:" 11.22 11.23 @@ -98,75 +98,130 @@ 11.24 msgid "Done" 11.25 msgstr "Klar" 11.26 11.27 -#: tinyutils/tazx:26 11.28 -msgid "Window Manager:" 11.29 -msgstr "Fönster hanterare:" 11.30 +#: tinyutils/tazx:141 11.31 +msgid "Creating:" 11.32 +msgstr "" 11.33 11.34 -#: tinyutils/tazx:27 tinyutils/tazx:152 11.35 +#: tinyutils/tazx:242 11.36 msgid "Install Xorg" 11.37 msgstr "Installera Xorg" 11.38 11.39 -#: tinyutils/tazx:63 11.40 -msgid "Creating:" 11.41 -msgstr "" 11.42 - 11.43 -#: tinyutils/tazx:153 11.44 +#: tinyutils/tazx:243 11.45 msgid "Tazx helps you to select your X driver." 11.46 msgstr "Tazx hjälper dig att välja din X drivrutin." 11.47 11.48 -#: tinyutils/tazx:154 tinyutils/hwsetup:258 11.49 -msgid "Auto configuring Xorg..." 11.50 +#: tinyutils/tazx:244 11.51 +msgid "Auto configuring" 11.52 msgstr "" 11.53 11.54 -#: tinyutils/tazx:156 tinyutils/tazx:184 11.55 +#: tinyutils/tazx:246 11.56 msgid "driver" 11.57 msgstr "" 11.58 11.59 -#: tinyutils/tazx:157 11.60 +#: tinyutils/tazx:247 tinyutils/slitaz-config:233 11.61 msgid "Quit" 11.62 msgstr "" 11.63 11.64 -#: tinyutils/tazx:186 tinyutils/hwsetup:107 11.65 -#, sh-format 11.66 -msgid "Failed to setup $DEVICE" 11.67 +#: tinyutils/tazx:276 11.68 +msgid "Failed to setup driver" 11.69 msgstr "" 11.70 11.71 -#: tinyutils/tazx:192 tinyutils/hwsetup:117 11.72 +#: tinyutils/tazx:276 11.73 +msgid "(unknown hardware)" 11.74 +msgstr "" 11.75 + 11.76 +#: tinyutils/tazx:289 tinyutils/hwsetup:117 11.77 #, sh-format 11.78 msgid "Installing pkg: $pkg" 11.79 msgstr "" 11.80 11.81 -#: tinyutils/tazx:202 tinyutils/tazx:276 11.82 -#, sh-format 11.83 -msgid "${INST_i18n}: ${WM_i18n} + applications" 11.84 +#: tinyutils/tazx:307 tinyutils/tazx:423 11.85 +msgid "Install Window Manager and applications" 11.86 msgstr "" 11.87 11.88 -#: tinyutils/tazx:270 11.89 +#: tinyutils/tazx:393 tinyutils/tazx:399 11.90 +#, fuzzy 11.91 +msgid "Install" 11.92 +msgstr "Installera Xorg" 11.93 + 11.94 +#: tinyutils/tazx:409 11.95 +msgid "ON" 11.96 +msgstr "" 11.97 + 11.98 +#: tinyutils/tazx:410 tinyutils/tazx:441 11.99 +msgid "OFF" 11.100 +msgstr "" 11.101 + 11.102 +#: tinyutils/tazx:417 11.103 #, fuzzy 11.104 msgid "SliTaz Xorg config" 11.105 msgstr "Slitaz språk konfiguration" 11.106 11.107 -#: tinyutils/tazx:272 11.108 +#: tinyutils/tazx:419 11.109 msgid "Install or reconfigure Xorg" 11.110 msgstr "Installera eller omkonifigurera Xorg" 11.111 11.112 -#: tinyutils/tazx:273 11.113 +#: tinyutils/tazx:420 11.114 msgid "Install Xorg server (light version)" 11.115 msgstr "" 11.116 11.117 -#: tinyutils/tazx:274 11.118 +#: tinyutils/tazx:421 11.119 msgid "AutoStart Xorg by SLiM on boot" 11.120 msgstr "" 11.121 11.122 -#: tinyutils/tazx:275 11.123 +#: tinyutils/tazx:422 11.124 msgid "(Re)Start Simple Login Manager now" 11.125 msgstr "" 11.126 11.127 -#: tinyutils/tazx:277 11.128 +#: tinyutils/tazx:424 11.129 msgid "Quit Tazx utility" 11.130 msgstr "Avsluta Tazx verktyget" 11.131 11.132 -#: tinyutils/tazx:384 11.133 +#: tinyutils/tazx:449 11.134 +msgid "Start X on boot:" 11.135 +msgstr "" 11.136 + 11.137 +#: tinyutils/tazx:551 11.138 +msgid "configuration tool for SliTaz GNU/Linux" 11.139 +msgstr "" 11.140 + 11.141 +#: tinyutils/tazx:553 tinyutils/hwsetup:25 11.142 +msgid "command" 11.143 +msgstr "" 11.144 + 11.145 +#: tinyutils/tazx:553 11.146 +msgid "parameter" 11.147 +msgstr "" 11.148 + 11.149 +#: tinyutils/tazx:555 tinyutils/hwsetup:27 tinyutils/frugal:36 11.150 +msgid "Commands:" 11.151 +msgstr "" 11.152 + 11.153 +#: tinyutils/tazx:556 11.154 +msgid "Install Xorg and selected Xorg driver" 11.155 +msgstr "" 11.156 + 11.157 +#: tinyutils/tazx:557 11.158 +msgid "Configure Xorg, generate configuration files" 11.159 +msgstr "" 11.160 + 11.161 +#: tinyutils/tazx:558 11.162 +msgid "Set monitor default depth (valid parameters: 8, 15, 16 or 24)" 11.163 +msgstr "" 11.164 + 11.165 +#: tinyutils/tazx:559 11.166 +msgid "Auto-select and install Xorg driver" 11.167 +msgstr "" 11.168 + 11.169 +#: tinyutils/tazx:560 11.170 +msgid "Get files for starting an X session and config the keyboard" 11.171 +msgstr "" 11.172 + 11.173 +#: tinyutils/tazx:561 11.174 +msgid "Generate or regenerate Xorg keyboard config" 11.175 +msgstr "" 11.176 + 11.177 +#: tinyutils/tazx:572 11.178 msgid "Run tazx as root if you need to configure xorg" 11.179 msgstr "" 11.180 11.181 @@ -258,14 +313,6 @@ 11.182 msgid "SliTaz Setup configuration" 11.183 msgstr "" 11.184 11.185 -#: tinyutils/hwsetup:25 11.186 -msgid "command" 11.187 -msgstr "" 11.188 - 11.189 -#: tinyutils/hwsetup:27 tinyutils/frugal:36 11.190 -msgid "Commands:" 11.191 -msgstr "" 11.192 - 11.193 #: tinyutils/hwsetup:29 11.194 msgid "Print this short usage." 11.195 msgstr "" 11.196 @@ -326,6 +373,11 @@ 11.197 "to SliTaz Bug tracker or Forum." 11.198 msgstr "" 11.199 11.200 +#: tinyutils/hwsetup:107 11.201 +#, sh-format 11.202 +msgid "Failed to setup $DEVICE" 11.203 +msgstr "" 11.204 + 11.205 #: tinyutils/hwsetup:131 11.206 #, sh-format 11.207 msgid "Would you like to install pkg: $pkg" 11.208 @@ -358,6 +410,10 @@ 11.209 msgid "New udev rules are added by a package" 11.210 msgstr "" 11.211 11.212 +#: tinyutils/hwsetup:258 11.213 +msgid "Auto configuring Xorg..." 11.214 +msgstr "" 11.215 + 11.216 #: tinyutils/hwsetup:261 11.217 msgid "Configuring Xorg..." 11.218 msgstr "" 11.219 @@ -702,6 +758,155 @@ 11.220 msgid "Unmounting ISO image..." 11.221 msgstr "" 11.222 11.223 +#: tinyutils/slitaz-config:14 11.224 +#, fuzzy 11.225 +msgid "SliTaz Config" 11.226 +msgstr "Slitaz språk konfiguration" 11.227 + 11.228 +#: tinyutils/slitaz-config:36 11.229 +msgid "Post Installation" 11.230 +msgstr "" 11.231 + 11.232 +#: tinyutils/slitaz-config:37 11.233 +msgid "Continue" 11.234 +msgstr "" 11.235 + 11.236 +#: tinyutils/slitaz-config:43 11.237 +msgid "Root Password" 11.238 +msgstr "" 11.239 + 11.240 +#: tinyutils/slitaz-config:44 11.241 +msgid "Enter new password for \\Zb\\Z1root" 11.242 +msgstr "" 11.243 + 11.244 +#: tinyutils/slitaz-config:53 11.245 +msgid "Add User" 11.246 +msgstr "" 11.247 + 11.248 +#: tinyutils/slitaz-config:56 11.249 +msgid "Enter login name for the new \\Zb\\Z4user" 11.250 +msgstr "" 11.251 + 11.252 +#: tinyutils/slitaz-config:61 11.253 +#, sh-format 11.254 +msgid "Enter password for user \\Zb\\Z4$user" 11.255 +msgstr "" 11.256 + 11.257 +#: tinyutils/slitaz-config:121 11.258 +msgid "connected" 11.259 +msgstr "" 11.260 + 11.261 +#: tinyutils/slitaz-config:136 11.262 +msgid "Quality" 11.263 +msgstr "" 11.264 + 11.265 +#: tinyutils/slitaz-config:136 11.266 +msgid "Key" 11.267 +msgstr "" 11.268 + 11.269 +#: tinyutils/slitaz-config:140 tinyutils/slitaz-config:169 11.270 +msgid "hidden.network" 11.271 +msgstr "" 11.272 + 11.273 +#: tinyutils/slitaz-config:140 11.274 +msgid "Connect.to.a.hidden.network" 11.275 +msgstr "" 11.276 + 11.277 +#: tinyutils/slitaz-config:156 11.278 +msgid "Select" 11.279 +msgstr "" 11.280 + 11.281 +#: tinyutils/slitaz-config:157 11.282 +msgid "Connect to a Wi-Fi network" 11.283 +msgstr "" 11.284 + 11.285 +#: tinyutils/slitaz-config:159 11.286 +msgid "Connect.to.any.network" 11.287 +msgstr "" 11.288 + 11.289 +#: tinyutils/slitaz-config:170 11.290 +msgid "Wi-Fi ESSID" 11.291 +msgstr "" 11.292 + 11.293 +#: tinyutils/slitaz-config:171 11.294 +msgid "Enter Wi-Fi access point ESSID (name)" 11.295 +msgstr "" 11.296 + 11.297 +#: tinyutils/slitaz-config:176 tinyutils/slitaz-config:187 11.298 +msgid "Wi-Fi Password" 11.299 +msgstr "" 11.300 + 11.301 +#: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 11.302 +#, sh-format 11.303 +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" 11.304 +msgstr "" 11.305 + 11.306 +#: tinyutils/slitaz-config:197 11.307 +msgid "Shutting down network interfaces..." 11.308 +msgstr "" 11.309 + 11.310 +#: tinyutils/slitaz-config:201 11.311 +msgid "Configuring: /etc/network.conf..." 11.312 +msgstr "" 11.313 + 11.314 +#: tinyutils/slitaz-config:211 11.315 +msgid "Restarting Wi-Fi interface..." 11.316 +msgstr "" 11.317 + 11.318 +#: tinyutils/slitaz-config:215 11.319 +msgid "Checking connection..." 11.320 +msgstr "" 11.321 + 11.322 +#: tinyutils/slitaz-config:220 11.323 +#, sh-format 11.324 +msgid "IP address: $ip" 11.325 +msgstr "" 11.326 + 11.327 +#: tinyutils/slitaz-config:222 11.328 +msgid "Unable to connect..." 11.329 +msgstr "" 11.330 + 11.331 +#: tinyutils/slitaz-config:226 11.332 +msgid "Wi-Fi Config" 11.333 +msgstr "" 11.334 + 11.335 +#: tinyutils/slitaz-config:233 11.336 +msgid "Exec" 11.337 +msgstr "" 11.338 + 11.339 +#: tinyutils/slitaz-config:235 11.340 +#, fuzzy 11.341 +msgid "System keyboard setting" 11.342 +msgstr "Slitaz tangentbords layout konfiguration" 11.343 + 11.344 +#: tinyutils/slitaz-config:236 11.345 +#, fuzzy 11.346 +msgid "System language setting" 11.347 +msgstr "Slitaz språk konfiguration" 11.348 + 11.349 +#: tinyutils/slitaz-config:237 11.350 +msgid "Wi-Fi network settings" 11.351 +msgstr "" 11.352 + 11.353 +#: tinyutils/slitaz-config:238 11.354 +msgid "Add a new user" 11.355 +msgstr "" 11.356 + 11.357 +#: tinyutils/slitaz-config:239 11.358 +msgid "Change root password" 11.359 +msgstr "" 11.360 + 11.361 +#: tinyutils/slitaz-config:240 11.362 +msgid "Set system date from the web" 11.363 +msgstr "" 11.364 + 11.365 +#: tinyutils/slitaz-config:241 11.366 +msgid "Exit from SliTaz Config" 11.367 +msgstr "" 11.368 + 11.369 +#~ msgid "Window Manager:" 11.370 +#~ msgstr "Fönster hanterare:" 11.371 + 11.372 #~ msgid "Tazx dialog helps you to configure your Xorg server." 11.373 #~ msgstr "Tazx dialogen hjälper dig att konfigurera din Xorg server." 11.374
12.1 --- a/po/slitaz-tools/zh_CN.po Sat Nov 15 06:45:42 2014 +0200 12.2 +++ b/po/slitaz-tools/zh_CN.po Thu Nov 20 06:04:24 2014 +0200 12.3 @@ -7,7 +7,7 @@ 12.4 msgstr "" 12.5 "Project-Id-Version: SliTaz Tools\n" 12.6 "Report-Msgid-Bugs-To: \n" 12.7 -"POT-Creation-Date: 2014-11-14 21:22+0000\n" 12.8 +"POT-Creation-Date: 2014-11-20 05:20+0200\n" 12.9 "PO-Revision-Date: 2014-07-01 18:05+0800\n" 12.10 "Last-Translator: 张文宇 <jame987165702@gmail.com>\n" 12.11 "Language-Team: \n" 12.12 @@ -22,8 +22,8 @@ 12.13 msgid "SliTaz GNU/Linux locale setting using dialog boxes." 12.14 msgstr "SliTaz GNU / Linux地区设置对话框。" 12.15 12.16 -#: tinyutils/tazlocale:17 tinyutils/decode:30 tinyutils/hwsetup:24 12.17 -#: tinyutils/frugal:32 12.18 +#: tinyutils/tazlocale:17 tinyutils/tazx:553 tinyutils/decode:30 12.19 +#: tinyutils/hwsetup:24 tinyutils/frugal:32 12.20 msgid "Usage:" 12.21 msgstr "用法:" 12.22 12.23 @@ -93,74 +93,134 @@ 12.24 msgid "Done" 12.25 msgstr "完成!" 12.26 12.27 -#: tinyutils/tazx:26 12.28 -msgid "Window Manager:" 12.29 -msgstr "" 12.30 +#: tinyutils/tazx:141 12.31 +msgid "Creating:" 12.32 +msgstr "创建：" 12.33 12.34 -#: tinyutils/tazx:27 tinyutils/tazx:152 12.35 +#: tinyutils/tazx:242 12.36 msgid "Install Xorg" 12.37 msgstr "安装Xorg" 12.38 12.39 -#: tinyutils/tazx:63 12.40 -msgid "Creating:" 12.41 -msgstr "创建：" 12.42 - 12.43 -#: tinyutils/tazx:153 12.44 +#: tinyutils/tazx:243 12.45 msgid "Tazx helps you to select your X driver." 12.46 msgstr "Tazx帮助你选择你的X驱动程序。" 12.47 12.48 -#: tinyutils/tazx:154 tinyutils/hwsetup:258 12.49 -msgid "Auto configuring Xorg..." 12.50 +#: tinyutils/tazx:244 12.51 +#, fuzzy 12.52 +msgid "Auto configuring" 12.53 msgstr "自动配置Xorg中…" 12.54 12.55 -#: tinyutils/tazx:156 tinyutils/tazx:184 12.56 +#: tinyutils/tazx:246 12.57 msgid "driver" 12.58 msgstr "驱动）" 12.59 12.60 -#: tinyutils/tazx:157 12.61 +#: tinyutils/tazx:247 tinyutils/slitaz-config:233 12.62 msgid "Quit" 12.63 msgstr "离开" 12.64 12.65 -#: tinyutils/tazx:186 tinyutils/hwsetup:107 12.66 -#, sh-format 12.67 -msgid "Failed to setup $DEVICE" 12.68 +#: tinyutils/tazx:276 12.69 +#, fuzzy 12.70 +msgid "Failed to setup driver" 12.71 msgstr "未能设置$DEVICE" 12.72 12.73 -#: tinyutils/tazx:192 tinyutils/hwsetup:117 12.74 +#: tinyutils/tazx:276 12.75 +msgid "(unknown hardware)" 12.76 +msgstr "" 12.77 + 12.78 +#: tinyutils/tazx:289 tinyutils/hwsetup:117 12.79 #, sh-format 12.80 msgid "Installing pkg: $pkg" 12.81 msgstr "安装 $pkg包" 12.82 12.83 -#: tinyutils/tazx:202 tinyutils/tazx:276 12.84 -#, sh-format 12.85 -msgid "${INST_i18n}: ${WM_i18n} + applications" 12.86 +#: tinyutils/tazx:307 tinyutils/tazx:423 12.87 +#, fuzzy 12.88 +msgid "Install Window Manager and applications" 12.89 +msgstr "扫描仪应用" 12.90 + 12.91 +#: tinyutils/tazx:393 tinyutils/tazx:399 12.92 +#, fuzzy 12.93 +msgid "Install" 12.94 +msgstr "安装Xorg" 12.95 + 12.96 +#: tinyutils/tazx:409 12.97 +msgid "ON" 12.98 msgstr "" 12.99 12.100 -#: tinyutils/tazx:270 12.101 +#: tinyutils/tazx:410 tinyutils/tazx:441 12.102 +msgid "OFF" 12.103 +msgstr "" 12.104 + 12.105 +#: tinyutils/tazx:417 12.106 msgid "SliTaz Xorg config" 12.107 msgstr "SliTaz Xorg配置" 12.108 12.109 -#: tinyutils/tazx:272 12.110 +#: tinyutils/tazx:419 12.111 msgid "Install or reconfigure Xorg" 12.112 msgstr "安装或配置Xorg" 12.113 12.114 -#: tinyutils/tazx:273 12.115 +#: tinyutils/tazx:420 12.116 msgid "Install Xorg server (light version)" 12.117 msgstr "安装Xorg服务器（简版）" 12.118 12.119 -#: tinyutils/tazx:274 12.120 +#: tinyutils/tazx:421 12.121 msgid "AutoStart Xorg by SLiM on boot" 12.122 msgstr "" 12.123 12.124 -#: tinyutils/tazx:275 12.125 +#: tinyutils/tazx:422 12.126 msgid "(Re)Start Simple Login Manager now" 12.127 msgstr "" 12.128 12.129 -#: tinyutils/tazx:277 12.130 +#: tinyutils/tazx:424 12.131 msgid "Quit Tazx utility" 12.132 msgstr "退出Tazx实用程序" 12.133 12.134 -#: tinyutils/tazx:384 12.135 +#: tinyutils/tazx:449 12.136 +msgid "Start X on boot:" 12.137 +msgstr "" 12.138 + 12.139 +#: tinyutils/tazx:551 12.140 +msgid "configuration tool for SliTaz GNU/Linux" 12.141 +msgstr "" 12.142 + 12.143 +#: tinyutils/tazx:553 tinyutils/hwsetup:25 12.144 +msgid "command" 12.145 +msgstr "命令" 12.146 + 12.147 +#: tinyutils/tazx:553 12.148 +msgid "parameter" 12.149 +msgstr "" 12.150 + 12.151 +#: tinyutils/tazx:555 tinyutils/hwsetup:27 tinyutils/frugal:36 12.152 +msgid "Commands:" 12.153 +msgstr "命令:" 12.154 + 12.155 +#: tinyutils/tazx:556 12.156 +#, fuzzy 12.157 +msgid "Install Xorg and selected Xorg driver" 12.158 +msgstr "安装Xorg服务器（简版）" 12.159 + 12.160 +#: tinyutils/tazx:557 12.161 +#, fuzzy 12.162 +msgid "Configure Xorg, generate configuration files" 12.163 +msgstr "用途：aticonfig是生成模板的配置文件的实用工具，如果必要的话。" 12.164 + 12.165 +#: tinyutils/tazx:558 12.166 +msgid "Set monitor default depth (valid parameters: 8, 15, 16 or 24)" 12.167 +msgstr "" 12.168 + 12.169 +#: tinyutils/tazx:559 12.170 +msgid "Auto-select and install Xorg driver" 12.171 +msgstr "" 12.172 + 12.173 +#: tinyutils/tazx:560 12.174 +msgid "Get files for starting an X session and config the keyboard" 12.175 +msgstr "" 12.176 + 12.177 +#: tinyutils/tazx:561 12.178 +msgid "Generate or regenerate Xorg keyboard config" 12.179 +msgstr "" 12.180 + 12.181 +#: tinyutils/tazx:572 12.182 msgid "Run tazx as root if you need to configure xorg" 12.183 msgstr "" 12.184 12.185 @@ -252,14 +312,6 @@ 12.186 msgid "SliTaz Setup configuration" 12.187 msgstr "SliTaz安装配置" 12.188 12.189 -#: tinyutils/hwsetup:25 12.190 -msgid "command" 12.191 -msgstr "命令" 12.192 - 12.193 -#: tinyutils/hwsetup:27 tinyutils/frugal:36 12.194 -msgid "Commands:" 12.195 -msgstr "命令:" 12.196 - 12.197 #: tinyutils/hwsetup:29 12.198 msgid "Print this short usage." 12.199 msgstr "打印简短的使用方法。" 12.200 @@ -322,6 +374,11 @@ 12.201 "由于不兼容的硬件故障，这个 $DEVICE 设备没有得到正确的测试。请报告任何成功，失" 12.202 "败，错误SliTaz bug跟踪或论坛。" 12.203 12.204 +#: tinyutils/hwsetup:107 12.205 +#, sh-format 12.206 +msgid "Failed to setup $DEVICE" 12.207 +msgstr "未能设置$DEVICE" 12.208 + 12.209 #: tinyutils/hwsetup:131 12.210 #, sh-format 12.211 msgid "Would you like to install pkg: $pkg" 12.212 @@ -354,6 +411,10 @@ 12.213 msgid "New udev rules are added by a package" 12.214 msgstr "新的包增加udev规则" 12.215 12.216 +#: tinyutils/hwsetup:258 12.217 +msgid "Auto configuring Xorg..." 12.218 +msgstr "自动配置Xorg中…" 12.219 + 12.220 #: tinyutils/hwsetup:261 12.221 msgid "Configuring Xorg..." 12.222 msgstr "配置Xorg中…" 12.223 @@ -702,3 +763,153 @@ 12.224 #: tinyutils/frugal:131 12.225 msgid "Unmounting ISO image..." 12.226 msgstr "卸载ISO 映像中..." 12.227 + 12.228 +#: tinyutils/slitaz-config:14 12.229 +#, fuzzy 12.230 +msgid "SliTaz Config" 12.231 +msgstr "SliTaz Xorg配置" 12.232 + 12.233 +#: tinyutils/slitaz-config:36 12.234 +#, fuzzy 12.235 +msgid "Post Installation" 12.236 +msgstr "设置根文件系统（root）安装路径" 12.237 + 12.238 +#: tinyutils/slitaz-config:37 12.239 +msgid "Continue" 12.240 +msgstr "" 12.241 + 12.242 +#: tinyutils/slitaz-config:43 12.243 +#, fuzzy 12.244 +msgid "Root Password" 12.245 +msgstr "密码:" 12.246 + 12.247 +#: tinyutils/slitaz-config:44 12.248 +msgid "Enter new password for \\Zb\\Z1root" 12.249 +msgstr "" 12.250 + 12.251 +#: tinyutils/slitaz-config:53 12.252 +msgid "Add User" 12.253 +msgstr "" 12.254 + 12.255 +#: tinyutils/slitaz-config:56 12.256 +msgid "Enter login name for the new \\Zb\\Z4user" 12.257 +msgstr "" 12.258 + 12.259 +#: tinyutils/slitaz-config:61 12.260 +#, sh-format 12.261 +msgid "Enter password for user \\Zb\\Z4$user" 12.262 +msgstr "" 12.263 + 12.264 +#: tinyutils/slitaz-config:121 12.265 +msgid "connected" 12.266 +msgstr "" 12.267 + 12.268 +#: tinyutils/slitaz-config:136 12.269 +msgid "Quality" 12.270 +msgstr "" 12.271 + 12.272 +#: tinyutils/slitaz-config:136 12.273 +msgid "Key" 12.274 +msgstr "" 12.275 + 12.276 +#: tinyutils/slitaz-config:140 tinyutils/slitaz-config:169 12.277 +msgid "hidden.network" 12.278 +msgstr "" 12.279 + 12.280 +#: tinyutils/slitaz-config:140 12.281 +msgid "Connect.to.a.hidden.network" 12.282 +msgstr "" 12.283 + 12.284 +#: tinyutils/slitaz-config:156 12.285 +msgid "Select" 12.286 +msgstr "" 12.287 + 12.288 +#: tinyutils/slitaz-config:157 12.289 +msgid "Connect to a Wi-Fi network" 12.290 +msgstr "" 12.291 + 12.292 +#: tinyutils/slitaz-config:159 12.293 +msgid "Connect.to.any.network" 12.294 +msgstr "" 12.295 + 12.296 +#: tinyutils/slitaz-config:170 12.297 +msgid "Wi-Fi ESSID" 12.298 +msgstr "" 12.299 + 12.300 +#: tinyutils/slitaz-config:171 12.301 +msgid "Enter Wi-Fi access point ESSID (name)" 12.302 +msgstr "" 12.303 + 12.304 +#: tinyutils/slitaz-config:176 tinyutils/slitaz-config:187 12.305 +#, fuzzy 12.306 +msgid "Wi-Fi Password" 12.307 +msgstr "密码:" 12.308 + 12.309 +#: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 12.310 +#, sh-format 12.311 +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" 12.312 +msgstr "" 12.313 + 12.314 +#: tinyutils/slitaz-config:197 12.315 +msgid "Shutting down network interfaces..." 12.316 +msgstr "" 12.317 + 12.318 +#: tinyutils/slitaz-config:201 12.319 +#, fuzzy 12.320 +msgid "Configuring: /etc/network.conf..." 12.321 +msgstr "配置Xorg中…" 12.322 + 12.323 +#: tinyutils/slitaz-config:211 12.324 +msgid "Restarting Wi-Fi interface..." 12.325 +msgstr "" 12.326 + 12.327 +#: tinyutils/slitaz-config:215 12.328 +msgid "Checking connection..." 12.329 +msgstr "" 12.330 + 12.331 +#: tinyutils/slitaz-config:220 12.332 +#, sh-format 12.333 +msgid "IP address: $ip" 12.334 +msgstr "" 12.335 + 12.336 +#: tinyutils/slitaz-config:222 12.337 +msgid "Unable to connect..." 12.338 +msgstr "" 12.339 + 12.340 +#: tinyutils/slitaz-config:226 12.341 +msgid "Wi-Fi Config" 12.342 +msgstr "" 12.343 + 12.344 +#: tinyutils/slitaz-config:233 12.345 +msgid "Exec" 12.346 +msgstr "" 12.347 + 12.348 +#: tinyutils/slitaz-config:235 12.349 +#, fuzzy 12.350 +msgid "System keyboard setting" 12.351 +msgstr "SliTaz键盘设置" 12.352 + 12.353 +#: tinyutils/slitaz-config:236 12.354 +#, fuzzy 12.355 +msgid "System language setting" 12.356 +msgstr "SliTaz语言设置" 12.357 + 12.358 +#: tinyutils/slitaz-config:237 12.359 +msgid "Wi-Fi network settings" 12.360 +msgstr "" 12.361 + 12.362 +#: tinyutils/slitaz-config:238 12.363 +msgid "Add a new user" 12.364 +msgstr "" 12.365 + 12.366 +#: tinyutils/slitaz-config:239 12.367 +msgid "Change root password" 12.368 +msgstr "" 12.369 + 12.370 +#: tinyutils/slitaz-config:240 12.371 +msgid "Set system date from the web" 12.372 +msgstr "" 12.373 + 12.374 +#: tinyutils/slitaz-config:241 12.375 +msgid "Exit from SliTaz Config" 12.376 +msgstr ""
13.1 --- a/po/tazbox/el.po Sat Nov 15 06:45:42 2014 +0200 13.2 +++ b/po/tazbox/el.po Thu Nov 20 06:04:24 2014 +0200 13.3 @@ -7,7 +7,7 @@ 13.4 msgstr "" 13.5 "Project-Id-Version: TazBox\n" 13.6 "Report-Msgid-Bugs-To: \n" 13.7 -"POT-Creation-Date: 2014-05-23 03:33+0300\n" 13.8 +"POT-Creation-Date: 2014-11-18 20:10+0200\n" 13.9 "PO-Revision-Date: 2012-11-23 11:30+0200\n" 13.10 "Last-Translator: Constantine Mousafiris <kvisitor@gnugr.org>\n" 13.11 "Language-Team: Kostis Mousafiris\n" 13.12 @@ -344,34 +344,34 @@ 13.13 msgid "All Applications" 13.14 msgstr "Όλες οι εφαρμογές" 13.15 13.16 -#: tazbox/tazbox:604 13.17 +#: tazbox/tazbox:593 13.18 msgid "Downloading..." 13.19 msgstr "" 13.20 13.21 -#: tazbox/tazbox:660 13.22 +#: tazbox/tazbox:642 13.23 msgid "SliTaz default applications" 13.24 msgstr "" 13.25 13.26 -#: tazbox/tazbox:662 13.27 +#: tazbox/tazbox:644 13.28 msgid "SliTaz default applications configuration" 13.29 msgstr "" 13.30 13.31 -#: tazbox/tazbox:664 13.32 +#: tazbox/tazbox:646 13.33 msgid "File manager:" 13.34 msgstr "" 13.35 13.36 -#: tazbox/tazbox:665 13.37 +#: tazbox/tazbox:647 13.38 msgid "Web browser:" 13.39 msgstr "" 13.40 13.41 -#: tazbox/tazbox:666 13.42 +#: tazbox/tazbox:648 13.43 msgid "Text editor:" 13.44 msgstr "" 13.45 13.46 -#: tazbox/tazbox:667 13.47 +#: tazbox/tazbox:649 13.48 msgid "Terminal:" 13.49 msgstr "" 13.50 13.51 -#: tazbox/tazbox:668 13.52 +#: tazbox/tazbox:650 13.53 msgid "Window manager:" 13.54 msgstr ""
14.1 --- a/po/tazbox/es.po Sat Nov 15 06:45:42 2014 +0200 14.2 +++ b/po/tazbox/es.po Thu Nov 20 06:04:24 2014 +0200 14.3 @@ -7,7 +7,7 @@ 14.4 msgstr "" 14.5 "Project-Id-Version: TazBox\n" 14.6 "Report-Msgid-Bugs-To: \n" 14.7 -"POT-Creation-Date: 2014-05-23 03:33+0300\n" 14.8 +"POT-Creation-Date: 2014-11-18 20:10+0200\n" 14.9 "PO-Revision-Date: 2011-08-11 00:21-0300\n" 14.10 "Last-Translator: Lucas Gioia <lucas.lucas.lucas24@gmail.com>\n" 14.11 "Language-Team: \n" 14.12 @@ -343,34 +343,34 @@ 14.13 msgid "All Applications" 14.14 msgstr "Todas las aplicaciónes" 14.15 14.16 -#: tazbox/tazbox:604 14.17 +#: tazbox/tazbox:593 14.18 msgid "Downloading..." 14.19 msgstr "" 14.20 14.21 -#: tazbox/tazbox:660 14.22 +#: tazbox/tazbox:642 14.23 msgid "SliTaz default applications" 14.24 msgstr "" 14.25 14.26 -#: tazbox/tazbox:662 14.27 +#: tazbox/tazbox:644 14.28 msgid "SliTaz default applications configuration" 14.29 msgstr "" 14.30 14.31 -#: tazbox/tazbox:664 14.32 +#: tazbox/tazbox:646 14.33 msgid "File manager:" 14.34 msgstr "" 14.35 14.36 -#: tazbox/tazbox:665 14.37 +#: tazbox/tazbox:647 14.38 msgid "Web browser:" 14.39 msgstr "" 14.40 14.41 -#: tazbox/tazbox:666 14.42 +#: tazbox/tazbox:648 14.43 msgid "Text editor:" 14.44 msgstr "" 14.45 14.46 -#: tazbox/tazbox:667 14.47 +#: tazbox/tazbox:649 14.48 msgid "Terminal:" 14.49 msgstr "" 14.50 14.51 -#: tazbox/tazbox:668 14.52 +#: tazbox/tazbox:650 14.53 msgid "Window manager:" 14.54 msgstr ""
15.1 --- a/po/tazbox/fa.po Sat Nov 15 06:45:42 2014 +0200 15.2 +++ b/po/tazbox/fa.po Thu Nov 20 06:04:24 2014 +0200 15.3 @@ -7,7 +7,7 @@ 15.4 msgstr "" 15.5 "Project-Id-Version: TazBox\n" 15.6 "Report-Msgid-Bugs-To: \n" 15.7 -"POT-Creation-Date: 2014-05-23 03:33+0300\n" 15.8 +"POT-Creation-Date: 2014-11-18 20:10+0200\n" 15.9 "PO-Revision-Date: 2014-06-26 19:26+0400\n" 15.10 "Last-Translator: Ali Rashidi <alirashidi17@yahoo.com>\n" 15.11 "Language-Team: LANGUAGE <LL@li.org>\n" 15.12 @@ -345,34 +345,34 @@ 15.13 msgid "All Applications" 15.14 msgstr "همه برنامه ها" 15.15 15.16 -#: tazbox/tazbox:604 15.17 +#: tazbox/tazbox:593 15.18 msgid "Downloading..." 15.19 msgstr "...در حال دانلود" 15.20 15.21 -#: tazbox/tazbox:660 15.22 +#: tazbox/tazbox:642 15.23 msgid "SliTaz default applications" 15.24 msgstr "SliTaz برنامه های پیشفرض" 15.25 15.26 -#: tazbox/tazbox:662 15.27 +#: tazbox/tazbox:644 15.28 msgid "SliTaz default applications configuration" 15.29 msgstr "SliTaz پیکربندی برنامه های پیشفرض" 15.30 15.31 -#: tazbox/tazbox:664 15.32 +#: tazbox/tazbox:646 15.33 msgid "File manager:" 15.34 msgstr ":مدیر فایل" 15.35 15.36 -#: tazbox/tazbox:665 15.37 +#: tazbox/tazbox:647 15.38 msgid "Web browser:" 15.39 msgstr ":مرورگر وب" 15.40 15.41 -#: tazbox/tazbox:666 15.42 +#: tazbox/tazbox:648 15.43 msgid "Text editor:" 15.44 msgstr ":ویرایشگر متن" 15.45 15.46 -#: tazbox/tazbox:667 15.47 +#: tazbox/tazbox:649 15.48 msgid "Terminal:" 15.49 msgstr ":ترمینال" 15.50 15.51 -#: tazbox/tazbox:668 15.52 +#: tazbox/tazbox:650 15.53 msgid "Window manager:" 15.54 msgstr ":مدیر پنجره"
16.1 --- a/po/tazbox/fr.po Sat Nov 15 06:45:42 2014 +0200 16.2 +++ b/po/tazbox/fr.po Thu Nov 20 06:04:24 2014 +0200 16.3 @@ -7,7 +7,7 @@ 16.4 msgstr "" 16.5 "Project-Id-Version: TazBox\n" 16.6 "Report-Msgid-Bugs-To: \n" 16.7 -"POT-Creation-Date: 2014-05-23 03:33+0300\n" 16.8 +"POT-Creation-Date: 2014-11-18 20:10+0200\n" 16.9 "PO-Revision-Date: 2012-03-24 14:36+0100\n" 16.10 "Last-Translator: Christophe Lincoln <pankso@slitaz.org>\n" 16.11 "Language-Team: French\n" 16.12 @@ -226,7 +226,9 @@ 16.13 16.14 #: tazbox/tazbox:276 16.15 msgid "Select country and press \"Forward\" or manually select timezone file." 16.16 -msgstr "Choisissez le pays et pressez \"suivant\" ou choissez un fichier de zone horaire." 16.17 +msgstr "" 16.18 +"Choisissez le pays et pressez \"suivant\" ou choissez un fichier de zone " 16.19 +"horaire." 16.20 16.21 #: tazbox/tazbox:277 16.22 msgid "Tip: manage timezones list by installing/removing locale packages." 16.23 @@ -271,7 +273,8 @@ 16.24 16.25 #: tazbox/tazbox:439 16.26 msgid "Check only locale packages you need and press \"Install/Remove\"." 16.27 -msgstr "Sélectionnez seulement les paquets nécéssaires et pressez \"Ajoute/Retire\"." 16.28 +msgstr "" 16.29 +"Sélectionnez seulement les paquets nécéssaires et pressez \"Ajoute/Retire\"." 16.30 16.31 #: tazbox/tazbox:441 16.32 msgid "Inst." 16.33 @@ -343,34 +346,34 @@ 16.34 msgid "All Applications" 16.35 msgstr "Toutes les applications" 16.36 16.37 -#: tazbox/tazbox:604 16.38 +#: tazbox/tazbox:593 16.39 msgid "Downloading..." 16.40 msgstr "Télécharge..." 16.41 16.42 -#: tazbox/tazbox:660 16.43 +#: tazbox/tazbox:642 16.44 msgid "SliTaz default applications" 16.45 msgstr "Applications SliTaz par défaut" 16.46 16.47 -#: tazbox/tazbox:662 16.48 +#: tazbox/tazbox:644 16.49 msgid "SliTaz default applications configuration" 16.50 msgstr "Configuration des applications SliTaz par défaut" 16.51 16.52 -#: tazbox/tazbox:664 16.53 +#: tazbox/tazbox:646 16.54 msgid "File manager:" 16.55 msgstr "Gestionnaire de fichiers :" 16.56 16.57 -#: tazbox/tazbox:665 16.58 +#: tazbox/tazbox:647 16.59 msgid "Web browser:" 16.60 msgstr "Navigateur WEB :" 16.61 16.62 -#: tazbox/tazbox:666 16.63 +#: tazbox/tazbox:648 16.64 msgid "Text editor:" 16.65 msgstr "Editeur de textes :" 16.66 16.67 -#: tazbox/tazbox:667 16.68 +#: tazbox/tazbox:649 16.69 msgid "Terminal:" 16.70 msgstr "Terminal :" 16.71 16.72 -#: tazbox/tazbox:668 16.73 +#: tazbox/tazbox:650 16.74 msgid "Window manager:" 16.75 msgstr "Gestionnaire de fenêtres :"
17.1 --- a/po/tazbox/pl.po Sat Nov 15 06:45:42 2014 +0200 17.2 +++ b/po/tazbox/pl.po Thu Nov 20 06:04:24 2014 +0200 17.3 @@ -7,7 +7,7 @@ 17.4 msgstr "" 17.5 "Project-Id-Version: TazBox\n" 17.6 "Report-Msgid-Bugs-To: \n" 17.7 -"POT-Creation-Date: 2014-05-23 03:33+0300\n" 17.8 +"POT-Creation-Date: 2014-11-18 20:10+0200\n" 17.9 "PO-Revision-Date: 2013-07-23 12:35+0100\n" 17.10 "Last-Translator: Paweł Pyrczak <tkr.tkr.pl@gmail.com>\n" 17.11 "Language-Team: Paweł Pyrczak <support@pyrczak.pl>\n" 17.12 @@ -345,34 +345,34 @@ 17.13 msgid "All Applications" 17.14 msgstr "Wszystkie aplikacje" 17.15 17.16 -#: tazbox/tazbox:604 17.17 +#: tazbox/tazbox:593 17.18 msgid "Downloading..." 17.19 msgstr "" 17.20 17.21 -#: tazbox/tazbox:660 17.22 +#: tazbox/tazbox:642 17.23 msgid "SliTaz default applications" 17.24 msgstr "Domyślne aplikacjie SliTaz" 17.25 17.26 -#: tazbox/tazbox:662 17.27 +#: tazbox/tazbox:644 17.28 msgid "SliTaz default applications configuration" 17.29 msgstr "Domyślna konfiguracja aplikacji SliTaz" 17.30 17.31 -#: tazbox/tazbox:664 17.32 +#: tazbox/tazbox:646 17.33 msgid "File manager:" 17.34 msgstr "Menadżer plików:" 17.35 17.36 -#: tazbox/tazbox:665 17.37 +#: tazbox/tazbox:647 17.38 msgid "Web browser:" 17.39 msgstr "Przeglądarka internetowa:" 17.40 17.41 -#: tazbox/tazbox:666 17.42 +#: tazbox/tazbox:648 17.43 msgid "Text editor:" 17.44 msgstr "Edytor textowy:" 17.45 17.46 -#: tazbox/tazbox:667 17.47 +#: tazbox/tazbox:649 17.48 msgid "Terminal:" 17.49 msgstr "Terminal:" 17.50 17.51 -#: tazbox/tazbox:668 17.52 +#: tazbox/tazbox:650 17.53 msgid "Window manager:" 17.54 msgstr "Menadżer okien:"
18.1 --- a/po/tazbox/pt_BR.po Sat Nov 15 06:45:42 2014 +0200 18.2 +++ b/po/tazbox/pt_BR.po Thu Nov 20 06:04:24 2014 +0200 18.3 @@ -7,7 +7,7 @@ 18.4 msgstr "" 18.5 "Project-Id-Version: tazbox\n" 18.6 "Report-Msgid-Bugs-To: \n" 18.7 -"POT-Creation-Date: 2014-05-23 03:33+0300\n" 18.8 +"POT-Creation-Date: 2014-11-18 20:10+0200\n" 18.9 "PO-Revision-Date: 2014-03-06 22:12-0300\n" 18.10 "Last-Translator: Claudinei Pereira <claudinei@slitaz.org>\n" 18.11 "Language-Team: Brazilian Portuguese <i18n@slitaz.org>\n" 18.12 @@ -170,7 +170,8 @@ 18.13 18.14 #: tazbox/tazbox:170 18.15 msgid "Tip: manage locales list by installing/removing locale packages." 18.16 -msgstr "Dica: gerencie a lista de locales instalando ou removendo pacotes de locales." 18.17 +msgstr "" 18.18 +"Dica: gerencie a lista de locales instalando ou removendo pacotes de locales." 18.19 18.20 #: tazbox/tazbox:171 tazbox/tazbox:279 18.21 msgid "Flag" 18.22 @@ -230,8 +231,8 @@ 18.23 #: tazbox/tazbox:277 18.24 msgid "Tip: manage timezones list by installing/removing locale packages." 18.25 msgstr "" 18.26 -"Dica: gerencie a lista de zonas horárias instalando ou removendo " 18.27 -"pacotes de locale." 18.28 +"Dica: gerencie a lista de zonas horárias instalando ou removendo pacotes de " 18.29 +"locale." 18.30 18.31 #: tazbox/tazbox:279 18.32 msgid "Code" 18.33 @@ -273,8 +274,8 @@ 18.34 #: tazbox/tazbox:439 18.35 msgid "Check only locale packages you need and press \"Install/Remove\"." 18.36 msgstr "" 18.37 -"Verifique somente os locales que você necessita clique " 18.38 -"em \"Instalar/Remover\"." 18.39 +"Verifique somente os locales que você necessita clique em \"Instalar/Remover" 18.40 +"\"." 18.41 18.42 #: tazbox/tazbox:441 18.43 msgid "Inst." 18.44 @@ -346,35 +347,35 @@ 18.45 msgid "All Applications" 18.46 msgstr "Todos os aplicativos" 18.47 18.48 -#: tazbox/tazbox:604 18.49 +#: tazbox/tazbox:593 18.50 msgid "Downloading..." 18.51 msgstr "Baixando..." 18.52 18.53 -#: tazbox/tazbox:660 18.54 +#: tazbox/tazbox:642 18.55 msgid "SliTaz default applications" 18.56 msgstr "Aplicativos padrão do SliTaz" 18.57 18.58 -#: tazbox/tazbox:662 18.59 +#: tazbox/tazbox:644 18.60 msgid "SliTaz default applications configuration" 18.61 msgstr "Configuração dos aplicativos padrão do SliTaz" 18.62 18.63 -#: tazbox/tazbox:664 18.64 +#: tazbox/tazbox:646 18.65 msgid "File manager:" 18.66 msgstr "Gerenciador de arquivos:" 18.67 18.68 -#: tazbox/tazbox:665 18.69 +#: tazbox/tazbox:647 18.70 msgid "Web browser:" 18.71 msgstr "Navegador web:" 18.72 18.73 -#: tazbox/tazbox:666 18.74 +#: tazbox/tazbox:648 18.75 msgid "Text editor:" 18.76 msgstr "Editor de texto:" 18.77 18.78 -#: tazbox/tazbox:667 18.79 +#: tazbox/tazbox:649 18.80 msgid "Terminal:" 18.81 msgstr "Terminal:" 18.82 18.83 -#: tazbox/tazbox:668 18.84 +#: tazbox/tazbox:650 18.85 msgid "Window manager:" 18.86 msgstr "Gerenciador de janelas:" 18.87
19.1 --- a/po/tazbox/ru.po Sat Nov 15 06:45:42 2014 +0200 19.2 +++ b/po/tazbox/ru.po Thu Nov 20 06:04:24 2014 +0200 19.3 @@ -7,7 +7,7 @@ 19.4 msgstr "" 19.5 "Project-Id-Version: TazBox\n" 19.6 "Report-Msgid-Bugs-To: \n" 19.7 -"POT-Creation-Date: 2014-05-23 03:33+0300\n" 19.8 +"POT-Creation-Date: 2014-11-18 20:10+0200\n" 19.9 "PO-Revision-Date: 2014-05-23 03:34+0300\n" 19.10 "Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n" 19.11 "Language-Team: \n" 19.12 @@ -17,7 +17,8 @@ 19.13 "Content-Transfer-Encoding: 8bit\n" 19.14 "X-Poedit-Language: Russian\n" 19.15 "X-Poedit-Basepath: ../../\n" 19.16 -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" 19.17 +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" 19.18 +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" 19.19 "X-Language: ru\n" 19.20 "X-Source-Language: en\n" 19.21 "X-Poedit-SearchPath-0: .\n" 19.22 @@ -72,7 +73,8 @@ 19.23 19.24 #: tazbox/tazbox:43 19.25 msgid "System initial setup (locale, keymap & timezone)" 19.26 -msgstr "Начальные установки системы (локаль, раскладка клавиатуры и часовой пояс)" 19.27 +msgstr "" 19.28 +"Начальные установки системы (локаль, раскладка клавиатуры и часовой пояс)" 19.29 19.30 #: tazbox/tazbox:44 19.31 msgid "Create a new file or folder on the desktop" 19.32 @@ -148,18 +150,16 @@ 19.33 19.34 #: tazbox/tazbox:137 19.35 msgid "" 19.36 -"Here you can set your preferences \\n" 19.37 -" for <b>locale, keymap and timezone</b>." 19.38 +"Here you can set your preferences \\n for <b>locale, keymap and timezone</b>." 19.39 msgstr "" 19.40 -"Здесь вы можете установить\\n" 19.41 -"<b>локаль, раскладку клавиатуры и часовой пояс</b>." 19.42 +"Здесь вы можете установить\\n<b>локаль, раскладку клавиатуры и часовой пояс</" 19.43 +"b>." 19.44 19.45 #: tazbox/tazbox:139 19.46 msgid "Locale" 19.47 msgstr "Локаль" 19.48 19.49 -#: tazbox/tazbox:140 19.50 -#: tazbox/tazbox:206 19.51 +#: tazbox/tazbox:140 tazbox/tazbox:206 19.52 msgid "Keymap" 19.53 msgstr "Раскладка" 19.54 19.55 @@ -177,10 +177,11 @@ 19.56 19.57 #: tazbox/tazbox:170 19.58 msgid "Tip: manage locales list by installing/removing locale packages." 19.59 -msgstr "Подсказка: вы можете управлять списком локалей, устанавливая и удаляя пакеты локалей." 19.60 +msgstr "" 19.61 +"Подсказка: вы можете управлять списком локалей, устанавливая и удаляя пакеты " 19.62 +"локалей." 19.63 19.64 -#: tazbox/tazbox:171 19.65 -#: tazbox/tazbox:279 19.66 +#: tazbox/tazbox:171 tazbox/tazbox:279 19.67 msgid "Flag" 19.68 msgstr "флаг" 19.69 19.70 @@ -188,13 +189,11 @@ 19.71 msgid "Name" 19.72 msgstr "Название" 19.73 19.74 -#: tazbox/tazbox:172 19.75 -#: tazbox/tazbox:442 19.76 +#: tazbox/tazbox:172 tazbox/tazbox:442 19.77 msgid "Description" 19.78 msgstr "Описание" 19.79 19.80 -#: tazbox/tazbox:174 19.81 -#: tazbox/tazbox:280 19.82 +#: tazbox/tazbox:174 tazbox/tazbox:280 19.83 msgid "Manage" 19.84 msgstr "Пакеты" 19.85 19.86 @@ -215,10 +214,7 @@ 19.87 msgid "Type" 19.88 msgstr "Тип" 19.89 19.90 -#: tazbox/tazbox:244 19.91 -#: tazbox/tazbox:272 19.92 -#: tazbox/tazbox:288 19.93 -#: tazbox/tazbox:301 19.94 +#: tazbox/tazbox:244 tazbox/tazbox:272 tazbox/tazbox:288 tazbox/tazbox:301 19.95 msgid "SliTaz TZ" 19.96 msgstr "Часовой пояс SliTaz" 19.97 19.98 @@ -230,19 +226,20 @@ 19.99 msgid "Are you agreed?" 19.100 msgstr "Вы согласны?" 19.101 19.102 -#: tazbox/tazbox:275 19.103 -#: tazbox/tazbox:291 19.104 -#: tazbox/tazbox:304 19.105 +#: tazbox/tazbox:275 tazbox/tazbox:291 tazbox/tazbox:304 19.106 msgid "TimeZone Configuration" 19.107 msgstr "Настройка часового пояса" 19.108 19.109 #: tazbox/tazbox:276 19.110 msgid "Select country and press \"Forward\" or manually select timezone file." 19.111 -msgstr "Выберите страну и нажмите «Вперёд» или вручную выберите файл часового пояса." 19.112 +msgstr "" 19.113 +"Выберите страну и нажмите «Вперёд» или вручную выберите файл часового пояса." 19.114 19.115 #: tazbox/tazbox:277 19.116 msgid "Tip: manage timezones list by installing/removing locale packages." 19.117 -msgstr "Подсказка: вы можете управлять списком часовых поясов, устанавливая и удаляя пакеты локалей." 19.118 +msgstr "" 19.119 +"Подсказка: вы можете управлять списком часовых поясов, устанавливая и удаляя " 19.120 +"пакеты локалей." 19.121 19.122 #: tazbox/tazbox:279 19.123 msgid "Code" 19.124 @@ -283,7 +280,8 @@ 19.125 19.126 #: tazbox/tazbox:439 19.127 msgid "Check only locale packages you need and press \"Install/Remove\"." 19.128 -msgstr "Отметьте только пакеты с нужными вам локалями и нажмите «Установить/удалить»." 19.129 +msgstr "" 19.130 +"Отметьте только пакеты с нужными вам локалями и нажмите «Установить/удалить»." 19.131 19.132 #: tazbox/tazbox:441 19.133 msgid "Inst." 19.134 @@ -355,35 +353,34 @@ 19.135 msgid "All Applications" 19.136 msgstr "Все приложения" 19.137 19.138 -#: tazbox/tazbox:604 19.139 +#: tazbox/tazbox:593 19.140 msgid "Downloading..." 19.141 msgstr "Загрузка…" 19.142 19.143 -#: tazbox/tazbox:660 19.144 +#: tazbox/tazbox:642 19.145 msgid "SliTaz default applications" 19.146 msgstr "Избранные приложения SliTaz" 19.147 19.148 -#: tazbox/tazbox:662 19.149 +#: tazbox/tazbox:644 19.150 msgid "SliTaz default applications configuration" 19.151 msgstr "Настройка избранных приложений SliTaz" 19.152 19.153 -#: tazbox/tazbox:664 19.154 +#: tazbox/tazbox:646 19.155 msgid "File manager:" 19.156 msgstr "Файловый менеджер:" 19.157 19.158 -#: tazbox/tazbox:665 19.159 +#: tazbox/tazbox:647 19.160 msgid "Web browser:" 19.161 msgstr "Браузер:" 19.162 19.163 -#: tazbox/tazbox:666 19.164 +#: tazbox/tazbox:648 19.165 msgid "Text editor:" 19.166 msgstr "Текстовый редактор:" 19.167 19.168 -#: tazbox/tazbox:667 19.169 +#: tazbox/tazbox:649 19.170 msgid "Terminal:" 19.171 msgstr "Терминал:" 19.172 19.173 -#: tazbox/tazbox:668 19.174 +#: tazbox/tazbox:650 19.175 msgid "Window manager:" 19.176 msgstr "Оконный менеджер:" 19.177 -
20.1 --- a/po/tazbox/sv.po Sat Nov 15 06:45:42 2014 +0200 20.2 +++ b/po/tazbox/sv.po Thu Nov 20 06:04:24 2014 +0200 20.3 @@ -7,7 +7,7 @@ 20.4 msgstr "" 20.5 "Project-Id-Version: TazBox\n" 20.6 "Report-Msgid-Bugs-To: \n" 20.7 -"POT-Creation-Date: 2014-05-23 03:33+0300\n" 20.8 +"POT-Creation-Date: 2014-11-18 20:10+0200\n" 20.9 "PO-Revision-Date: 2012-07-12 13:14-0000\n" 20.10 "Last-Translator: Emil Eklund <emileklund123@gmail.com>\n" 20.11 "Language-Team: Swedish\n" 20.12 @@ -341,34 +341,34 @@ 20.13 msgid "All Applications" 20.14 msgstr "Alla Applikationer" 20.15 20.16 -#: tazbox/tazbox:604 20.17 +#: tazbox/tazbox:593 20.18 msgid "Downloading..." 20.19 msgstr "" 20.20 20.21 -#: tazbox/tazbox:660 20.22 +#: tazbox/tazbox:642 20.23 msgid "SliTaz default applications" 20.24 msgstr "" 20.25 20.26 -#: tazbox/tazbox:662 20.27 +#: tazbox/tazbox:644 20.28 msgid "SliTaz default applications configuration" 20.29 msgstr "" 20.30 20.31 -#: tazbox/tazbox:664 20.32 +#: tazbox/tazbox:646 20.33 msgid "File manager:" 20.34 msgstr "" 20.35 20.36 -#: tazbox/tazbox:665 20.37 +#: tazbox/tazbox:647 20.38 msgid "Web browser:" 20.39 msgstr "" 20.40 20.41 -#: tazbox/tazbox:666 20.42 +#: tazbox/tazbox:648 20.43 msgid "Text editor:" 20.44 msgstr "" 20.45 20.46 -#: tazbox/tazbox:667 20.47 +#: tazbox/tazbox:649 20.48 msgid "Terminal:" 20.49 msgstr "" 20.50 20.51 -#: tazbox/tazbox:668 20.52 +#: tazbox/tazbox:650 20.53 msgid "Window manager:" 20.54 msgstr ""
21.1 --- a/po/tazbox/tazbox.pot Sat Nov 15 06:45:42 2014 +0200 21.2 +++ b/po/tazbox/tazbox.pot Thu Nov 20 06:04:24 2014 +0200 21.3 @@ -8,7 +8,7 @@ 21.4 msgstr "" 21.5 "Project-Id-Version: TazBox\n" 21.6 "Report-Msgid-Bugs-To: \n" 21.7 -"POT-Creation-Date: 2014-05-23 03:33+0300\n" 21.8 +"POT-Creation-Date: 2014-11-20 05:38+0200\n" 21.9 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 21.10 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 21.11 "Language-Team: LANGUAGE <LL@li.org>\n" 21.12 @@ -338,34 +338,34 @@ 21.13 msgid "All Applications" 21.14 msgstr "" 21.15 21.16 -#: tazbox/tazbox:604 21.17 +#: tazbox/tazbox:593 21.18 msgid "Downloading..." 21.19 msgstr "" 21.20 21.21 -#: tazbox/tazbox:660 21.22 +#: tazbox/tazbox:642 21.23 msgid "SliTaz default applications" 21.24 msgstr "" 21.25 21.26 -#: tazbox/tazbox:662 21.27 +#: tazbox/tazbox:644 21.28 msgid "SliTaz default applications configuration" 21.29 msgstr "" 21.30 21.31 -#: tazbox/tazbox:664 21.32 +#: tazbox/tazbox:646 21.33 msgid "File manager:" 21.34 msgstr "" 21.35 21.36 -#: tazbox/tazbox:665 21.37 +#: tazbox/tazbox:647 21.38 msgid "Web browser:" 21.39 msgstr "" 21.40 21.41 -#: tazbox/tazbox:666 21.42 +#: tazbox/tazbox:648 21.43 msgid "Text editor:" 21.44 msgstr "" 21.45 21.46 -#: tazbox/tazbox:667 21.47 +#: tazbox/tazbox:649 21.48 msgid "Terminal:" 21.49 msgstr "" 21.50 21.51 -#: tazbox/tazbox:668 21.52 +#: tazbox/tazbox:650 21.53 msgid "Window manager:" 21.54 msgstr ""
22.1 --- a/po/tazbox/zh_CN.po Sat Nov 15 06:45:42 2014 +0200 22.2 +++ b/po/tazbox/zh_CN.po Thu Nov 20 06:04:24 2014 +0200 22.3 @@ -7,7 +7,7 @@ 22.4 msgstr "" 22.5 "Project-Id-Version: TazBox\n" 22.6 "Report-Msgid-Bugs-To: \n" 22.7 -"POT-Creation-Date: 2014-06-08 02:35+0800\n" 22.8 +"POT-Creation-Date: 2014-11-18 20:10+0200\n" 22.9 "PO-Revision-Date: 2014-06-26 15:06+0800\n" 22.10 "Last-Translator: 张文宇 <jame987165702@gmail.com>\n" 22.11 "Language-Team: 张文宇 <jame987165702@gmail.com>\n" 22.12 @@ -339,34 +339,34 @@ 22.13 msgid "All Applications" 22.14 msgstr "所有程式" 22.15 22.16 -#: tazbox/tazbox:604 22.17 +#: tazbox/tazbox:593 22.18 msgid "Downloading..." 22.19 msgstr "正在下载..." 22.20 22.21 -#: tazbox/tazbox:660 22.22 +#: tazbox/tazbox:642 22.23 msgid "SliTaz default applications" 22.24 msgstr "SliTaz 预设应用程式" 22.25 22.26 -#: tazbox/tazbox:662 22.27 +#: tazbox/tazbox:644 22.28 msgid "SliTaz default applications configuration" 22.29 msgstr "SliTaz 预设应用程式配置" 22.30 22.31 -#: tazbox/tazbox:664 22.32 +#: tazbox/tazbox:646 22.33 msgid "File manager:" 22.34 msgstr "文件管理器" 22.35 22.36 -#: tazbox/tazbox:665 22.37 +#: tazbox/tazbox:647 22.38 msgid "Web browser:" 22.39 msgstr "网页瀏览器:" 22.40 22.41 -#: tazbox/tazbox:666 22.42 +#: tazbox/tazbox:648 22.43 msgid "Text editor:" 22.44 msgstr "文字编辑器:" 22.45 22.46 -#: tazbox/tazbox:667 22.47 +#: tazbox/tazbox:649 22.48 msgid "Terminal:" 22.49 msgstr "终端:" 22.50 22.51 -#: tazbox/tazbox:668 22.52 +#: tazbox/tazbox:650 22.53 msgid "Window manager:" 22.54 msgstr "窗口管理员"
23.1 --- a/po/tazbox/zh_TW.po Sat Nov 15 06:45:42 2014 +0200 23.2 +++ b/po/tazbox/zh_TW.po Thu Nov 20 06:04:24 2014 +0200 23.3 @@ -7,14 +7,15 @@ 23.4 msgstr "" 23.5 "Project-Id-Version: TazBox\n" 23.6 "Report-Msgid-Bugs-To: \n" 23.7 -"POT-Creation-Date: 2014-06-08 02:35+0800\n" 23.8 +"POT-Creation-Date: 2014-11-18 20:10+0200\n" 23.9 "PO-Revision-Date: 2014-06-08 02:35+0800\n" 23.10 -"Last-Translator: <lunglungyu2004@gmail.com>\n\n" 23.11 +"Last-Translator: <lunglungyu2004@gmail.com>\n" 23.12 "Language-Team: \n" 23.13 "Language: zh_TW\n" 23.14 "MIME-Version: 1.0\n" 23.15 "Content-Type: text/plain; charset=UTF-8\n" 23.16 "Content-Transfer-Encoding: 8bit\n" 23.17 +"\n" 23.18 23.19 #: tazbox/tazbox:28 23.20 msgid "SliTaz tiny GUI boxes for the desktop" 23.21 @@ -143,8 +144,7 @@ 23.22 #: tazbox/tazbox:137 23.23 msgid "" 23.24 "Here you can set your preferences \\n for <b>locale, keymap and timezone</b>." 23.25 -msgstr "" 23.26 -"你可以在這裏設定 \\n <b>locale,鍵映射及時區</b>的偏好." 23.27 +msgstr "你可以在這裏設定 \\n <b>locale,鍵映射及時區</b>的偏好." 23.28 23.29 #: tazbox/tazbox:139 23.30 msgid "Locale" 23.31 @@ -338,34 +338,34 @@ 23.32 msgid "All Applications" 23.33 msgstr "所有程式" 23.34 23.35 -#: tazbox/tazbox:604 23.36 +#: tazbox/tazbox:593 23.37 msgid "Downloading..." 23.38 msgstr "正在下載..." 23.39 23.40 -#: tazbox/tazbox:660 23.41 +#: tazbox/tazbox:642 23.42 msgid "SliTaz default applications" 23.43 msgstr "SliTaz 預設應用程式" 23.44 23.45 -#: tazbox/tazbox:662 23.46 +#: tazbox/tazbox:644 23.47 msgid "SliTaz default applications configuration" 23.48 msgstr "SliTaz 預設應用程式配置" 23.49 23.50 -#: tazbox/tazbox:664 23.51 +#: tazbox/tazbox:646 23.52 msgid "File manager:" 23.53 msgstr "文件管理器" 23.54 23.55 -#: tazbox/tazbox:665 23.56 +#: tazbox/tazbox:647 23.57 msgid "Web browser:" 23.58 msgstr "網頁瀏覽器:" 23.59 23.60 -#: tazbox/tazbox:666 23.61 +#: tazbox/tazbox:648 23.62 msgid "Text editor:" 23.63 msgstr "文字編輯器:" 23.64 23.65 -#: tazbox/tazbox:667 23.66 +#: tazbox/tazbox:649 23.67 msgid "Terminal:" 23.68 msgstr "終端:" 23.69 23.70 -#: tazbox/tazbox:668 23.71 +#: tazbox/tazbox:650 23.72 msgid "Window manager:" 23.73 msgstr "窗口管理員"
24.1 --- a/po/tazdrop/tazdrop.pot Sat Nov 15 06:45:42 2014 +0200 24.2 +++ b/po/tazdrop/tazdrop.pot Thu Nov 20 06:04:24 2014 +0200 24.3 @@ -8,7 +8,7 @@ 24.4 msgstr "" 24.5 "Project-Id-Version: TazDrop\n" 24.6 "Report-Msgid-Bugs-To: \n" 24.7 -"POT-Creation-Date: 2014-05-23 03:33+0300\n" 24.8 +"POT-Creation-Date: 2014-11-20 05:38+0200\n" 24.9 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 24.10 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 24.11 "Language-Team: LANGUAGE <LL@li.org>\n"
25.1 --- a/tinyutils/browser Sat Nov 15 06:45:42 2014 +0200 25.2 +++ b/tinyutils/browser Thu Nov 20 06:04:24 2014 +0200 25.3 @@ -3,24 +3,27 @@ 25.4 # 25.5 . /etc/slitaz/applications.conf 25.6 25.7 -USER_CONFIG="$HOME/.config/slitaz/applications.conf" 25.8 +USER_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/slitaz/applications.conf" 25.9 [ -f $USER_CONFIG ] && . $USER_CONFIG 25.10 25.11 EXEC="exec setsid $BROWSER" 25.12 25.13 -if [ ! -z $XAUTHORITY ]; then 25.14 - EXECT="terminal -e $BROWSER"; 25.15 - case $BROWSER in links) EXECT="$EXEC -g" ;; esac 25.16 +if [ -z "$XAUTHORITY" ]; then 25.17 + # console session 25.18 + EXECT="$BROWSER" 25.19 else 25.20 - EXECT="$BROWSER"; 25.21 + # Xorg session 25.22 + case $BROWSER in 25.23 + links) EXECT="$EXEC -g" ;; 25.24 + *) EXECT="terminal -e $BROWSER" ;; 25.25 + esac 25.26 fi 25.27 25.28 case $BROWSER in 25.29 - *links*|retawq|lynx) 25.30 - $EXECT $@ ;; 25.31 - w3m) $EXECT -N $@ ;; 25.32 - qupzil*)$EXEC -ow $@ ;; 25.33 - *) $EXEC $@ ;; 25.34 + *links*|retawq|lynx) $EXECT $@ ;; 25.35 + w3m) $EXECT -N $@ ;; 25.36 + qupzil*) $EXEC -ow $@ ;; 25.37 + *) $EXEC $@ ;; 25.38 esac 25.39 25.40 exit 0
26.1 --- a/tinyutils/editor Sat Nov 15 06:45:42 2014 +0200 26.2 +++ b/tinyutils/editor Thu Nov 20 06:04:24 2014 +0200 26.3 @@ -3,17 +3,20 @@ 26.4 # 26.5 . /etc/slitaz/applications.conf 26.6 26.7 -USER_CONFIG="$HOME/.config/slitaz/applications.conf" 26.8 +USER_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/slitaz/applications.conf" 26.9 [ -f $USER_CONFIG ] && . $USER_CONFIG 26.10 26.11 -if [ ! -z $XAUTHORITY ]; then 26.12 - EXEC="terminal -e $EDITOR"; 26.13 -else EXEC="$EDITOR"; 26.14 +if [ -z "$XAUTHORITY" ]; then 26.15 + # console session 26.16 + EXEC="$EDITOR" 26.17 +else 26.18 + # Xorg session 26.19 + EXEC="terminal -e $EDITOR" 26.20 fi 26.21 26.22 case $EDITOR in 26.23 emacs|joe|jed|ht|le|nano|vi*) $EXEC $@ ;; 26.24 - mcedit) $EXEC -a -S nicedark $@ ;; 26.25 + mcedit) $EXEC -a -S nicedark $@ ;; 26.26 *) exec setsid $EDITOR $@ ;; 26.27 esac 26.28
27.1 --- a/tinyutils/file-manager Sat Nov 15 06:45:42 2014 +0200 27.2 +++ b/tinyutils/file-manager Thu Nov 20 06:04:24 2014 +0200 27.3 @@ -3,18 +3,21 @@ 27.4 # 27.5 . /etc/slitaz/applications.conf 27.6 27.7 -USER_CONFIG="$HOME/.config/slitaz/applications.conf" 27.8 +USER_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/slitaz/applications.conf" 27.9 [ -f $USER_CONFIG ] && . $USER_CONFIG 27.10 27.11 -if [ ! -z $XAUTHORITY ]; then 27.12 - EXEC="terminal -e $FILE_MANAGER" ; 27.13 -else EXEC="$FILE_MANAGER" ; 27.14 +if [ -z "$XAUTHORITY" ]; then 27.15 + # console session 27.16 + EXEC="$FILE_MANAGER" 27.17 +else 27.18 + # Xorg session 27.19 + EXEC="terminal -e $FILE_MANAGER" 27.20 fi 27.21 27.22 case $FILE_MANAGER in 27.23 - clex) $EXEC ;; 27.24 - ytree) $EXEC $@ ;; 27.25 - mc) $EXEC -S gotar -d $@ ;; 27.26 + clex) $EXEC ;; 27.27 + ytree) $EXEC $@ ;; 27.28 + mc) $EXEC -S gotar -d $@ ;; 27.29 *) exec setsid $FILE_MANAGER $@ ;; 27.30 esac 27.31
28.1 --- a/tinyutils/slitaz-config Sat Nov 15 06:45:42 2014 +0200 28.2 +++ b/tinyutils/slitaz-config Thu Nov 20 06:04:24 2014 +0200 28.3 @@ -7,9 +7,11 @@ 28.4 # Author: Christophe Lincoln <pankso@slitaz.org> 28.5 # 28.6 . /lib/libtaz.sh 28.7 +export TEXTDOMAIN='slitaz-tools' #i18n 28.8 + 28.9 check_root 28.10 28.11 -title="{ SliTaz Config }" 28.12 +title="{ $(_ 'SliTaz Config') }" 28.13 about="/usr/share/doc/slitaz/post-install.txt" 28.14 tmpdir="/tmp/$(basename $0)" 28.15 tmp="$tmpdir/$$" 28.16 @@ -17,7 +19,12 @@ 28.17 width="72" 28.18 28.19 # Use a tmp directory 28.20 -mkdir -p ${tmpdir} 28.21 +mkdir -p $tmpdir 28.22 + 28.23 +quit() { 28.24 + rm -rf $tmpdir; exit 0 28.25 +} 28.26 + 28.27 28.28 # 28.29 # GUI Functions 28.30 @@ -26,45 +33,48 @@ 28.31 # Coded for the ARM first boot settings 28.32 about_post_install() { 28.33 dialog --cr-wrap \ 28.34 - --title "{ Post Installation }" \ 28.35 - --exit-label "Continue" \ 28.36 - --textbox "$about" ${height} ${width} 28.37 + --title "{ $(_ 'Post Installation') }" \ 28.38 + --exit-label "$(_ 'Continue')" \ 28.39 + --textbox "$about" $height $width 28.40 } 28.41 28.42 # Set root passwd 28.43 root_passwd() { 28.44 - dialog --title "{ Root Password }" --colors \ 28.45 - --inputbox "\nEnter new password for \Zb\Z1root" \ 28.46 - 12 ${width} 2>${tmp} 28.47 - passwd=$(cat $tmp) 28.48 - [ "$passwd" == "" ] && return 0 28.49 - echo "root:$passwd" | chpasswd --md5 >/dev/null 28.50 + dialog --title "{ $(_ 'Root Password') }" --colors \ 28.51 + --inputbox "\n$(_ 'Enter new password for \Zb\Z1root')" \ 28.52 + 12 $width 2>$tmp 28.53 + passwd=$(cat $tmp) 28.54 + [ -z "$passwd" ] && return 0 28.55 + echo "root:$passwd" | chpasswd --md5 >/dev/null 28.56 } 28.57 28.58 # Add a new user 28.59 add_user() { 28.60 - title="{ Add User }" 28.61 - dialog --title "$title" --colors \ 28.62 - --inputbox "\nEnter login name for the new \Zb\Z4user" 12 ${width} 2>${tmp} 28.63 + title2="{ $(_ 'Add User') }" 28.64 + 28.65 + dialog --title "$title2" --colors \ 28.66 + --inputbox "\n$(_ 'Enter login name for the new \Zb\Z4user')" 12 $width 2>$tmp 28.67 user=$(cat $tmp) 28.68 - [ "$user" == "" ] && return 0 28.69 - dialog --title "$title" --colors \ 28.70 - --inputbox "\nEnter password for user \Zb\Z4${user}" 12 ${width} 2>${tmp} 28.71 + [ -z "$user" ] && return 0 28.72 + 28.73 + dialog --title "$title2" --colors \ 28.74 + --inputbox "\n$(_ 'Enter password for user \Zb\Z4$user')" 12 $width 2>$tmp 28.75 passwd=$(cat $tmp) 28.76 - [ "$passwd" == "" ] && return 0 28.77 - adduser -D -g "SliTaz User" -G users ${user} 28.78 - echo "$user:$passwd" | chpasswd --md5 >/dev/null 28.79 - 28.80 - # User groups 28.81 - for group in audio cdrom video tty; do 28.82 - addgroup ${user} ${group} >/dev/null 28.83 + [ -z "$passwd" ] && return 0 28.84 + 28.85 + adduser -D -g "SliTaz User" -G users $user 28.86 + echo "$user:$passwd" | chpasswd --md5 >/dev/null 28.87 + 28.88 + # User groups 28.89 + for group in audio cdrom video tty; do 28.90 + addgroup $user $group >/dev/null 28.91 done 28.92 - 28.93 + 28.94 # Make sure system-wide applications.conf is used 28.95 - config="/home/${user}/.config" 28.96 - mkdir -p ${config}/slitaz 28.97 - cp -f /etc/slitaz/applications.conf ${config}/slitaz 28.98 - 28.99 + config="/home/$user/.config" 28.100 + mkdir -p $config/slitaz 28.101 + cp -f /etc/slitaz/applications.conf $config/slitaz 28.102 + 28.103 # Slim default user on post-install 28.104 if [ -f "/etc/slim.conf" ] && [ ! -f "/var/lib/slitaz/post-install" ]; then 28.105 sed -i s"/default_user .*/default_user $user/" /etc/slim.conf 28.106 @@ -72,101 +82,124 @@ 28.107 } 28.108 28.109 set_date() { 28.110 - clear && newline 28.111 - echo -n "Old date:"; date 28.112 + clear; newline 28.113 + echo "Old date: $(date)" 28.114 rdate -s tick.greyware.com 2>/dev/null 28.115 - echo -n "New date:"; date 28.116 + echo "New date: $(date)" 28.117 sleep 4 28.118 } 28.119 28.120 -# Catch ESSIDs and format output for Ncurses Dialog or GTK Yad tree. 28.121 -# We get the list of networks by Cell and without spaces. 28.122 +# Catch ESSIDs and format output for Ncurses Dialog or GTK Yad tree. 28.123 +# We get the list of networks by Cell and without spaces. 28.124 # Usage: detect_wifi --output=gtk (default output to dialog) 28.125 detect_wifi() { 28.126 . /etc/network.conf 28.127 ifconfig $WIFI_INTERFACE up 28.128 + 28.129 if [ -d /sys/class/net/$WIFI_INTERFACE/wireless ]; then 28.130 - for i in $(iwlist $WIFI_INTERFACE scan | sed s/"Cell "/Cell-/ | grep "Cell-" | awk '{print $1}') 28.131 - do 28.132 + IFS=$'\n'; hidden='' 28.133 + for i in $(iwlist $WIFI_INTERFACE scan | grep -Eo 'Cell [0-9]*'); do 28.134 scan=$(iwlist $WIFI_INTERFACE scan last | \ 28.135 awk '/(Cell|ESS|Qual|Encry|IE: WPA|WPA2)/ {print}' | \ 28.136 - sed s/"Cell "/Cell-/ | grep -A 5 "$i") 28.137 + sed "/$i/,/Cell/ !d") 28.138 + 28.139 essid=$(echo $scan | cut -d '"' -f 2) 28.140 28.141 - if echo "$scan" | grep -q Quality; then 28.142 - quality=$(echo $scan | sed 's/.*Quality=\([^ ]*\).*/\1/' | sed 's/.*Quality:\([^ ]*\).*/\1/') 28.143 - else 28.144 - quality="$(_n '-----')" 28.145 - fi 28.146 + quality=$(echo $scan | grep -Eo 'Quality[:=][^ ]*' | tr -cd '0-9/') 28.147 + [ -z "$quality" ] && quality='-----' 28.148 28.149 - crypto=$(echo $scan | sed 's/.*key:\([^ ]*\).*/\1/') 28.150 + crypto="$(echo $scan | sed 's/.*key:\([^ ]*\).*/\1/')" 28.151 + 28.152 # Check encryption type 28.153 if echo "$scan" | grep -q WPA*; then 28.154 crypto="WPA" 28.155 fi 28.156 28.157 # Connected or not connected... 28.158 - if ifconfig | grep -A 1 $WIFI_INTERFACE | \ 28.159 - grep -q inet && iwconfig $WIFI_INTERFACE | \ 28.160 - grep ESSID | grep -q -w "$essid"; then 28.161 - status=connected 28.162 + if ifconfig | grep -A1 $WIFI_INTERFACE | grep -qF 'inet' && \ 28.163 + iwconfig $WIFI_INTERFACE | grep ESSID | grep -qwF "$essid"; then 28.164 + status="..$(_ 'connected')" 28.165 else 28.166 - status="--" 28.167 + status='' 28.168 fi 28.169 - 28.170 + 28.171 # Output 28.172 - case "$output" in 28.173 - gtk) 28.174 - echo -e "$( _n 'any')\n$(_n 'N/A')\n$(_n 'none')\n$(_n '-')" 28.175 - echo -e "$essid\n$quality\n$crypto\n$status" ;; 28.176 - *) 28.177 - echo "$essid" "QA_${quality}_KEY_${crypto}_${status}" ;; 28.178 - esac 28.179 + if [ -z "$essid" ]; then 28.180 + hidden='yes' 28.181 + else 28.182 + case "$output" in 28.183 + gtk) 28.184 + #echo -e "$(_n 'any')\n$(_n 'N/A')\n$(_n 'none')\n$(_n '-')" 28.185 + echo -e "$essid\n$quality\n$crypto\n$status" ;; 28.186 + *) 28.187 + echo "$essid" 28.188 + echo "$(_ 'Quality'):${quality}..$(_ 'Key'):${crypto}${status}" ;; 28.189 + esac 28.190 + fi 28.191 done 28.192 + [ -n "$hidden" ] && echo "$(_ 'hidden.network')" "$(_ 'Connect.to.a.hidden.network')" 28.193 fi 28.194 } 28.195 28.196 -# Wireless config so users dont have to edit any config files on post 28.197 +# Show message and percentage on the dialog gauge 28.198 +msg() { 28.199 + sleep 1; echo -e "XXX\n$1\n$MSG\nXXX" 28.200 +} 28.201 + 28.202 +# Wireless config so users don't have to edit any config files on post 28.203 # install to get connected. If the wired connection is used it will auto 28.204 # connect with DHCP so no need for a dialog frontend. 28.205 wifi_setup() { 28.206 . /etc/network.conf 28.207 dialog \ 28.208 --clear --title "$title" \ 28.209 - --ok-label "Select" \ 28.210 - --menu "\n$(gettext 'Connect to a Wi-Fi network')" \ 28.211 - ${height} ${width} 14 \ 28.212 -"any" "Quality_N/A" \ 28.213 -$(detect_wifi) 2>${tmp} 28.214 - 28.215 + --ok-label "$(_ 'Select')" \ 28.216 + --menu "\n$(_ 'Connect to a Wi-Fi network')" \ 28.217 + $height $width 14 \ 28.218 +"any" "$(_ 'Connect.to.any.network')" \ 28.219 +$(detect_wifi) 2>$tmp 28.220 + 28.221 # Handle options 28.222 - case "${?}" in 28.223 - 1|255) rm -rf ${tmpdir} && exit 0 ;; 28.224 + case "$?" in 28.225 + 1|255) quit ;; 28.226 0) essid=$(cat $tmp) ;; 28.227 esac 28.228 - 28.229 - # Check if we need to prompt user for an encrypted network 28.230 - scan=$(iwlist $WIFI_INTERFACE scan | \ 28.231 - awk '/(Cell|ESS|Qual|Encry|IE: WPA|WPA2)/ {print}' | \ 28.232 - sed s/"Cell "/Cell-/ | grep -A 5 "$essid") 28.233 - if echo "$scan" | sed 's/.*key:\([^ ]*\).*/\1/' | grep -q WPA*; then 28.234 - dialog --title "{ Wi-Fi Password }" --colors \ 28.235 - --inputbox "\nEnter wifi key (password) for \Zb\Z4${essid}" \ 28.236 - 12 ${width} 2>${tmp} 28.237 + 28.238 + # Connect to hidden network 28.239 + if [ "$essid" == "$(_ 'hidden.network')" ]; then 28.240 + dialog --title "{ $(_ 'Wi-Fi ESSID') }" \ 28.241 + --inputbox "\n$(_ 'Enter Wi-Fi access point ESSID (name)')" \ 28.242 + 12 $width 2>$tmp 28.243 + essid=$(cat $tmp) 28.244 + [ -z "$essid" ] && exit 0 28.245 + 28.246 + dialog --title "{ $(_ 'Wi-Fi Password') }" --colors \ 28.247 + --inputbox "\n$(_ 'Enter Wi-Fi key (password) for \Zb\Z4$essid')" \ 28.248 + 12 $width 2>$tmp 28.249 key=$(cat $tmp) 28.250 - [ "$key" == "" ] && return 0 28.251 + else 28.252 + 28.253 + # Check if we need to prompt user for an encrypted network 28.254 + key=$(iwlist $WIFI_INTERFACE scan last | grep -E 'Cell |Encryption|ESSID' | \ 28.255 + grep -C1 "$essid" | sed -n 's|.*key:\(.*\)|\1|p') 28.256 + 28.257 + if [ "$key" == "on" ]; then 28.258 + dialog --title "{ $(_ 'Wi-Fi Password') }" --colors \ 28.259 + --inputbox "\n$(_ 'Enter Wi-Fi key (password) for \Zb\Z4$essid')" \ 28.260 + 12 $width 2>$tmp 28.261 + key=$(cat $tmp) 28.262 + [ -z "$key" ] && exit 0 28.263 + fi 28.264 fi 28.265 - 28.266 + 28.267 # Configure connection 28.268 { 28.269 - echo "XXX" && echo 30 28.270 - echo -e "\nShuting down network interfaces..." 28.271 - echo "XXX" 28.272 - stopd network.sh >/dev/null 2>&1 && sleep 2 28.273 - 28.274 - echo "XXX" && echo 30 28.275 - echo -e "\nConfiguring: /etc/network.conf..." 28.276 - echo "XXX" 28.277 + MSG="\n$(_ 'Shutting down network interfaces...')" 28.278 + msg 0; stopd network.sh >/dev/null 2>&1 28.279 + msg 10 28.280 + 28.281 + MSG="\n$(_ 'Configuring: /etc/network.conf...')" 28.282 + msg 20 28.283 # WIFI_KEY_TYPE=any should work for WEP/WPA* 28.284 sed -i \ 28.285 -e s"/^WIFI=.*/WIFI=\"yes\"/" \ 28.286 @@ -174,62 +207,55 @@ 28.287 -e s"/^WIFI_KEY=.*/WIFI_KEY=\"$key\"/" \ 28.288 -e s"/^WIFI_KEY_TYPE=.*/WIFI_KEY_TYPE=\"any\"/" \ 28.289 /etc/network.conf 28.290 - sleep 1 28.291 - 28.292 - echo "XXX" && echo 60 28.293 - echo -e "\nRestarting wifi interface..." 28.294 - echo "XXX" 28.295 - startd network.sh >/dev/null 2>&1 && sleep 3 28.296 - 28.297 - echo "XXX" && echo 90 28.298 - echo -e "\nChecking connection..." 28.299 - sleep 1 28.300 - ip=$(ifconfig | fgrep -A 1 "encap:Ethernet" | fgrep "inet" | \ 28.301 - cut -d ":" -f 2 | awk '{print $1}') 28.302 - echo "XXX" 28.303 - sleep 1 28.304 - 28.305 - echo "XXX" && echo 100 28.306 + 28.307 + MSG="\n$(_ 'Restarting Wi-Fi interface...')" 28.308 + msg 30; startd network.sh >/dev/null 2>&1 28.309 + msg 40; msg 50; msg 60; msg 70; msg 80 28.310 + 28.311 + MSG="\n$(_ 'Checking connection...')" 28.312 + msg 90; sleep 2 28.313 + ip="$(ifconfig $WIFI_INTERFACE | fgrep 'inet addr' | sed 's|.*:\([^ ]*\) .*|\1|')" 28.314 + 28.315 if [ "$ip" ]; then 28.316 - echo -e "\nIP address: $ip" 28.317 + MSG="\n$(_ 'IP address: $ip')" 28.318 else 28.319 - echo -e "\nUnable to connect..." 28.320 + MSG="\n$(_ 'Unable to connect...')" 28.321 fi 28.322 - echo "XXX" && sleep 2 28.323 - 28.324 - } | dialog --title "{ Wi-Fi Config }" --gauge "" 8 ${width} 0 28.325 + msg 100; sleep 2 28.326 + 28.327 + } | dialog --title "{ $(_ 'Wi-Fi Config') }" --gauge "" 8 $width 0 28.328 } 28.329 28.330 # Main Dialog menu 28.331 main_box() { 28.332 dialog \ 28.333 --clear --title "$title" \ 28.334 - --ok-label "Exec" --cancel-label "Quit" \ 28.335 - --menu "" ${height} ${width} 14 \ 28.336 -"keyboard" "$(gettext 'System keyboard setting')" \ 28.337 -"locale" "$(gettext 'System language setting')" \ 28.338 -"wifi-setup" "$(gettext 'Wi-Fi network settings')" \ 28.339 -"add-user" "$(gettext 'Add a new user')" \ 28.340 -"root-passwd" "$(gettext 'Change root password')" \ 28.341 -"set-date" "$(gettext 'Set system date from the web')" \ 28.342 -"quit" "$(gettext 'Exit from SliTaz Config')" 2>${tmp} 28.343 - 28.344 + --ok-label "$(_ 'Exec')" --cancel-label "$(_ 'Quit')" \ 28.345 + --menu "" $height $width 14 \ 28.346 +"keyboard" "$(_ 'System keyboard setting')" \ 28.347 +"locale" "$(_ 'System language setting')" \ 28.348 +"wifi-setup" "$(_ 'Wi-Fi network settings')" \ 28.349 +"add-user" "$(_ 'Add a new user')" \ 28.350 +"root-passwd" "$(_ 'Change root password')" \ 28.351 +"set-date" "$(_ 'Set system date from the web')" \ 28.352 +"quit" "$(_ 'Exit from SliTaz Config')" 2>$tmp 28.353 + 28.354 # Handle options 28.355 - opt=${?} 28.356 + opt="$?" 28.357 case "$opt" in 28.358 - 1|255) rm -rf ${tmpdir} && exit 0 ;; 28.359 + 1|255) quit ;; 28.360 esac 28.361 - 28.362 + 28.363 # Handle actions 28.364 action=$(cat $tmp) 28.365 case "$action" in 28.366 - keyboard) tazkeymap ;; 28.367 - locale) tazlocale ;; 28.368 - wifi-setup) wifi_setup ;; 28.369 - add-user) add_user ;; 28.370 + keyboard) tazkeymap ;; 28.371 + locale) tazlocale ;; 28.372 + wifi-setup) wifi_setup ;; 28.373 + add-user) add_user ;; 28.374 root-passwd) root_passwd ;; 28.375 - set-date) set_date ;; 28.376 - quit) rm -rf ${tmpdir} && exit 0 ;; 28.377 + set-date) set_date ;; 28.378 + quit) quit ;; 28.379 esac 28.380 } 28.381 28.382 @@ -238,8 +264,8 @@ 28.383 # 28.384 28.385 case "$1" in 28.386 - *_*) 28.387 - # Execute functions 28.388 + *_*) 28.389 + # Execute functions 28.390 $@ ;; 28.391 *) 28.392 while true; do
29.1 --- a/tinyutils/tazx Sat Nov 15 06:45:42 2014 +0200 29.2 +++ b/tinyutils/tazx Thu Nov 20 06:04:24 2014 +0200 29.3 @@ -1,7 +1,7 @@ 29.4 #!/bin/sh 29.5 # 29.6 # Tazx - Ncurses X configuration for SliTaz GNU/Linux using Dialog boxes. 29.7 -# This tinyutil is part of slitaz-tools. Tazx can configure Xorg with 29.8 +# This tinyutil is part of slitaz-tools. Tazx can configure Xorg with 29.9 # several Window Managers. The GTK interface to configure X is in tazbox. 29.10 # 29.11 # (c) 2011-2014 SliTaz GNU/Linux - GNU GPL v3. 29.12 @@ -18,31 +18,32 @@ 29.13 . /etc/slitaz/slitaz.conf 29.14 . /etc/slitaz/applications.conf 29.15 29.16 -installed="$PKGS_DB/installed" 29.17 - 29.18 export TEXTDOMAIN='slitaz-tools' #i18n 29.19 : ${DIALOG=dialog --timeout 60} 29.20 29.21 -WM_i18n=$(_n 'Window Manager:'| sed s/://) 29.22 -INST_i18n=$(_n 'Install Xorg' | sed 's|Xorg||;s|X.org||;s| ||') 29.23 - 29.24 # Default user for config files in Live mode, id is 1000 since it is 29.25 # created by /etc/init.d/bootopts.sh. 29.26 -USER=$(cat /etc/passwd | grep 1000 | cut -d ":" -f 1) 29.27 + 29.28 +USER=$(awk -F: '/1000/{print $1}' /etc/passwd) 29.29 + 29.30 29.31 # 29.32 # Functions 29.33 # 29.34 29.35 + 29.36 # Save chunk of xorg.conf into specified file 29.37 + 29.38 save_chunk() { 29.39 sed -e '/Section "'${1#*-}'"/,/EndSection/!d' \ 29.40 - -e "s/EndSection/EndSection\n/" $xorg_template > \ 29.41 + -e "s/EndSection/&\n/" $xorg_template > \ 29.42 $xorg_config/$1.conf 29.43 } 29.44 29.45 + 29.46 +# Create a xorg.conf if needed 29.47 + 29.48 gen_xorg_conf_file() { 29.49 - # Create a xorg.conf if needed. 29.50 if [ ! -f /etc/X11/xorg.conf ]; then 29.51 cat > /etc/X11/xorg.conf << EOT 29.52 # You can put here your own Xorg configurations. This config file is read 29.53 @@ -52,16 +53,94 @@ 29.54 fi 29.55 } 29.56 29.57 + 29.58 +# Add or remove xkb applet from lxpanel 29.59 + 29.60 +xkb() { 29.61 + case $(id -u) in 29.62 + 0) 29.63 + # Empty if lxpanel not running, else something like: 29.64 + # tux lxpanel -p slitaz 29.65 + LXPS=$(ps -ouser,args | sed -n '/[l]xpanel/ s| *| |p' | \ 29.66 + fgrep -v '[' | fgrep -v 'xkb' | fgrep -v 'sh') 29.67 + 29.68 + # Stop lxpanel 29.69 + if [ -n "$LXPS" ]; then 29.70 + lxpanelctl exit 29.71 + killall lxpanel 29.72 + fi 29.73 + 29.74 + # For all human users 29.75 + for USER in $(awk -F: '/\/home\//{print $1}' /etc/passwd); do 29.76 + su $USER -c '. ~/.profile; tazx xkb' 29.77 + done 29.78 + 29.79 + # Re-run lxpanel 29.80 + [ -n "$LXPS" ] && su ${LXPS%% *} -c "exec ${LXPS#* }" & 29.81 + ;; 29.82 + 29.83 + *) 29.84 + DOTCONFIG=${XDG_CONFIG_HOME:-$HOME/.config} 29.85 + CFG_LXPANEL=$DOTCONFIG/lxpanel 29.86 + 29.87 + if [ ! -d $CFG_LXPANEL ]; then 29.88 + mkdir -p $DOTCONFIG 29.89 + cp -r /etc/lxpanel $DOTCONFIG 29.90 + fi 29.91 + 29.92 + case $(fgrep 'XkbLayout' /etc/X11/xorg.conf.d/40-Keyboard.conf | \ 29.93 + fgrep -o ',') in 29.94 + '') 29.95 + for CFG in $(find $CFG_LXPANEL -type f -name panel); do 29.96 + if [ -n "$(grep 'type = xkb' $CFG)" ]; then 29.97 + echo "Remove xkb applet from $CFG" 29.98 + sed -i "$(grep -n -e "^Plugin {" -e "^}" -e "xkb" \ 29.99 + $CFG | grep -C 1 xkb | grep -v xkb | cut -d: \ 29.100 + -f1 | tr '\n' ' ' | sed 's| |,|')d" $CFG 29.101 + fi 29.102 + done ;; 29.103 + ',') 29.104 + for CFG in $(find $CFG_LXPANEL -type f -name panel); do 29.105 + if [ -z "$(grep 'type = xkb' $CFG)" ]; then 29.106 + echo "Add xkb applet to $CFG" 29.107 + XKB='Plugin {\ 29.108 + type = xkb\ 29.109 + Config {\ 29.110 + DisplayType=0\ 29.111 + PerWinLayout=0\ 29.112 + NoResetOpt=0\ 29.113 + KeepSysLayouts=1\ 29.114 + Model=pc105\ 29.115 + LayoutsList=us\ 29.116 + VariantsList=,\ 29.117 + ToggleOpt=shift_caps_toggle\ 29.118 + FlagSize=4\ 29.119 + }\ 29.120 +}\ 29.121 +' 29.122 + sed -i "$(grep -n -e "^Plugin {" -e "tray" $CFG | \ 29.123 + grep -B1 tray | head -n1 | cut -d: -f1) i\\ 29.124 +$XKB" $CFG 29.125 + fi 29.126 + done ;; 29.127 + esac ;; 29.128 + esac 29.129 +} 29.130 + 29.131 + 29.132 # Generate or regenerate 40-Keyboard.conf 29.133 + 29.134 keyboard_conf() { 29.135 - # Configure the keyboard with the right keymap. 29.136 + # Configure the keyboard with the right keymap 29.137 keymap=$(cat /etc/keymap.conf) 29.138 keyboard_config="/etc/X11/xorg.conf.d/40-Keyboard.conf" 29.139 variant="" 29.140 + 29.141 # this XkbOption moved from 40-evdev.conf (xorg-xf86-input-evdev) 29.142 options="terminate:ctrl_alt_bksp" 29.143 - gettext "Creating:"; echo -n " $keyboard_config" 29.144 + _n 'Creating:'; echo -n " $keyboard_config" 29.145 mkdir -p $(dirname $keyboard_config) 29.146 + 29.147 case "$keymap" in 29.148 fr_CH-latin1) 29.149 # Swiss FrenCH 29.150 @@ -72,11 +151,11 @@ 29.151 ru) 29.152 # Russian 29.153 layout="us,ru" 29.154 - options="grp:ctrl_shift_toggle, grp_led:scroll, $options" ;; 29.155 + options="grp:ctrl_shift_toggle, grp_led:scroll, compose:ralt, $options" ;; 29.156 ua) 29.157 # Ukrainian 29.158 layout="us,ua,ru" 29.159 - options="grp:ctrl_shift_toggle, $options" ;; 29.160 + options="grp:ctrl_shift_toggle, compose:ralt, $options" ;; 29.161 slovene) 29.162 # Slovenian 29.163 layout="si"; options="grp:alt_shift_toggle, $options" ;; 29.164 @@ -89,6 +168,7 @@ 29.165 keymap=${keymap%-lat6} 29.166 layout=${keymap%-abnt2} 29.167 esac 29.168 + 29.169 cat > $keyboard_config << EOC 29.170 Section "InputClass" 29.171 Identifier "Keyboard Defaults" 29.172 @@ -98,11 +178,15 @@ 29.173 Option "XkbOptions" "$options" 29.174 EndSection 29.175 EOC 29.176 + 29.177 status 29.178 - [ x$variant == x ] && sed -i '/XkbVariant/d' ${keyboard_config} 29.179 + [ -z "$variant" ] && sed -i '/XkbVariant/d' $keyboard_config 29.180 + xkb 29.181 } 29.182 29.183 -# Populate xorg.conf.d. 29.184 + 29.185 +# Populate xorg.conf.d 29.186 + 29.187 xorg_conf_d() { 29.188 # Define the xorg.conf.d (can be /etc/X11/xorg.conf.d or /usr/share/X11/xorg.conf.d) 29.189 xorg_config=/etc/X11/xorg.conf.d 29.190 @@ -114,7 +198,7 @@ 29.191 Xorg -configure :2 29.192 29.193 # Backup existing config. 29.194 - tar -cf $xorg_config/../Previous_xorg.conf.d.tar $xorg_config/ &> /dev/null 29.195 + tar -cf $xorg_config/../Previous_xorg.conf.d.tar $xorg_config/ &> /dev/null 29.196 29.197 # Put the different sections in separate files in the config directory. 29.198 save_chunk 10-ServerLayout 29.199 @@ -133,48 +217,54 @@ 29.200 gen_xorg_conf_file 29.201 } 29.202 29.203 + 29.204 +# Process dialog's return code. 29.205 + 29.206 dialog_end() { 29.207 retval=$? 29.208 exec 3>&- 29.209 # Continue or exit. 29.210 case $retval in 29.211 - 0|3) continue ;; 29.212 - 1|255) exit 0 ;; 29.213 + 0|3) continue ;; 29.214 + 1|255) exit 0 ;; 29.215 esac 29.216 } 29.217 29.218 + 29.219 # Install xorg server. 29.220 + 29.221 install_xorg() { 29.222 - [ -f "/var/lib/tazpkg/packages.list" ] || tazpkg recharge 29.223 + [ -f "$PKGS_DB/packages.list" ] || tazpkg recharge 29.224 + 29.225 exec 3>&1 29.226 - value=$($DIALOG \ 29.227 - --clear --colors --scrollbar --default-item "$1" \ 29.228 - --title " $(_n 'Install Xorg') " \ 29.229 - --menu "$(_n 'Tazx helps you to select your X driver.')" 16 70 8 \ 29.230 - Auto_select "$(_n 'Auto configuring Xorg...' | sed 's/X//;s/org//;s|...$||;s| |_|')" \ 29.231 - $(fgrep xorg-xf86-video /var/lib/tazpkg/packages.list | cut -d- -f4 | \ 29.232 - while read x; do echo $x; _ 'driver'; done) \ 29.233 - "quit" "$(_n 'Quit')" \ 29.234 - 2>&1 1>&3) 29.235 + 29.236 + driver=$($DIALOG \ 29.237 + --clear --colors --scrollbar --title " $(_ 'Install Xorg') " \ 29.238 + --menu "$(_ 'Tazx helps you to select your X driver.')" 16 70 9 \ 29.239 + 'auto' "$(_ 'Auto configuring')" \ 29.240 + $(fgrep xorg-xf86-video- $PKGS_DB/packages.list | cut -d- -f4 | \ 29.241 + sed "s|.*|& $(_ 'driver')|") \ 29.242 + 'quit' "$(_ 'Quit')" \ 29.243 + 2>&1 1>&3) 29.244 + 29.245 dialog_end 29.246 29.247 - # Set selected value. 29.248 - case $value in 29.249 + case $driver in 29.250 quit) exit 0 ;; 29.251 - Auto_select) autoselect_driver ;; 29.252 + auto) autoselect_driver ;; 29.253 *) 29.254 inst_pkg xorg-server 29.255 - inst_pkg xorg-xf86-video-$value 29.256 + inst_pkg xorg-xf86-video-$driver 29.257 xorg_conf_d ;; 29.258 esac 29.259 } 29.260 29.261 29.262 -# Auto-select and install Xorg driver 29.263 +# Auto-select and install Xorg driver. 29.264 + 29.265 autoselect_driver() { 29.266 inst_pkg xorg-server 29.267 29.268 - DEVICE="$(_ 'driver')" 29.269 for VID in $(busybox lspci | grep 'Class 03' | cut -c21-24 | sort -u); do 29.270 case $VID in 29.271 1022|1002) d=ati ;; 29.272 @@ -183,7 +273,7 @@ 29.273 1039) d=sis ;; 29.274 15ad) d=vmware ;; 29.275 *) d=''; $DIALOG --colors --msgbox \ 29.276 - "\Z1 $(_n 'Failed to setup $DEVICE') \Zn (unknown hardware)" 5 68 ;; 29.277 + "\n\Z1$(_n 'Failed to setup driver')\Zn $(_ '(unknown hardware)')" 7 68 ;; 29.278 esac 29.279 [ -n "$d" ] && inst_pkg xorg-xf86-video-$d 29.280 done 29.281 @@ -191,142 +281,216 @@ 29.282 xorg_conf_d 29.283 } 29.284 29.285 + 29.286 +# Install specified package. 29.287 + 29.288 inst_pkg() { 29.289 - pkg="$@" && colorize 3 $(_ 'Installing pkg: $pkg') 29.290 - CMD="sudo tazpkg -gi $@" 29.291 - test $(id -u) = 0 && CMD="tazpkg -gi $@" 29.292 - [ -d "$installed/$@" ] || $CMD 29.293 + pkg="$@" 29.294 + colorize 3 $(_ 'Installing pkg: $pkg') 29.295 + 29.296 + case $(id -u) in 29.297 + 0) CMD="tazpkg -gi $@" ;; 29.298 + *) CMD="sudo tazpkg -gi $@" ;; 29.299 + esac 29.300 + [ -d "$INSTALLED/$@" ] || $CMD 29.301 } 29.302 29.303 + 29.304 +# Select/install Window Manager and favorite applications. 29.305 + 29.306 apps_dialog() { 29.307 - . ${user_conf} 29.308 + . $user_conf 29.309 + 29.310 exec 3>&1 29.311 + 29.312 app=$($DIALOG --clear --colors --backtitle "$msg" \ 29.313 - --title "{\Z3 $(_n '${INST_i18n}: ${WM_i18n} + applications') \Zn}" \ 29.314 + --title "{\Z3 $(_n 'Install Window Manager and applications') \Zn}" \ 29.315 --inputmenu "" 21 52 18 \ 29.316 - $(for a in WINDOW_MANAGER EDITOR BROWSER TERMINAL FILE_MANAGER; do 29.317 - eval n='$'"$a" ; echo "$a $n"; 29.318 - done) 2>&1 1>&3) 29.319 + $(for a in WINDOW_MANAGER EDITOR BROWSER TERMINAL FILE_MANAGER; do 29.320 + eval n='$'$a; echo $a $n; 29.321 + done) 2>&1 1>&3) 29.322 dialog_end 29.323 + 29.324 case $app in 29.325 - RENAME*)appname=$(echo $app | cut -d " " -f3) 29.326 - app=$(echo $app | cut -d " " -f2) ;; 29.327 + RENAMED) # like: RENAMED EDITOR myeditor 29.328 + appname=$(echo $app | cut -d" " -f3) 29.329 + app=$(echo $app | cut -d" " -f2) ;; 29.330 *) 29.331 - app_name_dialog only-installed d a-item ;; 29.332 + app_name_dialog only-installed ;; 29.333 esac 29.334 - if [ ! $appname = " " ]; then 29.335 - [ ! $appname = show_ALL ] || app_name_dialog full-list d 29.336 - if [ ! $(busybox which ${appname} 2>/dev/null) ]; then 29.337 - inst_pkg $appname 29.338 - [ -d "$installed/$appname" ] || inst_pkg \ 29.339 - $(tazpkg search-pkgname /bin/$appname | grep -Ev '=|:| |/bin/') 29.340 - else 29.341 - sed '/'${app}'/s|=.*$|="'${appname}'"|' -i ${user_conf} 29.342 + 29.343 + if [ $appname != " " ]; then 29.344 + if [ $appname = show_ALL ]; then 29.345 + app_name_dialog full-list 29.346 fi 29.347 + if [ -z $(busybox which $appname) ]; then 29.348 + inst_pkg $(lzcat $PKGS_DB/files.list.lzma | fgrep /bin/$appname | head -n1 | cut -d: -f1) 29.349 + fi 29.350 + sed -i "/$app/ s|=.*$|=$appname|" $user_conf 29.351 fi 29.352 - msg=''; apps_dialog 29.353 + 29.354 + msg=''; apps_dialog # loop 29.355 } 29.356 29.357 + 29.358 +# Show list of applications to choose. 29.359 + 29.360 app_name_dialog() { 29.361 - sz=28 ; [ $1 = full-list ] || sz=18 29.362 + case $1 in 29.363 + full-list) height=24 ;; 29.364 + *) height=18 ;; 29.365 + esac 29.366 + 29.367 exec 3>&1 29.368 - appname=$($DIALOG --clear --colors --title "${app}" \ 29.369 - --menu "" $sz 50 24 $(gen_applist $app $@) 2>&1 1>&3) \ 29.370 + 29.371 + appname=$($DIALOG --clear --colors --title "$app" \ 29.372 + --menu '' $height 50 24 $(gen_applist $app $@) 2>&1 1>&3) 29.373 dialog_end 29.374 } 29.375 29.376 + 29.377 +# Generate application list for Dialog or Yad. 29.378 + 29.379 gen_applist() { 29.380 -. ${user_conf} 29.381 -FILE_MANAGERS="clex caja emelfm2 mc pathfinder pcmanfm pcmanfm-qt ranger spacefm thunar xfe ytree" 29.382 -BROWSERS="arora chrome cream dillo elinks firefox firefox-official iron links lynx \ 29.383 - midori netsurf opera QtWeb qupzilla retawq seamonkey surf tazweb" 29.384 -EDITORS="adie beaver emacs geany jed joe juffed ht le leafpad mcedit mousepad mp-5 \ 29.385 - nano qedit SciTE vi vim xedit xfw zile" 29.386 -TERMINALS="aterm evilvte lxterminal mrxvt qterminal sakura stjerm tilda urxvt vte \ 29.387 - xterm yeahconsole" 29.388 -WINDOW_MANAGERS="awesome blackbox compiz dwm echinus enlightenment fluxbox icewm jwm \ 29.389 - lxde-session lxqt karmen matchbox openbox-session pekwm ratpoison xfwm4" 29.390 + # $1 = [ FILE_MANAGER | BROWSER | EDITOR | TERMINAL | WINDOW_MANAGER ] 29.391 + # $2 = [ only-installed | full-list ] 29.392 + # $3 = [ yad | * ] 29.393 + 29.394 + . $user_conf 29.395 + 29.396 + FILE_MANAGERS="clex caja emelfm2 mc pathfinder pcmanfm pcmanfm-qt ranger \ 29.397 +spacefm thunar xfe ytree" 29.398 + 29.399 + BROWSERS="arora chrome cream dillo elinks firefox firefox-official iron \ 29.400 +links lynx midori netsurf opera QtWeb qupzilla retawq seamonkey surf tazweb" 29.401 + 29.402 + EDITORS="adie beaver emacs geany jed joe juffed ht le leafpad mcedit \ 29.403 +mousepad mp-5 nano qedit SciTE vi vim xedit xfw zile" 29.404 + 29.405 + TERMINALS="aterm evilvte lxterminal mrxvt qterminal sakura stjerm tilda \ 29.406 +urxvt vte xterm yeahconsole" 29.407 + 29.408 + WINDOW_MANAGERS="awesome blackbox compiz dwm echinus enlightenment fluxbox \ 29.409 +icewm jwm lxde-session lxqt karmen matchbox openbox-session pekwm ratpoison \ 29.410 +xfwm4" 29.411 29.412 eval list='$'"$1"S 29.413 eval current='$'"$1" 29.414 -for i in $current $(echo ' '$list' ' | sed "s| "$current" | |g") $4 ; do 29.415 - t="<--" ; [ $(busybox which $i 2>/dev/null) ] || t=--- 29.416 - if [ $2 = only-installed ] && [ $t = --- ]; then 29.417 - case $i in 29.418 - a-item) i=show_ALL t="+"${INST_i18n};; 29.419 - *) i=" " t=" " ;; esac 29.420 + 29.421 + for i in $current $(echo " $list " | sed "s| $current | |g"); do 29.422 + 29.423 + case $(busybox which $i) in 29.424 + '') # not installed 29.425 + t='---' ;; 29.426 + *) # installed 29.427 + t='<--' ;; 29.428 + esac 29.429 + 29.430 + if [ "$2" == 'full-list' ] || [ "$t" == '<--' ]; then 29.431 + echo "$i" 29.432 + 29.433 + if [ "$3" != 'yad' ]; then 29.434 + echo "$(echo $t | sed "s|---|$(_n 'Install')|g")" 29.435 + fi 29.436 + fi 29.437 + done 29.438 + 29.439 + if [ "$2" == 'only-installed' ] && [ "$3" != 'yad' ]; then 29.440 + echo 'show_ALL' "+$(_n 'Install')" 29.441 fi 29.442 - echo "$i" 29.443 - [ $3 = yad ] || echo -e "$(echo $t | sed "s|---|${INST_i18n}|g ; s| ||g")" 29.444 -done 29.445 } 29.446 29.447 + 29.448 # Screen configuration dialog. 29.449 + 29.450 config_dialog() { 29.451 - . /etc/rcS.conf ; LM="ON" 29.452 - [ $LOGIN_MANAGER = "slim" ] || LM="OFF" 29.453 + . /etc/rcS.conf 29.454 + case $LOGIN_MANAGER in 29.455 + slim) LM="$(_ 'ON')" ;; 29.456 + *) LM="$(_ 'OFF')" ;; 29.457 + esac 29.458 29.459 exec 3>&1 29.460 + 29.461 value=$($DIALOG \ 29.462 --clear --colors \ 29.463 --title "{ $(_n 'SliTaz Xorg config') }" \ 29.464 --menu "" 16 72 10 \ 29.465 "xorg" "$(_n 'Install or reconfigure Xorg')" \ 29.466 "xorg-light" "$(_n 'Install Xorg server (light version)')" \ 29.467 - "onboot" "$(_n 'AutoStart Xorg by SLiM on boot') ...| \Z5$LM\Zn" \ 29.468 + "onboot" "$(_n 'AutoStart Xorg by SLiM on boot'): \Z5$LM\Zn" \ 29.469 "slim" "$(_n '(Re)Start Simple Login Manager now')" \ 29.470 - "wm_apps" "$(_n '${INST_i18n}: ${WM_i18n} + applications')" \ 29.471 + "wm_apps" "$(_n 'Install Window Manager and applications')" \ 29.472 "quit" "$(_n 'Quit Tazx utility')" \ 29.473 2>&1 1>&3) 29.474 dialog_end 29.475 - # Set selected value. 29.476 + 29.477 case "$value" in 29.478 xorg) 29.479 install_xorg ;; 29.480 + 29.481 xorg-light) 29.482 inst_pkg xorg-server-light 29.483 inst_pkg xorg-xf86-video-fbdev 29.484 xorg_conf_d ;; 29.485 + 29.486 onboot) 29.487 - inst_pkg slim ; inst_pkg dbus 29.488 - if [ $LM = "OFF" ] ; then 29.489 - LM=slim 29.490 - else LM="" 29.491 + inst_pkg slim 29.492 + inst_pkg dbus 29.493 + 29.494 + if [ $LM == "$(_ 'OFF')" ]; then 29.495 + LM='slim' 29.496 + else 29.497 + LM='' 29.498 fi 29.499 - sed '/LOGIN_MANAGER/s|=.*$|="'$LM'"|' -i /etc/rcS.conf 29.500 - [ $LM = "slim" ] || LM=disabled 29.501 - echo "start X on boot:" $(boldify $LM) ;; 29.502 + sed -i "/LOGIN_MANAGER/ s|=.*$|=$LM|" /etc/rcS.conf 29.503 + 29.504 + [ -z "$LM" ] && LM='disabled' 29.505 + _n "Start X on boot:"; boldify " $LM" ;; 29.506 + 29.507 slim) 29.508 - inst_pkg slim ; inst_pkg dbus 29.509 - [ ! -z $XAUTHORITY ] || stopd slim ;sleep 2; startd slim ;; 29.510 + inst_pkg slim 29.511 + inst_pkg dbus 29.512 + if [ -z $XAUTHORITY ]; then 29.513 + stopd slim; sleep 2; startd slim 29.514 + fi ;; 29.515 + 29.516 wm_apps) 29.517 - slitaz_apps_conf ; apps_dialog ;; 29.518 + slitaz_apps_conf 29.519 + apps_dialog ;; 29.520 + 29.521 *) 29.522 exit 0 ;; 29.523 esac 29.524 } 29.525 29.526 + 29.527 # ~/.config/slitaz/applications.conf: Missing = failed to login 29.528 # Make users applications.conf in /etc/skel so new added user will get 29.529 # a working X session. Note --> flavors can have a custom config in 29.530 # /etc/slitaz/applications that we must use. 29.531 + 29.532 slitaz_apps_conf() { 29.533 apps_conf=/etc/slitaz/applications.conf 29.534 - 29.535 + 29.536 if [ "$(id -u)" = 0 ]; then 29.537 - user_conf=${apps_conf} 29.538 + user_conf=$apps_conf 29.539 new_user_conf="/etc/skel/.config/slitaz/applications.conf" 29.540 - mkdir -p $(dirname $user_conf); cp -f ${apps_conf} ${new_user_conf} 29.541 + mkdir -p $(dirname $new_user_conf) 29.542 + cp -f $apps_conf $new_user_conf 29.543 else 29.544 # If started by: startx and with boot opts screen=text 29.545 - user_conf="$HOME/.config/slitaz/applications.conf" 29.546 + user_conf="${XDG_CONFIG_HOME:-$HOME/.config}/slitaz/applications.conf" 29.547 if [ ! -f "$user_conf" ]; then 29.548 - mkdir -p $(dirname $user_conf); cp ${apps_conf} ${user_conf} 29.549 + mkdir -p $(dirname $user_conf) 29.550 + cp $apps_conf $user_conf 29.551 fi 29.552 fi 29.553 + 29.554 [ -f "$HOME/.xinitrc" ] || inst_pkg slitaz-configs-base --forced 29.555 } 29.556 29.557 + 29.558 # Commands 29.559 29.560 case "$1" in 29.561 @@ -334,7 +498,7 @@ 29.562 check_root 29.563 install_xorg 29.564 slitaz_apps_conf ;; 29.565 - 29.566 + 29.567 config-xorg) 29.568 check_root 29.569 slitaz_apps_conf 29.570 @@ -345,44 +509,70 @@ 29.571 sed -i "s/.*EndSubSection.*/\\t\\tModes\\t\"$MODE\"\\n&/" \ 29.572 /etc/X11/xorg.conf.d/70-Screen.conf 29.573 fi ;; 29.574 - 29.575 + 29.576 init) 29.577 # We don't need much config files with last Xorg version, So just 29.578 # get files for starting an X session and config the keyboard. 29.579 check_root 29.580 slitaz_apps_conf 29.581 - keyboard_conf 29.582 + keyboard_conf 29.583 gen_xorg_conf_file ;; 29.584 - 29.585 + 29.586 keyboard) 29.587 - echo "Generating: 40-Keyboard.conf" 29.588 keyboard_conf ;; 29.589 - 29.590 + 29.591 get-applist) 29.592 slitaz_apps_conf 29.593 gen_applist $2 $3 $4 ;; 29.594 + 29.595 auto) 29.596 autoselect_driver ;; 29.597 + 29.598 bpp) 29.599 check_root 29.600 xorg_conf_d 29.601 - case "$2" in 8|15|16|24) colors=$2 ;; 29.602 - *) exec 3>&1 && colors=$($DIALOG --menu " " 12 12 12 \ 29.603 - 24 truecolor 16 hicolor 15 hicolor 8 256colors 2>&1 1>&3) ; dialog_end ;; 29.604 + case "$2" in 29.605 + 8|15|16|24) 29.606 + colors=$2 ;; 29.607 + *) 29.608 + exec 3>&1 29.609 + colors=$($DIALOG --menu " " 12 12 12 \ 29.610 + 24 truecolor 16 hicolor 15 hicolor 8 256colors 2>&1 1>&3) 29.611 + dialog_end ;; 29.612 esac 29.613 sed 's|Monitor.*"$|&\n\tDefaultDepth '$colors'|' \ 29.614 -i ${xorg_config}/70-Screen.conf ;; 29.615 + 29.616 + xkb) 29.617 + xkb ;; 29.618 + 29.619 *help) 29.620 - echo "Usage: $(basename $0) [install-xorg|bpp|auto|config-xorg|init|keyboard]" ;; 29.621 + emsg " 29.622 +<b>tazx</b> - $(_ 'configuration tool for SliTaz GNU/Linux') 29.623 + 29.624 +<c 33>$(_ 'Usage:')</c> <b>tazx</b> <c 34>$(_ 'command')</c> $(_ 'parameter') 29.625 + 29.626 +<c 34>$(_ 'Commands:')</c> 29.627 +install-xorg $(_ 'Install Xorg and selected Xorg driver') 29.628 +config-xorg $(_ 'Configure Xorg, generate configuration files') 29.629 +bpp $(_ 'Set monitor default depth (valid parameters: 8, 15, 16 or 24)') 29.630 +auto $(_ 'Auto-select and install Xorg driver') 29.631 +init $(_ 'Get files for starting an X session and config the keyboard') 29.632 +keyboard $(_ 'Generate or regenerate Xorg keyboard config') 29.633 +" 29.634 + ;; 29.635 + 29.636 *) 29.637 # User can get a new .xinitrc with tazx from cmdline. 29.638 - if [ $(id -u) == 0 ]; then 29.639 - slitaz_apps_conf 29.640 - config_dialog 29.641 - else msg="\Z1 $(_n 'Run tazx as root if you need to configure xorg') \Zn" 29.642 - slitaz_apps_conf 29.643 - apps_dialog 29.644 - fi 29.645 + case $(id -u) in 29.646 + 0) 29.647 + slitaz_apps_conf 29.648 + config_dialog ;; 29.649 + *) 29.650 + msg="\Z1 $(_n 'Run tazx as root if you need to configure xorg') \Zn" 29.651 + slitaz_apps_conf 29.652 + apps_dialog ;; 29.653 + esac 29.654 # gen_xsession 29.655 ;; 29.656 esac
30.1 --- a/tinyutils/terminal Sat Nov 15 06:45:42 2014 +0200 30.2 +++ b/tinyutils/terminal Thu Nov 20 06:04:24 2014 +0200 30.3 @@ -25,7 +25,7 @@ 30.4 } 30.5 30.6 30.7 -USER_CONFIG="$HOME/.config/slitaz/applications.conf" 30.8 +USER_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/slitaz/applications.conf" 30.9 [ -f $USER_CONFIG ] && . $USER_CONFIG 30.10 30.11 local PARAMS="" GEOMETRY="80x24" TITLE="SliTaz $(cat /etc/slitaz-release)" COMMAND