slitaz-tools rev 753
Add info cmd to tazlocale and let users see configs)
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Mon Apr 30 14:12:13 2012 +0200 (2012-04-30) |
| parents | f73c8f4bb66c |
| children | 6e62d41a70d2 |
| files | po/slitaz-boxes/slitaz-boxes.pot po/slitaz-tools/es_AR.po po/slitaz-tools/fr.po po/slitaz-tools/pt_BR.po po/slitaz-tools/slitaz-tools.pot po/tazbox/tazbox.pot po/tazdrop/tazdrop.pot po/tazinst/tazinst.pot tinyutils/tazkeymap tinyutils/tazlocale |
line diff
1.1 --- a/po/slitaz-boxes/slitaz-boxes.pot Mon Apr 30 14:04:35 2012 +0200 1.2 +++ b/po/slitaz-boxes/slitaz-boxes.pot Mon Apr 30 14:12:13 2012 +0200 1.3 @@ -8,7 +8,7 @@ 1.4 msgstr "" 1.5 "Project-Id-Version: SliTaz Boxes\n" 1.6 "Report-Msgid-Bugs-To: \n" 1.7 -"POT-Creation-Date: 2012-04-30 13:50+0200\n" 1.8 +"POT-Creation-Date: 2012-04-30 14:08+0200\n" 1.9 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 1.10 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 1.11 "Language-Team: LANGUAGE <LL@li.org>\n"
2.1 --- a/po/slitaz-tools/es_AR.po Mon Apr 30 14:04:35 2012 +0200 2.2 +++ b/po/slitaz-tools/es_AR.po Mon Apr 30 14:12:13 2012 +0200 2.3 @@ -7,7 +7,7 @@ 2.4 msgstr "" 2.5 "Project-Id-Version: SliTaz Tools\n" 2.6 "Report-Msgid-Bugs-To: \n" 2.7 -"POT-Creation-Date: 2012-04-30 13:50+0200\n" 2.8 +"POT-Creation-Date: 2012-04-30 14:08+0200\n" 2.9 "PO-Revision-Date: 2011-08-11 00:08-0300\n" 2.10 "Last-Translator: Lucas Gioia <lucas.lucas.lucas24@gmail.com>\n" 2.11 "Language-Team: LANGUAGE <LL@li.org>\n" 2.12 @@ -16,26 +16,30 @@ 2.13 "Content-Type: text/plain; charset=UTF-8\n" 2.14 "Content-Transfer-Encoding: 8bit\n" 2.15 2.16 -#: tinyutils/tazlocale:83 2.17 +#: tinyutils/tazlocale:82 2.18 msgid "Setting system locale to:" 2.19 msgstr "" 2.20 2.21 -#: tinyutils/tazlocale:97 2.22 +#: tinyutils/tazlocale:96 2.23 msgid "SliTaz language configuration" 2.24 msgstr "SliTaz configuración del lenguaje" 2.25 2.26 -#: tinyutils/tazlocale:116 2.27 +#: tinyutils/tazlocale:115 2.28 msgid "" 2.29 "Please logout of your current session and login again to use new locale." 2.30 msgstr "" 2.31 "Por favor, cierre su sesión actual e iniciela nuevamente para usar un nuevo " 2.32 "local." 2.33 2.34 -#: tinyutils/tazkeymap:49 2.35 +#: tinyutils/tazlocale:124 tinyutils/tazkeymap:47 2.36 msgid "Config file :" 2.37 msgstr "" 2.38 2.39 -#: tinyutils/tazkeymap:50 2.40 +#: tinyutils/tazlocale:125 2.41 +msgid "Current locale:" 2.42 +msgstr "" 2.43 + 2.44 +#: tinyutils/tazkeymap:48 2.45 msgid "Current keymap:" 2.46 msgstr "" 2.47
3.1 --- a/po/slitaz-tools/fr.po Mon Apr 30 14:04:35 2012 +0200 3.2 +++ b/po/slitaz-tools/fr.po Mon Apr 30 14:12:13 2012 +0200 3.3 @@ -7,8 +7,8 @@ 3.4 msgstr "" 3.5 "Project-Id-Version: SliTaz Tools\n" 3.6 "Report-Msgid-Bugs-To: \n" 3.7 -"POT-Creation-Date: 2012-04-30 13:50+0200\n" 3.8 -"PO-Revision-Date: 2012-04-30 14:03+0100\n" 3.9 +"POT-Creation-Date: 2012-04-30 14:08+0200\n" 3.10 +"PO-Revision-Date: 2012-04-30 14:10+0100\n" 3.11 "Last-Translator: Christophe Lincoln <pankso@slitaz.org>\n" 3.12 "Language-Team: French\n" 3.13 "Language: fr\n" 3.14 @@ -17,23 +17,28 @@ 3.15 "Content-Transfer-Encoding: 8bit\n" 3.16 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 3.17 3.18 -#: tinyutils/tazlocale:83 3.19 +#: tinyutils/tazlocale:82 3.20 msgid "Setting system locale to:" 3.21 msgstr "Paramétrage de la langue du système:" 3.22 3.23 -#: tinyutils/tazlocale:97 3.24 +#: tinyutils/tazlocale:96 3.25 msgid "SliTaz language configuration" 3.26 msgstr "Configuration de la langue" 3.27 3.28 -#: tinyutils/tazlocale:116 3.29 +#: tinyutils/tazlocale:115 3.30 msgid "Please logout of your current session and login again to use new locale." 3.31 msgstr "Veuillez vous déloguer et vous reloguer une fois pour utiliser la nouvelle locale." 3.32 3.33 -#: tinyutils/tazkeymap:49 3.34 +#: tinyutils/tazlocale:124 3.35 +#: tinyutils/tazkeymap:47 3.36 msgid "Config file :" 3.37 msgstr "Fichier de config:" 3.38 3.39 -#: tinyutils/tazkeymap:50 3.40 +#: tinyutils/tazlocale:125 3.41 +msgid "Current locale:" 3.42 +msgstr "Locale actuelle :" 3.43 + 3.44 +#: tinyutils/tazkeymap:48 3.45 msgid "Current keymap:" 3.46 msgstr "Clavier actuel :" 3.47
4.1 --- a/po/slitaz-tools/pt_BR.po Mon Apr 30 14:04:35 2012 +0200 4.2 +++ b/po/slitaz-tools/pt_BR.po Mon Apr 30 14:12:13 2012 +0200 4.3 @@ -8,7 +8,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-04-30 13:50+0200\n" 4.8 +"POT-Creation-Date: 2012-04-30 14:08+0200\n" 4.9 "PO-Revision-Date: 2011-06-18 16:37-0300\n" 4.10 "Last-Translator: Claudinei Pereira <claudinei@slitaz.org>\n" 4.11 "Language-Team: Portuguese <i18n@slitaz.org>\n" 4.12 @@ -18,25 +18,29 @@ 4.13 "Content-Transfer-Encoding: 8bit\n" 4.14 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 4.15 4.16 -#: tinyutils/tazlocale:83 4.17 +#: tinyutils/tazlocale:82 4.18 msgid "Setting system locale to:" 4.19 msgstr "" 4.20 4.21 -#: tinyutils/tazlocale:97 4.22 +#: tinyutils/tazlocale:96 4.23 msgid "SliTaz language configuration" 4.24 msgstr "Configuração de Linguagem do SliTaz" 4.25 4.26 -#: tinyutils/tazlocale:116 4.27 +#: tinyutils/tazlocale:115 4.28 msgid "" 4.29 "Please logout of your current session and login again to use new locale." 4.30 msgstr "" 4.31 "Finalize a sessão atual e faça login novamente para usar a nova linguagem." 4.32 4.33 -#: tinyutils/tazkeymap:49 4.34 +#: tinyutils/tazlocale:124 tinyutils/tazkeymap:47 4.35 msgid "Config file :" 4.36 msgstr "" 4.37 4.38 -#: tinyutils/tazkeymap:50 4.39 +#: tinyutils/tazlocale:125 4.40 +msgid "Current locale:" 4.41 +msgstr "" 4.42 + 4.43 +#: tinyutils/tazkeymap:48 4.44 msgid "Current keymap:" 4.45 msgstr "" 4.46
5.1 --- a/po/slitaz-tools/slitaz-tools.pot Mon Apr 30 14:04:35 2012 +0200 5.2 +++ b/po/slitaz-tools/slitaz-tools.pot Mon Apr 30 14:12:13 2012 +0200 5.3 @@ -8,7 +8,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 13:50+0200\n" 5.8 +"POT-Creation-Date: 2012-04-30 14:08+0200\n" 5.9 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 5.10 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 5.11 "Language-Team: LANGUAGE <LL@li.org>\n" 5.12 @@ -17,24 +17,28 @@ 5.13 "Content-Type: text/plain; charset=CHARSET\n" 5.14 "Content-Transfer-Encoding: 8bit\n" 5.15 5.16 -#: tinyutils/tazlocale:83 5.17 +#: tinyutils/tazlocale:82 5.18 msgid "Setting system locale to:" 5.19 msgstr "" 5.20 5.21 -#: tinyutils/tazlocale:97 5.22 +#: tinyutils/tazlocale:96 5.23 msgid "SliTaz language configuration" 5.24 msgstr "" 5.25 5.26 -#: tinyutils/tazlocale:116 5.27 +#: tinyutils/tazlocale:115 5.28 msgid "" 5.29 "Please logout of your current session and login again to use new locale." 5.30 msgstr "" 5.31 5.32 -#: tinyutils/tazkeymap:49 5.33 +#: tinyutils/tazlocale:124 tinyutils/tazkeymap:47 5.34 msgid "Config file :" 5.35 msgstr "" 5.36 5.37 -#: tinyutils/tazkeymap:50 5.38 +#: tinyutils/tazlocale:125 5.39 +msgid "Current locale:" 5.40 +msgstr "" 5.41 + 5.42 +#: tinyutils/tazkeymap:48 5.43 msgid "Current keymap:" 5.44 msgstr "" 5.45
6.1 --- a/po/tazbox/tazbox.pot Mon Apr 30 14:04:35 2012 +0200 6.2 +++ b/po/tazbox/tazbox.pot Mon Apr 30 14:12:13 2012 +0200 6.3 @@ -8,7 +8,7 @@ 6.4 msgstr "" 6.5 "Project-Id-Version: TazBox\n" 6.6 "Report-Msgid-Bugs-To: \n" 6.7 -"POT-Creation-Date: 2012-04-30 13:50+0200\n" 6.8 +"POT-Creation-Date: 2012-04-30 14:08+0200\n" 6.9 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 6.10 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 6.11 "Language-Team: LANGUAGE <LL@li.org>\n"
7.1 --- a/po/tazdrop/tazdrop.pot Mon Apr 30 14:04:35 2012 +0200 7.2 +++ b/po/tazdrop/tazdrop.pot Mon Apr 30 14:12:13 2012 +0200 7.3 @@ -8,7 +8,7 @@ 7.4 msgstr "" 7.5 "Project-Id-Version: TazDrop\n" 7.6 "Report-Msgid-Bugs-To: \n" 7.7 -"POT-Creation-Date: 2012-04-30 13:50+0200\n" 7.8 +"POT-Creation-Date: 2012-04-30 14:08+0200\n" 7.9 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 7.10 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 7.11 "Language-Team: LANGUAGE <LL@li.org>\n"
8.1 --- a/po/tazinst/tazinst.pot Mon Apr 30 14:04:35 2012 +0200 8.2 +++ b/po/tazinst/tazinst.pot Mon Apr 30 14:12:13 2012 +0200 8.3 @@ -8,7 +8,7 @@ 8.4 msgstr "" 8.5 "Project-Id-Version: Tazinst\n" 8.6 "Report-Msgid-Bugs-To: \n" 8.7 -"POT-Creation-Date: 2012-04-30 13:50+0200\n" 8.8 +"POT-Creation-Date: 2012-04-30 14:08+0200\n" 8.9 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 8.10 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 8.11 "Language-Team: LANGUAGE <LL@li.org>\n"
9.1 --- a/tinyutils/tazkeymap Mon Apr 30 14:04:35 2012 +0200 9.2 +++ b/tinyutils/tazkeymap Mon Apr 30 14:12:13 2012 +0200 9.3 @@ -7,9 +7,7 @@ 9.4 # 9.5 # Author: Christophe Lincoln <pankso@slitaz.org> 9.6 # 9.7 -: ${DIALOG=dialog} 9.8 . /lib/libtaz.sh 9.9 -check_root 9.10 9.11 # Internationalization 9.12 . /usr/bin/gettext.sh 9.13 @@ -52,6 +50,8 @@ 9.14 list_keymaps | sort ;; 9.15 "") 9.16 # Default to text mode dialog. 9.17 + : ${DIALOG=dialog} 9.18 + check_root 9.19 exec 3>&1 9.20 value=$($DIALOG --clear \ 9.21 --title " $(gettext "SliTaz keymap configuration") " \ 9.22 @@ -76,6 +76,7 @@ 9.23 *) 9.24 # Used to configure keymap from cmdline or scripts 9.25 kmap=$1 9.26 + check_root 9.27 system_config 9.28 load_keymap ;; 9.29 esac
10.1 --- a/tinyutils/tazlocale Mon Apr 30 14:04:35 2012 +0200 10.2 +++ b/tinyutils/tazlocale Mon Apr 30 14:12:13 2012 +0200 10.3 @@ -8,7 +8,6 @@ 10.4 # Author: Christophe Lincoln <pankso@slitaz.org> 10.5 # 10.6 . /lib/libtaz.sh 10.7 -check_root 10.8 10.9 # Internationalization 10.10 . /usr/bin/gettext.sh 10.11 @@ -121,6 +120,9 @@ 10.12 } 10.13 10.14 case "$1" in 10.15 + info) 10.16 + gettext "Config file :"; echo " /etc/locale.conf" 10.17 + gettext "Current locale:"; echo " $LANG" ;; 10.18 list) 10.19 for i in $(ls -1 /usr/share/i18n/locales | grep ^[a-z][a-z]_[A-Z][A-Z]) 10.20 do 10.21 @@ -130,10 +132,12 @@ 10.22 "") 10.23 # No args: display Ncurses dialog. 10.24 : ${DIALOG=dialog} 10.25 + check_root 10.26 dialog_menu ;; 10.27 *) 10.28 # Usage: tazlocale LANG_COUNTRY 10.29 locale=$1 10.30 + check_root 10.31 system_config 10.32 gen_utf8_locale 10.33 link_language_files ;;