# HG changeset patch # User Aleksej Bobylev # Date 1416456264 -7200 # Node ID eb791cfb71c03e9f58f5e70c8ba4335d28f8a776 # Parent a37f6f8dda42c749b4175f8e1114368fa0d5897d 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. diff -r a37f6f8dda42 -r eb791cfb71c0 Makefile --- a/Makefile Sat Nov 15 06:45:42 2014 +0200 +++ b/Makefile Thu Nov 20 06:04:24 2014 +0200 @@ -23,7 +23,7 @@ --package-name="SliTaz Tools" \ ./tinyutils/tazlocale ./tinyutils/tazkeymap ./tinyutils/setmixer \ ./tinyutils/tazx ./tinyutils/decode ./tinyutils/terminal \ - ./tinyutils/hwsetup ./tinyutils/frugal + ./tinyutils/hwsetup ./tinyutils/frugal ./tinyutils/slitaz-config @echo "done" boxes-pot: diff -r a37f6f8dda42 -r eb791cfb71c0 po/slitaz-boxes/slitaz-boxes.pot --- a/po/slitaz-boxes/slitaz-boxes.pot Sat Nov 15 06:45:42 2014 +0200 +++ b/po/slitaz-boxes/slitaz-boxes.pot Thu Nov 20 06:04:24 2014 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: SliTaz Boxes\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-23 03:33+0300\n" +"POT-Creation-Date: 2014-11-20 05:38+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -r a37f6f8dda42 -r eb791cfb71c0 po/slitaz-tools/el.po --- a/po/slitaz-tools/el.po Sat Nov 15 06:45:42 2014 +0200 +++ b/po/slitaz-tools/el.po Thu Nov 20 06:04:24 2014 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-14 21:22+0000\n" +"POT-Creation-Date: 2014-11-20 05:20+0200\n" "PO-Revision-Date: 2012-12-18 22:06+0300\n" "Last-Translator: Constantine Mousafiris \n" "Language-Team: Kostis Mousafiris\n" @@ -21,8 +21,8 @@ msgid "SliTaz GNU/Linux locale setting using dialog boxes." msgstr "" -#: tinyutils/tazlocale:17 tinyutils/decode:30 tinyutils/hwsetup:24 -#: tinyutils/frugal:32 +#: tinyutils/tazlocale:17 tinyutils/tazx:553 tinyutils/decode:30 +#: tinyutils/hwsetup:24 tinyutils/frugal:32 msgid "Usage:" msgstr "Χρήση:" @@ -98,75 +98,131 @@ msgid "Done" msgstr "Ολοκληρώθηκε" -#: tinyutils/tazx:26 -msgid "Window Manager:" -msgstr "Διαχειριστής παραθύρων:" +#: tinyutils/tazx:141 +msgid "Creating:" +msgstr "" -#: tinyutils/tazx:27 tinyutils/tazx:152 +#: tinyutils/tazx:242 msgid "Install Xorg" msgstr "Εγκατάσταση του Xorg" -#: tinyutils/tazx:63 -msgid "Creating:" -msgstr "" - -#: tinyutils/tazx:153 +#: tinyutils/tazx:243 msgid "Tazx helps you to select your X driver." msgstr "Ο Tazx σας βοηθά να επιλέξετε τον οδηγό (driver) για το Χ." -#: tinyutils/tazx:154 tinyutils/hwsetup:258 -msgid "Auto configuring Xorg..." -msgstr "" +#: tinyutils/tazx:244 +#, fuzzy +msgid "Auto configuring" +msgstr "Αρχείο ρυθμίσεων:" -#: tinyutils/tazx:156 tinyutils/tazx:184 +#: tinyutils/tazx:246 msgid "driver" msgstr "" -#: tinyutils/tazx:157 +#: tinyutils/tazx:247 tinyutils/slitaz-config:233 msgid "Quit" msgstr "" -#: tinyutils/tazx:186 tinyutils/hwsetup:107 -#, sh-format -msgid "Failed to setup $DEVICE" +#: tinyutils/tazx:276 +msgid "Failed to setup driver" msgstr "" -#: tinyutils/tazx:192 tinyutils/hwsetup:117 +#: tinyutils/tazx:276 +msgid "(unknown hardware)" +msgstr "" + +#: tinyutils/tazx:289 tinyutils/hwsetup:117 #, sh-format msgid "Installing pkg: $pkg" msgstr "" -#: tinyutils/tazx:202 tinyutils/tazx:276 -#, sh-format -msgid "${INST_i18n}: ${WM_i18n} + applications" +#: tinyutils/tazx:307 tinyutils/tazx:423 +msgid "Install Window Manager and applications" msgstr "" -#: tinyutils/tazx:270 +#: tinyutils/tazx:393 tinyutils/tazx:399 +#, fuzzy +msgid "Install" +msgstr "Εγκατάσταση του Xorg" + +#: tinyutils/tazx:409 +msgid "ON" +msgstr "" + +#: tinyutils/tazx:410 tinyutils/tazx:441 +msgid "OFF" +msgstr "" + +#: tinyutils/tazx:417 #, fuzzy msgid "SliTaz Xorg config" msgstr "Ρύθμιση γλώσσας του SliTaz" -#: tinyutils/tazx:272 +#: tinyutils/tazx:419 msgid "Install or reconfigure Xorg" msgstr "Εγκατάσταση ή επαναρύθμιση του X org" -#: tinyutils/tazx:273 +#: tinyutils/tazx:420 msgid "Install Xorg server (light version)" msgstr "" -#: tinyutils/tazx:274 +#: tinyutils/tazx:421 msgid "AutoStart Xorg by SLiM on boot" msgstr "" -#: tinyutils/tazx:275 +#: tinyutils/tazx:422 msgid "(Re)Start Simple Login Manager now" msgstr "" -#: tinyutils/tazx:277 +#: tinyutils/tazx:424 msgid "Quit Tazx utility" msgstr "Κλείστε το βοηθητικό πρόγραμμα Tazx" -#: tinyutils/tazx:384 +#: tinyutils/tazx:449 +msgid "Start X on boot:" +msgstr "" + +#: tinyutils/tazx:551 +msgid "configuration tool for SliTaz GNU/Linux" +msgstr "" + +#: tinyutils/tazx:553 tinyutils/hwsetup:25 +msgid "command" +msgstr "" + +#: tinyutils/tazx:553 +msgid "parameter" +msgstr "" + +#: tinyutils/tazx:555 tinyutils/hwsetup:27 tinyutils/frugal:36 +msgid "Commands:" +msgstr "" + +#: tinyutils/tazx:556 +msgid "Install Xorg and selected Xorg driver" +msgstr "" + +#: tinyutils/tazx:557 +msgid "Configure Xorg, generate configuration files" +msgstr "" + +#: tinyutils/tazx:558 +msgid "Set monitor default depth (valid parameters: 8, 15, 16 or 24)" +msgstr "" + +#: tinyutils/tazx:559 +msgid "Auto-select and install Xorg driver" +msgstr "" + +#: tinyutils/tazx:560 +msgid "Get files for starting an X session and config the keyboard" +msgstr "" + +#: tinyutils/tazx:561 +msgid "Generate or regenerate Xorg keyboard config" +msgstr "" + +#: tinyutils/tazx:572 msgid "Run tazx as root if you need to configure xorg" msgstr "" @@ -258,14 +314,6 @@ msgid "SliTaz Setup configuration" msgstr "" -#: tinyutils/hwsetup:25 -msgid "command" -msgstr "" - -#: tinyutils/hwsetup:27 tinyutils/frugal:36 -msgid "Commands:" -msgstr "" - #: tinyutils/hwsetup:29 msgid "Print this short usage." msgstr "" @@ -326,6 +374,11 @@ "to SliTaz Bug tracker or Forum." msgstr "" +#: tinyutils/hwsetup:107 +#, sh-format +msgid "Failed to setup $DEVICE" +msgstr "" + #: tinyutils/hwsetup:131 #, sh-format msgid "Would you like to install pkg: $pkg" @@ -358,6 +411,10 @@ msgid "New udev rules are added by a package" msgstr "" +#: tinyutils/hwsetup:258 +msgid "Auto configuring Xorg..." +msgstr "" + #: tinyutils/hwsetup:261 msgid "Configuring Xorg..." msgstr "" @@ -702,6 +759,155 @@ msgid "Unmounting ISO image..." msgstr "" +#: tinyutils/slitaz-config:14 +#, fuzzy +msgid "SliTaz Config" +msgstr "Ρύθμιση γλώσσας του SliTaz" + +#: tinyutils/slitaz-config:36 +msgid "Post Installation" +msgstr "" + +#: tinyutils/slitaz-config:37 +msgid "Continue" +msgstr "" + +#: tinyutils/slitaz-config:43 +msgid "Root Password" +msgstr "" + +#: tinyutils/slitaz-config:44 +msgid "Enter new password for \\Zb\\Z1root" +msgstr "" + +#: tinyutils/slitaz-config:53 +msgid "Add User" +msgstr "" + +#: tinyutils/slitaz-config:56 +msgid "Enter login name for the new \\Zb\\Z4user" +msgstr "" + +#: tinyutils/slitaz-config:61 +#, sh-format +msgid "Enter password for user \\Zb\\Z4$user" +msgstr "" + +#: tinyutils/slitaz-config:121 +msgid "connected" +msgstr "" + +#: tinyutils/slitaz-config:136 +msgid "Quality" +msgstr "" + +#: tinyutils/slitaz-config:136 +msgid "Key" +msgstr "" + +#: tinyutils/slitaz-config:140 tinyutils/slitaz-config:169 +msgid "hidden.network" +msgstr "" + +#: tinyutils/slitaz-config:140 +msgid "Connect.to.a.hidden.network" +msgstr "" + +#: tinyutils/slitaz-config:156 +msgid "Select" +msgstr "" + +#: tinyutils/slitaz-config:157 +msgid "Connect to a Wi-Fi network" +msgstr "" + +#: tinyutils/slitaz-config:159 +msgid "Connect.to.any.network" +msgstr "" + +#: tinyutils/slitaz-config:170 +msgid "Wi-Fi ESSID" +msgstr "" + +#: tinyutils/slitaz-config:171 +msgid "Enter Wi-Fi access point ESSID (name)" +msgstr "" + +#: tinyutils/slitaz-config:176 tinyutils/slitaz-config:187 +msgid "Wi-Fi Password" +msgstr "" + +#: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 +#, sh-format +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" +msgstr "" + +#: tinyutils/slitaz-config:197 +msgid "Shutting down network interfaces..." +msgstr "" + +#: tinyutils/slitaz-config:201 +msgid "Configuring: /etc/network.conf..." +msgstr "" + +#: tinyutils/slitaz-config:211 +msgid "Restarting Wi-Fi interface..." +msgstr "" + +#: tinyutils/slitaz-config:215 +msgid "Checking connection..." +msgstr "" + +#: tinyutils/slitaz-config:220 +#, sh-format +msgid "IP address: $ip" +msgstr "" + +#: tinyutils/slitaz-config:222 +msgid "Unable to connect..." +msgstr "" + +#: tinyutils/slitaz-config:226 +msgid "Wi-Fi Config" +msgstr "" + +#: tinyutils/slitaz-config:233 +msgid "Exec" +msgstr "" + +#: tinyutils/slitaz-config:235 +#, fuzzy +msgid "System keyboard setting" +msgstr "Ρύθμιση του keymap στο SliTaz" + +#: tinyutils/slitaz-config:236 +#, fuzzy +msgid "System language setting" +msgstr "Ρύθμιση γλώσσας του SliTaz" + +#: tinyutils/slitaz-config:237 +msgid "Wi-Fi network settings" +msgstr "" + +#: tinyutils/slitaz-config:238 +msgid "Add a new user" +msgstr "" + +#: tinyutils/slitaz-config:239 +msgid "Change root password" +msgstr "" + +#: tinyutils/slitaz-config:240 +msgid "Set system date from the web" +msgstr "" + +#: tinyutils/slitaz-config:241 +msgid "Exit from SliTaz Config" +msgstr "" + +#~ msgid "Window Manager:" +#~ msgstr "Διαχειριστής παραθύρων:" + #~ msgid "Tazx dialog helps you to configure your Xorg server." #~ msgstr "" #~ "Το παράθυρο διαλόγου του Tazx σας βοηθά να ρυθμίσετε τον διακομιστή Xorg." diff -r a37f6f8dda42 -r eb791cfb71c0 po/slitaz-tools/es.po --- a/po/slitaz-tools/es.po Sat Nov 15 06:45:42 2014 +0200 +++ b/po/slitaz-tools/es.po Thu Nov 20 06:04:24 2014 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-14 21:22+0000\n" +"POT-Creation-Date: 2014-11-20 05:20+0200\n" "PO-Revision-Date: 2011-08-11 00:08-0300\n" "Last-Translator: Lucas Gioia \n" "Language-Team: \n" @@ -20,8 +20,8 @@ msgid "SliTaz GNU/Linux locale setting using dialog boxes." msgstr "" -#: tinyutils/tazlocale:17 tinyutils/decode:30 tinyutils/hwsetup:24 -#: tinyutils/frugal:32 +#: tinyutils/tazlocale:17 tinyutils/tazx:553 tinyutils/decode:30 +#: tinyutils/hwsetup:24 tinyutils/frugal:32 msgid "Usage:" msgstr "" @@ -97,75 +97,130 @@ msgid "Done" msgstr "Listo" -#: tinyutils/tazx:26 -msgid "Window Manager:" -msgstr "Gestor de ventanas:" +#: tinyutils/tazx:141 +msgid "Creating:" +msgstr "" -#: tinyutils/tazx:27 tinyutils/tazx:152 +#: tinyutils/tazx:242 msgid "Install Xorg" msgstr "Instalar Xorg" -#: tinyutils/tazx:63 -msgid "Creating:" -msgstr "" - -#: tinyutils/tazx:153 +#: tinyutils/tazx:243 msgid "Tazx helps you to select your X driver." msgstr "Tazx le ayudará a seleccionar su controlador X." -#: tinyutils/tazx:154 tinyutils/hwsetup:258 -msgid "Auto configuring Xorg..." +#: tinyutils/tazx:244 +msgid "Auto configuring" msgstr "" -#: tinyutils/tazx:156 tinyutils/tazx:184 +#: tinyutils/tazx:246 msgid "driver" msgstr "" -#: tinyutils/tazx:157 +#: tinyutils/tazx:247 tinyutils/slitaz-config:233 msgid "Quit" msgstr "" -#: tinyutils/tazx:186 tinyutils/hwsetup:107 -#, sh-format -msgid "Failed to setup $DEVICE" +#: tinyutils/tazx:276 +msgid "Failed to setup driver" msgstr "" -#: tinyutils/tazx:192 tinyutils/hwsetup:117 +#: tinyutils/tazx:276 +msgid "(unknown hardware)" +msgstr "" + +#: tinyutils/tazx:289 tinyutils/hwsetup:117 #, sh-format msgid "Installing pkg: $pkg" msgstr "" -#: tinyutils/tazx:202 tinyutils/tazx:276 -#, sh-format -msgid "${INST_i18n}: ${WM_i18n} + applications" +#: tinyutils/tazx:307 tinyutils/tazx:423 +msgid "Install Window Manager and applications" msgstr "" -#: tinyutils/tazx:270 +#: tinyutils/tazx:393 tinyutils/tazx:399 +#, fuzzy +msgid "Install" +msgstr "Instalar Xorg" + +#: tinyutils/tazx:409 +msgid "ON" +msgstr "" + +#: tinyutils/tazx:410 tinyutils/tazx:441 +msgid "OFF" +msgstr "" + +#: tinyutils/tazx:417 #, fuzzy msgid "SliTaz Xorg config" msgstr "SliTaz configuración del lenguaje" -#: tinyutils/tazx:272 +#: tinyutils/tazx:419 msgid "Install or reconfigure Xorg" msgstr "Instalar o reconfigurar Xorg" -#: tinyutils/tazx:273 +#: tinyutils/tazx:420 msgid "Install Xorg server (light version)" msgstr "" -#: tinyutils/tazx:274 +#: tinyutils/tazx:421 msgid "AutoStart Xorg by SLiM on boot" msgstr "" -#: tinyutils/tazx:275 +#: tinyutils/tazx:422 msgid "(Re)Start Simple Login Manager now" msgstr "" -#: tinyutils/tazx:277 +#: tinyutils/tazx:424 msgid "Quit Tazx utility" msgstr "Salir de la utilidad Tazx" -#: tinyutils/tazx:384 +#: tinyutils/tazx:449 +msgid "Start X on boot:" +msgstr "" + +#: tinyutils/tazx:551 +msgid "configuration tool for SliTaz GNU/Linux" +msgstr "" + +#: tinyutils/tazx:553 tinyutils/hwsetup:25 +msgid "command" +msgstr "" + +#: tinyutils/tazx:553 +msgid "parameter" +msgstr "" + +#: tinyutils/tazx:555 tinyutils/hwsetup:27 tinyutils/frugal:36 +msgid "Commands:" +msgstr "" + +#: tinyutils/tazx:556 +msgid "Install Xorg and selected Xorg driver" +msgstr "" + +#: tinyutils/tazx:557 +msgid "Configure Xorg, generate configuration files" +msgstr "" + +#: tinyutils/tazx:558 +msgid "Set monitor default depth (valid parameters: 8, 15, 16 or 24)" +msgstr "" + +#: tinyutils/tazx:559 +msgid "Auto-select and install Xorg driver" +msgstr "" + +#: tinyutils/tazx:560 +msgid "Get files for starting an X session and config the keyboard" +msgstr "" + +#: tinyutils/tazx:561 +msgid "Generate or regenerate Xorg keyboard config" +msgstr "" + +#: tinyutils/tazx:572 msgid "Run tazx as root if you need to configure xorg" msgstr "" @@ -257,14 +312,6 @@ msgid "SliTaz Setup configuration" msgstr "" -#: tinyutils/hwsetup:25 -msgid "command" -msgstr "" - -#: tinyutils/hwsetup:27 tinyutils/frugal:36 -msgid "Commands:" -msgstr "" - #: tinyutils/hwsetup:29 msgid "Print this short usage." msgstr "" @@ -325,6 +372,11 @@ "to SliTaz Bug tracker or Forum." msgstr "" +#: tinyutils/hwsetup:107 +#, sh-format +msgid "Failed to setup $DEVICE" +msgstr "" + #: tinyutils/hwsetup:131 #, sh-format msgid "Would you like to install pkg: $pkg" @@ -357,6 +409,10 @@ msgid "New udev rules are added by a package" msgstr "" +#: tinyutils/hwsetup:258 +msgid "Auto configuring Xorg..." +msgstr "" + #: tinyutils/hwsetup:261 msgid "Configuring Xorg..." msgstr "" @@ -701,6 +757,155 @@ msgid "Unmounting ISO image..." msgstr "" +#: tinyutils/slitaz-config:14 +#, fuzzy +msgid "SliTaz Config" +msgstr "SliTaz configuración del lenguaje" + +#: tinyutils/slitaz-config:36 +msgid "Post Installation" +msgstr "" + +#: tinyutils/slitaz-config:37 +msgid "Continue" +msgstr "" + +#: tinyutils/slitaz-config:43 +msgid "Root Password" +msgstr "" + +#: tinyutils/slitaz-config:44 +msgid "Enter new password for \\Zb\\Z1root" +msgstr "" + +#: tinyutils/slitaz-config:53 +msgid "Add User" +msgstr "" + +#: tinyutils/slitaz-config:56 +msgid "Enter login name for the new \\Zb\\Z4user" +msgstr "" + +#: tinyutils/slitaz-config:61 +#, sh-format +msgid "Enter password for user \\Zb\\Z4$user" +msgstr "" + +#: tinyutils/slitaz-config:121 +msgid "connected" +msgstr "" + +#: tinyutils/slitaz-config:136 +msgid "Quality" +msgstr "" + +#: tinyutils/slitaz-config:136 +msgid "Key" +msgstr "" + +#: tinyutils/slitaz-config:140 tinyutils/slitaz-config:169 +msgid "hidden.network" +msgstr "" + +#: tinyutils/slitaz-config:140 +msgid "Connect.to.a.hidden.network" +msgstr "" + +#: tinyutils/slitaz-config:156 +msgid "Select" +msgstr "" + +#: tinyutils/slitaz-config:157 +msgid "Connect to a Wi-Fi network" +msgstr "" + +#: tinyutils/slitaz-config:159 +msgid "Connect.to.any.network" +msgstr "" + +#: tinyutils/slitaz-config:170 +msgid "Wi-Fi ESSID" +msgstr "" + +#: tinyutils/slitaz-config:171 +msgid "Enter Wi-Fi access point ESSID (name)" +msgstr "" + +#: tinyutils/slitaz-config:176 tinyutils/slitaz-config:187 +msgid "Wi-Fi Password" +msgstr "" + +#: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 +#, sh-format +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" +msgstr "" + +#: tinyutils/slitaz-config:197 +msgid "Shutting down network interfaces..." +msgstr "" + +#: tinyutils/slitaz-config:201 +msgid "Configuring: /etc/network.conf..." +msgstr "" + +#: tinyutils/slitaz-config:211 +msgid "Restarting Wi-Fi interface..." +msgstr "" + +#: tinyutils/slitaz-config:215 +msgid "Checking connection..." +msgstr "" + +#: tinyutils/slitaz-config:220 +#, sh-format +msgid "IP address: $ip" +msgstr "" + +#: tinyutils/slitaz-config:222 +msgid "Unable to connect..." +msgstr "" + +#: tinyutils/slitaz-config:226 +msgid "Wi-Fi Config" +msgstr "" + +#: tinyutils/slitaz-config:233 +msgid "Exec" +msgstr "" + +#: tinyutils/slitaz-config:235 +#, fuzzy +msgid "System keyboard setting" +msgstr "SliTaz configuración de teclas" + +#: tinyutils/slitaz-config:236 +#, fuzzy +msgid "System language setting" +msgstr "SliTaz configuración del lenguaje" + +#: tinyutils/slitaz-config:237 +msgid "Wi-Fi network settings" +msgstr "" + +#: tinyutils/slitaz-config:238 +msgid "Add a new user" +msgstr "" + +#: tinyutils/slitaz-config:239 +msgid "Change root password" +msgstr "" + +#: tinyutils/slitaz-config:240 +msgid "Set system date from the web" +msgstr "" + +#: tinyutils/slitaz-config:241 +msgid "Exit from SliTaz Config" +msgstr "" + +#~ msgid "Window Manager:" +#~ msgstr "Gestor de ventanas:" + #, fuzzy #~ msgid "Tazx dialog helps you to configure your Xorg server." #~ msgstr "Los diálogos Tazx le ayudarán a configurar su servidor Xorg." diff -r a37f6f8dda42 -r eb791cfb71c0 po/slitaz-tools/fa.po --- a/po/slitaz-tools/fa.po Sat Nov 15 06:45:42 2014 +0200 +++ b/po/slitaz-tools/fa.po Thu Nov 20 06:04:24 2014 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-14 21:22+0000\n" +"POT-Creation-Date: 2014-11-20 05:20+0200\n" "PO-Revision-Date: 2014-06-26 16:08+0400\n" "Last-Translator: Ali Rashidi \n" "Language-Team: LANGUAGE \n" @@ -22,8 +22,8 @@ msgid "SliTaz GNU/Linux locale setting using dialog boxes." msgstr ":توسط کادر های محاوره SliTaz GNU/Linux تنظیمات منطقه ای" -#: tinyutils/tazlocale:17 tinyutils/decode:30 tinyutils/hwsetup:24 -#: tinyutils/frugal:32 +#: tinyutils/tazlocale:17 tinyutils/tazx:553 tinyutils/decode:30 +#: tinyutils/hwsetup:24 tinyutils/frugal:32 msgid "Usage:" msgstr ":طریقه استفاده" @@ -95,74 +95,136 @@ msgid "Done" msgstr "انجام شد" -#: tinyutils/tazx:26 -msgid "Window Manager:" -msgstr "" +#: tinyutils/tazx:141 +msgid "Creating:" +msgstr ":در حال ایجاد" -#: tinyutils/tazx:27 tinyutils/tazx:152 +#: tinyutils/tazx:242 msgid "Install Xorg" msgstr "Xorg نصب" -#: tinyutils/tazx:63 -msgid "Creating:" -msgstr ":در حال ایجاد" - -#: tinyutils/tazx:153 +#: tinyutils/tazx:243 msgid "Tazx helps you to select your X driver." msgstr "خود را انتخاب نمایید. X به شما کمک میکند تا درایور Tazx" -#: tinyutils/tazx:154 tinyutils/hwsetup:258 -msgid "Auto configuring Xorg..." +#: tinyutils/tazx:244 +#, fuzzy +msgid "Auto configuring" msgstr "...Xorg در حال نصب خودکار " -#: tinyutils/tazx:156 tinyutils/tazx:184 +#: tinyutils/tazx:246 msgid "driver" msgstr "درایور" -#: tinyutils/tazx:157 +#: tinyutils/tazx:247 tinyutils/slitaz-config:233 msgid "Quit" msgstr "خروج" -#: tinyutils/tazx:186 tinyutils/hwsetup:107 -#, sh-format -msgid "Failed to setup $DEVICE" +#: tinyutils/tazx:276 +#, fuzzy +msgid "Failed to setup driver" msgstr "نشد $DEVICE موفق به نصب " -#: tinyutils/tazx:192 tinyutils/hwsetup:117 +#: tinyutils/tazx:276 +msgid "(unknown hardware)" +msgstr "" + +#: tinyutils/tazx:289 tinyutils/hwsetup:117 #, sh-format msgid "Installing pkg: $pkg" msgstr "$pkg :در حال نصب پکیج" -#: tinyutils/tazx:202 tinyutils/tazx:276 -#, sh-format -msgid "${INST_i18n}: ${WM_i18n} + applications" +#: tinyutils/tazx:307 tinyutils/tazx:423 +#, fuzzy +msgid "Install Window Manager and applications" +msgstr "نرم افزار اسکنر" + +#: tinyutils/tazx:393 tinyutils/tazx:399 +#, fuzzy +msgid "Install" +msgstr "Xorg نصب" + +#: tinyutils/tazx:409 +msgid "ON" msgstr "" -#: tinyutils/tazx:270 +#: tinyutils/tazx:410 tinyutils/tazx:441 +msgid "OFF" +msgstr "" + +#: tinyutils/tazx:417 msgid "SliTaz Xorg config" msgstr "SliTaz Xorg پیکربندی" -#: tinyutils/tazx:272 +#: tinyutils/tazx:419 msgid "Install or reconfigure Xorg" msgstr "Xorg نصب یا پیکربندی مجدد" -#: tinyutils/tazx:273 +#: tinyutils/tazx:420 msgid "Install Xorg server (light version)" msgstr "(نسخه کم حجم) Xorg server نصب" -#: tinyutils/tazx:274 +#: tinyutils/tazx:421 msgid "AutoStart Xorg by SLiM on boot" msgstr "" -#: tinyutils/tazx:275 +#: tinyutils/tazx:422 msgid "(Re)Start Simple Login Manager now" msgstr "" -#: tinyutils/tazx:277 +#: tinyutils/tazx:424 msgid "Quit Tazx utility" msgstr "Tazx خروج از ابزار" -#: tinyutils/tazx:384 +#: tinyutils/tazx:449 +msgid "Start X on boot:" +msgstr "" + +#: tinyutils/tazx:551 +msgid "configuration tool for SliTaz GNU/Linux" +msgstr "" + +#: tinyutils/tazx:553 tinyutils/hwsetup:25 +msgid "command" +msgstr "فرمان" + +#: tinyutils/tazx:553 +msgid "parameter" +msgstr "" + +#: tinyutils/tazx:555 tinyutils/hwsetup:27 tinyutils/frugal:36 +msgid "Commands:" +msgstr ":فرامین" + +#: tinyutils/tazx:556 +#, fuzzy +msgid "Install Xorg and selected Xorg driver" +msgstr "(نسخه کم حجم) Xorg server نصب" + +#: tinyutils/tazx:557 +#, fuzzy +msgid "Configure Xorg, generate configuration files" +msgstr "" +"برای تولید یک فایل قالب پیکربندی در صورت نیاز استفاده کنید aticonfig :از " +"ابزار" + +#: tinyutils/tazx:558 +msgid "Set monitor default depth (valid parameters: 8, 15, 16 or 24)" +msgstr "" + +#: tinyutils/tazx:559 +msgid "Auto-select and install Xorg driver" +msgstr "" + +#: tinyutils/tazx:560 +msgid "Get files for starting an X session and config the keyboard" +msgstr "" + +#: tinyutils/tazx:561 +msgid "Generate or regenerate Xorg keyboard config" +msgstr "" + +#: tinyutils/tazx:572 msgid "Run tazx as root if you need to configure xorg" msgstr "" @@ -254,14 +316,6 @@ msgid "SliTaz Setup configuration" msgstr "SliTaz پیکربندی نصب " -#: tinyutils/hwsetup:25 -msgid "command" -msgstr "فرمان" - -#: tinyutils/hwsetup:27 tinyutils/frugal:36 -msgid "Commands:" -msgstr ":فرامین" - #: tinyutils/hwsetup:29 msgid "Print this short usage." msgstr ".چاپ این طریقه استفاده کوتاه" @@ -325,6 +379,11 @@ "باگ در دستگاه را به انجمن یا پیگیری باگ های $DEVICE به علت کمبود سخت افزار " "هماهنگ برای عیب یابی، این" +#: tinyutils/hwsetup:107 +#, sh-format +msgid "Failed to setup $DEVICE" +msgstr "نشد $DEVICE موفق به نصب " + #: tinyutils/hwsetup:131 #, sh-format msgid "Would you like to install pkg: $pkg" @@ -357,6 +416,10 @@ msgid "New udev rules are added by a package" msgstr ".توسط یک پکیج افزوده شدند udev قواعد جدید " +#: tinyutils/hwsetup:258 +msgid "Auto configuring Xorg..." +msgstr "...Xorg در حال نصب خودکار " + #: tinyutils/hwsetup:261 msgid "Configuring Xorg..." msgstr "Xorg در حال پیکربندی " @@ -718,3 +781,153 @@ #: tinyutils/frugal:131 msgid "Unmounting ISO image..." msgstr "...ISO در حال جداسازی فایل " + +#: tinyutils/slitaz-config:14 +#, fuzzy +msgid "SliTaz Config" +msgstr "SliTaz Xorg پیکربندی" + +#: tinyutils/slitaz-config:36 +#, fuzzy +msgid "Post Installation" +msgstr "(root) نمایش مسیر نصب ریشه" + +#: tinyutils/slitaz-config:37 +msgid "Continue" +msgstr "" + +#: tinyutils/slitaz-config:43 +#, fuzzy +msgid "Root Password" +msgstr ":رمز عبور" + +#: tinyutils/slitaz-config:44 +msgid "Enter new password for \\Zb\\Z1root" +msgstr "" + +#: tinyutils/slitaz-config:53 +msgid "Add User" +msgstr "" + +#: tinyutils/slitaz-config:56 +msgid "Enter login name for the new \\Zb\\Z4user" +msgstr "" + +#: tinyutils/slitaz-config:61 +#, sh-format +msgid "Enter password for user \\Zb\\Z4$user" +msgstr "" + +#: tinyutils/slitaz-config:121 +msgid "connected" +msgstr "" + +#: tinyutils/slitaz-config:136 +msgid "Quality" +msgstr "" + +#: tinyutils/slitaz-config:136 +msgid "Key" +msgstr "" + +#: tinyutils/slitaz-config:140 tinyutils/slitaz-config:169 +msgid "hidden.network" +msgstr "" + +#: tinyutils/slitaz-config:140 +msgid "Connect.to.a.hidden.network" +msgstr "" + +#: tinyutils/slitaz-config:156 +msgid "Select" +msgstr "" + +#: tinyutils/slitaz-config:157 +msgid "Connect to a Wi-Fi network" +msgstr "" + +#: tinyutils/slitaz-config:159 +msgid "Connect.to.any.network" +msgstr "" + +#: tinyutils/slitaz-config:170 +msgid "Wi-Fi ESSID" +msgstr "" + +#: tinyutils/slitaz-config:171 +msgid "Enter Wi-Fi access point ESSID (name)" +msgstr "" + +#: tinyutils/slitaz-config:176 tinyutils/slitaz-config:187 +#, fuzzy +msgid "Wi-Fi Password" +msgstr ":رمز عبور" + +#: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 +#, sh-format +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" +msgstr "" + +#: tinyutils/slitaz-config:197 +msgid "Shutting down network interfaces..." +msgstr "" + +#: tinyutils/slitaz-config:201 +#, fuzzy +msgid "Configuring: /etc/network.conf..." +msgstr "Xorg در حال پیکربندی " + +#: tinyutils/slitaz-config:211 +msgid "Restarting Wi-Fi interface..." +msgstr "" + +#: tinyutils/slitaz-config:215 +msgid "Checking connection..." +msgstr "" + +#: tinyutils/slitaz-config:220 +#, sh-format +msgid "IP address: $ip" +msgstr "" + +#: tinyutils/slitaz-config:222 +msgid "Unable to connect..." +msgstr "" + +#: tinyutils/slitaz-config:226 +msgid "Wi-Fi Config" +msgstr "" + +#: tinyutils/slitaz-config:233 +msgid "Exec" +msgstr "" + +#: tinyutils/slitaz-config:235 +#, fuzzy +msgid "System keyboard setting" +msgstr "SliTaz تنظیمات صفحه کلید" + +#: tinyutils/slitaz-config:236 +#, fuzzy +msgid "System language setting" +msgstr "SliTaz تنظیمات زبان" + +#: tinyutils/slitaz-config:237 +msgid "Wi-Fi network settings" +msgstr "" + +#: tinyutils/slitaz-config:238 +msgid "Add a new user" +msgstr "" + +#: tinyutils/slitaz-config:239 +msgid "Change root password" +msgstr "" + +#: tinyutils/slitaz-config:240 +msgid "Set system date from the web" +msgstr "" + +#: tinyutils/slitaz-config:241 +msgid "Exit from SliTaz Config" +msgstr "" diff -r a37f6f8dda42 -r eb791cfb71c0 po/slitaz-tools/fr.po --- a/po/slitaz-tools/fr.po Sat Nov 15 06:45:42 2014 +0200 +++ b/po/slitaz-tools/fr.po Thu Nov 20 06:04:24 2014 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-14 21:22+0000\n" +"POT-Creation-Date: 2014-11-20 05:20+0200\n" "PO-Revision-Date: 2014-01-02 19:14+0100\n" "Last-Translator: Christophe Lincoln \n" "Language-Team: French\n" @@ -22,8 +22,8 @@ msgid "SliTaz GNU/Linux locale setting using dialog boxes." msgstr "Configuration de la langue via des boîtes GTK" -#: tinyutils/tazlocale:17 tinyutils/decode:30 tinyutils/hwsetup:24 -#: tinyutils/frugal:32 +#: tinyutils/tazlocale:17 tinyutils/tazx:553 tinyutils/decode:30 +#: tinyutils/hwsetup:24 tinyutils/frugal:32 msgid "Usage:" msgstr "Utilisation :" @@ -99,76 +99,136 @@ msgid "Done" msgstr "Fait" -#: tinyutils/tazx:26 -msgid "Window Manager:" -msgstr "Gestionnaire de fenêtres :" - -#: tinyutils/tazx:27 tinyutils/tazx:152 -msgid "Install Xorg" -msgstr "Installer Xorg" - -#: tinyutils/tazx:63 +#: tinyutils/tazx:141 #, fuzzy msgid "Creating:" msgstr "Nettoyage de:" -#: tinyutils/tazx:153 +#: tinyutils/tazx:242 +msgid "Install Xorg" +msgstr "Installer Xorg" + +#: tinyutils/tazx:243 msgid "Tazx helps you to select your X driver." msgstr "Tazx vous aide à sélectionner votre pilote Xorg." -#: tinyutils/tazx:154 tinyutils/hwsetup:258 -msgid "Auto configuring Xorg..." +#: tinyutils/tazx:244 +#, fuzzy +msgid "Auto configuring" msgstr "Auto configuration de Xorg..." -#: tinyutils/tazx:156 tinyutils/tazx:184 +#: tinyutils/tazx:246 msgid "driver" msgstr "pilote" -#: tinyutils/tazx:157 +#: tinyutils/tazx:247 tinyutils/slitaz-config:233 msgid "Quit" msgstr "Quitter" -#: tinyutils/tazx:186 tinyutils/hwsetup:107 -#, sh-format -msgid "Failed to setup $DEVICE" +#: tinyutils/tazx:276 +#, fuzzy +msgid "Failed to setup driver" msgstr "Echec de la configuration de $DEVICE" -#: tinyutils/tazx:192 tinyutils/hwsetup:117 +#: tinyutils/tazx:276 +msgid "(unknown hardware)" +msgstr "" + +#: tinyutils/tazx:289 tinyutils/hwsetup:117 #, sh-format msgid "Installing pkg: $pkg" msgstr "Installation du paquet : $pkg" -#: tinyutils/tazx:202 tinyutils/tazx:276 -#, sh-format -msgid "${INST_i18n}: ${WM_i18n} + applications" +#: tinyutils/tazx:307 tinyutils/tazx:423 +#, fuzzy +msgid "Install Window Manager and applications" +msgstr "application scanner" + +#: tinyutils/tazx:393 tinyutils/tazx:399 +#, fuzzy +msgid "Install" +msgstr "Installer Xorg" + +#: tinyutils/tazx:409 +msgid "ON" msgstr "" -#: tinyutils/tazx:270 +#: tinyutils/tazx:410 tinyutils/tazx:441 +msgid "OFF" +msgstr "" + +#: tinyutils/tazx:417 #, fuzzy msgid "SliTaz Xorg config" msgstr "Configuration de la langue" -#: tinyutils/tazx:272 +#: tinyutils/tazx:419 msgid "Install or reconfigure Xorg" msgstr "Installer ou reconfigurer Xorg" -#: tinyutils/tazx:273 +#: tinyutils/tazx:420 msgid "Install Xorg server (light version)" msgstr "Installer le serveur Xorg (version light)" -#: tinyutils/tazx:274 +#: tinyutils/tazx:421 msgid "AutoStart Xorg by SLiM on boot" msgstr "" -#: tinyutils/tazx:275 +#: tinyutils/tazx:422 msgid "(Re)Start Simple Login Manager now" msgstr "" -#: tinyutils/tazx:277 +#: tinyutils/tazx:424 msgid "Quit Tazx utility" msgstr "Quitter l'utilitaire Tazx" -#: tinyutils/tazx:384 +#: tinyutils/tazx:449 +msgid "Start X on boot:" +msgstr "" + +#: tinyutils/tazx:551 +msgid "configuration tool for SliTaz GNU/Linux" +msgstr "" + +#: tinyutils/tazx:553 tinyutils/hwsetup:25 +msgid "command" +msgstr "commande" + +#: tinyutils/tazx:553 +msgid "parameter" +msgstr "" + +#: tinyutils/tazx:555 tinyutils/hwsetup:27 tinyutils/frugal:36 +msgid "Commands:" +msgstr "Commandes:" + +#: tinyutils/tazx:556 +#, fuzzy +msgid "Install Xorg and selected Xorg driver" +msgstr "Installer le serveur Xorg (version light)" + +#: tinyutils/tazx:557 +#, fuzzy +msgid "Configure Xorg, generate configuration files" +msgstr "Utilise: aticonfig pour créer un modèle de fichier de config si besion" + +#: tinyutils/tazx:558 +msgid "Set monitor default depth (valid parameters: 8, 15, 16 or 24)" +msgstr "" + +#: tinyutils/tazx:559 +msgid "Auto-select and install Xorg driver" +msgstr "" + +#: tinyutils/tazx:560 +msgid "Get files for starting an X session and config the keyboard" +msgstr "" + +#: tinyutils/tazx:561 +msgid "Generate or regenerate Xorg keyboard config" +msgstr "" + +#: tinyutils/tazx:572 msgid "Run tazx as root if you need to configure xorg" msgstr "" @@ -260,14 +320,6 @@ msgid "SliTaz Setup configuration" msgstr "Configuration de SliTaz" -#: tinyutils/hwsetup:25 -msgid "command" -msgstr "commande" - -#: tinyutils/hwsetup:27 tinyutils/frugal:36 -msgid "Commands:" -msgstr "Commandes:" - #: tinyutils/hwsetup:29 #, fuzzy msgid "Print this short usage." @@ -332,6 +384,11 @@ "$DEVICE n'a pas été correctement testé. Veuillez reporter les succés, " "échecs, et bugs sur les SliTaz Bug tracker ou Forum." +#: tinyutils/hwsetup:107 +#, sh-format +msgid "Failed to setup $DEVICE" +msgstr "Echec de la configuration de $DEVICE" + #: tinyutils/hwsetup:131 #, sh-format msgid "Would you like to install pkg: $pkg" @@ -364,6 +421,10 @@ msgid "New udev rules are added by a package" msgstr "Des nouvelles régles sont ajoutées par le paquet" +#: tinyutils/hwsetup:258 +msgid "Auto configuring Xorg..." +msgstr "Auto configuration de Xorg..." + #: tinyutils/hwsetup:261 msgid "Configuring Xorg..." msgstr "Configuration de Xorg..." @@ -715,6 +776,159 @@ msgid "Unmounting ISO image..." msgstr "Démontage de l'image ISO..." +#: tinyutils/slitaz-config:14 +#, fuzzy +msgid "SliTaz Config" +msgstr "Configuration de la langue" + +#: tinyutils/slitaz-config:36 +#, fuzzy +msgid "Post Installation" +msgstr "Défini le chemin d'installation" + +#: tinyutils/slitaz-config:37 +msgid "Continue" +msgstr "" + +#: tinyutils/slitaz-config:43 +#, fuzzy +msgid "Root Password" +msgstr "Mot de passe:" + +#: tinyutils/slitaz-config:44 +msgid "Enter new password for \\Zb\\Z1root" +msgstr "" + +#: tinyutils/slitaz-config:53 +msgid "Add User" +msgstr "" + +#: tinyutils/slitaz-config:56 +msgid "Enter login name for the new \\Zb\\Z4user" +msgstr "" + +#: tinyutils/slitaz-config:61 +#, sh-format +msgid "Enter password for user \\Zb\\Z4$user" +msgstr "" + +#: tinyutils/slitaz-config:121 +msgid "connected" +msgstr "" + +#: tinyutils/slitaz-config:136 +msgid "Quality" +msgstr "" + +#: tinyutils/slitaz-config:136 +msgid "Key" +msgstr "" + +#: tinyutils/slitaz-config:140 tinyutils/slitaz-config:169 +msgid "hidden.network" +msgstr "" + +#: tinyutils/slitaz-config:140 +msgid "Connect.to.a.hidden.network" +msgstr "" + +#: tinyutils/slitaz-config:156 +msgid "Select" +msgstr "" + +#: tinyutils/slitaz-config:157 +msgid "Connect to a Wi-Fi network" +msgstr "" + +#: tinyutils/slitaz-config:159 +msgid "Connect.to.any.network" +msgstr "" + +#: tinyutils/slitaz-config:170 +msgid "Wi-Fi ESSID" +msgstr "" + +#: tinyutils/slitaz-config:171 +msgid "Enter Wi-Fi access point ESSID (name)" +msgstr "" + +#: tinyutils/slitaz-config:176 tinyutils/slitaz-config:187 +#, fuzzy +msgid "Wi-Fi Password" +msgstr "Mot de passe:" + +#: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 +#, sh-format +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" +msgstr "" + +#: tinyutils/slitaz-config:197 +msgid "Shutting down network interfaces..." +msgstr "" + +#: tinyutils/slitaz-config:201 +#, fuzzy +msgid "Configuring: /etc/network.conf..." +msgstr "Configuration de Xorg..." + +#: tinyutils/slitaz-config:211 +msgid "Restarting Wi-Fi interface..." +msgstr "" + +#: tinyutils/slitaz-config:215 +msgid "Checking connection..." +msgstr "" + +#: tinyutils/slitaz-config:220 +#, sh-format +msgid "IP address: $ip" +msgstr "" + +#: tinyutils/slitaz-config:222 +msgid "Unable to connect..." +msgstr "" + +#: tinyutils/slitaz-config:226 +msgid "Wi-Fi Config" +msgstr "" + +#: tinyutils/slitaz-config:233 +msgid "Exec" +msgstr "" + +#: tinyutils/slitaz-config:235 +#, fuzzy +msgid "System keyboard setting" +msgstr "Configuration du clavier" + +#: tinyutils/slitaz-config:236 +#, fuzzy +msgid "System language setting" +msgstr "Configuration de la langue" + +#: tinyutils/slitaz-config:237 +msgid "Wi-Fi network settings" +msgstr "" + +#: tinyutils/slitaz-config:238 +msgid "Add a new user" +msgstr "" + +#: tinyutils/slitaz-config:239 +msgid "Change root password" +msgstr "" + +#: tinyutils/slitaz-config:240 +msgid "Set system date from the web" +msgstr "" + +#: tinyutils/slitaz-config:241 +msgid "Exit from SliTaz Config" +msgstr "" + +#~ msgid "Window Manager:" +#~ msgstr "Gestionnaire de fenêtres :" + #~ msgid "Configure X" #~ msgstr "Configurer X" diff -r a37f6f8dda42 -r eb791cfb71c0 po/slitaz-tools/pl.po --- a/po/slitaz-tools/pl.po Sat Nov 15 06:45:42 2014 +0200 +++ b/po/slitaz-tools/pl.po Thu Nov 20 06:04:24 2014 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-14 21:22+0000\n" +"POT-Creation-Date: 2014-11-20 05:20+0200\n" "PO-Revision-Date: 2013-07-23 12:35+0100\n" "Last-Translator: Paweł Pyrczak \n" "Language-Team: Paweł Pyrczak \n" @@ -25,8 +25,8 @@ msgid "SliTaz GNU/Linux locale setting using dialog boxes." msgstr "" -#: tinyutils/tazlocale:17 tinyutils/decode:30 tinyutils/hwsetup:24 -#: tinyutils/frugal:32 +#: tinyutils/tazlocale:17 tinyutils/tazx:553 tinyutils/decode:30 +#: tinyutils/hwsetup:24 tinyutils/frugal:32 msgid "Usage:" msgstr "Użycie:" @@ -102,75 +102,130 @@ msgid "Done" msgstr "Zakończono" -#: tinyutils/tazx:26 -msgid "Window Manager:" -msgstr "Menadżer okien:" +#: tinyutils/tazx:141 +msgid "Creating:" +msgstr "" -#: tinyutils/tazx:27 tinyutils/tazx:152 +#: tinyutils/tazx:242 msgid "Install Xorg" msgstr "Zainstaluj Xorg" -#: tinyutils/tazx:63 -msgid "Creating:" -msgstr "" - -#: tinyutils/tazx:153 +#: tinyutils/tazx:243 msgid "Tazx helps you to select your X driver." msgstr "Tazx pomaga w wybraniu właściwego sterownika X" -#: tinyutils/tazx:154 tinyutils/hwsetup:258 -msgid "Auto configuring Xorg..." +#: tinyutils/tazx:244 +msgid "Auto configuring" msgstr "" -#: tinyutils/tazx:156 tinyutils/tazx:184 +#: tinyutils/tazx:246 msgid "driver" msgstr "" -#: tinyutils/tazx:157 +#: tinyutils/tazx:247 tinyutils/slitaz-config:233 msgid "Quit" msgstr "" -#: tinyutils/tazx:186 tinyutils/hwsetup:107 -#, sh-format -msgid "Failed to setup $DEVICE" +#: tinyutils/tazx:276 +msgid "Failed to setup driver" msgstr "" -#: tinyutils/tazx:192 tinyutils/hwsetup:117 +#: tinyutils/tazx:276 +msgid "(unknown hardware)" +msgstr "" + +#: tinyutils/tazx:289 tinyutils/hwsetup:117 #, sh-format msgid "Installing pkg: $pkg" msgstr "" -#: tinyutils/tazx:202 tinyutils/tazx:276 -#, sh-format -msgid "${INST_i18n}: ${WM_i18n} + applications" +#: tinyutils/tazx:307 tinyutils/tazx:423 +msgid "Install Window Manager and applications" msgstr "" -#: tinyutils/tazx:270 +#: tinyutils/tazx:393 tinyutils/tazx:399 +#, fuzzy +msgid "Install" +msgstr "Zainstaluj Xorg" + +#: tinyutils/tazx:409 +msgid "ON" +msgstr "" + +#: tinyutils/tazx:410 tinyutils/tazx:441 +msgid "OFF" +msgstr "" + +#: tinyutils/tazx:417 #, fuzzy msgid "SliTaz Xorg config" msgstr "Konfiguracja języka SliTaz" -#: tinyutils/tazx:272 +#: tinyutils/tazx:419 msgid "Install or reconfigure Xorg" msgstr "Zainstaluj i skonfiguruj Xorg" -#: tinyutils/tazx:273 +#: tinyutils/tazx:420 msgid "Install Xorg server (light version)" msgstr "" -#: tinyutils/tazx:274 +#: tinyutils/tazx:421 msgid "AutoStart Xorg by SLiM on boot" msgstr "" -#: tinyutils/tazx:275 +#: tinyutils/tazx:422 msgid "(Re)Start Simple Login Manager now" msgstr "" -#: tinyutils/tazx:277 +#: tinyutils/tazx:424 msgid "Quit Tazx utility" msgstr "Zamknij narzędzie Tazx" -#: tinyutils/tazx:384 +#: tinyutils/tazx:449 +msgid "Start X on boot:" +msgstr "" + +#: tinyutils/tazx:551 +msgid "configuration tool for SliTaz GNU/Linux" +msgstr "" + +#: tinyutils/tazx:553 tinyutils/hwsetup:25 +msgid "command" +msgstr "" + +#: tinyutils/tazx:553 +msgid "parameter" +msgstr "" + +#: tinyutils/tazx:555 tinyutils/hwsetup:27 tinyutils/frugal:36 +msgid "Commands:" +msgstr "" + +#: tinyutils/tazx:556 +msgid "Install Xorg and selected Xorg driver" +msgstr "" + +#: tinyutils/tazx:557 +msgid "Configure Xorg, generate configuration files" +msgstr "" + +#: tinyutils/tazx:558 +msgid "Set monitor default depth (valid parameters: 8, 15, 16 or 24)" +msgstr "" + +#: tinyutils/tazx:559 +msgid "Auto-select and install Xorg driver" +msgstr "" + +#: tinyutils/tazx:560 +msgid "Get files for starting an X session and config the keyboard" +msgstr "" + +#: tinyutils/tazx:561 +msgid "Generate or regenerate Xorg keyboard config" +msgstr "" + +#: tinyutils/tazx:572 msgid "Run tazx as root if you need to configure xorg" msgstr "" @@ -262,14 +317,6 @@ msgid "SliTaz Setup configuration" msgstr "" -#: tinyutils/hwsetup:25 -msgid "command" -msgstr "" - -#: tinyutils/hwsetup:27 tinyutils/frugal:36 -msgid "Commands:" -msgstr "" - #: tinyutils/hwsetup:29 msgid "Print this short usage." msgstr "" @@ -330,6 +377,11 @@ "to SliTaz Bug tracker or Forum." msgstr "" +#: tinyutils/hwsetup:107 +#, sh-format +msgid "Failed to setup $DEVICE" +msgstr "" + #: tinyutils/hwsetup:131 #, sh-format msgid "Would you like to install pkg: $pkg" @@ -362,6 +414,10 @@ msgid "New udev rules are added by a package" msgstr "" +#: tinyutils/hwsetup:258 +msgid "Auto configuring Xorg..." +msgstr "" + #: tinyutils/hwsetup:261 msgid "Configuring Xorg..." msgstr "" @@ -706,6 +762,155 @@ msgid "Unmounting ISO image..." msgstr "" +#: tinyutils/slitaz-config:14 +#, fuzzy +msgid "SliTaz Config" +msgstr "Konfiguracja języka SliTaz" + +#: tinyutils/slitaz-config:36 +msgid "Post Installation" +msgstr "" + +#: tinyutils/slitaz-config:37 +msgid "Continue" +msgstr "" + +#: tinyutils/slitaz-config:43 +msgid "Root Password" +msgstr "" + +#: tinyutils/slitaz-config:44 +msgid "Enter new password for \\Zb\\Z1root" +msgstr "" + +#: tinyutils/slitaz-config:53 +msgid "Add User" +msgstr "" + +#: tinyutils/slitaz-config:56 +msgid "Enter login name for the new \\Zb\\Z4user" +msgstr "" + +#: tinyutils/slitaz-config:61 +#, sh-format +msgid "Enter password for user \\Zb\\Z4$user" +msgstr "" + +#: tinyutils/slitaz-config:121 +msgid "connected" +msgstr "" + +#: tinyutils/slitaz-config:136 +msgid "Quality" +msgstr "" + +#: tinyutils/slitaz-config:136 +msgid "Key" +msgstr "" + +#: tinyutils/slitaz-config:140 tinyutils/slitaz-config:169 +msgid "hidden.network" +msgstr "" + +#: tinyutils/slitaz-config:140 +msgid "Connect.to.a.hidden.network" +msgstr "" + +#: tinyutils/slitaz-config:156 +msgid "Select" +msgstr "" + +#: tinyutils/slitaz-config:157 +msgid "Connect to a Wi-Fi network" +msgstr "" + +#: tinyutils/slitaz-config:159 +msgid "Connect.to.any.network" +msgstr "" + +#: tinyutils/slitaz-config:170 +msgid "Wi-Fi ESSID" +msgstr "" + +#: tinyutils/slitaz-config:171 +msgid "Enter Wi-Fi access point ESSID (name)" +msgstr "" + +#: tinyutils/slitaz-config:176 tinyutils/slitaz-config:187 +msgid "Wi-Fi Password" +msgstr "" + +#: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 +#, sh-format +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" +msgstr "" + +#: tinyutils/slitaz-config:197 +msgid "Shutting down network interfaces..." +msgstr "" + +#: tinyutils/slitaz-config:201 +msgid "Configuring: /etc/network.conf..." +msgstr "" + +#: tinyutils/slitaz-config:211 +msgid "Restarting Wi-Fi interface..." +msgstr "" + +#: tinyutils/slitaz-config:215 +msgid "Checking connection..." +msgstr "" + +#: tinyutils/slitaz-config:220 +#, sh-format +msgid "IP address: $ip" +msgstr "" + +#: tinyutils/slitaz-config:222 +msgid "Unable to connect..." +msgstr "" + +#: tinyutils/slitaz-config:226 +msgid "Wi-Fi Config" +msgstr "" + +#: tinyutils/slitaz-config:233 +msgid "Exec" +msgstr "" + +#: tinyutils/slitaz-config:235 +#, fuzzy +msgid "System keyboard setting" +msgstr "Konfiguracja układu klawiatury SliTaz" + +#: tinyutils/slitaz-config:236 +#, fuzzy +msgid "System language setting" +msgstr "Konfiguracja języka SliTaz" + +#: tinyutils/slitaz-config:237 +msgid "Wi-Fi network settings" +msgstr "" + +#: tinyutils/slitaz-config:238 +msgid "Add a new user" +msgstr "" + +#: tinyutils/slitaz-config:239 +msgid "Change root password" +msgstr "" + +#: tinyutils/slitaz-config:240 +msgid "Set system date from the web" +msgstr "" + +#: tinyutils/slitaz-config:241 +msgid "Exit from SliTaz Config" +msgstr "" + +#~ msgid "Window Manager:" +#~ msgstr "Menadżer okien:" + #~ msgid "Tazx dialog helps you to configure your Xorg server." #~ msgstr "Dialog Tazx pomaga w konfiguracji serwera Xorg." diff -r a37f6f8dda42 -r eb791cfb71c0 po/slitaz-tools/pt_BR.po --- a/po/slitaz-tools/pt_BR.po Sat Nov 15 06:45:42 2014 +0200 +++ b/po/slitaz-tools/pt_BR.po Thu Nov 20 06:04:24 2014 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-14 21:22+0000\n" +"POT-Creation-Date: 2014-11-20 05:20+0200\n" "PO-Revision-Date: 2014-06-16 20:11-0300\n" "Last-Translator: Claudinei Pereira \n" "Language-Team: Portuguese \n" @@ -22,8 +22,8 @@ msgstr "" "Configuração de locale do SliTaz GNU/Linux utilizando caixas de diálogo." -#: tinyutils/tazlocale:17 tinyutils/decode:30 tinyutils/hwsetup:24 -#: tinyutils/frugal:32 +#: tinyutils/tazlocale:17 tinyutils/tazx:553 tinyutils/decode:30 +#: tinyutils/hwsetup:24 tinyutils/frugal:32 msgid "Usage:" msgstr "Utilização" @@ -98,74 +98,136 @@ msgid "Done" msgstr "Feito" -#: tinyutils/tazx:26 -msgid "Window Manager:" -msgstr "Gerenciador de janelas:" +#: tinyutils/tazx:141 +msgid "Creating:" +msgstr "Criando:" -#: tinyutils/tazx:27 tinyutils/tazx:152 +#: tinyutils/tazx:242 msgid "Install Xorg" msgstr "Instalar Xorg" -#: tinyutils/tazx:63 -msgid "Creating:" -msgstr "Criando:" - -#: tinyutils/tazx:153 +#: tinyutils/tazx:243 msgid "Tazx helps you to select your X driver." msgstr "O Tazx ajuda a selecionar o driver gráfico." -#: tinyutils/tazx:154 tinyutils/hwsetup:258 -msgid "Auto configuring Xorg..." +#: tinyutils/tazx:244 +#, fuzzy +msgid "Auto configuring" msgstr "Auto configurando Xorg..." -#: tinyutils/tazx:156 tinyutils/tazx:184 +#: tinyutils/tazx:246 msgid "driver" msgstr "driver" -#: tinyutils/tazx:157 +#: tinyutils/tazx:247 tinyutils/slitaz-config:233 msgid "Quit" msgstr "Sair" -#: tinyutils/tazx:186 tinyutils/hwsetup:107 -#, sh-format -msgid "Failed to setup $DEVICE" +#: tinyutils/tazx:276 +#, fuzzy +msgid "Failed to setup driver" msgstr "Falha ao configurar $DEVICE" -#: tinyutils/tazx:192 tinyutils/hwsetup:117 +#: tinyutils/tazx:276 +msgid "(unknown hardware)" +msgstr "" + +#: tinyutils/tazx:289 tinyutils/hwsetup:117 #, sh-format msgid "Installing pkg: $pkg" msgstr "Instalando pacote: $pkg" -#: tinyutils/tazx:202 tinyutils/tazx:276 -#, sh-format -msgid "${INST_i18n}: ${WM_i18n} + applications" +#: tinyutils/tazx:307 tinyutils/tazx:423 +#, fuzzy +msgid "Install Window Manager and applications" +msgstr "aplicativo do scanner" + +#: tinyutils/tazx:393 tinyutils/tazx:399 +#, fuzzy +msgid "Install" +msgstr "Instalar Xorg" + +#: tinyutils/tazx:409 +msgid "ON" msgstr "" -#: tinyutils/tazx:270 +#: tinyutils/tazx:410 tinyutils/tazx:441 +msgid "OFF" +msgstr "" + +#: tinyutils/tazx:417 msgid "SliTaz Xorg config" msgstr "Configuraçãdo Xorg do SliTaz" -#: tinyutils/tazx:272 +#: tinyutils/tazx:419 msgid "Install or reconfigure Xorg" msgstr "Instale ou reconfigure o Xorg" -#: tinyutils/tazx:273 +#: tinyutils/tazx:420 msgid "Install Xorg server (light version)" msgstr "Instalar o servidor Xorg (versão leve)" -#: tinyutils/tazx:274 +#: tinyutils/tazx:421 msgid "AutoStart Xorg by SLiM on boot" msgstr "" -#: tinyutils/tazx:275 +#: tinyutils/tazx:422 msgid "(Re)Start Simple Login Manager now" msgstr "" -#: tinyutils/tazx:277 +#: tinyutils/tazx:424 msgid "Quit Tazx utility" msgstr "Sair do utilitário Tazx" -#: tinyutils/tazx:384 +#: tinyutils/tazx:449 +msgid "Start X on boot:" +msgstr "" + +#: tinyutils/tazx:551 +msgid "configuration tool for SliTaz GNU/Linux" +msgstr "" + +#: tinyutils/tazx:553 tinyutils/hwsetup:25 +msgid "command" +msgstr "comando" + +#: tinyutils/tazx:553 +msgid "parameter" +msgstr "" + +#: tinyutils/tazx:555 tinyutils/hwsetup:27 tinyutils/frugal:36 +msgid "Commands:" +msgstr "Comandos:" + +#: tinyutils/tazx:556 +#, fuzzy +msgid "Install Xorg and selected Xorg driver" +msgstr "Instalar o servidor Xorg (versão leve)" + +#: tinyutils/tazx:557 +#, fuzzy +msgid "Configure Xorg, generate configuration files" +msgstr "" +"Usar: utilitário aticonfig para gerar template de arquivo de configuração se " +"necessário" + +#: tinyutils/tazx:558 +msgid "Set monitor default depth (valid parameters: 8, 15, 16 or 24)" +msgstr "" + +#: tinyutils/tazx:559 +msgid "Auto-select and install Xorg driver" +msgstr "" + +#: tinyutils/tazx:560 +msgid "Get files for starting an X session and config the keyboard" +msgstr "" + +#: tinyutils/tazx:561 +msgid "Generate or regenerate Xorg keyboard config" +msgstr "" + +#: tinyutils/tazx:572 msgid "Run tazx as root if you need to configure xorg" msgstr "" @@ -257,14 +319,6 @@ msgid "SliTaz Setup configuration" msgstr "Configuração do SliTaz" -#: tinyutils/hwsetup:25 -msgid "command" -msgstr "comando" - -#: tinyutils/hwsetup:27 tinyutils/frugal:36 -msgid "Commands:" -msgstr "Comandos:" - #: tinyutils/hwsetup:29 msgid "Print this short usage." msgstr "Mostra esta utilização." @@ -328,6 +382,11 @@ "não foi testado adequadamente. Por favor reportar qualquer sucesso, falha ou " "bug no fórum ou no SliTaz Bug tracker." +#: tinyutils/hwsetup:107 +#, sh-format +msgid "Failed to setup $DEVICE" +msgstr "Falha ao configurar $DEVICE" + #: tinyutils/hwsetup:131 #, sh-format msgid "Would you like to install pkg: $pkg" @@ -360,6 +419,10 @@ msgid "New udev rules are added by a package" msgstr "Novas regras do udev foram adicionadas para o pacote" +#: tinyutils/hwsetup:258 +msgid "Auto configuring Xorg..." +msgstr "Auto configurando Xorg..." + #: tinyutils/hwsetup:261 msgid "Configuring Xorg..." msgstr "Configurando Xorg..." @@ -716,6 +779,159 @@ msgid "Unmounting ISO image..." msgstr "Desmontando imagem ISO..." +#: tinyutils/slitaz-config:14 +#, fuzzy +msgid "SliTaz Config" +msgstr "Configuraçãdo Xorg do SliTaz" + +#: tinyutils/slitaz-config:36 +#, fuzzy +msgid "Post Installation" +msgstr "Definir caminho de instalação raiz" + +#: tinyutils/slitaz-config:37 +msgid "Continue" +msgstr "" + +#: tinyutils/slitaz-config:43 +#, fuzzy +msgid "Root Password" +msgstr "Senha:" + +#: tinyutils/slitaz-config:44 +msgid "Enter new password for \\Zb\\Z1root" +msgstr "" + +#: tinyutils/slitaz-config:53 +msgid "Add User" +msgstr "" + +#: tinyutils/slitaz-config:56 +msgid "Enter login name for the new \\Zb\\Z4user" +msgstr "" + +#: tinyutils/slitaz-config:61 +#, sh-format +msgid "Enter password for user \\Zb\\Z4$user" +msgstr "" + +#: tinyutils/slitaz-config:121 +msgid "connected" +msgstr "" + +#: tinyutils/slitaz-config:136 +msgid "Quality" +msgstr "" + +#: tinyutils/slitaz-config:136 +msgid "Key" +msgstr "" + +#: tinyutils/slitaz-config:140 tinyutils/slitaz-config:169 +msgid "hidden.network" +msgstr "" + +#: tinyutils/slitaz-config:140 +msgid "Connect.to.a.hidden.network" +msgstr "" + +#: tinyutils/slitaz-config:156 +msgid "Select" +msgstr "" + +#: tinyutils/slitaz-config:157 +msgid "Connect to a Wi-Fi network" +msgstr "" + +#: tinyutils/slitaz-config:159 +msgid "Connect.to.any.network" +msgstr "" + +#: tinyutils/slitaz-config:170 +msgid "Wi-Fi ESSID" +msgstr "" + +#: tinyutils/slitaz-config:171 +msgid "Enter Wi-Fi access point ESSID (name)" +msgstr "" + +#: tinyutils/slitaz-config:176 tinyutils/slitaz-config:187 +#, fuzzy +msgid "Wi-Fi Password" +msgstr "Senha:" + +#: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 +#, sh-format +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" +msgstr "" + +#: tinyutils/slitaz-config:197 +msgid "Shutting down network interfaces..." +msgstr "" + +#: tinyutils/slitaz-config:201 +#, fuzzy +msgid "Configuring: /etc/network.conf..." +msgstr "Configurando Xorg..." + +#: tinyutils/slitaz-config:211 +msgid "Restarting Wi-Fi interface..." +msgstr "" + +#: tinyutils/slitaz-config:215 +msgid "Checking connection..." +msgstr "" + +#: tinyutils/slitaz-config:220 +#, sh-format +msgid "IP address: $ip" +msgstr "" + +#: tinyutils/slitaz-config:222 +msgid "Unable to connect..." +msgstr "" + +#: tinyutils/slitaz-config:226 +msgid "Wi-Fi Config" +msgstr "" + +#: tinyutils/slitaz-config:233 +msgid "Exec" +msgstr "" + +#: tinyutils/slitaz-config:235 +#, fuzzy +msgid "System keyboard setting" +msgstr "ConfiguraçaoTeclado do SliTaz" + +#: tinyutils/slitaz-config:236 +#, fuzzy +msgid "System language setting" +msgstr "Configuração de Linguagem do SliTaz" + +#: tinyutils/slitaz-config:237 +msgid "Wi-Fi network settings" +msgstr "" + +#: tinyutils/slitaz-config:238 +msgid "Add a new user" +msgstr "" + +#: tinyutils/slitaz-config:239 +msgid "Change root password" +msgstr "" + +#: tinyutils/slitaz-config:240 +msgid "Set system date from the web" +msgstr "" + +#: tinyutils/slitaz-config:241 +msgid "Exit from SliTaz Config" +msgstr "" + +#~ msgid "Window Manager:" +#~ msgstr "Gerenciador de janelas:" + #~ msgid "Configure X" #~ msgstr "Configurar X" diff -r a37f6f8dda42 -r eb791cfb71c0 po/slitaz-tools/ru.po --- a/po/slitaz-tools/ru.po Sat Nov 15 06:45:42 2014 +0200 +++ b/po/slitaz-tools/ru.po Thu Nov 20 06:04:24 2014 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-14 21:22+0000\n" -"PO-Revision-Date: 2014-05-23 03:28+0300\n" +"POT-Creation-Date: 2014-11-20 05:20+0200\n" +"PO-Revision-Date: 2014-11-20 05:30+0300\n" "Last-Translator: Aleksej Bobylev \n" "Language-Team: \n" "Language: Russian\n" @@ -23,8 +23,8 @@ msgid "SliTaz GNU/Linux locale setting using dialog boxes." msgstr "Настройка локали SliTaz GNU/Linux с использованием dialog." -#: tinyutils/tazlocale:17 tinyutils/decode:30 tinyutils/hwsetup:24 -#: tinyutils/frugal:32 +#: tinyutils/tazlocale:17 tinyutils/tazx:553 tinyutils/decode:30 +#: tinyutils/hwsetup:24 tinyutils/frugal:32 msgid "Usage:" msgstr "Использование:" @@ -101,76 +101,130 @@ msgid "Done" msgstr "Готово" -#: tinyutils/tazx:26 -msgid "Window Manager:" -msgstr "Менеджер окон:" - -#: tinyutils/tazx:27 tinyutils/tazx:152 -msgid "Install Xorg" -msgstr "Установка X.org" - -#: tinyutils/tazx:63 +#: tinyutils/tazx:141 msgid "Creating:" msgstr "Создается:" -#: tinyutils/tazx:153 +#: tinyutils/tazx:242 +msgid "Install Xorg" +msgstr "Установка Xorg" + +#: tinyutils/tazx:243 msgid "Tazx helps you to select your X driver." -msgstr "Tazx поможет вам выбрать драйвер для X.Org." +msgstr "Tazx поможет вам выбрать драйвер для Xorg." -#: tinyutils/tazx:154 tinyutils/hwsetup:258 -msgid "Auto configuring Xorg..." -msgstr "Авто-настройка Xorg…" +#: tinyutils/tazx:244 +msgid "Auto configuring" +msgstr "Авто-настройка" -#: tinyutils/tazx:156 tinyutils/tazx:184 +#: tinyutils/tazx:246 msgid "driver" msgstr "драйвер" -#: tinyutils/tazx:157 +#: tinyutils/tazx:247 tinyutils/slitaz-config:233 msgid "Quit" msgstr "Выход" -#: tinyutils/tazx:186 tinyutils/hwsetup:107 -#, sh-format -msgid "Failed to setup $DEVICE" -msgstr "Не удалось настроить $DEVICE" +#: tinyutils/tazx:276 +msgid "Failed to setup driver" +msgstr "Не удалось установить драйвер" -#: tinyutils/tazx:192 tinyutils/hwsetup:117 +#: tinyutils/tazx:276 +msgid "(unknown hardware)" +msgstr "(неизвестное оборудование)" + +#: tinyutils/tazx:289 tinyutils/hwsetup:117 #, sh-format msgid "Installing pkg: $pkg" msgstr "Установка пакета «$pkg»" -#: tinyutils/tazx:202 tinyutils/tazx:276 -#, sh-format -msgid "${INST_i18n}: ${WM_i18n} + applications" -msgstr "${INST_i18n}: ${WM_i18n}+программы" +#: tinyutils/tazx:307 tinyutils/tazx:423 +msgid "Install Window Manager and applications" +msgstr "Установка менеджера окон и приложений" -#: tinyutils/tazx:270 +#: tinyutils/tazx:393 tinyutils/tazx:399 +msgid "Install" +msgstr "Установить" + +#: tinyutils/tazx:409 +msgid "ON" +msgstr "ВКЛ" + +#: tinyutils/tazx:410 tinyutils/tazx:441 +msgid "OFF" +msgstr "ОТКЛ" + +#: tinyutils/tazx:417 msgid "SliTaz Xorg config" -msgstr "Настройка X.Org в SliTaz" +msgstr "Настройка Xorg в SliTaz" -#: tinyutils/tazx:272 +#: tinyutils/tazx:419 msgid "Install or reconfigure Xorg" -msgstr "Установить или перенастроить X.org" +msgstr "Установить или перенастроить Xorg" -#: tinyutils/tazx:273 +#: tinyutils/tazx:420 msgid "Install Xorg server (light version)" -msgstr "Установка облегченного сервера X.Org" +msgstr "Установить облегченный сервер Xorg" -#: tinyutils/tazx:274 +#: tinyutils/tazx:421 msgid "AutoStart Xorg by SLiM on boot" -msgstr "" +msgstr "Автозапуск Xorg через SLiM при старте системы" -#: tinyutils/tazx:275 +#: tinyutils/tazx:422 msgid "(Re)Start Simple Login Manager now" -msgstr "" +msgstr "(Пере)запустить простой менеджер входа SLiM сейчас" -#: tinyutils/tazx:277 +#: tinyutils/tazx:424 msgid "Quit Tazx utility" msgstr "Выйти из утилиты Tazx" -#: tinyutils/tazx:384 +#: tinyutils/tazx:449 +msgid "Start X on boot:" +msgstr "Запуск X при старте системы:" + +#: tinyutils/tazx:551 +msgid "configuration tool for SliTaz GNU/Linux" +msgstr "утилита настройки SliTaz GNU/Linux" + +#: tinyutils/tazx:553 tinyutils/hwsetup:25 +msgid "command" +msgstr "команда" + +#: tinyutils/tazx:553 +msgid "parameter" +msgstr "параметр" + +#: tinyutils/tazx:555 tinyutils/hwsetup:27 tinyutils/frugal:36 +msgid "Commands:" +msgstr "Команды:" + +#: tinyutils/tazx:556 +msgid "Install Xorg and selected Xorg driver" +msgstr "Установить Xorg и выбранный драйвер Xorg" + +#: tinyutils/tazx:557 +msgid "Configure Xorg, generate configuration files" +msgstr "Настроить Xorg, создать конфигурационные файлы" + +#: tinyutils/tazx:558 +msgid "Set monitor default depth (valid parameters: 8, 15, 16 or 24)" +msgstr "Установить глубину цвета монитора (параметр: 8, 15, 16 или 24)" + +#: tinyutils/tazx:559 +msgid "Auto-select and install Xorg driver" +msgstr "Автоматически выбрать и установить драйвер Xorg" + +#: tinyutils/tazx:560 +msgid "Get files for starting an X session and config the keyboard" +msgstr "Создать файлы для запуска X-сессии и настроить клавиатуру" + +#: tinyutils/tazx:561 +msgid "Generate or regenerate Xorg keyboard config" +msgstr "Создать конфигурационный файл клавиатуры для Xorg" + +#: tinyutils/tazx:572 msgid "Run tazx as root if you need to configure xorg" -msgstr "" +msgstr "Если нужно настроить Xorg — запустите tazx от имени root" #: tinyutils/decode:28 msgid "Decode audio and video files" @@ -260,14 +314,6 @@ msgid "SliTaz Setup configuration" msgstr "Настройка оборудования SliTaz" -#: tinyutils/hwsetup:25 -msgid "command" -msgstr "команда" - -#: tinyutils/hwsetup:27 tinyutils/frugal:36 -msgid "Commands:" -msgstr "Команды:" - #: tinyutils/hwsetup:29 msgid "Print this short usage." msgstr "Вывести эту справку" @@ -302,7 +348,7 @@ #: tinyutils/hwsetup:37 msgid "Nvidia (non-free/free) setup." -msgstr "Настройка видео-карты Nvidia (свободные и несвободные драйверы)." +msgstr "Настройка видео-карты nVidia (свободные и несвободные драйверы)." #: tinyutils/hwsetup:38 msgid "ATI (non-free/free) setup." @@ -331,6 +377,11 @@ "SliTaz. Сообщите о ваших успехах, неудачах, ошибках в баг-трекер SliTaz или " "на форум." +#: tinyutils/hwsetup:107 +#, sh-format +msgid "Failed to setup $DEVICE" +msgstr "Не удалось настроить $DEVICE" + #: tinyutils/hwsetup:131 #, sh-format msgid "Would you like to install pkg: $pkg" @@ -365,6 +416,10 @@ msgid "New udev rules are added by a package" msgstr "При установке пакета добавлены новые правила UDEV" +#: tinyutils/hwsetup:258 +msgid "Auto configuring Xorg..." +msgstr "Авто-настройка Xorg…" + #: tinyutils/hwsetup:261 msgid "Configuring Xorg..." msgstr "Настройка X.Org…" @@ -590,7 +645,7 @@ #: tinyutils/hwsetup:646 msgid "Do you want to configure X using free nvidia driver" -msgstr "Настроить X.Org, используя свободный драйвер Nvidia" +msgstr "Настроить Xorg, используя свободный драйвер nVidia" #: tinyutils/hwsetup:652 #, sh-format @@ -599,7 +654,7 @@ #: tinyutils/hwsetup:678 msgid "Do you want to configure X using non-free catalyst ATI (radeon) driver" -msgstr "Настроить X.Org, используя несвободный драйвер ATI Catalyst (Radeon)" +msgstr "Настроить Xorg, используя несвободный драйвер ATI Catalyst (Radeon)" #: tinyutils/hwsetup:682 #, sh-format @@ -625,7 +680,7 @@ #: tinyutils/hwsetup:711 msgid "Do you want to configure X using free ATI (radeon) driver" -msgstr "Настроить X.Org, используя свободный драйвер ATI (Radeon)" +msgstr "Настроить Xorg, используя свободный драйвер ATI (Radeon)" #: tinyutils/hwsetup:715 #, sh-format @@ -724,45 +779,145 @@ msgid "Unmounting ISO image..." msgstr "Отключение образа ISO…" -#~ msgid "Configure X" -#~ msgstr "Настройка XOrg" +#: tinyutils/slitaz-config:14 +msgid "SliTaz Config" +msgstr "Настройка SliTaz" -#~ msgid "Tazx dialog helps you to configure your Xorg server." -#~ msgstr "Диалог Tazx поможет вам настроить сервер Xorg." +#: tinyutils/slitaz-config:36 +msgid "Post Installation" +msgstr "После установки" -#~ msgid "X server:" -#~ msgstr "X-сервер:" +#: tinyutils/slitaz-config:37 +msgid "Continue" +msgstr "Продолжить" -#~ msgid "Install TinyX server Xfbdev" -#~ msgstr "Установить сервер TinyX: Xfbdev" +#: tinyutils/slitaz-config:43 +msgid "Root Password" +msgstr "Пароль root" -#~ msgid "You must be root to configure X server." -#~ msgstr "Вы должны быть администратором для настройки X-сервера." +#: tinyutils/slitaz-config:44 +msgid "Enter new password for \\Zb\\Z1root" +msgstr "Введите новый пароль для \\Zb\\Z1root" -#~ msgid "" -#~ "Your previous config is in /etc/X11/xorg.conf.d/60-Device.conf\n" -#~ "If nvidia fails, you can remove /etc/X11/xorg.conf.d/55-DeviceTweaks.conf " -#~ "to restore previous config." -#~ msgstr "" -#~ "Предыдущие настройки находятся в файле /etc/X11/xorg.conf.d/60-Device." -#~ "conf\n" -#~ "Если драйвер nvidia не будет корректно работать, вы можете удалить /etc/" -#~ "X11/xorg.conf.d/55-DeviceTweaks.conf, чтобы вернуться к предыдущим " -#~ "настройкам." +#: tinyutils/slitaz-config:53 +msgid "Add User" +msgstr "Добавить пользователя" -#~ msgid "" -#~ "Quick start guide: http://www.gphoto.org/doc/manual/using-gphoto2.html" -#~ msgstr "" -#~ "Краткое руководство пользователя: http://www.gphoto.org/doc/manual/using-" -#~ "gphoto2.html" +#: tinyutils/slitaz-config:56 +msgid "Enter login name for the new \\Zb\\Z4user" +msgstr "Введите логин нового \\Zb\\Z4пользователя" -#~ msgid "You must be root to run $command with this option." -#~ msgstr "" -#~ "Вы должны быть администратором, чтобы запустить $command с этим " -#~ "параметром." +#: tinyutils/slitaz-config:61 +#, sh-format +msgid "Enter password for user \\Zb\\Z4$user" +msgstr "Введите пароль для пользователя \\Zb\\Z4$user" -#~ msgid "Please use 'su' and root password to become super-user." -#~ msgstr "Введите «su» и пароль root, чтобы стать администратором." +#: tinyutils/slitaz-config:121 +msgid "connected" +msgstr "подключено" -#~ msgid "Setting system locale to: $locale" -#~ msgstr "Установка системной локали «$locale»" +#: tinyutils/slitaz-config:136 +msgid "Quality" +msgstr "Уровень" + +#: tinyutils/slitaz-config:136 +msgid "Key" +msgstr "Безопасность" + +#: tinyutils/slitaz-config:140 tinyutils/slitaz-config:169 +msgid "hidden.network" +msgstr "скрытая.сеть" + +#: tinyutils/slitaz-config:140 +msgid "Connect.to.a.hidden.network" +msgstr "Соединиться.со.скрытой.сетью" + +#: tinyutils/slitaz-config:156 +msgid "Select" +msgstr "Выбрать" + +#: tinyutils/slitaz-config:157 +msgid "Connect to a Wi-Fi network" +msgstr "Соединение с сетью Wi-Fi" + +#: tinyutils/slitaz-config:159 +msgid "Connect.to.any.network" +msgstr "Соединиться.с.любой.сетью" + +#: tinyutils/slitaz-config:170 +msgid "Wi-Fi ESSID" +msgstr "ESSID Wi-Fi" + +#: tinyutils/slitaz-config:171 +msgid "Enter Wi-Fi access point ESSID (name)" +msgstr "Введите ESSID (имя) точки доступа Wi-Fi" + +#: tinyutils/slitaz-config:176 tinyutils/slitaz-config:187 +msgid "Wi-Fi Password" +msgstr "Пароль Wi-Fi" + +#: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 +#, sh-format +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" +msgstr "Введите пароль Wi-Fi для \\Zb\\Z4$essid" + +#: tinyutils/slitaz-config:197 +msgid "Shutting down network interfaces..." +msgstr "Выключение сетевых интерфейсов…" + +#: tinyutils/slitaz-config:201 +msgid "Configuring: /etc/network.conf..." +msgstr "Настройка /etc/network.conf…" + +#: tinyutils/slitaz-config:211 +msgid "Restarting Wi-Fi interface..." +msgstr "Перезапуск интерфейса Wi-Fi…" + +#: tinyutils/slitaz-config:215 +msgid "Checking connection..." +msgstr "Проверка соединения…" + +#: tinyutils/slitaz-config:220 +#, sh-format +msgid "IP address: $ip" +msgstr "IP-адрес: $ip" + +#: tinyutils/slitaz-config:222 +msgid "Unable to connect..." +msgstr "Не удалось соединиться…" + +#: tinyutils/slitaz-config:226 +msgid "Wi-Fi Config" +msgstr "Параметры Wi-Fi" + +#: tinyutils/slitaz-config:233 +msgid "Exec" +msgstr "Пуск" + +#: tinyutils/slitaz-config:235 +msgid "System keyboard setting" +msgstr "Настройка клавиатурной раскладки" + +#: tinyutils/slitaz-config:236 +msgid "System language setting" +msgstr "Настройка языка системы" + +#: tinyutils/slitaz-config:237 +msgid "Wi-Fi network settings" +msgstr "Настройка подключения Wi-Fi" + +#: tinyutils/slitaz-config:238 +msgid "Add a new user" +msgstr "Добавить пользователя" + +#: tinyutils/slitaz-config:239 +msgid "Change root password" +msgstr "Изменить пароль root" + +#: tinyutils/slitaz-config:240 +msgid "Set system date from the web" +msgstr "Установить системную дату по интернету" + +#: tinyutils/slitaz-config:241 +msgid "Exit from SliTaz Config" +msgstr "Выйти из настройки SliTaz" diff -r a37f6f8dda42 -r eb791cfb71c0 po/slitaz-tools/slitaz-tools.pot --- a/po/slitaz-tools/slitaz-tools.pot Sat Nov 15 06:45:42 2014 +0200 +++ b/po/slitaz-tools/slitaz-tools.pot Thu Nov 20 06:04:24 2014 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-14 21:22+0000\n" +"POT-Creation-Date: 2014-11-20 05:38+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,8 +21,8 @@ msgid "SliTaz GNU/Linux locale setting using dialog boxes." msgstr "" -#: tinyutils/tazlocale:17 tinyutils/decode:30 tinyutils/hwsetup:24 -#: tinyutils/frugal:32 +#: tinyutils/tazlocale:17 tinyutils/tazx:553 tinyutils/decode:30 +#: tinyutils/hwsetup:24 tinyutils/frugal:32 msgid "Usage:" msgstr "" @@ -92,74 +92,128 @@ msgid "Done" msgstr "" -#: tinyutils/tazx:26 -msgid "Window Manager:" +#: tinyutils/tazx:141 +msgid "Creating:" msgstr "" -#: tinyutils/tazx:27 tinyutils/tazx:152 +#: tinyutils/tazx:242 msgid "Install Xorg" msgstr "" -#: tinyutils/tazx:63 -msgid "Creating:" -msgstr "" - -#: tinyutils/tazx:153 +#: tinyutils/tazx:243 msgid "Tazx helps you to select your X driver." msgstr "" -#: tinyutils/tazx:154 tinyutils/hwsetup:258 -msgid "Auto configuring Xorg..." +#: tinyutils/tazx:244 +msgid "Auto configuring" msgstr "" -#: tinyutils/tazx:156 tinyutils/tazx:184 +#: tinyutils/tazx:246 msgid "driver" msgstr "" -#: tinyutils/tazx:157 +#: tinyutils/tazx:247 tinyutils/slitaz-config:233 msgid "Quit" msgstr "" -#: tinyutils/tazx:186 tinyutils/hwsetup:107 -#, sh-format -msgid "Failed to setup $DEVICE" +#: tinyutils/tazx:276 +msgid "Failed to setup driver" msgstr "" -#: tinyutils/tazx:192 tinyutils/hwsetup:117 +#: tinyutils/tazx:276 +msgid "(unknown hardware)" +msgstr "" + +#: tinyutils/tazx:289 tinyutils/hwsetup:117 #, sh-format msgid "Installing pkg: $pkg" msgstr "" -#: tinyutils/tazx:202 tinyutils/tazx:276 -#, sh-format -msgid "${INST_i18n}: ${WM_i18n} + applications" +#: tinyutils/tazx:307 tinyutils/tazx:423 +msgid "Install Window Manager and applications" msgstr "" -#: tinyutils/tazx:270 +#: tinyutils/tazx:393 tinyutils/tazx:399 +msgid "Install" +msgstr "" + +#: tinyutils/tazx:409 +msgid "ON" +msgstr "" + +#: tinyutils/tazx:410 tinyutils/tazx:441 +msgid "OFF" +msgstr "" + +#: tinyutils/tazx:417 msgid "SliTaz Xorg config" msgstr "" -#: tinyutils/tazx:272 +#: tinyutils/tazx:419 msgid "Install or reconfigure Xorg" msgstr "" -#: tinyutils/tazx:273 +#: tinyutils/tazx:420 msgid "Install Xorg server (light version)" msgstr "" -#: tinyutils/tazx:274 +#: tinyutils/tazx:421 msgid "AutoStart Xorg by SLiM on boot" msgstr "" -#: tinyutils/tazx:275 +#: tinyutils/tazx:422 msgid "(Re)Start Simple Login Manager now" msgstr "" -#: tinyutils/tazx:277 +#: tinyutils/tazx:424 msgid "Quit Tazx utility" msgstr "" -#: tinyutils/tazx:384 +#: tinyutils/tazx:449 +msgid "Start X on boot:" +msgstr "" + +#: tinyutils/tazx:551 +msgid "configuration tool for SliTaz GNU/Linux" +msgstr "" + +#: tinyutils/tazx:553 tinyutils/hwsetup:25 +msgid "command" +msgstr "" + +#: tinyutils/tazx:553 +msgid "parameter" +msgstr "" + +#: tinyutils/tazx:555 tinyutils/hwsetup:27 tinyutils/frugal:36 +msgid "Commands:" +msgstr "" + +#: tinyutils/tazx:556 +msgid "Install Xorg and selected Xorg driver" +msgstr "" + +#: tinyutils/tazx:557 +msgid "Configure Xorg, generate configuration files" +msgstr "" + +#: tinyutils/tazx:558 +msgid "Set monitor default depth (valid parameters: 8, 15, 16 or 24)" +msgstr "" + +#: tinyutils/tazx:559 +msgid "Auto-select and install Xorg driver" +msgstr "" + +#: tinyutils/tazx:560 +msgid "Get files for starting an X session and config the keyboard" +msgstr "" + +#: tinyutils/tazx:561 +msgid "Generate or regenerate Xorg keyboard config" +msgstr "" + +#: tinyutils/tazx:572 msgid "Run tazx as root if you need to configure xorg" msgstr "" @@ -251,14 +305,6 @@ msgid "SliTaz Setup configuration" msgstr "" -#: tinyutils/hwsetup:25 -msgid "command" -msgstr "" - -#: tinyutils/hwsetup:27 tinyutils/frugal:36 -msgid "Commands:" -msgstr "" - #: tinyutils/hwsetup:29 msgid "Print this short usage." msgstr "" @@ -319,6 +365,11 @@ "to SliTaz Bug tracker or Forum." msgstr "" +#: tinyutils/hwsetup:107 +#, sh-format +msgid "Failed to setup $DEVICE" +msgstr "" + #: tinyutils/hwsetup:131 #, sh-format msgid "Would you like to install pkg: $pkg" @@ -351,6 +402,10 @@ msgid "New udev rules are added by a package" msgstr "" +#: tinyutils/hwsetup:258 +msgid "Auto configuring Xorg..." +msgstr "" + #: tinyutils/hwsetup:261 msgid "Configuring Xorg..." msgstr "" @@ -694,3 +749,146 @@ #: tinyutils/frugal:131 msgid "Unmounting ISO image..." msgstr "" + +#: tinyutils/slitaz-config:14 +msgid "SliTaz Config" +msgstr "" + +#: tinyutils/slitaz-config:36 +msgid "Post Installation" +msgstr "" + +#: tinyutils/slitaz-config:37 +msgid "Continue" +msgstr "" + +#: tinyutils/slitaz-config:43 +msgid "Root Password" +msgstr "" + +#: tinyutils/slitaz-config:44 +msgid "Enter new password for \\Zb\\Z1root" +msgstr "" + +#: tinyutils/slitaz-config:53 +msgid "Add User" +msgstr "" + +#: tinyutils/slitaz-config:56 +msgid "Enter login name for the new \\Zb\\Z4user" +msgstr "" + +#: tinyutils/slitaz-config:61 +#, sh-format +msgid "Enter password for user \\Zb\\Z4$user" +msgstr "" + +#: tinyutils/slitaz-config:121 +msgid "connected" +msgstr "" + +#: tinyutils/slitaz-config:136 +msgid "Quality" +msgstr "" + +#: tinyutils/slitaz-config:136 +msgid "Key" +msgstr "" + +#: tinyutils/slitaz-config:140 tinyutils/slitaz-config:169 +msgid "hidden.network" +msgstr "" + +#: tinyutils/slitaz-config:140 +msgid "Connect.to.a.hidden.network" +msgstr "" + +#: tinyutils/slitaz-config:156 +msgid "Select" +msgstr "" + +#: tinyutils/slitaz-config:157 +msgid "Connect to a Wi-Fi network" +msgstr "" + +#: tinyutils/slitaz-config:159 +msgid "Connect.to.any.network" +msgstr "" + +#: tinyutils/slitaz-config:170 +msgid "Wi-Fi ESSID" +msgstr "" + +#: tinyutils/slitaz-config:171 +msgid "Enter Wi-Fi access point ESSID (name)" +msgstr "" + +#: tinyutils/slitaz-config:176 tinyutils/slitaz-config:187 +msgid "Wi-Fi Password" +msgstr "" + +#: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 +#, sh-format +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" +msgstr "" + +#: tinyutils/slitaz-config:197 +msgid "Shutting down network interfaces..." +msgstr "" + +#: tinyutils/slitaz-config:201 +msgid "Configuring: /etc/network.conf..." +msgstr "" + +#: tinyutils/slitaz-config:211 +msgid "Restarting Wi-Fi interface..." +msgstr "" + +#: tinyutils/slitaz-config:215 +msgid "Checking connection..." +msgstr "" + +#: tinyutils/slitaz-config:220 +#, sh-format +msgid "IP address: $ip" +msgstr "" + +#: tinyutils/slitaz-config:222 +msgid "Unable to connect..." +msgstr "" + +#: tinyutils/slitaz-config:226 +msgid "Wi-Fi Config" +msgstr "" + +#: tinyutils/slitaz-config:233 +msgid "Exec" +msgstr "" + +#: tinyutils/slitaz-config:235 +msgid "System keyboard setting" +msgstr "" + +#: tinyutils/slitaz-config:236 +msgid "System language setting" +msgstr "" + +#: tinyutils/slitaz-config:237 +msgid "Wi-Fi network settings" +msgstr "" + +#: tinyutils/slitaz-config:238 +msgid "Add a new user" +msgstr "" + +#: tinyutils/slitaz-config:239 +msgid "Change root password" +msgstr "" + +#: tinyutils/slitaz-config:240 +msgid "Set system date from the web" +msgstr "" + +#: tinyutils/slitaz-config:241 +msgid "Exit from SliTaz Config" +msgstr "" diff -r a37f6f8dda42 -r eb791cfb71c0 po/slitaz-tools/sv.po --- a/po/slitaz-tools/sv.po Sat Nov 15 06:45:42 2014 +0200 +++ b/po/slitaz-tools/sv.po Thu Nov 20 06:04:24 2014 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-14 21:22+0000\n" +"POT-Creation-Date: 2014-11-20 05:20+0200\n" "PO-Revision-Date: 2012-07-12 12:59-0000\n" "Last-Translator: Emil Eklund \n" "Language-Team: Swedish\n" @@ -21,8 +21,8 @@ msgid "SliTaz GNU/Linux locale setting using dialog boxes." msgstr "" -#: tinyutils/tazlocale:17 tinyutils/decode:30 tinyutils/hwsetup:24 -#: tinyutils/frugal:32 +#: tinyutils/tazlocale:17 tinyutils/tazx:553 tinyutils/decode:30 +#: tinyutils/hwsetup:24 tinyutils/frugal:32 msgid "Usage:" msgstr "Användning:" @@ -98,75 +98,130 @@ msgid "Done" msgstr "Klar" -#: tinyutils/tazx:26 -msgid "Window Manager:" -msgstr "Fönster hanterare:" +#: tinyutils/tazx:141 +msgid "Creating:" +msgstr "" -#: tinyutils/tazx:27 tinyutils/tazx:152 +#: tinyutils/tazx:242 msgid "Install Xorg" msgstr "Installera Xorg" -#: tinyutils/tazx:63 -msgid "Creating:" -msgstr "" - -#: tinyutils/tazx:153 +#: tinyutils/tazx:243 msgid "Tazx helps you to select your X driver." msgstr "Tazx hjälper dig att välja din X drivrutin." -#: tinyutils/tazx:154 tinyutils/hwsetup:258 -msgid "Auto configuring Xorg..." +#: tinyutils/tazx:244 +msgid "Auto configuring" msgstr "" -#: tinyutils/tazx:156 tinyutils/tazx:184 +#: tinyutils/tazx:246 msgid "driver" msgstr "" -#: tinyutils/tazx:157 +#: tinyutils/tazx:247 tinyutils/slitaz-config:233 msgid "Quit" msgstr "" -#: tinyutils/tazx:186 tinyutils/hwsetup:107 -#, sh-format -msgid "Failed to setup $DEVICE" +#: tinyutils/tazx:276 +msgid "Failed to setup driver" msgstr "" -#: tinyutils/tazx:192 tinyutils/hwsetup:117 +#: tinyutils/tazx:276 +msgid "(unknown hardware)" +msgstr "" + +#: tinyutils/tazx:289 tinyutils/hwsetup:117 #, sh-format msgid "Installing pkg: $pkg" msgstr "" -#: tinyutils/tazx:202 tinyutils/tazx:276 -#, sh-format -msgid "${INST_i18n}: ${WM_i18n} + applications" +#: tinyutils/tazx:307 tinyutils/tazx:423 +msgid "Install Window Manager and applications" msgstr "" -#: tinyutils/tazx:270 +#: tinyutils/tazx:393 tinyutils/tazx:399 +#, fuzzy +msgid "Install" +msgstr "Installera Xorg" + +#: tinyutils/tazx:409 +msgid "ON" +msgstr "" + +#: tinyutils/tazx:410 tinyutils/tazx:441 +msgid "OFF" +msgstr "" + +#: tinyutils/tazx:417 #, fuzzy msgid "SliTaz Xorg config" msgstr "Slitaz språk konfiguration" -#: tinyutils/tazx:272 +#: tinyutils/tazx:419 msgid "Install or reconfigure Xorg" msgstr "Installera eller omkonifigurera Xorg" -#: tinyutils/tazx:273 +#: tinyutils/tazx:420 msgid "Install Xorg server (light version)" msgstr "" -#: tinyutils/tazx:274 +#: tinyutils/tazx:421 msgid "AutoStart Xorg by SLiM on boot" msgstr "" -#: tinyutils/tazx:275 +#: tinyutils/tazx:422 msgid "(Re)Start Simple Login Manager now" msgstr "" -#: tinyutils/tazx:277 +#: tinyutils/tazx:424 msgid "Quit Tazx utility" msgstr "Avsluta Tazx verktyget" -#: tinyutils/tazx:384 +#: tinyutils/tazx:449 +msgid "Start X on boot:" +msgstr "" + +#: tinyutils/tazx:551 +msgid "configuration tool for SliTaz GNU/Linux" +msgstr "" + +#: tinyutils/tazx:553 tinyutils/hwsetup:25 +msgid "command" +msgstr "" + +#: tinyutils/tazx:553 +msgid "parameter" +msgstr "" + +#: tinyutils/tazx:555 tinyutils/hwsetup:27 tinyutils/frugal:36 +msgid "Commands:" +msgstr "" + +#: tinyutils/tazx:556 +msgid "Install Xorg and selected Xorg driver" +msgstr "" + +#: tinyutils/tazx:557 +msgid "Configure Xorg, generate configuration files" +msgstr "" + +#: tinyutils/tazx:558 +msgid "Set monitor default depth (valid parameters: 8, 15, 16 or 24)" +msgstr "" + +#: tinyutils/tazx:559 +msgid "Auto-select and install Xorg driver" +msgstr "" + +#: tinyutils/tazx:560 +msgid "Get files for starting an X session and config the keyboard" +msgstr "" + +#: tinyutils/tazx:561 +msgid "Generate or regenerate Xorg keyboard config" +msgstr "" + +#: tinyutils/tazx:572 msgid "Run tazx as root if you need to configure xorg" msgstr "" @@ -258,14 +313,6 @@ msgid "SliTaz Setup configuration" msgstr "" -#: tinyutils/hwsetup:25 -msgid "command" -msgstr "" - -#: tinyutils/hwsetup:27 tinyutils/frugal:36 -msgid "Commands:" -msgstr "" - #: tinyutils/hwsetup:29 msgid "Print this short usage." msgstr "" @@ -326,6 +373,11 @@ "to SliTaz Bug tracker or Forum." msgstr "" +#: tinyutils/hwsetup:107 +#, sh-format +msgid "Failed to setup $DEVICE" +msgstr "" + #: tinyutils/hwsetup:131 #, sh-format msgid "Would you like to install pkg: $pkg" @@ -358,6 +410,10 @@ msgid "New udev rules are added by a package" msgstr "" +#: tinyutils/hwsetup:258 +msgid "Auto configuring Xorg..." +msgstr "" + #: tinyutils/hwsetup:261 msgid "Configuring Xorg..." msgstr "" @@ -702,6 +758,155 @@ msgid "Unmounting ISO image..." msgstr "" +#: tinyutils/slitaz-config:14 +#, fuzzy +msgid "SliTaz Config" +msgstr "Slitaz språk konfiguration" + +#: tinyutils/slitaz-config:36 +msgid "Post Installation" +msgstr "" + +#: tinyutils/slitaz-config:37 +msgid "Continue" +msgstr "" + +#: tinyutils/slitaz-config:43 +msgid "Root Password" +msgstr "" + +#: tinyutils/slitaz-config:44 +msgid "Enter new password for \\Zb\\Z1root" +msgstr "" + +#: tinyutils/slitaz-config:53 +msgid "Add User" +msgstr "" + +#: tinyutils/slitaz-config:56 +msgid "Enter login name for the new \\Zb\\Z4user" +msgstr "" + +#: tinyutils/slitaz-config:61 +#, sh-format +msgid "Enter password for user \\Zb\\Z4$user" +msgstr "" + +#: tinyutils/slitaz-config:121 +msgid "connected" +msgstr "" + +#: tinyutils/slitaz-config:136 +msgid "Quality" +msgstr "" + +#: tinyutils/slitaz-config:136 +msgid "Key" +msgstr "" + +#: tinyutils/slitaz-config:140 tinyutils/slitaz-config:169 +msgid "hidden.network" +msgstr "" + +#: tinyutils/slitaz-config:140 +msgid "Connect.to.a.hidden.network" +msgstr "" + +#: tinyutils/slitaz-config:156 +msgid "Select" +msgstr "" + +#: tinyutils/slitaz-config:157 +msgid "Connect to a Wi-Fi network" +msgstr "" + +#: tinyutils/slitaz-config:159 +msgid "Connect.to.any.network" +msgstr "" + +#: tinyutils/slitaz-config:170 +msgid "Wi-Fi ESSID" +msgstr "" + +#: tinyutils/slitaz-config:171 +msgid "Enter Wi-Fi access point ESSID (name)" +msgstr "" + +#: tinyutils/slitaz-config:176 tinyutils/slitaz-config:187 +msgid "Wi-Fi Password" +msgstr "" + +#: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 +#, sh-format +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" +msgstr "" + +#: tinyutils/slitaz-config:197 +msgid "Shutting down network interfaces..." +msgstr "" + +#: tinyutils/slitaz-config:201 +msgid "Configuring: /etc/network.conf..." +msgstr "" + +#: tinyutils/slitaz-config:211 +msgid "Restarting Wi-Fi interface..." +msgstr "" + +#: tinyutils/slitaz-config:215 +msgid "Checking connection..." +msgstr "" + +#: tinyutils/slitaz-config:220 +#, sh-format +msgid "IP address: $ip" +msgstr "" + +#: tinyutils/slitaz-config:222 +msgid "Unable to connect..." +msgstr "" + +#: tinyutils/slitaz-config:226 +msgid "Wi-Fi Config" +msgstr "" + +#: tinyutils/slitaz-config:233 +msgid "Exec" +msgstr "" + +#: tinyutils/slitaz-config:235 +#, fuzzy +msgid "System keyboard setting" +msgstr "Slitaz tangentbords layout konfiguration" + +#: tinyutils/slitaz-config:236 +#, fuzzy +msgid "System language setting" +msgstr "Slitaz språk konfiguration" + +#: tinyutils/slitaz-config:237 +msgid "Wi-Fi network settings" +msgstr "" + +#: tinyutils/slitaz-config:238 +msgid "Add a new user" +msgstr "" + +#: tinyutils/slitaz-config:239 +msgid "Change root password" +msgstr "" + +#: tinyutils/slitaz-config:240 +msgid "Set system date from the web" +msgstr "" + +#: tinyutils/slitaz-config:241 +msgid "Exit from SliTaz Config" +msgstr "" + +#~ msgid "Window Manager:" +#~ msgstr "Fönster hanterare:" + #~ msgid "Tazx dialog helps you to configure your Xorg server." #~ msgstr "Tazx dialogen hjälper dig att konfigurera din Xorg server." diff -r a37f6f8dda42 -r eb791cfb71c0 po/slitaz-tools/zh_CN.po --- a/po/slitaz-tools/zh_CN.po Sat Nov 15 06:45:42 2014 +0200 +++ b/po/slitaz-tools/zh_CN.po Thu Nov 20 06:04:24 2014 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-14 21:22+0000\n" +"POT-Creation-Date: 2014-11-20 05:20+0200\n" "PO-Revision-Date: 2014-07-01 18:05+0800\n" "Last-Translator: 张文宇 \n" "Language-Team: \n" @@ -22,8 +22,8 @@ msgid "SliTaz GNU/Linux locale setting using dialog boxes." msgstr "SliTaz GNU / Linux地区设置对话框。" -#: tinyutils/tazlocale:17 tinyutils/decode:30 tinyutils/hwsetup:24 -#: tinyutils/frugal:32 +#: tinyutils/tazlocale:17 tinyutils/tazx:553 tinyutils/decode:30 +#: tinyutils/hwsetup:24 tinyutils/frugal:32 msgid "Usage:" msgstr "用法:" @@ -93,74 +93,134 @@ msgid "Done" msgstr "完成!" -#: tinyutils/tazx:26 -msgid "Window Manager:" -msgstr "" +#: tinyutils/tazx:141 +msgid "Creating:" +msgstr "创建：" -#: tinyutils/tazx:27 tinyutils/tazx:152 +#: tinyutils/tazx:242 msgid "Install Xorg" msgstr "安装Xorg" -#: tinyutils/tazx:63 -msgid "Creating:" -msgstr "创建：" - -#: tinyutils/tazx:153 +#: tinyutils/tazx:243 msgid "Tazx helps you to select your X driver." msgstr "Tazx帮助你选择你的X驱动程序。" -#: tinyutils/tazx:154 tinyutils/hwsetup:258 -msgid "Auto configuring Xorg..." +#: tinyutils/tazx:244 +#, fuzzy +msgid "Auto configuring" msgstr "自动配置Xorg中…" -#: tinyutils/tazx:156 tinyutils/tazx:184 +#: tinyutils/tazx:246 msgid "driver" msgstr "驱动）" -#: tinyutils/tazx:157 +#: tinyutils/tazx:247 tinyutils/slitaz-config:233 msgid "Quit" msgstr "离开" -#: tinyutils/tazx:186 tinyutils/hwsetup:107 -#, sh-format -msgid "Failed to setup $DEVICE" +#: tinyutils/tazx:276 +#, fuzzy +msgid "Failed to setup driver" msgstr "未能设置$DEVICE" -#: tinyutils/tazx:192 tinyutils/hwsetup:117 +#: tinyutils/tazx:276 +msgid "(unknown hardware)" +msgstr "" + +#: tinyutils/tazx:289 tinyutils/hwsetup:117 #, sh-format msgid "Installing pkg: $pkg" msgstr "安装 $pkg包" -#: tinyutils/tazx:202 tinyutils/tazx:276 -#, sh-format -msgid "${INST_i18n}: ${WM_i18n} + applications" +#: tinyutils/tazx:307 tinyutils/tazx:423 +#, fuzzy +msgid "Install Window Manager and applications" +msgstr "扫描仪应用" + +#: tinyutils/tazx:393 tinyutils/tazx:399 +#, fuzzy +msgid "Install" +msgstr "安装Xorg" + +#: tinyutils/tazx:409 +msgid "ON" msgstr "" -#: tinyutils/tazx:270 +#: tinyutils/tazx:410 tinyutils/tazx:441 +msgid "OFF" +msgstr "" + +#: tinyutils/tazx:417 msgid "SliTaz Xorg config" msgstr "SliTaz Xorg配置" -#: tinyutils/tazx:272 +#: tinyutils/tazx:419 msgid "Install or reconfigure Xorg" msgstr "安装或配置Xorg" -#: tinyutils/tazx:273 +#: tinyutils/tazx:420 msgid "Install Xorg server (light version)" msgstr "安装Xorg服务器（简版）" -#: tinyutils/tazx:274 +#: tinyutils/tazx:421 msgid "AutoStart Xorg by SLiM on boot" msgstr "" -#: tinyutils/tazx:275 +#: tinyutils/tazx:422 msgid "(Re)Start Simple Login Manager now" msgstr "" -#: tinyutils/tazx:277 +#: tinyutils/tazx:424 msgid "Quit Tazx utility" msgstr "退出Tazx实用程序" -#: tinyutils/tazx:384 +#: tinyutils/tazx:449 +msgid "Start X on boot:" +msgstr "" + +#: tinyutils/tazx:551 +msgid "configuration tool for SliTaz GNU/Linux" +msgstr "" + +#: tinyutils/tazx:553 tinyutils/hwsetup:25 +msgid "command" +msgstr "命令" + +#: tinyutils/tazx:553 +msgid "parameter" +msgstr "" + +#: tinyutils/tazx:555 tinyutils/hwsetup:27 tinyutils/frugal:36 +msgid "Commands:" +msgstr "命令:" + +#: tinyutils/tazx:556 +#, fuzzy +msgid "Install Xorg and selected Xorg driver" +msgstr "安装Xorg服务器（简版）" + +#: tinyutils/tazx:557 +#, fuzzy +msgid "Configure Xorg, generate configuration files" +msgstr "用途：aticonfig是生成模板的配置文件的实用工具，如果必要的话。" + +#: tinyutils/tazx:558 +msgid "Set monitor default depth (valid parameters: 8, 15, 16 or 24)" +msgstr "" + +#: tinyutils/tazx:559 +msgid "Auto-select and install Xorg driver" +msgstr "" + +#: tinyutils/tazx:560 +msgid "Get files for starting an X session and config the keyboard" +msgstr "" + +#: tinyutils/tazx:561 +msgid "Generate or regenerate Xorg keyboard config" +msgstr "" + +#: tinyutils/tazx:572 msgid "Run tazx as root if you need to configure xorg" msgstr "" @@ -252,14 +312,6 @@ msgid "SliTaz Setup configuration" msgstr "SliTaz安装配置" -#: tinyutils/hwsetup:25 -msgid "command" -msgstr "命令" - -#: tinyutils/hwsetup:27 tinyutils/frugal:36 -msgid "Commands:" -msgstr "命令:" - #: tinyutils/hwsetup:29 msgid "Print this short usage." msgstr "打印简短的使用方法。" @@ -322,6 +374,11 @@ "由于不兼容的硬件故障，这个 $DEVICE 设备没有得到正确的测试。请报告任何成功，失" "败，错误SliTaz bug跟踪或论坛。" +#: tinyutils/hwsetup:107 +#, sh-format +msgid "Failed to setup $DEVICE" +msgstr "未能设置$DEVICE" + #: tinyutils/hwsetup:131 #, sh-format msgid "Would you like to install pkg: $pkg" @@ -354,6 +411,10 @@ msgid "New udev rules are added by a package" msgstr "新的包增加udev规则" +#: tinyutils/hwsetup:258 +msgid "Auto configuring Xorg..." +msgstr "自动配置Xorg中…" + #: tinyutils/hwsetup:261 msgid "Configuring Xorg..." msgstr "配置Xorg中…" @@ -702,3 +763,153 @@ #: tinyutils/frugal:131 msgid "Unmounting ISO image..." msgstr "卸载ISO 映像中..." + +#: tinyutils/slitaz-config:14 +#, fuzzy +msgid "SliTaz Config" +msgstr "SliTaz Xorg配置" + +#: tinyutils/slitaz-config:36 +#, fuzzy +msgid "Post Installation" +msgstr "设置根文件系统（root）安装路径" + +#: tinyutils/slitaz-config:37 +msgid "Continue" +msgstr "" + +#: tinyutils/slitaz-config:43 +#, fuzzy +msgid "Root Password" +msgstr "密码:" + +#: tinyutils/slitaz-config:44 +msgid "Enter new password for \\Zb\\Z1root" +msgstr "" + +#: tinyutils/slitaz-config:53 +msgid "Add User" +msgstr "" + +#: tinyutils/slitaz-config:56 +msgid "Enter login name for the new \\Zb\\Z4user" +msgstr "" + +#: tinyutils/slitaz-config:61 +#, sh-format +msgid "Enter password for user \\Zb\\Z4$user" +msgstr "" + +#: tinyutils/slitaz-config:121 +msgid "connected" +msgstr "" + +#: tinyutils/slitaz-config:136 +msgid "Quality" +msgstr "" + +#: tinyutils/slitaz-config:136 +msgid "Key" +msgstr "" + +#: tinyutils/slitaz-config:140 tinyutils/slitaz-config:169 +msgid "hidden.network" +msgstr "" + +#: tinyutils/slitaz-config:140 +msgid "Connect.to.a.hidden.network" +msgstr "" + +#: tinyutils/slitaz-config:156 +msgid "Select" +msgstr "" + +#: tinyutils/slitaz-config:157 +msgid "Connect to a Wi-Fi network" +msgstr "" + +#: tinyutils/slitaz-config:159 +msgid "Connect.to.any.network" +msgstr "" + +#: tinyutils/slitaz-config:170 +msgid "Wi-Fi ESSID" +msgstr "" + +#: tinyutils/slitaz-config:171 +msgid "Enter Wi-Fi access point ESSID (name)" +msgstr "" + +#: tinyutils/slitaz-config:176 tinyutils/slitaz-config:187 +#, fuzzy +msgid "Wi-Fi Password" +msgstr "密码:" + +#: tinyutils/slitaz-config:177 tinyutils/slitaz-config:188 +#, sh-format +msgid "Enter Wi-Fi key (password) for \\Zb\\Z4$essid" +msgstr "" + +#: tinyutils/slitaz-config:197 +msgid "Shutting down network interfaces..." +msgstr "" + +#: tinyutils/slitaz-config:201 +#, fuzzy +msgid "Configuring: /etc/network.conf..." +msgstr "配置Xorg中…" + +#: tinyutils/slitaz-config:211 +msgid "Restarting Wi-Fi interface..." +msgstr "" + +#: tinyutils/slitaz-config:215 +msgid "Checking connection..." +msgstr "" + +#: tinyutils/slitaz-config:220 +#, sh-format +msgid "IP address: $ip" +msgstr "" + +#: tinyutils/slitaz-config:222 +msgid "Unable to connect..." +msgstr "" + +#: tinyutils/slitaz-config:226 +msgid "Wi-Fi Config" +msgstr "" + +#: tinyutils/slitaz-config:233 +msgid "Exec" +msgstr "" + +#: tinyutils/slitaz-config:235 +#, fuzzy +msgid "System keyboard setting" +msgstr "SliTaz键盘设置" + +#: tinyutils/slitaz-config:236 +#, fuzzy +msgid "System language setting" +msgstr "SliTaz语言设置" + +#: tinyutils/slitaz-config:237 +msgid "Wi-Fi network settings" +msgstr "" + +#: tinyutils/slitaz-config:238 +msgid "Add a new user" +msgstr "" + +#: tinyutils/slitaz-config:239 +msgid "Change root password" +msgstr "" + +#: tinyutils/slitaz-config:240 +msgid "Set system date from the web" +msgstr "" + +#: tinyutils/slitaz-config:241 +msgid "Exit from SliTaz Config" +msgstr "" diff -r a37f6f8dda42 -r eb791cfb71c0 po/tazbox/el.po --- a/po/tazbox/el.po Sat Nov 15 06:45:42 2014 +0200 +++ b/po/tazbox/el.po Thu Nov 20 06:04:24 2014 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-23 03:33+0300\n" +"POT-Creation-Date: 2014-11-18 20:10+0200\n" "PO-Revision-Date: 2012-11-23 11:30+0200\n" "Last-Translator: Constantine Mousafiris \n" "Language-Team: Kostis Mousafiris\n" @@ -344,34 +344,34 @@ msgid "All Applications" msgstr "Όλες οι εφαρμογές" -#: tazbox/tazbox:604 +#: tazbox/tazbox:593 msgid "Downloading..." msgstr "" -#: tazbox/tazbox:660 +#: tazbox/tazbox:642 msgid "SliTaz default applications" msgstr "" -#: tazbox/tazbox:662 +#: tazbox/tazbox:644 msgid "SliTaz default applications configuration" msgstr "" -#: tazbox/tazbox:664 +#: tazbox/tazbox:646 msgid "File manager:" msgstr "" -#: tazbox/tazbox:665 +#: tazbox/tazbox:647 msgid "Web browser:" msgstr "" -#: tazbox/tazbox:666 +#: tazbox/tazbox:648 msgid "Text editor:" msgstr "" -#: tazbox/tazbox:667 +#: tazbox/tazbox:649 msgid "Terminal:" msgstr "" -#: tazbox/tazbox:668 +#: tazbox/tazbox:650 msgid "Window manager:" msgstr "" diff -r a37f6f8dda42 -r eb791cfb71c0 po/tazbox/es.po --- a/po/tazbox/es.po Sat Nov 15 06:45:42 2014 +0200 +++ b/po/tazbox/es.po Thu Nov 20 06:04:24 2014 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-23 03:33+0300\n" +"POT-Creation-Date: 2014-11-18 20:10+0200\n" "PO-Revision-Date: 2011-08-11 00:21-0300\n" "Last-Translator: Lucas Gioia \n" "Language-Team: \n" @@ -343,34 +343,34 @@ msgid "All Applications" msgstr "Todas las aplicaciónes" -#: tazbox/tazbox:604 +#: tazbox/tazbox:593 msgid "Downloading..." msgstr "" -#: tazbox/tazbox:660 +#: tazbox/tazbox:642 msgid "SliTaz default applications" msgstr "" -#: tazbox/tazbox:662 +#: tazbox/tazbox:644 msgid "SliTaz default applications configuration" msgstr "" -#: tazbox/tazbox:664 +#: tazbox/tazbox:646 msgid "File manager:" msgstr "" -#: tazbox/tazbox:665 +#: tazbox/tazbox:647 msgid "Web browser:" msgstr "" -#: tazbox/tazbox:666 +#: tazbox/tazbox:648 msgid "Text editor:" msgstr "" -#: tazbox/tazbox:667 +#: tazbox/tazbox:649 msgid "Terminal:" msgstr "" -#: tazbox/tazbox:668 +#: tazbox/tazbox:650 msgid "Window manager:" msgstr "" diff -r a37f6f8dda42 -r eb791cfb71c0 po/tazbox/fa.po --- a/po/tazbox/fa.po Sat Nov 15 06:45:42 2014 +0200 +++ b/po/tazbox/fa.po Thu Nov 20 06:04:24 2014 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-23 03:33+0300\n" +"POT-Creation-Date: 2014-11-18 20:10+0200\n" "PO-Revision-Date: 2014-06-26 19:26+0400\n" "Last-Translator: Ali Rashidi \n" "Language-Team: LANGUAGE \n" @@ -345,34 +345,34 @@ msgid "All Applications" msgstr "همه برنامه ها" -#: tazbox/tazbox:604 +#: tazbox/tazbox:593 msgid "Downloading..." msgstr "...در حال دانلود" -#: tazbox/tazbox:660 +#: tazbox/tazbox:642 msgid "SliTaz default applications" msgstr "SliTaz برنامه های پیشفرض" -#: tazbox/tazbox:662 +#: tazbox/tazbox:644 msgid "SliTaz default applications configuration" msgstr "SliTaz پیکربندی برنامه های پیشفرض" -#: tazbox/tazbox:664 +#: tazbox/tazbox:646 msgid "File manager:" msgstr ":مدیر فایل" -#: tazbox/tazbox:665 +#: tazbox/tazbox:647 msgid "Web browser:" msgstr ":مرورگر وب" -#: tazbox/tazbox:666 +#: tazbox/tazbox:648 msgid "Text editor:" msgstr ":ویرایشگر متن" -#: tazbox/tazbox:667 +#: tazbox/tazbox:649 msgid "Terminal:" msgstr ":ترمینال" -#: tazbox/tazbox:668 +#: tazbox/tazbox:650 msgid "Window manager:" msgstr ":مدیر پنجره" diff -r a37f6f8dda42 -r eb791cfb71c0 po/tazbox/fr.po --- a/po/tazbox/fr.po Sat Nov 15 06:45:42 2014 +0200 +++ b/po/tazbox/fr.po Thu Nov 20 06:04:24 2014 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-23 03:33+0300\n" +"POT-Creation-Date: 2014-11-18 20:10+0200\n" "PO-Revision-Date: 2012-03-24 14:36+0100\n" "Last-Translator: Christophe Lincoln \n" "Language-Team: French\n" @@ -226,7 +226,9 @@ #: tazbox/tazbox:276 msgid "Select country and press \"Forward\" or manually select timezone file." -msgstr "Choisissez le pays et pressez \"suivant\" ou choissez un fichier de zone horaire." +msgstr "" +"Choisissez le pays et pressez \"suivant\" ou choissez un fichier de zone " +"horaire." #: tazbox/tazbox:277 msgid "Tip: manage timezones list by installing/removing locale packages." @@ -271,7 +273,8 @@ #: tazbox/tazbox:439 msgid "Check only locale packages you need and press \"Install/Remove\"." -msgstr "Sélectionnez seulement les paquets nécéssaires et pressez \"Ajoute/Retire\"." +msgstr "" +"Sélectionnez seulement les paquets nécéssaires et pressez \"Ajoute/Retire\"." #: tazbox/tazbox:441 msgid "Inst." @@ -343,34 +346,34 @@ msgid "All Applications" msgstr "Toutes les applications" -#: tazbox/tazbox:604 +#: tazbox/tazbox:593 msgid "Downloading..." msgstr "Télécharge..." -#: tazbox/tazbox:660 +#: tazbox/tazbox:642 msgid "SliTaz default applications" msgstr "Applications SliTaz par défaut" -#: tazbox/tazbox:662 +#: tazbox/tazbox:644 msgid "SliTaz default applications configuration" msgstr "Configuration des applications SliTaz par défaut" -#: tazbox/tazbox:664 +#: tazbox/tazbox:646 msgid "File manager:" msgstr "Gestionnaire de fichiers :" -#: tazbox/tazbox:665 +#: tazbox/tazbox:647 msgid "Web browser:" msgstr "Navigateur WEB :" -#: tazbox/tazbox:666 +#: tazbox/tazbox:648 msgid "Text editor:" msgstr "Editeur de textes :" -#: tazbox/tazbox:667 +#: tazbox/tazbox:649 msgid "Terminal:" msgstr "Terminal :" -#: tazbox/tazbox:668 +#: tazbox/tazbox:650 msgid "Window manager:" msgstr "Gestionnaire de fenêtres :" diff -r a37f6f8dda42 -r eb791cfb71c0 po/tazbox/pl.po --- a/po/tazbox/pl.po Sat Nov 15 06:45:42 2014 +0200 +++ b/po/tazbox/pl.po Thu Nov 20 06:04:24 2014 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-23 03:33+0300\n" +"POT-Creation-Date: 2014-11-18 20:10+0200\n" "PO-Revision-Date: 2013-07-23 12:35+0100\n" "Last-Translator: Paweł Pyrczak \n" "Language-Team: Paweł Pyrczak \n" @@ -345,34 +345,34 @@ msgid "All Applications" msgstr "Wszystkie aplikacje" -#: tazbox/tazbox:604 +#: tazbox/tazbox:593 msgid "Downloading..." msgstr "" -#: tazbox/tazbox:660 +#: tazbox/tazbox:642 msgid "SliTaz default applications" msgstr "Domyślne aplikacjie SliTaz" -#: tazbox/tazbox:662 +#: tazbox/tazbox:644 msgid "SliTaz default applications configuration" msgstr "Domyślna konfiguracja aplikacji SliTaz" -#: tazbox/tazbox:664 +#: tazbox/tazbox:646 msgid "File manager:" msgstr "Menadżer plików:" -#: tazbox/tazbox:665 +#: tazbox/tazbox:647 msgid "Web browser:" msgstr "Przeglądarka internetowa:" -#: tazbox/tazbox:666 +#: tazbox/tazbox:648 msgid "Text editor:" msgstr "Edytor textowy:" -#: tazbox/tazbox:667 +#: tazbox/tazbox:649 msgid "Terminal:" msgstr "Terminal:" -#: tazbox/tazbox:668 +#: tazbox/tazbox:650 msgid "Window manager:" msgstr "Menadżer okien:" diff -r a37f6f8dda42 -r eb791cfb71c0 po/tazbox/pt_BR.po --- a/po/tazbox/pt_BR.po Sat Nov 15 06:45:42 2014 +0200 +++ b/po/tazbox/pt_BR.po Thu Nov 20 06:04:24 2014 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: tazbox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-23 03:33+0300\n" +"POT-Creation-Date: 2014-11-18 20:10+0200\n" "PO-Revision-Date: 2014-03-06 22:12-0300\n" "Last-Translator: Claudinei Pereira \n" "Language-Team: Brazilian Portuguese \n" @@ -170,7 +170,8 @@ #: tazbox/tazbox:170 msgid "Tip: manage locales list by installing/removing locale packages." -msgstr "Dica: gerencie a lista de locales instalando ou removendo pacotes de locales." +msgstr "" +"Dica: gerencie a lista de locales instalando ou removendo pacotes de locales." #: tazbox/tazbox:171 tazbox/tazbox:279 msgid "Flag" @@ -230,8 +231,8 @@ #: tazbox/tazbox:277 msgid "Tip: manage timezones list by installing/removing locale packages." msgstr "" -"Dica: gerencie a lista de zonas horárias instalando ou removendo " -"pacotes de locale." +"Dica: gerencie a lista de zonas horárias instalando ou removendo pacotes de " +"locale." #: tazbox/tazbox:279 msgid "Code" @@ -273,8 +274,8 @@ #: tazbox/tazbox:439 msgid "Check only locale packages you need and press \"Install/Remove\"." msgstr "" -"Verifique somente os locales que você necessita clique " -"em \"Instalar/Remover\"." +"Verifique somente os locales que você necessita clique em \"Instalar/Remover" +"\"." #: tazbox/tazbox:441 msgid "Inst." @@ -346,35 +347,35 @@ msgid "All Applications" msgstr "Todos os aplicativos" -#: tazbox/tazbox:604 +#: tazbox/tazbox:593 msgid "Downloading..." msgstr "Baixando..." -#: tazbox/tazbox:660 +#: tazbox/tazbox:642 msgid "SliTaz default applications" msgstr "Aplicativos padrão do SliTaz" -#: tazbox/tazbox:662 +#: tazbox/tazbox:644 msgid "SliTaz default applications configuration" msgstr "Configuração dos aplicativos padrão do SliTaz" -#: tazbox/tazbox:664 +#: tazbox/tazbox:646 msgid "File manager:" msgstr "Gerenciador de arquivos:" -#: tazbox/tazbox:665 +#: tazbox/tazbox:647 msgid "Web browser:" msgstr "Navegador web:" -#: tazbox/tazbox:666 +#: tazbox/tazbox:648 msgid "Text editor:" msgstr "Editor de texto:" -#: tazbox/tazbox:667 +#: tazbox/tazbox:649 msgid "Terminal:" msgstr "Terminal:" -#: tazbox/tazbox:668 +#: tazbox/tazbox:650 msgid "Window manager:" msgstr "Gerenciador de janelas:" diff -r a37f6f8dda42 -r eb791cfb71c0 po/tazbox/ru.po --- a/po/tazbox/ru.po Sat Nov 15 06:45:42 2014 +0200 +++ b/po/tazbox/ru.po Thu Nov 20 06:04:24 2014 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-23 03:33+0300\n" +"POT-Creation-Date: 2014-11-18 20:10+0200\n" "PO-Revision-Date: 2014-05-23 03:34+0300\n" "Last-Translator: Aleksej Bobylev \n" "Language-Team: \n" @@ -17,7 +17,8 @@ "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Russian\n" "X-Poedit-Basepath: ../../\n" -"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" +"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" "X-Language: ru\n" "X-Source-Language: en\n" "X-Poedit-SearchPath-0: .\n" @@ -72,7 +73,8 @@ #: tazbox/tazbox:43 msgid "System initial setup (locale, keymap & timezone)" -msgstr "Начальные установки системы (локаль, раскладка клавиатуры и часовой пояс)" +msgstr "" +"Начальные установки системы (локаль, раскладка клавиатуры и часовой пояс)" #: tazbox/tazbox:44 msgid "Create a new file or folder on the desktop" @@ -148,18 +150,16 @@ #: tazbox/tazbox:137 msgid "" -"Here you can set your preferences \\n" -" for locale, keymap and timezone." +"Here you can set your preferences \\n for locale, keymap and timezone." msgstr "" -"Здесь вы можете установить\\n" -"локаль, раскладку клавиатуры и часовой пояс." +"Здесь вы можете установить\\nлокаль, раскладку клавиатуры и часовой пояс." #: tazbox/tazbox:139 msgid "Locale" msgstr "Локаль" -#: tazbox/tazbox:140 -#: tazbox/tazbox:206 +#: tazbox/tazbox:140 tazbox/tazbox:206 msgid "Keymap" msgstr "Раскладка" @@ -177,10 +177,11 @@ #: tazbox/tazbox:170 msgid "Tip: manage locales list by installing/removing locale packages." -msgstr "Подсказка: вы можете управлять списком локалей, устанавливая и удаляя пакеты локалей." +msgstr "" +"Подсказка: вы можете управлять списком локалей, устанавливая и удаляя пакеты " +"локалей." -#: tazbox/tazbox:171 -#: tazbox/tazbox:279 +#: tazbox/tazbox:171 tazbox/tazbox:279 msgid "Flag" msgstr "флаг" @@ -188,13 +189,11 @@ msgid "Name" msgstr "Название" -#: tazbox/tazbox:172 -#: tazbox/tazbox:442 +#: tazbox/tazbox:172 tazbox/tazbox:442 msgid "Description" msgstr "Описание" -#: tazbox/tazbox:174 -#: tazbox/tazbox:280 +#: tazbox/tazbox:174 tazbox/tazbox:280 msgid "Manage" msgstr "Пакеты" @@ -215,10 +214,7 @@ msgid "Type" msgstr "Тип" -#: tazbox/tazbox:244 -#: tazbox/tazbox:272 -#: tazbox/tazbox:288 -#: tazbox/tazbox:301 +#: tazbox/tazbox:244 tazbox/tazbox:272 tazbox/tazbox:288 tazbox/tazbox:301 msgid "SliTaz TZ" msgstr "Часовой пояс SliTaz" @@ -230,19 +226,20 @@ msgid "Are you agreed?" msgstr "Вы согласны?" -#: tazbox/tazbox:275 -#: tazbox/tazbox:291 -#: tazbox/tazbox:304 +#: tazbox/tazbox:275 tazbox/tazbox:291 tazbox/tazbox:304 msgid "TimeZone Configuration" msgstr "Настройка часового пояса" #: tazbox/tazbox:276 msgid "Select country and press \"Forward\" or manually select timezone file." -msgstr "Выберите страну и нажмите «Вперёд» или вручную выберите файл часового пояса." +msgstr "" +"Выберите страну и нажмите «Вперёд» или вручную выберите файл часового пояса." #: tazbox/tazbox:277 msgid "Tip: manage timezones list by installing/removing locale packages." -msgstr "Подсказка: вы можете управлять списком часовых поясов, устанавливая и удаляя пакеты локалей." +msgstr "" +"Подсказка: вы можете управлять списком часовых поясов, устанавливая и удаляя " +"пакеты локалей." #: tazbox/tazbox:279 msgid "Code" @@ -283,7 +280,8 @@ #: tazbox/tazbox:439 msgid "Check only locale packages you need and press \"Install/Remove\"." -msgstr "Отметьте только пакеты с нужными вам локалями и нажмите «Установить/удалить»." +msgstr "" +"Отметьте только пакеты с нужными вам локалями и нажмите «Установить/удалить»." #: tazbox/tazbox:441 msgid "Inst." @@ -355,35 +353,34 @@ msgid "All Applications" msgstr "Все приложения" -#: tazbox/tazbox:604 +#: tazbox/tazbox:593 msgid "Downloading..." msgstr "Загрузка…" -#: tazbox/tazbox:660 +#: tazbox/tazbox:642 msgid "SliTaz default applications" msgstr "Избранные приложения SliTaz" -#: tazbox/tazbox:662 +#: tazbox/tazbox:644 msgid "SliTaz default applications configuration" msgstr "Настройка избранных приложений SliTaz" -#: tazbox/tazbox:664 +#: tazbox/tazbox:646 msgid "File manager:" msgstr "Файловый менеджер:" -#: tazbox/tazbox:665 +#: tazbox/tazbox:647 msgid "Web browser:" msgstr "Браузер:" -#: tazbox/tazbox:666 +#: tazbox/tazbox:648 msgid "Text editor:" msgstr "Текстовый редактор:" -#: tazbox/tazbox:667 +#: tazbox/tazbox:649 msgid "Terminal:" msgstr "Терминал:" -#: tazbox/tazbox:668 +#: tazbox/tazbox:650 msgid "Window manager:" msgstr "Оконный менеджер:" - diff -r a37f6f8dda42 -r eb791cfb71c0 po/tazbox/sv.po --- a/po/tazbox/sv.po Sat Nov 15 06:45:42 2014 +0200 +++ b/po/tazbox/sv.po Thu Nov 20 06:04:24 2014 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-23 03:33+0300\n" +"POT-Creation-Date: 2014-11-18 20:10+0200\n" "PO-Revision-Date: 2012-07-12 13:14-0000\n" "Last-Translator: Emil Eklund \n" "Language-Team: Swedish\n" @@ -341,34 +341,34 @@ msgid "All Applications" msgstr "Alla Applikationer" -#: tazbox/tazbox:604 +#: tazbox/tazbox:593 msgid "Downloading..." msgstr "" -#: tazbox/tazbox:660 +#: tazbox/tazbox:642 msgid "SliTaz default applications" msgstr "" -#: tazbox/tazbox:662 +#: tazbox/tazbox:644 msgid "SliTaz default applications configuration" msgstr "" -#: tazbox/tazbox:664 +#: tazbox/tazbox:646 msgid "File manager:" msgstr "" -#: tazbox/tazbox:665 +#: tazbox/tazbox:647 msgid "Web browser:" msgstr "" -#: tazbox/tazbox:666 +#: tazbox/tazbox:648 msgid "Text editor:" msgstr "" -#: tazbox/tazbox:667 +#: tazbox/tazbox:649 msgid "Terminal:" msgstr "" -#: tazbox/tazbox:668 +#: tazbox/tazbox:650 msgid "Window manager:" msgstr "" diff -r a37f6f8dda42 -r eb791cfb71c0 po/tazbox/tazbox.pot --- a/po/tazbox/tazbox.pot Sat Nov 15 06:45:42 2014 +0200 +++ b/po/tazbox/tazbox.pot Thu Nov 20 06:04:24 2014 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-23 03:33+0300\n" +"POT-Creation-Date: 2014-11-20 05:38+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -338,34 +338,34 @@ msgid "All Applications" msgstr "" -#: tazbox/tazbox:604 +#: tazbox/tazbox:593 msgid "Downloading..." msgstr "" -#: tazbox/tazbox:660 +#: tazbox/tazbox:642 msgid "SliTaz default applications" msgstr "" -#: tazbox/tazbox:662 +#: tazbox/tazbox:644 msgid "SliTaz default applications configuration" msgstr "" -#: tazbox/tazbox:664 +#: tazbox/tazbox:646 msgid "File manager:" msgstr "" -#: tazbox/tazbox:665 +#: tazbox/tazbox:647 msgid "Web browser:" msgstr "" -#: tazbox/tazbox:666 +#: tazbox/tazbox:648 msgid "Text editor:" msgstr "" -#: tazbox/tazbox:667 +#: tazbox/tazbox:649 msgid "Terminal:" msgstr "" -#: tazbox/tazbox:668 +#: tazbox/tazbox:650 msgid "Window manager:" msgstr "" diff -r a37f6f8dda42 -r eb791cfb71c0 po/tazbox/zh_CN.po --- a/po/tazbox/zh_CN.po Sat Nov 15 06:45:42 2014 +0200 +++ b/po/tazbox/zh_CN.po Thu Nov 20 06:04:24 2014 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-08 02:35+0800\n" +"POT-Creation-Date: 2014-11-18 20:10+0200\n" "PO-Revision-Date: 2014-06-26 15:06+0800\n" "Last-Translator: 张文宇 \n" "Language-Team: 张文宇 \n" @@ -339,34 +339,34 @@ msgid "All Applications" msgstr "所有程式" -#: tazbox/tazbox:604 +#: tazbox/tazbox:593 msgid "Downloading..." msgstr "正在下载..." -#: tazbox/tazbox:660 +#: tazbox/tazbox:642 msgid "SliTaz default applications" msgstr "SliTaz 预设应用程式" -#: tazbox/tazbox:662 +#: tazbox/tazbox:644 msgid "SliTaz default applications configuration" msgstr "SliTaz 预设应用程式配置" -#: tazbox/tazbox:664 +#: tazbox/tazbox:646 msgid "File manager:" msgstr "文件管理器" -#: tazbox/tazbox:665 +#: tazbox/tazbox:647 msgid "Web browser:" msgstr "网页瀏览器:" -#: tazbox/tazbox:666 +#: tazbox/tazbox:648 msgid "Text editor:" msgstr "文字编辑器:" -#: tazbox/tazbox:667 +#: tazbox/tazbox:649 msgid "Terminal:" msgstr "终端:" -#: tazbox/tazbox:668 +#: tazbox/tazbox:650 msgid "Window manager:" msgstr "窗口管理员" diff -r a37f6f8dda42 -r eb791cfb71c0 po/tazbox/zh_TW.po --- a/po/tazbox/zh_TW.po Sat Nov 15 06:45:42 2014 +0200 +++ b/po/tazbox/zh_TW.po Thu Nov 20 06:04:24 2014 +0200 @@ -7,14 +7,15 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-08 02:35+0800\n" +"POT-Creation-Date: 2014-11-18 20:10+0200\n" "PO-Revision-Date: 2014-06-08 02:35+0800\n" -"Last-Translator: \n\n" +"Last-Translator: \n" "Language-Team: \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"\n" #: tazbox/tazbox:28 msgid "SliTaz tiny GUI boxes for the desktop" @@ -143,8 +144,7 @@ #: tazbox/tazbox:137 msgid "" "Here you can set your preferences \\n for locale, keymap and timezone." -msgstr "" -"你可以在這裏設定 \\n locale,鍵映射及時區的偏好." +msgstr "你可以在這裏設定 \\n locale,鍵映射及時區的偏好." #: tazbox/tazbox:139 msgid "Locale" @@ -338,34 +338,34 @@ msgid "All Applications" msgstr "所有程式" -#: tazbox/tazbox:604 +#: tazbox/tazbox:593 msgid "Downloading..." msgstr "正在下載..." -#: tazbox/tazbox:660 +#: tazbox/tazbox:642 msgid "SliTaz default applications" msgstr "SliTaz 預設應用程式" -#: tazbox/tazbox:662 +#: tazbox/tazbox:644 msgid "SliTaz default applications configuration" msgstr "SliTaz 預設應用程式配置" -#: tazbox/tazbox:664 +#: tazbox/tazbox:646 msgid "File manager:" msgstr "文件管理器" -#: tazbox/tazbox:665 +#: tazbox/tazbox:647 msgid "Web browser:" msgstr "網頁瀏覽器:" -#: tazbox/tazbox:666 +#: tazbox/tazbox:648 msgid "Text editor:" msgstr "文字編輯器:" -#: tazbox/tazbox:667 +#: tazbox/tazbox:649 msgid "Terminal:" msgstr "終端:" -#: tazbox/tazbox:668 +#: tazbox/tazbox:650 msgid "Window manager:" msgstr "窗口管理員" diff -r a37f6f8dda42 -r eb791cfb71c0 po/tazdrop/tazdrop.pot --- a/po/tazdrop/tazdrop.pot Sat Nov 15 06:45:42 2014 +0200 +++ b/po/tazdrop/tazdrop.pot Thu Nov 20 06:04:24 2014 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: TazDrop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-23 03:33+0300\n" +"POT-Creation-Date: 2014-11-20 05:38+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -r a37f6f8dda42 -r eb791cfb71c0 tinyutils/browser --- a/tinyutils/browser Sat Nov 15 06:45:42 2014 +0200 +++ b/tinyutils/browser Thu Nov 20 06:04:24 2014 +0200 @@ -3,24 +3,27 @@ # . /etc/slitaz/applications.conf -USER_CONFIG="$HOME/.config/slitaz/applications.conf" +USER_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/slitaz/applications.conf" [ -f $USER_CONFIG ] && . $USER_CONFIG EXEC="exec setsid $BROWSER" -if [ ! -z $XAUTHORITY ]; then - EXECT="terminal -e $BROWSER"; - case $BROWSER in links) EXECT="$EXEC -g" ;; esac +if [ -z "$XAUTHORITY" ]; then + # console session + EXECT="$BROWSER" else - EXECT="$BROWSER"; + # Xorg session + case $BROWSER in + links) EXECT="$EXEC -g" ;; + *) EXECT="terminal -e $BROWSER" ;; + esac fi case $BROWSER in - *links*|retawq|lynx) - $EXECT $@ ;; - w3m) $EXECT -N $@ ;; - qupzil*)$EXEC -ow $@ ;; - *) $EXEC $@ ;; + *links*|retawq|lynx) $EXECT $@ ;; + w3m) $EXECT -N $@ ;; + qupzil*) $EXEC -ow $@ ;; + *) $EXEC $@ ;; esac exit 0 diff -r a37f6f8dda42 -r eb791cfb71c0 tinyutils/editor --- a/tinyutils/editor Sat Nov 15 06:45:42 2014 +0200 +++ b/tinyutils/editor Thu Nov 20 06:04:24 2014 +0200 @@ -3,17 +3,20 @@ # . /etc/slitaz/applications.conf -USER_CONFIG="$HOME/.config/slitaz/applications.conf" +USER_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/slitaz/applications.conf" [ -f $USER_CONFIG ] && . $USER_CONFIG -if [ ! -z $XAUTHORITY ]; then - EXEC="terminal -e $EDITOR"; -else EXEC="$EDITOR"; +if [ -z "$XAUTHORITY" ]; then + # console session + EXEC="$EDITOR" +else + # Xorg session + EXEC="terminal -e $EDITOR" fi case $EDITOR in emacs|joe|jed|ht|le|nano|vi*) $EXEC $@ ;; - mcedit) $EXEC -a -S nicedark $@ ;; + mcedit) $EXEC -a -S nicedark $@ ;; *) exec setsid $EDITOR $@ ;; esac diff -r a37f6f8dda42 -r eb791cfb71c0 tinyutils/file-manager --- a/tinyutils/file-manager Sat Nov 15 06:45:42 2014 +0200 +++ b/tinyutils/file-manager Thu Nov 20 06:04:24 2014 +0200 @@ -3,18 +3,21 @@ # . /etc/slitaz/applications.conf -USER_CONFIG="$HOME/.config/slitaz/applications.conf" +USER_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/slitaz/applications.conf" [ -f $USER_CONFIG ] && . $USER_CONFIG -if [ ! -z $XAUTHORITY ]; then - EXEC="terminal -e $FILE_MANAGER" ; -else EXEC="$FILE_MANAGER" ; +if [ -z "$XAUTHORITY" ]; then + # console session + EXEC="$FILE_MANAGER" +else + # Xorg session + EXEC="terminal -e $FILE_MANAGER" fi case $FILE_MANAGER in - clex) $EXEC ;; - ytree) $EXEC $@ ;; - mc) $EXEC -S gotar -d $@ ;; + clex) $EXEC ;; + ytree) $EXEC $@ ;; + mc) $EXEC -S gotar -d $@ ;; *) exec setsid $FILE_MANAGER $@ ;; esac diff -r a37f6f8dda42 -r eb791cfb71c0 tinyutils/slitaz-config --- a/tinyutils/slitaz-config Sat Nov 15 06:45:42 2014 +0200 +++ b/tinyutils/slitaz-config Thu Nov 20 06:04:24 2014 +0200 @@ -7,9 +7,11 @@ # Author: Christophe Lincoln # . /lib/libtaz.sh +export TEXTDOMAIN='slitaz-tools' #i18n + check_root -title="{ SliTaz Config }" +title="{ $(_ 'SliTaz Config') }" about="/usr/share/doc/slitaz/post-install.txt" tmpdir="/tmp/$(basename $0)" tmp="$tmpdir/$$" @@ -17,7 +19,12 @@ width="72" # Use a tmp directory -mkdir -p ${tmpdir} +mkdir -p $tmpdir + +quit() { + rm -rf $tmpdir; exit 0 +} + # # GUI Functions @@ -26,45 +33,48 @@ # Coded for the ARM first boot settings about_post_install() { dialog --cr-wrap \ - --title "{ Post Installation }" \ - --exit-label "Continue" \ - --textbox "$about" ${height} ${width} + --title "{ $(_ 'Post Installation') }" \ + --exit-label "$(_ 'Continue')" \ + --textbox "$about" $height $width } # Set root passwd root_passwd() { - dialog --title "{ Root Password }" --colors \ - --inputbox "\nEnter new password for \Zb\Z1root" \ - 12 ${width} 2>${tmp} - passwd=$(cat $tmp) - [ "$passwd" == "" ] && return 0 - echo "root:$passwd" | chpasswd --md5 >/dev/null + dialog --title "{ $(_ 'Root Password') }" --colors \ + --inputbox "\n$(_ 'Enter new password for \Zb\Z1root')" \ + 12 $width 2>$tmp + passwd=$(cat $tmp) + [ -z "$passwd" ] && return 0 + echo "root:$passwd" | chpasswd --md5 >/dev/null } # Add a new user add_user() { - title="{ Add User }" - dialog --title "$title" --colors \ - --inputbox "\nEnter login name for the new \Zb\Z4user" 12 ${width} 2>${tmp} + title2="{ $(_ 'Add User') }" + + dialog --title "$title2" --colors \ + --inputbox "\n$(_ 'Enter login name for the new \Zb\Z4user')" 12 $width 2>$tmp user=$(cat $tmp) - [ "$user" == "" ] && return 0 - dialog --title "$title" --colors \ - --inputbox "\nEnter password for user \Zb\Z4${user}" 12 ${width} 2>${tmp} + [ -z "$user" ] && return 0 + + dialog --title "$title2" --colors \ + --inputbox "\n$(_ 'Enter password for user \Zb\Z4$user')" 12 $width 2>$tmp passwd=$(cat $tmp) - [ "$passwd" == "" ] && return 0 - adduser -D -g "SliTaz User" -G users ${user} - echo "$user:$passwd" | chpasswd --md5 >/dev/null - - # User groups - for group in audio cdrom video tty; do - addgroup ${user} ${group} >/dev/null + [ -z "$passwd" ] && return 0 + + adduser -D -g "SliTaz User" -G users $user + echo "$user:$passwd" | chpasswd --md5 >/dev/null + + # User groups + for group in audio cdrom video tty; do + addgroup $user $group >/dev/null done - + # Make sure system-wide applications.conf is used - config="/home/${user}/.config" - mkdir -p ${config}/slitaz - cp -f /etc/slitaz/applications.conf ${config}/slitaz - + config="/home/$user/.config" + mkdir -p $config/slitaz + cp -f /etc/slitaz/applications.conf $config/slitaz + # Slim default user on post-install if [ -f "/etc/slim.conf" ] && [ ! -f "/var/lib/slitaz/post-install" ]; then sed -i s"/default_user .*/default_user $user/" /etc/slim.conf @@ -72,101 +82,124 @@ } set_date() { - clear && newline - echo -n "Old date:"; date + clear; newline + echo "Old date: $(date)" rdate -s tick.greyware.com 2>/dev/null - echo -n "New date:"; date + echo "New date: $(date)" sleep 4 } -# Catch ESSIDs and format output for Ncurses Dialog or GTK Yad tree. -# We get the list of networks by Cell and without spaces. +# Catch ESSIDs and format output for Ncurses Dialog or GTK Yad tree. +# We get the list of networks by Cell and without spaces. # Usage: detect_wifi --output=gtk (default output to dialog) detect_wifi() { . /etc/network.conf ifconfig $WIFI_INTERFACE up + if [ -d /sys/class/net/$WIFI_INTERFACE/wireless ]; then - for i in $(iwlist $WIFI_INTERFACE scan | sed s/"Cell "/Cell-/ | grep "Cell-" | awk '{print $1}') - do + IFS=$'\n'; hidden='' + for i in $(iwlist $WIFI_INTERFACE scan | grep -Eo 'Cell [0-9]*'); do scan=$(iwlist $WIFI_INTERFACE scan last | \ awk '/(Cell|ESS|Qual|Encry|IE: WPA|WPA2)/ {print}' | \ - sed s/"Cell "/Cell-/ | grep -A 5 "$i") + sed "/$i/,/Cell/ !d") + essid=$(echo $scan | cut -d '"' -f 2) - if echo "$scan" | grep -q Quality; then - quality=$(echo $scan | sed 's/.*Quality=\([^ ]*\).*/\1/' | sed 's/.*Quality:\([^ ]*\).*/\1/') - else - quality="$(_n '-----')" - fi + quality=$(echo $scan | grep -Eo 'Quality[:=][^ ]*' | tr -cd '0-9/') + [ -z "$quality" ] && quality='-----' - crypto=$(echo $scan | sed 's/.*key:\([^ ]*\).*/\1/') + crypto="$(echo $scan | sed 's/.*key:\([^ ]*\).*/\1/')" + # Check encryption type if echo "$scan" | grep -q WPA*; then crypto="WPA" fi # Connected or not connected... - if ifconfig | grep -A 1 $WIFI_INTERFACE | \ - grep -q inet && iwconfig $WIFI_INTERFACE | \ - grep ESSID | grep -q -w "$essid"; then - status=connected + if ifconfig | grep -A1 $WIFI_INTERFACE | grep -qF 'inet' && \ + iwconfig $WIFI_INTERFACE | grep ESSID | grep -qwF "$essid"; then + status="..$(_ 'connected')" else - status="--" + status='' fi - + # Output - case "$output" in - gtk) - echo -e "$( _n 'any')\n$(_n 'N/A')\n$(_n 'none')\n$(_n '-')" - echo -e "$essid\n$quality\n$crypto\n$status" ;; - *) - echo "$essid" "QA_${quality}_KEY_${crypto}_${status}" ;; - esac + if [ -z "$essid" ]; then + hidden='yes' + else + case "$output" in + gtk) + #echo -e "$(_n 'any')\n$(_n 'N/A')\n$(_n 'none')\n$(_n '-')" + echo -e "$essid\n$quality\n$crypto\n$status" ;; + *) + echo "$essid" + echo "$(_ 'Quality'):${quality}..$(_ 'Key'):${crypto}${status}" ;; + esac + fi done + [ -n "$hidden" ] && echo "$(_ 'hidden.network')" "$(_ 'Connect.to.a.hidden.network')" fi } -# Wireless config so users dont have to edit any config files on post +# Show message and percentage on the dialog gauge +msg() { + sleep 1; echo -e "XXX\n$1\n$MSG\nXXX" +} + +# Wireless config so users don't have to edit any config files on post # install to get connected. If the wired connection is used it will auto # connect with DHCP so no need for a dialog frontend. wifi_setup() { . /etc/network.conf dialog \ --clear --title "$title" \ - --ok-label "Select" \ - --menu "\n$(gettext 'Connect to a Wi-Fi network')" \ - ${height} ${width} 14 \ -"any" "Quality_N/A" \ -$(detect_wifi) 2>${tmp} - + --ok-label "$(_ 'Select')" \ + --menu "\n$(_ 'Connect to a Wi-Fi network')" \ + $height $width 14 \ +"any" "$(_ 'Connect.to.any.network')" \ +$(detect_wifi) 2>$tmp + # Handle options - case "${?}" in - 1|255) rm -rf ${tmpdir} && exit 0 ;; + case "$?" in + 1|255) quit ;; 0) essid=$(cat $tmp) ;; esac - - # Check if we need to prompt user for an encrypted network - scan=$(iwlist $WIFI_INTERFACE scan | \ - awk '/(Cell|ESS|Qual|Encry|IE: WPA|WPA2)/ {print}' | \ - sed s/"Cell "/Cell-/ | grep -A 5 "$essid") - if echo "$scan" | sed 's/.*key:\([^ ]*\).*/\1/' | grep -q WPA*; then - dialog --title "{ Wi-Fi Password }" --colors \ - --inputbox "\nEnter wifi key (password) for \Zb\Z4${essid}" \ - 12 ${width} 2>${tmp} + + # Connect to hidden network + if [ "$essid" == "$(_ 'hidden.network')" ]; then + dialog --title "{ $(_ 'Wi-Fi ESSID') }" \ + --inputbox "\n$(_ 'Enter Wi-Fi access point ESSID (name)')" \ + 12 $width 2>$tmp + essid=$(cat $tmp) + [ -z "$essid" ] && exit 0 + + dialog --title "{ $(_ 'Wi-Fi Password') }" --colors \ + --inputbox "\n$(_ 'Enter Wi-Fi key (password) for \Zb\Z4$essid')" \ + 12 $width 2>$tmp key=$(cat $tmp) - [ "$key" == "" ] && return 0 + else + + # Check if we need to prompt user for an encrypted network + key=$(iwlist $WIFI_INTERFACE scan last | grep -E 'Cell |Encryption|ESSID' | \ + grep -C1 "$essid" | sed -n 's|.*key:\(.*\)|\1|p') + + if [ "$key" == "on" ]; then + dialog --title "{ $(_ 'Wi-Fi Password') }" --colors \ + --inputbox "\n$(_ 'Enter Wi-Fi key (password) for \Zb\Z4$essid')" \ + 12 $width 2>$tmp + key=$(cat $tmp) + [ -z "$key" ] && exit 0 + fi fi - + # Configure connection { - echo "XXX" && echo 30 - echo -e "\nShuting down network interfaces..." - echo "XXX" - stopd network.sh >/dev/null 2>&1 && sleep 2 - - echo "XXX" && echo 30 - echo -e "\nConfiguring: /etc/network.conf..." - echo "XXX" + MSG="\n$(_ 'Shutting down network interfaces...')" + msg 0; stopd network.sh >/dev/null 2>&1 + msg 10 + + MSG="\n$(_ 'Configuring: /etc/network.conf...')" + msg 20 # WIFI_KEY_TYPE=any should work for WEP/WPA* sed -i \ -e s"/^WIFI=.*/WIFI=\"yes\"/" \ @@ -174,62 +207,55 @@ -e s"/^WIFI_KEY=.*/WIFI_KEY=\"$key\"/" \ -e s"/^WIFI_KEY_TYPE=.*/WIFI_KEY_TYPE=\"any\"/" \ /etc/network.conf - sleep 1 - - echo "XXX" && echo 60 - echo -e "\nRestarting wifi interface..." - echo "XXX" - startd network.sh >/dev/null 2>&1 && sleep 3 - - echo "XXX" && echo 90 - echo -e "\nChecking connection..." - sleep 1 - ip=$(ifconfig | fgrep -A 1 "encap:Ethernet" | fgrep "inet" | \ - cut -d ":" -f 2 | awk '{print $1}') - echo "XXX" - sleep 1 - - echo "XXX" && echo 100 + + MSG="\n$(_ 'Restarting Wi-Fi interface...')" + msg 30; startd network.sh >/dev/null 2>&1 + msg 40; msg 50; msg 60; msg 70; msg 80 + + MSG="\n$(_ 'Checking connection...')" + msg 90; sleep 2 + ip="$(ifconfig $WIFI_INTERFACE | fgrep 'inet addr' | sed 's|.*:\([^ ]*\) .*|\1|')" + if [ "$ip" ]; then - echo -e "\nIP address: $ip" + MSG="\n$(_ 'IP address: $ip')" else - echo -e "\nUnable to connect..." + MSG="\n$(_ 'Unable to connect...')" fi - echo "XXX" && sleep 2 - - } | dialog --title "{ Wi-Fi Config }" --gauge "" 8 ${width} 0 + msg 100; sleep 2 + + } | dialog --title "{ $(_ 'Wi-Fi Config') }" --gauge "" 8 $width 0 } # Main Dialog menu main_box() { dialog \ --clear --title "$title" \ - --ok-label "Exec" --cancel-label "Quit" \ - --menu "" ${height} ${width} 14 \ -"keyboard" "$(gettext 'System keyboard setting')" \ -"locale" "$(gettext 'System language setting')" \ -"wifi-setup" "$(gettext 'Wi-Fi network settings')" \ -"add-user" "$(gettext 'Add a new user')" \ -"root-passwd" "$(gettext 'Change root password')" \ -"set-date" "$(gettext 'Set system date from the web')" \ -"quit" "$(gettext 'Exit from SliTaz Config')" 2>${tmp} - + --ok-label "$(_ 'Exec')" --cancel-label "$(_ 'Quit')" \ + --menu "" $height $width 14 \ +"keyboard" "$(_ 'System keyboard setting')" \ +"locale" "$(_ 'System language setting')" \ +"wifi-setup" "$(_ 'Wi-Fi network settings')" \ +"add-user" "$(_ 'Add a new user')" \ +"root-passwd" "$(_ 'Change root password')" \ +"set-date" "$(_ 'Set system date from the web')" \ +"quit" "$(_ 'Exit from SliTaz Config')" 2>$tmp + # Handle options - opt=${?} + opt="$?" case "$opt" in - 1|255) rm -rf ${tmpdir} && exit 0 ;; + 1|255) quit ;; esac - + # Handle actions action=$(cat $tmp) case "$action" in - keyboard) tazkeymap ;; - locale) tazlocale ;; - wifi-setup) wifi_setup ;; - add-user) add_user ;; + keyboard) tazkeymap ;; + locale) tazlocale ;; + wifi-setup) wifi_setup ;; + add-user) add_user ;; root-passwd) root_passwd ;; - set-date) set_date ;; - quit) rm -rf ${tmpdir} && exit 0 ;; + set-date) set_date ;; + quit) quit ;; esac } @@ -238,8 +264,8 @@ # case "$1" in - *_*) - # Execute functions + *_*) + # Execute functions $@ ;; *) while true; do diff -r a37f6f8dda42 -r eb791cfb71c0 tinyutils/tazx --- a/tinyutils/tazx Sat Nov 15 06:45:42 2014 +0200 +++ b/tinyutils/tazx Thu Nov 20 06:04:24 2014 +0200 @@ -1,7 +1,7 @@ #!/bin/sh # # Tazx - Ncurses X configuration for SliTaz GNU/Linux using Dialog boxes. -# This tinyutil is part of slitaz-tools. Tazx can configure Xorg with +# This tinyutil is part of slitaz-tools. Tazx can configure Xorg with # several Window Managers. The GTK interface to configure X is in tazbox. # # (c) 2011-2014 SliTaz GNU/Linux - GNU GPL v3. @@ -18,31 +18,32 @@ . /etc/slitaz/slitaz.conf . /etc/slitaz/applications.conf -installed="$PKGS_DB/installed" - export TEXTDOMAIN='slitaz-tools' #i18n : ${DIALOG=dialog --timeout 60} -WM_i18n=$(_n 'Window Manager:'| sed s/://) -INST_i18n=$(_n 'Install Xorg' | sed 's|Xorg||;s|X.org||;s| ||') - # Default user for config files in Live mode, id is 1000 since it is # created by /etc/init.d/bootopts.sh. -USER=$(cat /etc/passwd | grep 1000 | cut -d ":" -f 1) + +USER=$(awk -F: '/1000/{print $1}' /etc/passwd) + # # Functions # + # Save chunk of xorg.conf into specified file + save_chunk() { sed -e '/Section "'${1#*-}'"/,/EndSection/!d' \ - -e "s/EndSection/EndSection\n/" $xorg_template > \ + -e "s/EndSection/&\n/" $xorg_template > \ $xorg_config/$1.conf } + +# Create a xorg.conf if needed + gen_xorg_conf_file() { - # Create a xorg.conf if needed. if [ ! -f /etc/X11/xorg.conf ]; then cat > /etc/X11/xorg.conf << EOT # You can put here your own Xorg configurations. This config file is read @@ -52,16 +53,94 @@ fi } + +# Add or remove xkb applet from lxpanel + +xkb() { + case $(id -u) in + 0) + # Empty if lxpanel not running, else something like: + # tux lxpanel -p slitaz + LXPS=$(ps -ouser,args | sed -n '/[l]xpanel/ s| *| |p' | \ + fgrep -v '[' | fgrep -v 'xkb' | fgrep -v 'sh') + + # Stop lxpanel + if [ -n "$LXPS" ]; then + lxpanelctl exit + killall lxpanel + fi + + # For all human users + for USER in $(awk -F: '/\/home\//{print $1}' /etc/passwd); do + su $USER -c '. ~/.profile; tazx xkb' + done + + # Re-run lxpanel + [ -n "$LXPS" ] && su ${LXPS%% *} -c "exec ${LXPS#* }" & + ;; + + *) + DOTCONFIG=${XDG_CONFIG_HOME:-$HOME/.config} + CFG_LXPANEL=$DOTCONFIG/lxpanel + + if [ ! -d $CFG_LXPANEL ]; then + mkdir -p $DOTCONFIG + cp -r /etc/lxpanel $DOTCONFIG + fi + + case $(fgrep 'XkbLayout' /etc/X11/xorg.conf.d/40-Keyboard.conf | \ + fgrep -o ',') in + '') + for CFG in $(find $CFG_LXPANEL -type f -name panel); do + if [ -n "$(grep 'type = xkb' $CFG)" ]; then + echo "Remove xkb applet from $CFG" + sed -i "$(grep -n -e "^Plugin {" -e "^}" -e "xkb" \ + $CFG | grep -C 1 xkb | grep -v xkb | cut -d: \ + -f1 | tr '\n' ' ' | sed 's| |,|')d" $CFG + fi + done ;; + ',') + for CFG in $(find $CFG_LXPANEL -type f -name panel); do + if [ -z "$(grep 'type = xkb' $CFG)" ]; then + echo "Add xkb applet to $CFG" + XKB='Plugin {\ + type = xkb\ + Config {\ + DisplayType=0\ + PerWinLayout=0\ + NoResetOpt=0\ + KeepSysLayouts=1\ + Model=pc105\ + LayoutsList=us\ + VariantsList=,\ + ToggleOpt=shift_caps_toggle\ + FlagSize=4\ + }\ +}\ +' + sed -i "$(grep -n -e "^Plugin {" -e "tray" $CFG | \ + grep -B1 tray | head -n1 | cut -d: -f1) i\\ +$XKB" $CFG + fi + done ;; + esac ;; + esac +} + + # Generate or regenerate 40-Keyboard.conf + keyboard_conf() { - # Configure the keyboard with the right keymap. + # Configure the keyboard with the right keymap keymap=$(cat /etc/keymap.conf) keyboard_config="/etc/X11/xorg.conf.d/40-Keyboard.conf" variant="" + # this XkbOption moved from 40-evdev.conf (xorg-xf86-input-evdev) options="terminate:ctrl_alt_bksp" - gettext "Creating:"; echo -n " $keyboard_config" + _n 'Creating:'; echo -n " $keyboard_config" mkdir -p $(dirname $keyboard_config) + case "$keymap" in fr_CH-latin1) # Swiss FrenCH @@ -72,11 +151,11 @@ ru) # Russian layout="us,ru" - options="grp:ctrl_shift_toggle, grp_led:scroll, $options" ;; + options="grp:ctrl_shift_toggle, grp_led:scroll, compose:ralt, $options" ;; ua) # Ukrainian layout="us,ua,ru" - options="grp:ctrl_shift_toggle, $options" ;; + options="grp:ctrl_shift_toggle, compose:ralt, $options" ;; slovene) # Slovenian layout="si"; options="grp:alt_shift_toggle, $options" ;; @@ -89,6 +168,7 @@ keymap=${keymap%-lat6} layout=${keymap%-abnt2} esac + cat > $keyboard_config << EOC Section "InputClass" Identifier "Keyboard Defaults" @@ -98,11 +178,15 @@ Option "XkbOptions" "$options" EndSection EOC + status - [ x$variant == x ] && sed -i '/XkbVariant/d' ${keyboard_config} + [ -z "$variant" ] && sed -i '/XkbVariant/d' $keyboard_config + xkb } -# Populate xorg.conf.d. + +# Populate xorg.conf.d + xorg_conf_d() { # Define the xorg.conf.d (can be /etc/X11/xorg.conf.d or /usr/share/X11/xorg.conf.d) xorg_config=/etc/X11/xorg.conf.d @@ -114,7 +198,7 @@ Xorg -configure :2 # Backup existing config. - tar -cf $xorg_config/../Previous_xorg.conf.d.tar $xorg_config/ &> /dev/null + tar -cf $xorg_config/../Previous_xorg.conf.d.tar $xorg_config/ &> /dev/null # Put the different sections in separate files in the config directory. save_chunk 10-ServerLayout @@ -133,48 +217,54 @@ gen_xorg_conf_file } + +# Process dialog's return code. + dialog_end() { retval=$? exec 3>&- # Continue or exit. case $retval in - 0|3) continue ;; - 1|255) exit 0 ;; + 0|3) continue ;; + 1|255) exit 0 ;; esac } + # Install xorg server. + install_xorg() { - [ -f "/var/lib/tazpkg/packages.list" ] || tazpkg recharge + [ -f "$PKGS_DB/packages.list" ] || tazpkg recharge + exec 3>&1 - value=$($DIALOG \ - --clear --colors --scrollbar --default-item "$1" \ - --title " $(_n 'Install Xorg') " \ - --menu "$(_n 'Tazx helps you to select your X driver.')" 16 70 8 \ - Auto_select "$(_n 'Auto configuring Xorg...' | sed 's/X//;s/org//;s|...$||;s| |_|')" \ - $(fgrep xorg-xf86-video /var/lib/tazpkg/packages.list | cut -d- -f4 | \ - while read x; do echo $x; _ 'driver'; done) \ - "quit" "$(_n 'Quit')" \ - 2>&1 1>&3) + + driver=$($DIALOG \ + --clear --colors --scrollbar --title " $(_ 'Install Xorg') " \ + --menu "$(_ 'Tazx helps you to select your X driver.')" 16 70 9 \ + 'auto' "$(_ 'Auto configuring')" \ + $(fgrep xorg-xf86-video- $PKGS_DB/packages.list | cut -d- -f4 | \ + sed "s|.*|& $(_ 'driver')|") \ + 'quit' "$(_ 'Quit')" \ + 2>&1 1>&3) + dialog_end - # Set selected value. - case $value in + case $driver in quit) exit 0 ;; - Auto_select) autoselect_driver ;; + auto) autoselect_driver ;; *) inst_pkg xorg-server - inst_pkg xorg-xf86-video-$value + inst_pkg xorg-xf86-video-$driver xorg_conf_d ;; esac } -# Auto-select and install Xorg driver +# Auto-select and install Xorg driver. + autoselect_driver() { inst_pkg xorg-server - DEVICE="$(_ 'driver')" for VID in $(busybox lspci | grep 'Class 03' | cut -c21-24 | sort -u); do case $VID in 1022|1002) d=ati ;; @@ -183,7 +273,7 @@ 1039) d=sis ;; 15ad) d=vmware ;; *) d=''; $DIALOG --colors --msgbox \ - "\Z1 $(_n 'Failed to setup $DEVICE') \Zn (unknown hardware)" 5 68 ;; + "\n\Z1$(_n 'Failed to setup driver')\Zn $(_ '(unknown hardware)')" 7 68 ;; esac [ -n "$d" ] && inst_pkg xorg-xf86-video-$d done @@ -191,142 +281,216 @@ xorg_conf_d } + +# Install specified package. + inst_pkg() { - pkg="$@" && colorize 3 $(_ 'Installing pkg: $pkg') - CMD="sudo tazpkg -gi $@" - test $(id -u) = 0 && CMD="tazpkg -gi $@" - [ -d "$installed/$@" ] || $CMD + pkg="$@" + colorize 3 $(_ 'Installing pkg: $pkg') + + case $(id -u) in + 0) CMD="tazpkg -gi $@" ;; + *) CMD="sudo tazpkg -gi $@" ;; + esac + [ -d "$INSTALLED/$@" ] || $CMD } + +# Select/install Window Manager and favorite applications. + apps_dialog() { - . ${user_conf} + . $user_conf + exec 3>&1 + app=$($DIALOG --clear --colors --backtitle "$msg" \ - --title "{\Z3 $(_n '${INST_i18n}: ${WM_i18n} + applications') \Zn}" \ + --title "{\Z3 $(_n 'Install Window Manager and applications') \Zn}" \ --inputmenu "" 21 52 18 \ - $(for a in WINDOW_MANAGER EDITOR BROWSER TERMINAL FILE_MANAGER; do - eval n='$'"$a" ; echo "$a $n"; - done) 2>&1 1>&3) + $(for a in WINDOW_MANAGER EDITOR BROWSER TERMINAL FILE_MANAGER; do + eval n='$'$a; echo $a $n; + done) 2>&1 1>&3) dialog_end + case $app in - RENAME*)appname=$(echo $app | cut -d " " -f3) - app=$(echo $app | cut -d " " -f2) ;; + RENAMED) # like: RENAMED EDITOR myeditor + appname=$(echo $app | cut -d" " -f3) + app=$(echo $app | cut -d" " -f2) ;; *) - app_name_dialog only-installed d a-item ;; + app_name_dialog only-installed ;; esac - if [ ! $appname = " " ]; then - [ ! $appname = show_ALL ] || app_name_dialog full-list d - if [ ! $(busybox which ${appname} 2>/dev/null) ]; then - inst_pkg $appname - [ -d "$installed/$appname" ] || inst_pkg \ - $(tazpkg search-pkgname /bin/$appname | grep -Ev '=|:| |/bin/') - else - sed '/'${app}'/s|=.*$|="'${appname}'"|' -i ${user_conf} + + if [ $appname != " " ]; then + if [ $appname = show_ALL ]; then + app_name_dialog full-list fi + if [ -z $(busybox which $appname) ]; then + inst_pkg $(lzcat $PKGS_DB/files.list.lzma | fgrep /bin/$appname | head -n1 | cut -d: -f1) + fi + sed -i "/$app/ s|=.*$|=$appname|" $user_conf fi - msg=''; apps_dialog + + msg=''; apps_dialog # loop } + +# Show list of applications to choose. + app_name_dialog() { - sz=28 ; [ $1 = full-list ] || sz=18 + case $1 in + full-list) height=24 ;; + *) height=18 ;; + esac + exec 3>&1 - appname=$($DIALOG --clear --colors --title "${app}" \ - --menu "" $sz 50 24 $(gen_applist $app $@) 2>&1 1>&3) \ + + appname=$($DIALOG --clear --colors --title "$app" \ + --menu '' $height 50 24 $(gen_applist $app $@) 2>&1 1>&3) dialog_end } + +# Generate application list for Dialog or Yad. + gen_applist() { -. ${user_conf} -FILE_MANAGERS="clex caja emelfm2 mc pathfinder pcmanfm pcmanfm-qt ranger spacefm thunar xfe ytree" -BROWSERS="arora chrome cream dillo elinks firefox firefox-official iron links lynx \ - midori netsurf opera QtWeb qupzilla retawq seamonkey surf tazweb" -EDITORS="adie beaver emacs geany jed joe juffed ht le leafpad mcedit mousepad mp-5 \ - nano qedit SciTE vi vim xedit xfw zile" -TERMINALS="aterm evilvte lxterminal mrxvt qterminal sakura stjerm tilda urxvt vte \ - xterm yeahconsole" -WINDOW_MANAGERS="awesome blackbox compiz dwm echinus enlightenment fluxbox icewm jwm \ - lxde-session lxqt karmen matchbox openbox-session pekwm ratpoison xfwm4" + # $1 = [ FILE_MANAGER | BROWSER | EDITOR | TERMINAL | WINDOW_MANAGER ] + # $2 = [ only-installed | full-list ] + # $3 = [ yad | * ] + + . $user_conf + + FILE_MANAGERS="clex caja emelfm2 mc pathfinder pcmanfm pcmanfm-qt ranger \ +spacefm thunar xfe ytree" + + BROWSERS="arora chrome cream dillo elinks firefox firefox-official iron \ +links lynx midori netsurf opera QtWeb qupzilla retawq seamonkey surf tazweb" + + EDITORS="adie beaver emacs geany jed joe juffed ht le leafpad mcedit \ +mousepad mp-5 nano qedit SciTE vi vim xedit xfw zile" + + TERMINALS="aterm evilvte lxterminal mrxvt qterminal sakura stjerm tilda \ +urxvt vte xterm yeahconsole" + + WINDOW_MANAGERS="awesome blackbox compiz dwm echinus enlightenment fluxbox \ +icewm jwm lxde-session lxqt karmen matchbox openbox-session pekwm ratpoison \ +xfwm4" eval list='$'"$1"S eval current='$'"$1" -for i in $current $(echo ' '$list' ' | sed "s| "$current" | |g") $4 ; do - t="<--" ; [ $(busybox which $i 2>/dev/null) ] || t=--- - if [ $2 = only-installed ] && [ $t = --- ]; then - case $i in - a-item) i=show_ALL t="+"${INST_i18n};; - *) i=" " t=" " ;; esac + + for i in $current $(echo " $list " | sed "s| $current | |g"); do + + case $(busybox which $i) in + '') # not installed + t='---' ;; + *) # installed + t='<--' ;; + esac + + if [ "$2" == 'full-list' ] || [ "$t" == '<--' ]; then + echo "$i" + + if [ "$3" != 'yad' ]; then + echo "$(echo $t | sed "s|---|$(_n 'Install')|g")" + fi + fi + done + + if [ "$2" == 'only-installed' ] && [ "$3" != 'yad' ]; then + echo 'show_ALL' "+$(_n 'Install')" fi - echo "$i" - [ $3 = yad ] || echo -e "$(echo $t | sed "s|---|${INST_i18n}|g ; s| ||g")" -done } + # Screen configuration dialog. + config_dialog() { - . /etc/rcS.conf ; LM="ON" - [ $LOGIN_MANAGER = "slim" ] || LM="OFF" + . /etc/rcS.conf + case $LOGIN_MANAGER in + slim) LM="$(_ 'ON')" ;; + *) LM="$(_ 'OFF')" ;; + esac exec 3>&1 + value=$($DIALOG \ --clear --colors \ --title "{ $(_n 'SliTaz Xorg config') }" \ --menu "" 16 72 10 \ "xorg" "$(_n 'Install or reconfigure Xorg')" \ "xorg-light" "$(_n 'Install Xorg server (light version)')" \ - "onboot" "$(_n 'AutoStart Xorg by SLiM on boot') ...| \Z5$LM\Zn" \ + "onboot" "$(_n 'AutoStart Xorg by SLiM on boot'): \Z5$LM\Zn" \ "slim" "$(_n '(Re)Start Simple Login Manager now')" \ - "wm_apps" "$(_n '${INST_i18n}: ${WM_i18n} + applications')" \ + "wm_apps" "$(_n 'Install Window Manager and applications')" \ "quit" "$(_n 'Quit Tazx utility')" \ 2>&1 1>&3) dialog_end - # Set selected value. + case "$value" in xorg) install_xorg ;; + xorg-light) inst_pkg xorg-server-light inst_pkg xorg-xf86-video-fbdev xorg_conf_d ;; + onboot) - inst_pkg slim ; inst_pkg dbus - if [ $LM = "OFF" ] ; then - LM=slim - else LM="" + inst_pkg slim + inst_pkg dbus + + if [ $LM == "$(_ 'OFF')" ]; then + LM='slim' + else + LM='' fi - sed '/LOGIN_MANAGER/s|=.*$|="'$LM'"|' -i /etc/rcS.conf - [ $LM = "slim" ] || LM=disabled - echo "start X on boot:" $(boldify $LM) ;; + sed -i "/LOGIN_MANAGER/ s|=.*$|=$LM|" /etc/rcS.conf + + [ -z "$LM" ] && LM='disabled' + _n "Start X on boot:"; boldify " $LM" ;; + slim) - inst_pkg slim ; inst_pkg dbus - [ ! -z $XAUTHORITY ] || stopd slim ;sleep 2; startd slim ;; + inst_pkg slim + inst_pkg dbus + if [ -z $XAUTHORITY ]; then + stopd slim; sleep 2; startd slim + fi ;; + wm_apps) - slitaz_apps_conf ; apps_dialog ;; + slitaz_apps_conf + apps_dialog ;; + *) exit 0 ;; esac } + # ~/.config/slitaz/applications.conf: Missing = failed to login # Make users applications.conf in /etc/skel so new added user will get # a working X session. Note --> flavors can have a custom config in # /etc/slitaz/applications that we must use. + slitaz_apps_conf() { apps_conf=/etc/slitaz/applications.conf - + if [ "$(id -u)" = 0 ]; then - user_conf=${apps_conf} + user_conf=$apps_conf new_user_conf="/etc/skel/.config/slitaz/applications.conf" - mkdir -p $(dirname $user_conf); cp -f ${apps_conf} ${new_user_conf} + mkdir -p $(dirname $new_user_conf) + cp -f $apps_conf $new_user_conf else # If started by: startx and with boot opts screen=text - user_conf="$HOME/.config/slitaz/applications.conf" + user_conf="${XDG_CONFIG_HOME:-$HOME/.config}/slitaz/applications.conf" if [ ! -f "$user_conf" ]; then - mkdir -p $(dirname $user_conf); cp ${apps_conf} ${user_conf} + mkdir -p $(dirname $user_conf) + cp $apps_conf $user_conf fi fi + [ -f "$HOME/.xinitrc" ] || inst_pkg slitaz-configs-base --forced } + # Commands case "$1" in @@ -334,7 +498,7 @@ check_root install_xorg slitaz_apps_conf ;; - + config-xorg) check_root slitaz_apps_conf @@ -345,44 +509,70 @@ sed -i "s/.*EndSubSection.*/\\t\\tModes\\t\"$MODE\"\\n&/" \ /etc/X11/xorg.conf.d/70-Screen.conf fi ;; - + init) # We don't need much config files with last Xorg version, So just # get files for starting an X session and config the keyboard. check_root slitaz_apps_conf - keyboard_conf + keyboard_conf gen_xorg_conf_file ;; - + keyboard) - echo "Generating: 40-Keyboard.conf" keyboard_conf ;; - + get-applist) slitaz_apps_conf gen_applist $2 $3 $4 ;; + auto) autoselect_driver ;; + bpp) check_root xorg_conf_d - case "$2" in 8|15|16|24) colors=$2 ;; - *) exec 3>&1 && colors=$($DIALOG --menu " " 12 12 12 \ - 24 truecolor 16 hicolor 15 hicolor 8 256colors 2>&1 1>&3) ; dialog_end ;; + case "$2" in + 8|15|16|24) + colors=$2 ;; + *) + exec 3>&1 + colors=$($DIALOG --menu " " 12 12 12 \ + 24 truecolor 16 hicolor 15 hicolor 8 256colors 2>&1 1>&3) + dialog_end ;; esac sed 's|Monitor.*"$|&\n\tDefaultDepth '$colors'|' \ -i ${xorg_config}/70-Screen.conf ;; + + xkb) + xkb ;; + *help) - echo "Usage: $(basename $0) [install-xorg|bpp|auto|config-xorg|init|keyboard]" ;; + emsg " +tazx - $(_ 'configuration tool for SliTaz GNU/Linux') + +$(_ 'Usage:') tazx $(_ 'command') $(_ 'parameter') + +$(_ 'Commands:') +install-xorg $(_ 'Install Xorg and selected Xorg driver') +config-xorg $(_ 'Configure Xorg, generate configuration files') +bpp $(_ 'Set monitor default depth (valid parameters: 8, 15, 16 or 24)') +auto $(_ 'Auto-select and install Xorg driver') +init $(_ 'Get files for starting an X session and config the keyboard') +keyboard $(_ 'Generate or regenerate Xorg keyboard config') +" + ;; + *) # User can get a new .xinitrc with tazx from cmdline. - if [ $(id -u) == 0 ]; then - slitaz_apps_conf - config_dialog - else msg="\Z1 $(_n 'Run tazx as root if you need to configure xorg') \Zn" - slitaz_apps_conf - apps_dialog - fi + case $(id -u) in + 0) + slitaz_apps_conf + config_dialog ;; + *) + msg="\Z1 $(_n 'Run tazx as root if you need to configure xorg') \Zn" + slitaz_apps_conf + apps_dialog ;; + esac # gen_xsession ;; esac diff -r a37f6f8dda42 -r eb791cfb71c0 tinyutils/terminal --- a/tinyutils/terminal Sat Nov 15 06:45:42 2014 +0200 +++ b/tinyutils/terminal Thu Nov 20 06:04:24 2014 +0200 @@ -25,7 +25,7 @@ } -USER_CONFIG="$HOME/.config/slitaz/applications.conf" +USER_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/slitaz/applications.conf" [ -f $USER_CONFIG ] && . $USER_CONFIG local PARAMS="" GEOMETRY="80x24" TITLE="SliTaz $(cat /etc/slitaz-release)" COMMAND