slitaz-tools rev 810
Make terminal wrapper "smarter" (currently only sakura and xterm supported), back params to passwd.desktop; improve tazapps and gpl3 dialogs.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Thu Jul 18 03:32:28 2013 +0300 (2013-07-18) |
| parents | 0791bb2b4e0b |
| children | 72c2ef5c57e7 |
| files | Makefile applications/passwd.desktop pixmaps/gpl3.png po/slitaz-tools/el.po po/slitaz-tools/es_AR.po po/slitaz-tools/fr.po po/slitaz-tools/pt_BR.po po/slitaz-tools/ru.po po/slitaz-tools/slitaz-tools.pot tazbox/tazbox tinyutils/terminal |
line diff
1.1 --- a/Makefile Wed Jul 17 09:52:54 2013 +0200 1.2 +++ b/Makefile Thu Jul 18 03:32:28 2013 +0300 1.3 @@ -22,7 +22,7 @@ 1.4 @xgettext -o po/slitaz-tools/slitaz-tools.pot -L Shell \ 1.5 --package-name="SliTaz Tools" \ 1.6 ./tinyutils/tazlocale ./tinyutils/tazkeymap ./tinyutils/setmixer \ 1.7 - ./tinyutils/tazx ./tinyutils/decode 1.8 + ./tinyutils/tazx ./tinyutils/decode ./tinyutils/terminal 1.9 @echo "done" 1.10 1.11 boxes-pot: 1.12 @@ -113,27 +113,18 @@ 1.13 chmod +x $(DESTDIR)/etc/init.d/* 1.14 1.15 install-boxes: 1.16 - #install -m 0755 -d $(DESTDIR)/etc/wireless 1.17 install -m 0755 -d $(DESTDIR)$(PREFIX)/bin 1.18 - install -m 0755 -d $(DESTDIR)$(PREFIX)/lib/slitaz 1.19 install -m 0755 -d $(DESTDIR)$(PREFIX)/share/locale 1.20 install -m 0755 -d $(DESTDIR)$(PREFIX)/share/applications 1.21 install -m 0755 -d $(DESTDIR)$(PREFIX)/share/pixmaps 1.22 - install -m 0755 -d $(DESTDIR)$(PREFIX)/share/doc/slitaz 1.23 install -m 0755 boxes/* $(DESTDIR)$(PREFIX)/bin 1.24 install -m 0755 tazbox/tazbox $(DESTDIR)$(PREFIX)/bin 1.25 install -m 0755 tinyutils/subox $(DESTDIR)$(PREFIX)/bin 1.26 1.27 - # Libs 1.28 - #install -m 0755 lib/*.* $(DESTDIR)$(PREFIX)/lib/slitaz 1.29 - 1.30 # Desktop files and icons. 1.31 install -m 0644 applications/* $(DESTDIR)$(PREFIX)/share/applications 1.32 install -m 0644 pixmaps/* $(DESTDIR)$(PREFIX)/share/pixmaps 1.33 1.34 - # Documentation (style is already in slitaz-doc) 1.35 -# cp -a doc/*.html $(DESTDIR)$(PREFIX)/share/doc/slitaz 1.36 - 1.37 # i18n. 1.38 for l in $(LINGUAS); \ 1.39 do \
2.1 --- a/applications/passwd.desktop Wed Jul 17 09:52:54 2013 +0200 2.2 +++ b/applications/passwd.desktop Thu Jul 18 03:32:28 2013 +0300 2.3 @@ -5,6 +5,6 @@ 2.4 Name[pt]=Mudar Senha de Usuário 2.5 Name[pt_BR]=Mudar Senha de Usuário 2.6 Name[ru]=Пароль учетной записи 2.7 -Exec=terminal -e passwd 2.8 +Exec=terminal -h -T Passwd -geometry 60x10 -e passwd 2.9 Icon=system-config-authentication 2.10 Categories=ConsoleOnly;Settings;DesktopSettings;
3.1 Binary file pixmaps/gpl3.png has changed
4.1 --- a/po/slitaz-tools/el.po Wed Jul 17 09:52:54 2013 +0200 4.2 +++ b/po/slitaz-tools/el.po Thu Jul 18 03:32:28 2013 +0300 4.3 @@ -6,7 +6,7 @@ 4.4 msgstr "" 4.5 "Project-Id-Version: SliTaz Tools\n" 4.6 "Report-Msgid-Bugs-To: \n" 4.7 -"POT-Creation-Date: 2012-07-01 20:20+0000\n" 4.8 +"POT-Creation-Date: 2013-07-17 18:32+0300\n" 4.9 "PO-Revision-Date: 2012-12-18 22:06+0300\n" 4.10 "Last-Translator: Constantine Mousafiris <kvisitor@gnugr.org>\n" 4.11 "Language-Team: Kostis Mousafiris\n" 4.12 @@ -17,26 +17,26 @@ 4.13 "Plural-Forms: nplurals=2; plural=(n != 1);\n" 4.14 "X-Generator: Virtaal 0.5.2\n" 4.15 4.16 -#: tinyutils/tazlocale:82 4.17 +#: tinyutils/tazlocale:87 4.18 msgid "Setting system locale to:" 4.19 msgstr "Ρύθμιση του locale στο:" 4.20 4.21 -#: tinyutils/tazlocale:96 4.22 +#: tinyutils/tazlocale:101 4.23 msgid "SliTaz language configuration" 4.24 msgstr "Ρύθμιση γλώσσας του SliTaz" 4.25 4.26 -#: tinyutils/tazlocale:115 4.27 +#: tinyutils/tazlocale:120 4.28 msgid "" 4.29 "Please logout of your current session and login again to use new locale." 4.30 msgstr "" 4.31 "Παρακαλώ, αποσυνδεθείτε από την τρέχουσα συνεδρία σας και επανασυνδεθείτε, " 4.32 "για να χρησιμοποιήσετε το νέο locale." 4.33 4.34 -#: tinyutils/tazlocale:124 tinyutils/tazkeymap:47 4.35 +#: tinyutils/tazlocale:129 tinyutils/tazkeymap:47 4.36 msgid "Config file :" 4.37 msgstr "Αρχείο ρυθμίσεων :" 4.38 4.39 -#: tinyutils/tazlocale:125 4.40 +#: tinyutils/tazlocale:130 4.41 msgid "Current locale:" 4.42 msgstr "Τρέχον locale:" 4.43 4.44 @@ -67,36 +67,36 @@ 4.45 msgid "You must be root to configure X server." 4.46 msgstr "Πρέπει να είστε διαχειριστής συστήματος για να ρυθμίσετε τον X server." 4.47 4.48 -#: tinyutils/tazx:126 4.49 +#: tinyutils/tazx:131 4.50 msgid "Install Xorg" 4.51 msgstr "Εγκατάσταση του Xorg" 4.52 4.53 -#: tinyutils/tazx:128 4.54 +#: tinyutils/tazx:133 4.55 msgid "Tazx helps you to select your X driver." 4.56 msgstr "Ο Tazx σας βοηθά να επιλέξετε τον οδηγό (driver) για το Χ." 4.57 4.58 -#: tinyutils/tazx:163 4.59 +#: tinyutils/tazx:168 4.60 msgid "Tazx dialog helps you to configure your Xorg server." 4.61 msgstr "" 4.62 "Το παράθυρο διαλόγου του Tazx σας βοηθά να ρυθμίσετε τον διακομιστή Xorg." 4.63 4.64 -#: tinyutils/tazx:164 4.65 +#: tinyutils/tazx:169 4.66 msgid "Window Manager:" 4.67 msgstr "Διαχειριστής παραθύρων:" 4.68 4.69 -#: tinyutils/tazx:165 4.70 +#: tinyutils/tazx:170 4.71 msgid "X server:" 4.72 msgstr "Διακομιστής Χ:" 4.73 4.74 -#: tinyutils/tazx:166 4.75 +#: tinyutils/tazx:171 4.76 msgid "Install or reconfigure Xorg" 4.77 msgstr "Εγκατάσταση ή επαναρύθμιση του X org" 4.78 4.79 -#: tinyutils/tazx:167 4.80 +#: tinyutils/tazx:172 4.81 msgid "Install TinyX server Xfbdev" 4.82 msgstr "Εγκατάσταση του TinyX server Xfbdev" 4.83 4.84 -#: tinyutils/tazx:168 4.85 +#: tinyutils/tazx:173 4.86 msgid "Quit Tazx utility" 4.87 msgstr "Κλείστε το βοηθητικό πρόγραμμα Tazx" 4.88 4.89 @@ -131,3 +131,42 @@ 4.90 #: tinyutils/decode:98 4.91 msgid "No file:" 4.92 msgstr "Κανένα αρχείο:" 4.93 + 4.94 +#: tinyutils/terminal:24 4.95 +msgid "configurable SliTaz wrapper for terminal." 4.96 +msgstr "" 4.97 + 4.98 +#: tinyutils/terminal:26 4.99 +msgid "Recognized options:" 4.100 +msgstr "" 4.101 + 4.102 +#: tinyutils/terminal:27 4.103 +msgid "Print the version number" 4.104 +msgstr "" 4.105 + 4.106 +#: tinyutils/terminal:28 4.107 +msgid "Print out this message" 4.108 +msgstr "" 4.109 + 4.110 +#: tinyutils/terminal:29 4.111 +#, sh-format 4.112 +msgid "Width and height of terminal window ($GEOMETRY)" 4.113 +msgstr "" 4.114 + 4.115 +#: tinyutils/terminal:30 4.116 +#, sh-format 4.117 +msgid "Title name for window (\"$TITLE\")" 4.118 +msgstr "" 4.119 + 4.120 +#: tinyutils/terminal:31 4.121 +msgid "Dont't close terminal after command finished" 4.122 +msgstr "" 4.123 + 4.124 +#: tinyutils/terminal:32 4.125 +msgid "Command to execute (must be last in line)" 4.126 +msgstr "" 4.127 + 4.128 +#: tinyutils/terminal:35 4.129 +#, sh-format 4.130 +msgid "Help for $TERMINAL:" 4.131 +msgstr ""
5.1 --- a/po/slitaz-tools/es_AR.po Wed Jul 17 09:52:54 2013 +0200 5.2 +++ b/po/slitaz-tools/es_AR.po Thu Jul 18 03:32:28 2013 +0300 5.3 @@ -7,7 +7,7 @@ 5.4 msgstr "" 5.5 "Project-Id-Version: SliTaz Tools\n" 5.6 "Report-Msgid-Bugs-To: \n" 5.7 -"POT-Creation-Date: 2012-04-30 14:08+0200\n" 5.8 +"POT-Creation-Date: 2013-07-17 18:32+0300\n" 5.9 "PO-Revision-Date: 2011-08-11 00:08-0300\n" 5.10 "Last-Translator: Lucas Gioia <lucas.lucas.lucas24@gmail.com>\n" 5.11 "Language-Team: LANGUAGE <LL@li.org>\n" 5.12 @@ -16,26 +16,26 @@ 5.13 "Content-Type: text/plain; charset=UTF-8\n" 5.14 "Content-Transfer-Encoding: 8bit\n" 5.15 5.16 -#: tinyutils/tazlocale:82 5.17 +#: tinyutils/tazlocale:87 5.18 msgid "Setting system locale to:" 5.19 msgstr "" 5.20 5.21 -#: tinyutils/tazlocale:96 5.22 +#: tinyutils/tazlocale:101 5.23 msgid "SliTaz language configuration" 5.24 msgstr "SliTaz configuración del lenguaje" 5.25 5.26 -#: tinyutils/tazlocale:115 5.27 +#: tinyutils/tazlocale:120 5.28 msgid "" 5.29 "Please logout of your current session and login again to use new locale." 5.30 msgstr "" 5.31 "Por favor, cierre su sesión actual e iniciela nuevamente para usar un nuevo " 5.32 "local." 5.33 5.34 -#: tinyutils/tazlocale:124 tinyutils/tazkeymap:47 5.35 +#: tinyutils/tazlocale:129 tinyutils/tazkeymap:47 5.36 msgid "Config file :" 5.37 msgstr "" 5.38 5.39 -#: tinyutils/tazlocale:125 5.40 +#: tinyutils/tazlocale:130 5.41 msgid "Current locale:" 5.42 msgstr "" 5.43 5.44 @@ -66,36 +66,36 @@ 5.45 msgid "You must be root to configure X server." 5.46 msgstr "Debes ser root para configurar el servidor X." 5.47 5.48 -#: tinyutils/tazx:126 5.49 +#: tinyutils/tazx:131 5.50 msgid "Install Xorg" 5.51 msgstr "Instalar Xorg" 5.52 5.53 -#: tinyutils/tazx:128 5.54 +#: tinyutils/tazx:133 5.55 msgid "Tazx helps you to select your X driver." 5.56 msgstr "Tazx le ayudará a seleccionar su controlador X." 5.57 5.58 -#: tinyutils/tazx:163 5.59 +#: tinyutils/tazx:168 5.60 #, fuzzy 5.61 msgid "Tazx dialog helps you to configure your Xorg server." 5.62 msgstr "Los diálogos Tazx le ayudarán a configurar su servidor Xorg." 5.63 5.64 -#: tinyutils/tazx:164 5.65 +#: tinyutils/tazx:169 5.66 msgid "Window Manager:" 5.67 msgstr "Gestor de ventanas:" 5.68 5.69 -#: tinyutils/tazx:165 5.70 +#: tinyutils/tazx:170 5.71 msgid "X server:" 5.72 msgstr "Servidor X:" 5.73 5.74 -#: tinyutils/tazx:166 5.75 +#: tinyutils/tazx:171 5.76 msgid "Install or reconfigure Xorg" 5.77 msgstr "Instalar o reconfigurar Xorg" 5.78 5.79 -#: tinyutils/tazx:167 5.80 +#: tinyutils/tazx:172 5.81 msgid "Install TinyX server Xfbdev" 5.82 msgstr "Instalar TinyX servidor Xfbdev" 5.83 5.84 -#: tinyutils/tazx:168 5.85 +#: tinyutils/tazx:173 5.86 msgid "Quit Tazx utility" 5.87 msgstr "Salir de la utilidad Tazx" 5.88 5.89 @@ -131,6 +131,45 @@ 5.90 msgid "No file:" 5.91 msgstr "" 5.92 5.93 +#: tinyutils/terminal:24 5.94 +msgid "configurable SliTaz wrapper for terminal." 5.95 +msgstr "" 5.96 + 5.97 +#: tinyutils/terminal:26 5.98 +msgid "Recognized options:" 5.99 +msgstr "" 5.100 + 5.101 +#: tinyutils/terminal:27 5.102 +msgid "Print the version number" 5.103 +msgstr "" 5.104 + 5.105 +#: tinyutils/terminal:28 5.106 +msgid "Print out this message" 5.107 +msgstr "" 5.108 + 5.109 +#: tinyutils/terminal:29 5.110 +#, sh-format 5.111 +msgid "Width and height of terminal window ($GEOMETRY)" 5.112 +msgstr "" 5.113 + 5.114 +#: tinyutils/terminal:30 5.115 +#, sh-format 5.116 +msgid "Title name for window (\"$TITLE\")" 5.117 +msgstr "" 5.118 + 5.119 +#: tinyutils/terminal:31 5.120 +msgid "Dont't close terminal after command finished" 5.121 +msgstr "" 5.122 + 5.123 +#: tinyutils/terminal:32 5.124 +msgid "Command to execute (must be last in line)" 5.125 +msgstr "" 5.126 + 5.127 +#: tinyutils/terminal:35 5.128 +#, sh-format 5.129 +msgid "Help for $TERMINAL:" 5.130 +msgstr "" 5.131 + 5.132 #~ msgid "You must be root to run:" 5.133 #~ msgstr "Debes ser root para correr:" 5.134
6.1 --- a/po/slitaz-tools/fr.po Wed Jul 17 09:52:54 2013 +0200 6.2 +++ b/po/slitaz-tools/fr.po Thu Jul 18 03:32:28 2013 +0300 6.3 @@ -7,7 +7,7 @@ 6.4 msgstr "" 6.5 "Project-Id-Version: SliTaz Tools\n" 6.6 "Report-Msgid-Bugs-To: \n" 6.7 -"POT-Creation-Date: 2012-04-30 14:08+0200\n" 6.8 +"POT-Creation-Date: 2013-07-17 18:32+0300\n" 6.9 "PO-Revision-Date: 2012-04-30 14:10+0100\n" 6.10 "Last-Translator: Christophe Lincoln <pankso@slitaz.org>\n" 6.11 "Language-Team: French\n" 6.12 @@ -17,24 +17,26 @@ 6.13 "Content-Transfer-Encoding: 8bit\n" 6.14 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 6.15 6.16 -#: tinyutils/tazlocale:82 6.17 +#: tinyutils/tazlocale:87 6.18 msgid "Setting system locale to:" 6.19 msgstr "Paramétrage de la langue du système:" 6.20 6.21 -#: tinyutils/tazlocale:96 6.22 +#: tinyutils/tazlocale:101 6.23 msgid "SliTaz language configuration" 6.24 msgstr "Configuration de la langue" 6.25 6.26 -#: tinyutils/tazlocale:115 6.27 -msgid "Please logout of your current session and login again to use new locale." 6.28 -msgstr "Veuillez vous déloguer et vous reloguer une fois pour utiliser la nouvelle locale." 6.29 +#: tinyutils/tazlocale:120 6.30 +msgid "" 6.31 +"Please logout of your current session and login again to use new locale." 6.32 +msgstr "" 6.33 +"Veuillez vous déloguer et vous reloguer une fois pour utiliser la nouvelle " 6.34 +"locale." 6.35 6.36 -#: tinyutils/tazlocale:124 6.37 -#: tinyutils/tazkeymap:47 6.38 +#: tinyutils/tazlocale:129 tinyutils/tazkeymap:47 6.39 msgid "Config file :" 6.40 msgstr "Fichier de config:" 6.41 6.42 -#: tinyutils/tazlocale:125 6.43 +#: tinyutils/tazlocale:130 6.44 msgid "Current locale:" 6.45 msgstr "Locale actuelle :" 6.46 6.47 @@ -47,8 +49,11 @@ 6.48 msgstr "Configuration du clavier" 6.49 6.50 #: tinyutils/tazkeymap:69 6.51 -msgid "Please logout of your current session and login again to use new keyboard." 6.52 -msgstr "Veuillez vous déloguer et vous reloguer une fois pour utiliser le nouveau clavier." 6.53 +msgid "" 6.54 +"Please logout of your current session and login again to use new keyboard." 6.55 +msgstr "" 6.56 +"Veuillez vous déloguer et vous reloguer une fois pour utiliser le nouveau " 6.57 +"clavier." 6.58 6.59 #: tinyutils/setmixer:12 6.60 msgid "Setting default mixer volumes... " 6.61 @@ -62,35 +67,35 @@ 6.62 msgid "You must be root to configure X server." 6.63 msgstr "Vous devez être root pour configurer le serveur X." 6.64 6.65 -#: tinyutils/tazx:126 6.66 +#: tinyutils/tazx:131 6.67 msgid "Install Xorg" 6.68 msgstr "Installer Xorg" 6.69 6.70 -#: tinyutils/tazx:128 6.71 +#: tinyutils/tazx:133 6.72 msgid "Tazx helps you to select your X driver." 6.73 msgstr "Tazx vous aide à séléctionner votre pilote Xorg." 6.74 6.75 -#: tinyutils/tazx:163 6.76 +#: tinyutils/tazx:168 6.77 msgid "Tazx dialog helps you to configure your Xorg server." 6.78 msgstr "Tazx vous aide à configurer votre serveur Xorg." 6.79 6.80 -#: tinyutils/tazx:164 6.81 +#: tinyutils/tazx:169 6.82 msgid "Window Manager:" 6.83 msgstr "Gestionnaire de fenêtres:" 6.84 6.85 -#: tinyutils/tazx:165 6.86 +#: tinyutils/tazx:170 6.87 msgid "X server:" 6.88 msgstr "Serveur X:" 6.89 6.90 -#: tinyutils/tazx:166 6.91 +#: tinyutils/tazx:171 6.92 msgid "Install or reconfigure Xorg" 6.93 msgstr "Installer ou reconfigurer Xorg" 6.94 6.95 -#: tinyutils/tazx:167 6.96 +#: tinyutils/tazx:172 6.97 msgid "Install TinyX server Xfbdev" 6.98 msgstr "Installer le serveur TinyX Xfbdev" 6.99 6.100 -#: tinyutils/tazx:168 6.101 +#: tinyutils/tazx:173 6.102 msgid "Quit Tazx utility" 6.103 msgstr "Quitter l'utilitaire Tazx" 6.104 6.105 @@ -126,6 +131,45 @@ 6.106 msgid "No file:" 6.107 msgstr "Pas de fichier:" 6.108 6.109 +#: tinyutils/terminal:24 6.110 +msgid "configurable SliTaz wrapper for terminal." 6.111 +msgstr "" 6.112 + 6.113 +#: tinyutils/terminal:26 6.114 +msgid "Recognized options:" 6.115 +msgstr "" 6.116 + 6.117 +#: tinyutils/terminal:27 6.118 +msgid "Print the version number" 6.119 +msgstr "" 6.120 + 6.121 +#: tinyutils/terminal:28 6.122 +msgid "Print out this message" 6.123 +msgstr "" 6.124 + 6.125 +#: tinyutils/terminal:29 6.126 +#, sh-format 6.127 +msgid "Width and height of terminal window ($GEOMETRY)" 6.128 +msgstr "" 6.129 + 6.130 +#: tinyutils/terminal:30 6.131 +#, sh-format 6.132 +msgid "Title name for window (\"$TITLE\")" 6.133 +msgstr "" 6.134 + 6.135 +#: tinyutils/terminal:31 6.136 +msgid "Dont't close terminal after command finished" 6.137 +msgstr "" 6.138 + 6.139 +#: tinyutils/terminal:32 6.140 +msgid "Command to execute (must be last in line)" 6.141 +msgstr "" 6.142 + 6.143 +#: tinyutils/terminal:35 6.144 +#, sh-format 6.145 +msgid "Help for $TERMINAL:" 6.146 +msgstr "" 6.147 + 6.148 #~ msgid "You must be root to run:" 6.149 #~ msgstr "Vous devez être root pour lancer:" 6.150
7.1 --- a/po/slitaz-tools/pt_BR.po Wed Jul 17 09:52:54 2013 +0200 7.2 +++ b/po/slitaz-tools/pt_BR.po Thu Jul 18 03:32:28 2013 +0300 7.3 @@ -7,7 +7,7 @@ 7.4 msgstr "" 7.5 "Project-Id-Version: slitaz-tools\n" 7.6 "Report-Msgid-Bugs-To: \n" 7.7 -"POT-Creation-Date: 2012-04-30 14:08+0200\n" 7.8 +"POT-Creation-Date: 2013-07-17 18:32+0300\n" 7.9 "PO-Revision-Date: 2013-01-26 01:40-0300\n" 7.10 "Last-Translator: Claudinei Pereira <claudinei@slitaz.org>\n" 7.11 "Language-Team: Portuguese <i18n@slitaz.org>\n" 7.12 @@ -17,25 +17,25 @@ 7.13 "Content-Transfer-Encoding: 8bit\n" 7.14 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 7.15 7.16 -#: tinyutils/tazlocale:82 7.17 +#: tinyutils/tazlocale:87 7.18 msgid "Setting system locale to:" 7.19 msgstr "Definido linguagem do sistema para:" 7.20 7.21 -#: tinyutils/tazlocale:96 7.22 +#: tinyutils/tazlocale:101 7.23 msgid "SliTaz language configuration" 7.24 msgstr "Configuração de Linguagem do SliTaz" 7.25 7.26 -#: tinyutils/tazlocale:115 7.27 +#: tinyutils/tazlocale:120 7.28 msgid "" 7.29 "Please logout of your current session and login again to use new locale." 7.30 msgstr "" 7.31 "Finalize a sessão atual e faça login novamente para usar a nova linguagem." 7.32 7.33 -#: tinyutils/tazlocale:124 tinyutils/tazkeymap:47 7.34 +#: tinyutils/tazlocale:129 tinyutils/tazkeymap:47 7.35 msgid "Config file :" 7.36 msgstr "Arquivo de configuração:" 7.37 7.38 -#: tinyutils/tazlocale:125 7.39 +#: tinyutils/tazlocale:130 7.40 msgid "Current locale:" 7.41 msgstr "Linguagem atual:" 7.42 7.43 @@ -51,7 +51,8 @@ 7.44 msgid "" 7.45 "Please logout of your current session and login again to use new keyboard." 7.46 msgstr "" 7.47 -"Finalize a sessao atual e faça login novamente para usar o novo mapa de teclado." 7.48 +"Finalize a sessao atual e faça login novamente para usar o novo mapa de " 7.49 +"teclado." 7.50 7.51 #: tinyutils/setmixer:12 7.52 msgid "Setting default mixer volumes... " 7.53 @@ -65,35 +66,35 @@ 7.54 msgid "You must be root to configure X server." 7.55 msgstr "Você deve ser root para configurar o servidor gráfico." 7.56 7.57 -#: tinyutils/tazx:126 7.58 +#: tinyutils/tazx:131 7.59 msgid "Install Xorg" 7.60 msgstr "Instalar Xorg" 7.61 7.62 -#: tinyutils/tazx:128 7.63 +#: tinyutils/tazx:133 7.64 msgid "Tazx helps you to select your X driver." 7.65 msgstr "O Tazx ajuda a selecionar o driver gráfico." 7.66 7.67 -#: tinyutils/tazx:163 7.68 +#: tinyutils/tazx:168 7.69 msgid "Tazx dialog helps you to configure your Xorg server." 7.70 msgstr "A caixa de diálogo do Tazx ajuda a configurar o servidor gráfico." 7.71 7.72 -#: tinyutils/tazx:164 7.73 +#: tinyutils/tazx:169 7.74 msgid "Window Manager:" 7.75 msgstr "Gerenciador de janelas:" 7.76 7.77 -#: tinyutils/tazx:165 7.78 +#: tinyutils/tazx:170 7.79 msgid "X server:" 7.80 msgstr "Servidor gráfico:" 7.81 7.82 -#: tinyutils/tazx:166 7.83 +#: tinyutils/tazx:171 7.84 msgid "Install or reconfigure Xorg" 7.85 msgstr "Instale ou reconfigure o Xorg" 7.86 7.87 -#: tinyutils/tazx:167 7.88 +#: tinyutils/tazx:172 7.89 msgid "Install TinyX server Xfbdev" 7.90 msgstr "Instale o servidor gráfico leve Xfbdev" 7.91 7.92 -#: tinyutils/tazx:168 7.93 +#: tinyutils/tazx:173 7.94 msgid "Quit Tazx utility" 7.95 msgstr "Sair do utilitário Tazx" 7.96 7.97 @@ -129,6 +130,45 @@ 7.98 msgid "No file:" 7.99 msgstr "Nenhum arquivo:" 7.100 7.101 +#: tinyutils/terminal:24 7.102 +msgid "configurable SliTaz wrapper for terminal." 7.103 +msgstr "" 7.104 + 7.105 +#: tinyutils/terminal:26 7.106 +msgid "Recognized options:" 7.107 +msgstr "" 7.108 + 7.109 +#: tinyutils/terminal:27 7.110 +msgid "Print the version number" 7.111 +msgstr "" 7.112 + 7.113 +#: tinyutils/terminal:28 7.114 +msgid "Print out this message" 7.115 +msgstr "" 7.116 + 7.117 +#: tinyutils/terminal:29 7.118 +#, sh-format 7.119 +msgid "Width and height of terminal window ($GEOMETRY)" 7.120 +msgstr "" 7.121 + 7.122 +#: tinyutils/terminal:30 7.123 +#, sh-format 7.124 +msgid "Title name for window (\"$TITLE\")" 7.125 +msgstr "" 7.126 + 7.127 +#: tinyutils/terminal:31 7.128 +msgid "Dont't close terminal after command finished" 7.129 +msgstr "" 7.130 + 7.131 +#: tinyutils/terminal:32 7.132 +msgid "Command to execute (must be last in line)" 7.133 +msgstr "" 7.134 + 7.135 +#: tinyutils/terminal:35 7.136 +#, sh-format 7.137 +msgid "Help for $TERMINAL:" 7.138 +msgstr "" 7.139 + 7.140 #~ msgid "You must be root to run:" 7.141 #~ msgstr "Você deve ser root para executar:" 7.142
8.1 --- a/po/slitaz-tools/ru.po Wed Jul 17 09:52:54 2013 +0200 8.2 +++ b/po/slitaz-tools/ru.po Thu Jul 18 03:32:28 2013 +0300 8.3 @@ -1,41 +1,39 @@ 8.4 -# SOME DESCRIPTIVE TITLE. 8.5 -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER 8.6 -# This file is distributed under the same license as the PACKAGE package. 8.7 -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. 8.8 +# Russian translations for SliTaz Tools. 8.9 +# Copyright (C) 2013 SliTaz 8.10 +# This file is distributed under the same license as the slitaz-tools package. 8.11 +# Aleksej Bobylev <al.bobylev@gmail.com>, 2012. 8.12 # 8.13 msgid "" 8.14 msgstr "" 8.15 "Project-Id-Version: SliTaz Tools\n" 8.16 "Report-Msgid-Bugs-To: \n" 8.17 -"POT-Creation-Date: 2012-07-01 20:20+0000\n" 8.18 -"PO-Revision-Date: 2012-07-15 15:24-0000\n" 8.19 +"POT-Creation-Date: 2013-07-17 18:32+0300\n" 8.20 +"PO-Revision-Date: 2013-07-17 18:38+0300\n" 8.21 "Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n" 8.22 -"Language-Team: LANGUAGE <LL@li.org>\n" 8.23 +"Language-Team: \n" 8.24 "Language: \n" 8.25 "MIME-Version: 1.0\n" 8.26 "Content-Type: text/plain; charset=UTF-8\n" 8.27 "Content-Transfer-Encoding: 8bit\n" 8.28 -"X-Poedit-Basepath: ../../\n" 8.29 -"X-Poedit-SearchPath-0: .\n" 8.30 8.31 -#: tinyutils/tazlocale:82 8.32 +#: tinyutils/tazlocale:87 8.33 msgid "Setting system locale to:" 8.34 msgstr "Установка системной локали:" 8.35 8.36 -#: tinyutils/tazlocale:96 8.37 +#: tinyutils/tazlocale:101 8.38 msgid "SliTaz language configuration" 8.39 msgstr "Параметры языка SliTaz" 8.40 8.41 -#: tinyutils/tazlocale:115 8.42 +#: tinyutils/tazlocale:120 8.43 msgid "Please logout of your current session and login again to use new locale." 8.44 msgstr "Выйдите из системы и войдите повторно, чтобы использовать новую локаль." 8.45 8.46 -#: tinyutils/tazlocale:124 8.47 +#: tinyutils/tazlocale:129 8.48 #: tinyutils/tazkeymap:47 8.49 msgid "Config file :" 8.50 msgstr "Файл настроек :" 8.51 8.52 -#: tinyutils/tazlocale:125 8.53 +#: tinyutils/tazlocale:130 8.54 msgid "Current locale:" 8.55 msgstr "Текущая локаль :" 8.56 8.57 @@ -63,35 +61,35 @@ 8.58 msgid "You must be root to configure X server." 8.59 msgstr "Вы должны быть администратором для настройки X-сервера." 8.60 8.61 -#: tinyutils/tazx:126 8.62 +#: tinyutils/tazx:131 8.63 msgid "Install Xorg" 8.64 msgstr "Установка Xorg" 8.65 8.66 -#: tinyutils/tazx:128 8.67 +#: tinyutils/tazx:133 8.68 msgid "Tazx helps you to select your X driver." 8.69 msgstr "Tazx поможет вам выбрать драйвер для X." 8.70 8.71 -#: tinyutils/tazx:163 8.72 +#: tinyutils/tazx:168 8.73 msgid "Tazx dialog helps you to configure your Xorg server." 8.74 msgstr "Диалог Tazx поможет вам настроить сервер Xorg." 8.75 8.76 -#: tinyutils/tazx:164 8.77 +#: tinyutils/tazx:169 8.78 msgid "Window Manager:" 8.79 msgstr "Менеджер окон:" 8.80 8.81 -#: tinyutils/tazx:165 8.82 +#: tinyutils/tazx:170 8.83 msgid "X server:" 8.84 msgstr "X-сервер:" 8.85 8.86 -#: tinyutils/tazx:166 8.87 +#: tinyutils/tazx:171 8.88 msgid "Install or reconfigure Xorg" 8.89 msgstr "Установить или перенастроить Xorg" 8.90 8.91 -#: tinyutils/tazx:167 8.92 +#: tinyutils/tazx:172 8.93 msgid "Install TinyX server Xfbdev" 8.94 msgstr "Установить сервер TinyX: Xfbdev" 8.95 8.96 -#: tinyutils/tazx:168 8.97 +#: tinyutils/tazx:173 8.98 msgid "Quit Tazx utility" 8.99 msgstr "Выйти из утилиты Tazx" 8.100 8.101 @@ -127,6 +125,45 @@ 8.102 msgid "No file:" 8.103 msgstr "Нет файла:" 8.104 8.105 +#: tinyutils/terminal:24 8.106 +msgid "configurable SliTaz wrapper for terminal." 8.107 +msgstr "настраиваемая обёртка SliTaz для терминала." 8.108 + 8.109 +#: tinyutils/terminal:26 8.110 +msgid "Recognized options:" 8.111 +msgstr "Поддерживаемые параметры:" 8.112 + 8.113 +#: tinyutils/terminal:27 8.114 +msgid "Print the version number" 8.115 +msgstr "Информация о версии" 8.116 + 8.117 +#: tinyutils/terminal:28 8.118 +msgid "Print out this message" 8.119 +msgstr "Вывести эту справку" 8.120 + 8.121 +#: tinyutils/terminal:29 8.122 +#, sh-format 8.123 +msgid "Width and height of terminal window ($GEOMETRY)" 8.124 +msgstr "Ширина и высота окна терминала ($GEOMETRY)" 8.125 + 8.126 +#: tinyutils/terminal:30 8.127 +#, sh-format 8.128 +msgid "Title name for window (\"$TITLE\")" 8.129 +msgstr "Заголовок окна (\"$TITLE\")" 8.130 + 8.131 +#: tinyutils/terminal:31 8.132 +msgid "Dont't close terminal after command finished" 8.133 +msgstr "Не закрывать терминал после завершения команды" 8.134 + 8.135 +#: tinyutils/terminal:32 8.136 +msgid "Command to execute (must be last in line)" 8.137 +msgstr "Выполнить команду (должна быть последней в строке)" 8.138 + 8.139 +#: tinyutils/terminal:35 8.140 +#, sh-format 8.141 +msgid "Help for $TERMINAL:" 8.142 +msgstr "Справка программы $TERMINAL:" 8.143 + 8.144 #~ msgid "You must be root to run:" 8.145 #~ msgstr "Вы должны быть администратором, чтобы запустить:" 8.146
9.1 --- a/po/slitaz-tools/slitaz-tools.pot Wed Jul 17 09:52:54 2013 +0200 9.2 +++ b/po/slitaz-tools/slitaz-tools.pot Thu Jul 18 03:32:28 2013 +0300 9.3 @@ -8,7 +8,7 @@ 9.4 msgstr "" 9.5 "Project-Id-Version: SliTaz Tools\n" 9.6 "Report-Msgid-Bugs-To: \n" 9.7 -"POT-Creation-Date: 2012-07-01 20:20+0000\n" 9.8 +"POT-Creation-Date: 2013-07-17 18:32+0300\n" 9.9 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 9.10 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 9.11 "Language-Team: LANGUAGE <LL@li.org>\n" 9.12 @@ -17,24 +17,24 @@ 9.13 "Content-Type: text/plain; charset=CHARSET\n" 9.14 "Content-Transfer-Encoding: 8bit\n" 9.15 9.16 -#: tinyutils/tazlocale:82 9.17 +#: tinyutils/tazlocale:87 9.18 msgid "Setting system locale to:" 9.19 msgstr "" 9.20 9.21 -#: tinyutils/tazlocale:96 9.22 +#: tinyutils/tazlocale:101 9.23 msgid "SliTaz language configuration" 9.24 msgstr "" 9.25 9.26 -#: tinyutils/tazlocale:115 9.27 +#: tinyutils/tazlocale:120 9.28 msgid "" 9.29 "Please logout of your current session and login again to use new locale." 9.30 msgstr "" 9.31 9.32 -#: tinyutils/tazlocale:124 tinyutils/tazkeymap:47 9.33 +#: tinyutils/tazlocale:129 tinyutils/tazkeymap:47 9.34 msgid "Config file :" 9.35 msgstr "" 9.36 9.37 -#: tinyutils/tazlocale:125 9.38 +#: tinyutils/tazlocale:130 9.39 msgid "Current locale:" 9.40 msgstr "" 9.41 9.42 @@ -63,35 +63,35 @@ 9.43 msgid "You must be root to configure X server." 9.44 msgstr "" 9.45 9.46 -#: tinyutils/tazx:126 9.47 +#: tinyutils/tazx:131 9.48 msgid "Install Xorg" 9.49 msgstr "" 9.50 9.51 -#: tinyutils/tazx:128 9.52 +#: tinyutils/tazx:133 9.53 msgid "Tazx helps you to select your X driver." 9.54 msgstr "" 9.55 9.56 -#: tinyutils/tazx:163 9.57 +#: tinyutils/tazx:168 9.58 msgid "Tazx dialog helps you to configure your Xorg server." 9.59 msgstr "" 9.60 9.61 -#: tinyutils/tazx:164 9.62 +#: tinyutils/tazx:169 9.63 msgid "Window Manager:" 9.64 msgstr "" 9.65 9.66 -#: tinyutils/tazx:165 9.67 +#: tinyutils/tazx:170 9.68 msgid "X server:" 9.69 msgstr "" 9.70 9.71 -#: tinyutils/tazx:166 9.72 +#: tinyutils/tazx:171 9.73 msgid "Install or reconfigure Xorg" 9.74 msgstr "" 9.75 9.76 -#: tinyutils/tazx:167 9.77 +#: tinyutils/tazx:172 9.78 msgid "Install TinyX server Xfbdev" 9.79 msgstr "" 9.80 9.81 -#: tinyutils/tazx:168 9.82 +#: tinyutils/tazx:173 9.83 msgid "Quit Tazx utility" 9.84 msgstr "" 9.85 9.86 @@ -126,3 +126,42 @@ 9.87 #: tinyutils/decode:98 9.88 msgid "No file:" 9.89 msgstr "" 9.90 + 9.91 +#: tinyutils/terminal:24 9.92 +msgid "configurable SliTaz wrapper for terminal." 9.93 +msgstr "" 9.94 + 9.95 +#: tinyutils/terminal:26 9.96 +msgid "Recognized options:" 9.97 +msgstr "" 9.98 + 9.99 +#: tinyutils/terminal:27 9.100 +msgid "Print the version number" 9.101 +msgstr "" 9.102 + 9.103 +#: tinyutils/terminal:28 9.104 +msgid "Print out this message" 9.105 +msgstr "" 9.106 + 9.107 +#: tinyutils/terminal:29 9.108 +#, sh-format 9.109 +msgid "Width and height of terminal window ($GEOMETRY)" 9.110 +msgstr "" 9.111 + 9.112 +#: tinyutils/terminal:30 9.113 +#, sh-format 9.114 +msgid "Title name for window (\"$TITLE\")" 9.115 +msgstr "" 9.116 + 9.117 +#: tinyutils/terminal:31 9.118 +msgid "Dont't close terminal after command finished" 9.119 +msgstr "" 9.120 + 9.121 +#: tinyutils/terminal:32 9.122 +msgid "Command to execute (must be last in line)" 9.123 +msgstr "" 9.124 + 9.125 +#: tinyutils/terminal:35 9.126 +#, sh-format 9.127 +msgid "Help for $TERMINAL:" 9.128 +msgstr ""
10.1 --- a/tazbox/tazbox Wed Jul 17 09:52:54 2013 +0200 10.2 +++ b/tazbox/tazbox Thu Jul 18 03:32:28 2013 +0300 10.3 @@ -251,12 +251,24 @@ 10.4 10.5 # All applications 10.6 all_apps() { 10.7 - yad --icons --title="$(gettext "All Applications")" \ 10.8 + yad --icons --title="$(gettext 'All Applications')" \ 10.9 --compact --read-dir=/usr/share/applications \ 10.10 --window-icon=$icon --width=400 --height=400 \ 10.11 --button="gtk-close:0" 10.12 } 10.13 10.14 +# Generate alternatives list: first - current choice, following - existing apps 10.15 +gen_alt() { 10.16 + alts="$@" 10.17 + current=$(echo $alts | cut -d' ' -f1) 10.18 + alts=$(echo $alts | sed "s|$current||g") 10.19 + for alt in $alts; do 10.20 + [ ! $(busybox which $alt) ] && alts=$(echo $alts | sed "s|$alt||") 10.21 + done 10.22 + echo $current $alts | tr ' ' '!' #sed 's| |!|g' 10.23 +} 10.24 + 10.25 + 10.26 # 10.27 # Commands 10.28 # 10.29 @@ -358,30 +370,45 @@ 10.30 cp /etc/slitaz/applications.conf $CONFIG 10.31 fi 10.32 . $CONFIG 10.33 + 10.34 + FILE_MANAGERS=$(gen_alt $FILE_MANAGER \ 10.35 + clex emelfm2 mc pathfinder pcmanfm ranger spacefm thunar xfe ytree) 10.36 + BROWSERS=$(gen_alt $BROWSER \ 10.37 + arora chrome cream dillo elinks firefox iron links lynx midori \ 10.38 + netsurf opera retawq seamonkey surf tazweb) 10.39 + EDITORS=$(gen_alt $EDITOR \ 10.40 + adie beaver emacs geany jed joe le leafpad mousepad mp-5 nano \ 10.41 + SciTE vi vim xedit xfw zile) 10.42 + TERMINALS=$(gen_alt $TERMINAL \ 10.43 + aterm evilvte lxterminal mrxvt sakura stjerm tilda urxvt vte xterm \ 10.44 + yeahconsole) 10.45 + WINDOW_MANAGERS=$(gen_alt $WINDOW_MANAGER \ 10.46 + awesome blackbox dwm echinus enlightenment fluxbox icewm jwm \ 10.47 + karmen matchbox openbox-session pekwm ratpoison xfwm4) 10.48 + 10.49 eval $(yad --title="$(gettext 'SliTaz default applications')" \ 10.50 --window-icon=preferences-desktop --image=preferences-desktop \ 10.51 --text="<b>$(gettext 'SliTaz default applications configuration')</b>" \ 10.52 --form \ 10.53 - --field="$(gettext 'File manager:')" \ 10.54 - --field="$(gettext 'Web browser:')" \ 10.55 - --field="$(gettext 'Text editor:')" \ 10.56 - --field="$(gettext 'Terminal:')" \ 10.57 - --field="$(gettext 'Window manager:')" \ 10.58 - "$FILE_MANAGER" "$BROWSER" "$EDITOR" "$TERMINAL" "$WINDOW_MANAGER" | \ 10.59 + --field="$(gettext 'File manager:'):CBE" "$FILE_MANAGERS" \ 10.60 + --field="$(gettext 'Web browser:'):CBE" "$BROWSERS" \ 10.61 + --field="$(gettext 'Text editor:'):CBE" "$EDITORS" \ 10.62 + --field="$(gettext 'Terminal:'):CBE" "$TERMINALS" \ 10.63 + --field="$(gettext 'Window manager:'):CBE" "$WINDOW_MANAGERS" | \ 10.64 awk -F'|' '{printf "FILE_MANAGER=\"%s\"\nBROWSER=\"%s\"\nEDITOR=\"%s\"\ 10.65 TERMINAL=\"%s\"\nWINDOW_MANAGER=\"%s\"\n", $1, $2, $3, $4, $5}') 10.66 + 10.67 sed '/FILE_MANAGER=/s|"\([^"]*\)"|"'$FILE_MANAGER'"|; \ 10.68 /BROWSER=/s|"\([^"]*\)"|"'$BROWSER'"|; \ 10.69 /EDITOR=/s|"\([^"]*\)"|"'$EDITOR'"|; \ 10.70 /TERMINAL=/s|"\([^"]*\)"|"'$TERMINAL'"|; \ 10.71 /WINDOW_MANAGER=/s|"\([^"]*\)"|"'$WINDOW_MANAGER'"|' \ 10.72 - -i $CONFIG 10.73 - ;; 10.74 + -i $CONFIG ;; 10.75 gpl) 10.76 - yad --text-info --title="GNU General Public License" \ 10.77 - --window-icon=text-x-generic --geometry="560x500+0-24" \ 10.78 - --button "OK" < /usr/share/licenses/gpl.txt 10.79 - ;; 10.80 + yad --center --text-info --title="GNU General Public License" \ 10.81 + --image=/usr/share/pixmaps/gpl3.png --image-on-top \ 10.82 + --image-on-top --window-icon=text-x-generic --geometry="580x500" \ 10.83 + --fontname=monospace --button "OK" < /usr/share/licenses/gpl.txt ;; 10.84 *) 10.85 usage ;; 10.86 esac
11.1 --- a/tinyutils/terminal Wed Jul 17 09:52:54 2013 +0200 11.2 +++ b/tinyutils/terminal Thu Jul 18 03:32:28 2013 +0300 11.3 @@ -2,10 +2,55 @@ 11.4 # Launch SliTaz default X Terminal. 11.5 # 11.6 . /etc/slitaz/applications.conf 11.7 +. /lib/libtaz.sh 11.8 + 11.9 +export TEXTDOMAIN='slitaz-tools' 11.10 + 11.11 +help() { 11.12 + cat << EOT 11.13 +$(boldify terminal): $(gettext 'configurable SliTaz wrapper for terminal.') 11.14 + 11.15 +$(boldify $(gettext 'Recognized options:')) 11.16 +-v -version --version $(gettext 'Print the version number') 11.17 + -help --help $(gettext 'Print out this message') 11.18 + -geometry --geometry $(eval_gettext 'Width and height of terminal window ($GEOMETRY)') 11.19 +-t -title -T --title $(eval_gettext 'Title name for window ("$TITLE")') 11.20 +-h -hold $(gettext "Dont't close terminal after command finished") 11.21 +-e --xterm-execute $(gettext 'Command to execute (must be last in line)') 11.22 + 11.23 + 11.24 +$(boldify $(eval_gettext 'Help for $TERMINAL:')) 11.25 + 11.26 +EOT 11.27 + $TERMINAL $OPT_HELP 11.28 +} 11.29 + 11.30 11.31 USER_CONFIG="$HOME/.config/slitaz/applications.conf" 11.32 [ -f $USER_CONFIG ] && . $USER_CONFIG 11.33 11.34 -$TERMINAL "$@" & 11.35 +local PARAMS="" GEOMETRY="80x24" TITLE="SliTaz $(cat /etc/slitaz-release)" COMMAND 11.36 + 11.37 +case $TERMINAL in 11.38 + sakura) 11.39 + OPT_TITLE="-t"; OPT_GEOM="--geometry"; OPT_HELP="-?"; OPT_HOLD="-h";; 11.40 + xterm|*) 11.41 + OPT_TITLE="-T"; OPT_GEOM="-geometry"; OPT_HELP="-help"; OPT_HOLD="-hold";; 11.42 +esac 11.43 + 11.44 +until [ $# == 0 ]; do 11.45 + PARAM="$1" 11.46 + case "$PARAM" in 11.47 + -version|--version|-v) $TERMINAL -v; exit 0;; 11.48 + -help|--help) help; exit 0;; 11.49 + -h|-hold) shift; PARAMS="$PARAMS $OPT_HOLD";; 11.50 + -geometry|--geometry) shift; GEOMETRY="$1"; shift;; 11.51 + -t|-title|-T|--title) shift; TITLE="$1"; shift;; 11.52 + -e|--xterm-execute) shift; COMMAND="-e $@"; break;; 11.53 + *) shift; PARAMS="$PARAMS $PARAM";; 11.54 + esac 11.55 +done 11.56 + 11.57 +$TERMINAL $PARAMS $OPT_GEOM $GEOMETRY $OPT_TITLE "$TITLE" $COMMAND & 11.58 11.59 exit 0