# HG changeset patch # User Aleksej Bobylev # Date 1399406112 -10800 # Node ID 5a8adba12ac2506adbbf0d55aec9f48f4b3ba472 # Parent 3dd4838c69c621bc118f67389477783700888221 tazbox: huge update & bug fix diff -r 3dd4838c69c6 -r 5a8adba12ac2 po/slitaz-boxes/slitaz-boxes.pot --- a/po/slitaz-boxes/slitaz-boxes.pot Fri May 02 22:16:37 2014 +0200 +++ b/po/slitaz-boxes/slitaz-boxes.pot Tue May 06 22:55:12 2014 +0300 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: SliTaz Boxes\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-16 13:19+0300\n" +"POT-Creation-Date: 2014-05-06 22:40+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -r 3dd4838c69c6 -r 5a8adba12ac2 po/slitaz-tools/el.po --- a/po/slitaz-tools/el.po Fri May 02 22:16:37 2014 +0200 +++ b/po/slitaz-tools/el.po Tue May 06 22:55:12 2014 +0300 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-23 14:52+0100\n" +"POT-Creation-Date: 2014-05-05 16:00+0300\n" "PO-Revision-Date: 2012-12-18 22:06+0300\n" "Last-Translator: Constantine Mousafiris \n" "Language-Team: Kostis Mousafiris\n" @@ -98,36 +98,40 @@ msgid "Done" msgstr "Ολοκληρώθηκε" -#: tinyutils/tazx:131 +#: tinyutils/tazx:63 +msgid "Creating:" +msgstr "" + +#: tinyutils/tazx:142 msgid "Install Xorg" msgstr "Εγκατάσταση του Xorg" -#: tinyutils/tazx:132 +#: tinyutils/tazx:143 msgid "Tazx helps you to select your X driver." msgstr "Ο Tazx σας βοηθά να επιλέξετε τον οδηγό (driver) για το Χ." -#: tinyutils/tazx:134 +#: tinyutils/tazx:145 msgid "driver" msgstr "" -#: tinyutils/tazx:135 +#: tinyutils/tazx:146 msgid "Quit" msgstr "" -#: tinyutils/tazx:163 +#: tinyutils/tazx:174 #, fuzzy msgid "SliTaz Xorg config" msgstr "Ρύθμιση γλώσσας του SliTaz" -#: tinyutils/tazx:165 +#: tinyutils/tazx:176 msgid "Install or reconfigure Xorg" msgstr "Εγκατάσταση ή επαναρύθμιση του X org" -#: tinyutils/tazx:166 +#: tinyutils/tazx:177 msgid "Install Xorg server (light version)" msgstr "" -#: tinyutils/tazx:167 +#: tinyutils/tazx:178 msgid "Quit Tazx utility" msgstr "Κλείστε το βοηθητικό πρόγραμμα Tazx" diff -r 3dd4838c69c6 -r 5a8adba12ac2 po/slitaz-tools/es.po --- a/po/slitaz-tools/es.po Fri May 02 22:16:37 2014 +0200 +++ b/po/slitaz-tools/es.po Tue May 06 22:55:12 2014 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-23 14:52+0100\n" +"POT-Creation-Date: 2014-05-05 16:00+0300\n" "PO-Revision-Date: 2011-08-11 00:08-0300\n" "Last-Translator: Lucas Gioia \n" "Language-Team: \n" @@ -97,36 +97,40 @@ msgid "Done" msgstr "Listo" -#: tinyutils/tazx:131 +#: tinyutils/tazx:63 +msgid "Creating:" +msgstr "" + +#: tinyutils/tazx:142 msgid "Install Xorg" msgstr "Instalar Xorg" -#: tinyutils/tazx:132 +#: tinyutils/tazx:143 msgid "Tazx helps you to select your X driver." msgstr "Tazx le ayudará a seleccionar su controlador X." -#: tinyutils/tazx:134 +#: tinyutils/tazx:145 msgid "driver" msgstr "" -#: tinyutils/tazx:135 +#: tinyutils/tazx:146 msgid "Quit" msgstr "" -#: tinyutils/tazx:163 +#: tinyutils/tazx:174 #, fuzzy msgid "SliTaz Xorg config" msgstr "SliTaz configuración del lenguaje" -#: tinyutils/tazx:165 +#: tinyutils/tazx:176 msgid "Install or reconfigure Xorg" msgstr "Instalar o reconfigurar Xorg" -#: tinyutils/tazx:166 +#: tinyutils/tazx:177 msgid "Install Xorg server (light version)" msgstr "" -#: tinyutils/tazx:167 +#: tinyutils/tazx:178 msgid "Quit Tazx utility" msgstr "Salir de la utilidad Tazx" diff -r 3dd4838c69c6 -r 5a8adba12ac2 po/slitaz-tools/fr.po --- a/po/slitaz-tools/fr.po Fri May 02 22:16:37 2014 +0200 +++ b/po/slitaz-tools/fr.po Tue May 06 22:55:12 2014 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-23 14:52+0100\n" +"POT-Creation-Date: 2014-05-05 16:00+0300\n" "PO-Revision-Date: 2014-01-02 19:14+0100\n" "Last-Translator: Christophe Lincoln \n" "Language-Team: French\n" @@ -99,36 +99,41 @@ msgid "Done" msgstr "Fait" -#: tinyutils/tazx:131 +#: tinyutils/tazx:63 +#, fuzzy +msgid "Creating:" +msgstr "Nettoyage de:" + +#: tinyutils/tazx:142 msgid "Install Xorg" msgstr "Installer Xorg" -#: tinyutils/tazx:132 +#: tinyutils/tazx:143 msgid "Tazx helps you to select your X driver." msgstr "Tazx vous aide à séléctionner votre pilote Xorg." -#: tinyutils/tazx:134 +#: tinyutils/tazx:145 msgid "driver" msgstr "pilote" -#: tinyutils/tazx:135 +#: tinyutils/tazx:146 msgid "Quit" msgstr "Quitter" -#: tinyutils/tazx:163 +#: tinyutils/tazx:174 #, fuzzy msgid "SliTaz Xorg config" msgstr "Configuration de la langue" -#: tinyutils/tazx:165 +#: tinyutils/tazx:176 msgid "Install or reconfigure Xorg" msgstr "Installer ou reconfigurer Xorg" -#: tinyutils/tazx:166 +#: tinyutils/tazx:177 msgid "Install Xorg server (light version)" msgstr "" -#: tinyutils/tazx:167 +#: tinyutils/tazx:178 msgid "Quit Tazx utility" msgstr "Quitter l'utilitaire Tazx" diff -r 3dd4838c69c6 -r 5a8adba12ac2 po/slitaz-tools/pl.po --- a/po/slitaz-tools/pl.po Fri May 02 22:16:37 2014 +0200 +++ b/po/slitaz-tools/pl.po Tue May 06 22:55:12 2014 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-23 14:52+0100\n" +"POT-Creation-Date: 2014-05-05 16:00+0300\n" "PO-Revision-Date: 2013-07-23 12:35+0100\n" "Last-Translator: Paweł Pyrczak \n" "Language-Team: Paweł Pyrczak \n" @@ -102,36 +102,40 @@ msgid "Done" msgstr "Zakończono" -#: tinyutils/tazx:131 +#: tinyutils/tazx:63 +msgid "Creating:" +msgstr "" + +#: tinyutils/tazx:142 msgid "Install Xorg" msgstr "Zainstaluj Xorg" -#: tinyutils/tazx:132 +#: tinyutils/tazx:143 msgid "Tazx helps you to select your X driver." msgstr "Tazx pomaga w wybraniu właściwego sterownika X" -#: tinyutils/tazx:134 +#: tinyutils/tazx:145 msgid "driver" msgstr "" -#: tinyutils/tazx:135 +#: tinyutils/tazx:146 msgid "Quit" msgstr "" -#: tinyutils/tazx:163 +#: tinyutils/tazx:174 #, fuzzy msgid "SliTaz Xorg config" msgstr "Konfiguracja języka SliTaz" -#: tinyutils/tazx:165 +#: tinyutils/tazx:176 msgid "Install or reconfigure Xorg" msgstr "Zainstaluj i skonfiguruj Xorg" -#: tinyutils/tazx:166 +#: tinyutils/tazx:177 msgid "Install Xorg server (light version)" msgstr "" -#: tinyutils/tazx:167 +#: tinyutils/tazx:178 msgid "Quit Tazx utility" msgstr "Zamknij narzędzie Tazx" diff -r 3dd4838c69c6 -r 5a8adba12ac2 po/slitaz-tools/pt_BR.po --- a/po/slitaz-tools/pt_BR.po Fri May 02 22:16:37 2014 +0200 +++ b/po/slitaz-tools/pt_BR.po Tue May 06 22:55:12 2014 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-23 14:52+0100\n" +"POT-Creation-Date: 2014-05-05 16:00+0300\n" "PO-Revision-Date: 2014-01-15 21:48-0300\n" "Last-Translator: Claudinei Pereira \n" "Language-Team: Portuguese \n" @@ -98,35 +98,40 @@ msgid "Done" msgstr "Feito" -#: tinyutils/tazx:131 +#: tinyutils/tazx:63 +#, fuzzy +msgid "Creating:" +msgstr "Limpando:" + +#: tinyutils/tazx:142 msgid "Install Xorg" msgstr "Instalar Xorg" -#: tinyutils/tazx:132 +#: tinyutils/tazx:143 msgid "Tazx helps you to select your X driver." msgstr "O Tazx ajuda a selecionar o driver gráfico." -#: tinyutils/tazx:134 +#: tinyutils/tazx:145 msgid "driver" msgstr "driver" -#: tinyutils/tazx:135 +#: tinyutils/tazx:146 msgid "Quit" msgstr "Sair" -#: tinyutils/tazx:163 +#: tinyutils/tazx:174 msgid "SliTaz Xorg config" msgstr "Configuraçãdo Xorg do SliTaz" -#: tinyutils/tazx:165 +#: tinyutils/tazx:176 msgid "Install or reconfigure Xorg" msgstr "Instale ou reconfigure o Xorg" -#: tinyutils/tazx:166 +#: tinyutils/tazx:177 msgid "Install Xorg server (light version)" msgstr "Instalar o servidor Xorg (versão leve)" -#: tinyutils/tazx:167 +#: tinyutils/tazx:178 msgid "Quit Tazx utility" msgstr "Sair do utilitário Tazx" diff -r 3dd4838c69c6 -r 5a8adba12ac2 po/slitaz-tools/ru.po --- a/po/slitaz-tools/ru.po Fri May 02 22:16:37 2014 +0200 +++ b/po/slitaz-tools/ru.po Tue May 06 22:55:12 2014 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-23 14:52+0100\n" +"POT-Creation-Date: 2014-05-05 16:00+0300\n" "PO-Revision-Date: 2014-04-12 14:38+0300\n" "Last-Translator: Aleksej Bobylev \n" "Language-Team: \n" @@ -23,22 +23,16 @@ msgid "SliTaz GNU/Linux locale setting using dialog boxes." msgstr "Настройка локали SliTaz GNU/Linux с использованием dialog." -#: tinyutils/tazlocale:17 -#: tinyutils/decode:30 -#: tinyutils/hwsetup:24 +#: tinyutils/tazlocale:17 tinyutils/decode:30 tinyutils/hwsetup:24 #: tinyutils/frugal:32 msgid "Usage:" msgstr "Использование:" -#: tinyutils/tazlocale:18 -#: tinyutils/decode:31 -#: tinyutils/hwsetup:25 +#: tinyutils/tazlocale:18 tinyutils/decode:31 tinyutils/hwsetup:25 msgid "option" msgstr "параметр" -#: tinyutils/tazlocale:20 -#: tinyutils/hwsetup:40 -#: tinyutils/frugal:41 +#: tinyutils/tazlocale:20 tinyutils/hwsetup:40 tinyutils/frugal:41 msgid "Options:" msgstr "Параметры:" @@ -52,27 +46,31 @@ #: tinyutils/tazlocale:26 msgid "Any other option treated as locale - set locale (root)." -msgstr "Любой другой параметр считается именем локали — установить локаль (требуются права root)." +msgstr "" +"Любой другой параметр считается именем локали — установить локаль (требуются " +"права root)." #: tinyutils/tazlocale:27 msgid "Display locale selecting dialog if no option given (root)." -msgstr "При отсутствии параметров — показать диалог выбора локали (требуются права root)." +msgstr "" +"При отсутствии параметров — показать диалог выбора локали (требуются права " +"root)." #: tinyutils/tazlocale:105 msgid "SliTaz language setting" msgstr "Настройка языка SliTaz" #: tinyutils/tazlocale:124 -msgid "Please logout of your current session and login again to use new locale." -msgstr "Выйдите из системы и войдите повторно, чтобы использовать новую локаль." +msgid "" +"Please logout of your current session and login again to use new locale." +msgstr "" +"Выйдите из системы и войдите повторно, чтобы использовать новую локаль." -#: tinyutils/tazlocale:126 -#: tinyutils/tazkeymap:64 +#: tinyutils/tazlocale:126 tinyutils/tazkeymap:64 msgid "Information" msgstr "Информация" -#: tinyutils/tazlocale:136 -#: tinyutils/tazkeymap:42 +#: tinyutils/tazlocale:136 tinyutils/tazkeymap:42 msgid "Config file:" msgstr "Файл настроек:" @@ -89,8 +87,11 @@ msgstr "Настройка клавиатурной раскладки SliTaz" #: tinyutils/tazkeymap:65 -msgid "Please logout of your current session and login again to use new keyboard." -msgstr "Выйдите из системы и войдите повторно, чтобы использовать новую раскладку клавиатуры." +msgid "" +"Please logout of your current session and login again to use new keyboard." +msgstr "" +"Выйдите из системы и войдите повторно, чтобы использовать новую раскладку " +"клавиатуры." #: tinyutils/setmixer:12 msgid "Setting default mixer volumes... " @@ -100,35 +101,40 @@ msgid "Done" msgstr "Готово" -#: tinyutils/tazx:131 +#: tinyutils/tazx:63 +#, fuzzy +msgid "Creating:" +msgstr "Очистка:" + +#: tinyutils/tazx:142 msgid "Install Xorg" msgstr "Установка X.org" -#: tinyutils/tazx:132 +#: tinyutils/tazx:143 msgid "Tazx helps you to select your X driver." msgstr "Tazx поможет вам выбрать драйвер для X.Org." -#: tinyutils/tazx:134 +#: tinyutils/tazx:145 msgid "driver" msgstr "драйвер" -#: tinyutils/tazx:135 +#: tinyutils/tazx:146 msgid "Quit" msgstr "Выход" -#: tinyutils/tazx:163 +#: tinyutils/tazx:174 msgid "SliTaz Xorg config" msgstr "Настройка X.Org в SliTaz" -#: tinyutils/tazx:165 +#: tinyutils/tazx:176 msgid "Install or reconfigure Xorg" msgstr "Установить или перенастроить X.org" -#: tinyutils/tazx:166 +#: tinyutils/tazx:177 msgid "Install Xorg server (light version)" msgstr "Установка облегченного сервера X.Org" -#: tinyutils/tazx:167 +#: tinyutils/tazx:178 msgid "Quit Tazx utility" msgstr "Выйти из утилиты Tazx" @@ -136,8 +142,7 @@ msgid "Decode audio and video files" msgstr "Преобразование файлов аудио и видео" -#: tinyutils/decode:31 -#: tinyutils/decode:36 +#: tinyutils/decode:31 tinyutils/decode:36 msgid "file" msgstr "файл" @@ -145,8 +150,7 @@ msgid "URL" msgstr "адрес" -#: tinyutils/decode:33 -#: tinyutils/frugal:45 +#: tinyutils/decode:33 tinyutils/frugal:45 msgid "Examples:" msgstr "Примеры:" @@ -159,8 +163,7 @@ msgid "Missing decoder: $dec" msgstr "Отсутствует декодер «$dec»" -#: tinyutils/decode:48 -#: tinyutils/decode:80 +#: tinyutils/decode:48 tinyutils/decode:80 #, sh-format msgid "Skipping file: $name" msgstr "Файл «$name» не обработан" @@ -227,8 +230,7 @@ msgid "command" msgstr "команда" -#: tinyutils/hwsetup:27 -#: tinyutils/frugal:36 +#: tinyutils/hwsetup:27 tinyutils/frugal:36 msgid "Commands:" msgstr "Команды:" @@ -286,8 +288,14 @@ #: tinyutils/hwsetup:98 #, sh-format -msgid "Due to a lack of compatible hardware for troubleshooting, this $DEVICE device has not been properly tested. Please report any success, failure, bug to SliTaz Bug tracker or Forum." -msgstr "Работа этого устройства $DEVICE не проверялась, его нет у разработчиков SliTaz. Сообщите о ваших успехах, неудачах, ошибках в баг-трекер SliTaz или на форум." +msgid "" +"Due to a lack of compatible hardware for troubleshooting, this $DEVICE " +"device has not been properly tested. Please report any success, failure, bug " +"to SliTaz Bug tracker or Forum." +msgstr "" +"Работа этого устройства $DEVICE не проверялась, его нет у разработчиков " +"SliTaz. Сообщите о ваших успехах, неудачах, ошибках в баг-трекер SliTaz или " +"на форум." #: tinyutils/hwsetup:107 #, sh-format @@ -325,7 +333,9 @@ #: tinyutils/hwsetup:229 #, sh-format msgid "Your $DEVICE must be in $grp group with rw-rw-rw- permissions" -msgstr "Устройство «$DEVICE» должно принадлежать группе $grp и иметь права доступа rw-rw-rw-" +msgstr "" +"Устройство «$DEVICE» должно принадлежать группе $grp и иметь права доступа " +"rw-rw-rw-" #: tinyutils/hwsetup:250 msgid "New udev rules are added by a package" @@ -417,7 +427,9 @@ #: tinyutils/hwsetup:450 msgid "Webcam is set up; please use mplayer-svn/fswebcam/amsn/skype to view" -msgstr "Веб-камера настроена; запустите mplayer-svn, fswebcam, amsn или skype для проверки" +msgstr "" +"Веб-камера настроена; запустите mplayer-svn, fswebcam, amsn или skype для " +"проверки" #: tinyutils/hwsetup:466 msgid "Do you want to check if gphoto2 can talk to your camera" @@ -444,8 +456,7 @@ msgid "Bluetooth interfaces" msgstr "Интерфейсы Bluetooth" -#: tinyutils/hwsetup:510 -#: tinyutils/hwsetup:527 +#: tinyutils/hwsetup:510 tinyutils/hwsetup:527 msgid "Following Bluetooth commands may be of help" msgstr "Следующие команды Bluetooth могут пригодиться" @@ -461,11 +472,11 @@ msgid "pairing with remote bluetooth devices..." msgstr "сопряжение с устройством Bluetooth…" -#: tinyutils/hwsetup:520 -#: tinyutils/hwsetup:541 +#: tinyutils/hwsetup:520 tinyutils/hwsetup:541 #, sh-format msgid "You can manually edit the configuration files in $bt if need be" -msgstr "Если понадобится, вы можете самостоятельно править файлы настроек в $bt" +msgstr "" +"Если понадобится, вы можете самостоятельно править файлы настроек в $bt" #: tinyutils/hwsetup:534 msgid "for starting bluetooth daemon" @@ -507,7 +518,9 @@ #: tinyutils/hwsetup:577 msgid "Setting IPTABLES_RULES to yes in /etc/slitaz/firewall.conf" -msgstr "Переменной IPTABLES_RULES присваивается значение «yes» в файле /etc/slitaz/firewall.conf" +msgstr "" +"Переменной IPTABLES_RULES присваивается значение «yes» в файле /etc/slitaz/" +"firewall.conf" #: tinyutils/hwsetup:586 msgid "Probing for open ports..." @@ -521,26 +534,24 @@ msgid "Do you want to configure X using non-free nvidia driver" msgstr "Настроить X.Org, используя несвободный драйвер Nvidia" -#: tinyutils/hwsetup:610 -#: tinyutils/hwsetup:649 -#: tinyutils/hwsetup:681 +#: tinyutils/hwsetup:610 tinyutils/hwsetup:649 tinyutils/hwsetup:681 #: tinyutils/hwsetup:714 #, sh-format msgid "Your previous config is in $xorg60" msgstr "Предыдущие настройки находятся в файле $xorg60" -#: tinyutils/hwsetup:611 -#: tinyutils/hwsetup:650 +#: tinyutils/hwsetup:611 tinyutils/hwsetup:650 #, sh-format msgid "If nvidia fails, you can remove $xorg55 to restore previous config." -msgstr "Если драйвер ATI не будет корректно работать, вы можете удалить $xorg55, чтобы вернуться к предыдущим настройкам." +msgstr "" +"Если драйвер ATI не будет корректно работать, вы можете удалить $xorg55, " +"чтобы вернуться к предыдущим настройкам." #: tinyutils/hwsetup:618 msgid "Adding to xorg.conf:" msgstr "Добавление в xorg.conf:" -#: tinyutils/hwsetup:623 -#: tinyutils/hwsetup:659 +#: tinyutils/hwsetup:623 tinyutils/hwsetup:659 msgid "Checking if nvidia is working..." msgstr "Проверка того, что драйвер nvidia работает…" @@ -554,7 +565,8 @@ #: tinyutils/hwsetup:635 msgid "Use: nvidia-settings utility to configure your settings if necessary" -msgstr "При необходимости запустите утилиту nvidia-settings для настройки параметров" +msgstr "" +"При необходимости запустите утилиту nvidia-settings для настройки параметров" #: tinyutils/hwsetup:646 msgid "Do you want to configure X using free nvidia driver" @@ -572,7 +584,9 @@ #: tinyutils/hwsetup:682 #, sh-format msgid "If ati fails, you can remove $xorg55 to restore previous config." -msgstr "Если драйвер ATI не будет корректно работать, вы можете удалить $xorg55, чтобы вернуться к предыдущим настройкам." +msgstr "" +"Если драйвер ATI не будет корректно работать, вы можете удалить $xorg55, " +"чтобы вернуться к предыдущим настройкам." #: tinyutils/hwsetup:691 msgid "Checking if ati catalyst is working..." @@ -583,8 +597,11 @@ msgstr "Настройка:" #: tinyutils/hwsetup:696 -msgid "Use: aticonfig utility to generate a template configuration file if necessary" -msgstr "При необходимости запустите утилиту aticonfig для создания файла-шаблона настроек" +msgid "" +"Use: aticonfig utility to generate a template configuration file if necessary" +msgstr "" +"При необходимости запустите утилиту aticonfig для создания файла-шаблона " +"настроек" #: tinyutils/hwsetup:711 msgid "Do you want to configure X using free ATI (radeon) driver" @@ -593,7 +610,9 @@ #: tinyutils/hwsetup:715 #, sh-format msgid "If ATI fails, you can remove $xorg55 to restore previous config." -msgstr "Если драйвер ATI не будет корректно работать, вы можете удалить $xorg55, чтобы вернуться к предыдущим настройкам." +msgstr "" +"Если драйвер ATI не будет корректно работать, вы можете удалить $xorg55, " +"чтобы вернуться к предыдущим настройкам." #: tinyutils/hwsetup:717 #, sh-format @@ -618,7 +637,8 @@ #: tinyutils/hwsetup:770 msgid "Do you want to install all/few/no optional dependencies (all|few|N)? " -msgstr "Установить все (all), некоторые (few) или не устанавливать (no) зависимости? " +msgstr "" +"Установить все (all), некоторые (few) или не устанавливать (no) зависимости? " #: tinyutils/frugal:34 msgid "SliTaz frugal installation" diff -r 3dd4838c69c6 -r 5a8adba12ac2 po/slitaz-tools/slitaz-tools.pot --- a/po/slitaz-tools/slitaz-tools.pot Fri May 02 22:16:37 2014 +0200 +++ b/po/slitaz-tools/slitaz-tools.pot Tue May 06 22:55:12 2014 +0300 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-16 13:19+0300\n" +"POT-Creation-Date: 2014-05-06 22:40+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -92,35 +92,39 @@ msgid "Done" msgstr "" -#: tinyutils/tazx:131 +#: tinyutils/tazx:63 +msgid "Creating:" +msgstr "" + +#: tinyutils/tazx:142 msgid "Install Xorg" msgstr "" -#: tinyutils/tazx:132 +#: tinyutils/tazx:143 msgid "Tazx helps you to select your X driver." msgstr "" -#: tinyutils/tazx:134 +#: tinyutils/tazx:145 msgid "driver" msgstr "" -#: tinyutils/tazx:135 +#: tinyutils/tazx:146 msgid "Quit" msgstr "" -#: tinyutils/tazx:163 +#: tinyutils/tazx:174 msgid "SliTaz Xorg config" msgstr "" -#: tinyutils/tazx:165 +#: tinyutils/tazx:176 msgid "Install or reconfigure Xorg" msgstr "" -#: tinyutils/tazx:166 +#: tinyutils/tazx:177 msgid "Install Xorg server (light version)" msgstr "" -#: tinyutils/tazx:167 +#: tinyutils/tazx:178 msgid "Quit Tazx utility" msgstr "" diff -r 3dd4838c69c6 -r 5a8adba12ac2 po/slitaz-tools/sv.po --- a/po/slitaz-tools/sv.po Fri May 02 22:16:37 2014 +0200 +++ b/po/slitaz-tools/sv.po Tue May 06 22:55:12 2014 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-23 14:52+0100\n" +"POT-Creation-Date: 2014-05-05 16:00+0300\n" "PO-Revision-Date: 2012-07-12 12:59-0000\n" "Last-Translator: Emil Eklund \n" "Language-Team: Swedish\n" @@ -98,36 +98,40 @@ msgid "Done" msgstr "Klar" -#: tinyutils/tazx:131 +#: tinyutils/tazx:63 +msgid "Creating:" +msgstr "" + +#: tinyutils/tazx:142 msgid "Install Xorg" msgstr "Installera Xorg" -#: tinyutils/tazx:132 +#: tinyutils/tazx:143 msgid "Tazx helps you to select your X driver." msgstr "Tazx hjälper dig att välja din X drivrutin." -#: tinyutils/tazx:134 +#: tinyutils/tazx:145 msgid "driver" msgstr "" -#: tinyutils/tazx:135 +#: tinyutils/tazx:146 msgid "Quit" msgstr "" -#: tinyutils/tazx:163 +#: tinyutils/tazx:174 #, fuzzy msgid "SliTaz Xorg config" msgstr "Slitaz språk konfiguration" -#: tinyutils/tazx:165 +#: tinyutils/tazx:176 msgid "Install or reconfigure Xorg" msgstr "Installera eller omkonifigurera Xorg" -#: tinyutils/tazx:166 +#: tinyutils/tazx:177 msgid "Install Xorg server (light version)" msgstr "" -#: tinyutils/tazx:167 +#: tinyutils/tazx:178 msgid "Quit Tazx utility" msgstr "Avsluta Tazx verktyget" diff -r 3dd4838c69c6 -r 5a8adba12ac2 po/tazbox/el.po --- a/po/tazbox/el.po Fri May 02 22:16:37 2014 +0200 +++ b/po/tazbox/el.po Tue May 06 22:55:12 2014 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-16 13:19+0300\n" +"POT-Creation-Date: 2014-05-06 22:40+0300\n" "PO-Revision-Date: 2012-11-23 11:30+0200\n" "Last-Translator: Constantine Mousafiris \n" "Language-Team: Kostis Mousafiris\n" @@ -156,7 +156,7 @@ msgid "Locale" msgstr "" -#: tazbox/tazbox:140 tazbox/tazbox:192 +#: tazbox/tazbox:140 tazbox/tazbox:205 msgid "Keymap" msgstr "Αναπαράσταση συμβόλων πληκτρολογίου (keymap)" @@ -164,139 +164,214 @@ msgid "Timezone" msgstr "" -#: tazbox/tazbox:161 +#: tazbox/tazbox:165 msgid "SliTaz locale" msgstr "" -#: tazbox/tazbox:164 +#: tazbox/tazbox:168 msgid "Language configuration" msgstr "Ρύθμιση γλώσσας" -#: tazbox/tazbox:165 +#: tazbox/tazbox:169 +msgid "Tip: manage locale list by installing/removing locale packages." +msgstr "" + +#: tazbox/tazbox:170 tazbox/tazbox:278 +msgid "Flag" +msgstr "" + +#: tazbox/tazbox:170 msgid "Name" msgstr "Όνομα" -#: tazbox/tazbox:165 +#: tazbox/tazbox:171 tazbox/tazbox:441 msgid "Description" msgstr "Περιγραφή" +#: tazbox/tazbox:173 tazbox/tazbox:279 +msgid "Manage" +msgstr "" + #: tazbox/tazbox:188 +#, sh-format +msgid "Locale was set to $locale" +msgstr "" + +#: tazbox/tazbox:201 msgid "SliTaz keymap" msgstr "" -#: tazbox/tazbox:191 +#: tazbox/tazbox:204 msgid "Keyboard configuration" msgstr "Ρύθμιση πληκτρολογίου" -#: tazbox/tazbox:192 +#: tazbox/tazbox:205 msgid "Type" msgstr "Τύπος" -#: tazbox/tazbox:218 tazbox/tazbox:245 tazbox/tazbox:257 tazbox/tazbox:270 +#: tazbox/tazbox:243 tazbox/tazbox:271 tazbox/tazbox:287 tazbox/tazbox:300 msgid "SliTaz TZ" msgstr "" -#: tazbox/tazbox:221 +#: tazbox/tazbox:246 msgid "Suggested location:" msgstr "" -#: tazbox/tazbox:222 -msgid "Are you agree?" +#: tazbox/tazbox:247 +msgid "Are you agreed?" msgstr "" -#: tazbox/tazbox:248 tazbox/tazbox:260 tazbox/tazbox:273 +#: tazbox/tazbox:274 tazbox/tazbox:290 tazbox/tazbox:303 msgid "TimeZone Configuration" msgstr "Ρύθμιση ζώνης ώρας" -#: tazbox/tazbox:248 -msgid "Select country" +#: tazbox/tazbox:275 +msgid "Select country and press \"Forward\" or manual select timezone file." msgstr "" -#: tazbox/tazbox:250 -msgid "Flag" +#: tazbox/tazbox:276 +msgid "Tip: manage timezone list by installing/removing locale packages." msgstr "" -#: tazbox/tazbox:250 +#: tazbox/tazbox:278 msgid "Code" msgstr "" -#: tazbox/tazbox:250 +#: tazbox/tazbox:278 msgid "Country" msgstr "" -#: tazbox/tazbox:260 +#: tazbox/tazbox:280 +msgid "Manual" +msgstr "" + +#: tazbox/tazbox:290 msgid "Select time zone" msgstr "" -#: tazbox/tazbox:273 +#: tazbox/tazbox:303 msgid "Select location" msgstr "" -#: tazbox/tazbox:274 +#: tazbox/tazbox:304 msgid "Location/City" msgstr "" -#: tazbox/tazbox:299 +#: tazbox/tazbox:330 #, sh-format msgid "TimeZone was set to $timezone" msgstr "" -#: tazbox/tazbox:306 +#: tazbox/tazbox:366 +msgid "Please wait" +msgstr "" + +#: tazbox/tazbox:435 +msgid "Manage locale packages" +msgstr "" + +#: tazbox/tazbox:438 +msgid "Check only locale packages you need and press \"Install/Remove\"." +msgstr "" + +#: tazbox/tazbox:440 +msgid "Inst." +msgstr "" + +#: tazbox/tazbox:440 +msgid "Package Name" +msgstr "" + +#: tazbox/tazbox:441 +msgid "Size" +msgstr "" + +#: tazbox/tazbox:442 +msgid "Installed" +msgstr "" + +#: tazbox/tazbox:443 +msgid "Recharge list" +msgstr "" + +#: tazbox/tazbox:444 +msgid "Install/Remove" +msgstr "" + +#: tazbox/tazbox:460 +msgid "TazPkg log" +msgstr "" + +#: tazbox/tazbox:463 +#, sh-format +msgid "REMOVE: $pkg" +msgstr "" + +#: tazbox/tazbox:467 +#, sh-format +msgid "INSTALL: $pkg" +msgstr "" + +#: tazbox/tazbox:470 +msgid "Done!" +msgstr "" + +#: tazbox/tazbox:480 msgid "New file" msgstr "Νέο αρχείο" -#: tazbox/tazbox:309 +#: tazbox/tazbox:483 msgid "Create a new file or folder on your desktop" msgstr "Δημιουργία νέου αρχείου ή καταλόγου, πάνω στην επιφάνεια εργασίας σας" -#: tazbox/tazbox:310 +#: tazbox/tazbox:484 msgid "File name" msgstr "Όνομα αρχείου" -#: tazbox/tazbox:313 +#: tazbox/tazbox:487 msgid "SHell script" msgstr "Σενάριο κελύφους (SHell script)" -#: tazbox/tazbox:314 +#: tazbox/tazbox:488 msgid "Folder" msgstr "Κατάλογος" -#: tazbox/tazbox:316 +#: tazbox/tazbox:490 msgid "File" msgstr "Αρχείο" -#: tazbox/tazbox:341 +#: tazbox/tazbox:515 msgid "All Applications" msgstr "Όλες οι εφαρμογές" -#: tazbox/tazbox:429 +#: tazbox/tazbox:603 msgid "Downloading..." msgstr "" -#: tazbox/tazbox:481 +#: tazbox/tazbox:659 msgid "SliTaz default applications" msgstr "" -#: tazbox/tazbox:483 +#: tazbox/tazbox:661 msgid "SliTaz default applications configuration" msgstr "" -#: tazbox/tazbox:485 +#: tazbox/tazbox:663 msgid "File manager:" msgstr "" -#: tazbox/tazbox:486 +#: tazbox/tazbox:664 msgid "Web browser:" msgstr "" -#: tazbox/tazbox:487 +#: tazbox/tazbox:665 msgid "Text editor:" msgstr "" -#: tazbox/tazbox:488 +#: tazbox/tazbox:666 msgid "Terminal:" msgstr "" -#: tazbox/tazbox:489 +#: tazbox/tazbox:667 msgid "Window manager:" msgstr "" diff -r 3dd4838c69c6 -r 5a8adba12ac2 po/tazbox/es.po --- a/po/tazbox/es.po Fri May 02 22:16:37 2014 +0200 +++ b/po/tazbox/es.po Tue May 06 22:55:12 2014 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-16 13:19+0300\n" +"POT-Creation-Date: 2014-05-06 22:40+0300\n" "PO-Revision-Date: 2011-08-11 00:21-0300\n" "Last-Translator: Lucas Gioia \n" "Language-Team: \n" @@ -155,7 +155,7 @@ msgid "Locale" msgstr "" -#: tazbox/tazbox:140 tazbox/tazbox:192 +#: tazbox/tazbox:140 tazbox/tazbox:205 msgid "Keymap" msgstr "Mapa de caracteres" @@ -163,139 +163,214 @@ msgid "Timezone" msgstr "" -#: tazbox/tazbox:161 +#: tazbox/tazbox:165 msgid "SliTaz locale" msgstr "" -#: tazbox/tazbox:164 +#: tazbox/tazbox:168 msgid "Language configuration" msgstr "Configuración del idioma" -#: tazbox/tazbox:165 +#: tazbox/tazbox:169 +msgid "Tip: manage locale list by installing/removing locale packages." +msgstr "" + +#: tazbox/tazbox:170 tazbox/tazbox:278 +msgid "Flag" +msgstr "" + +#: tazbox/tazbox:170 msgid "Name" msgstr "Nombre" -#: tazbox/tazbox:165 +#: tazbox/tazbox:171 tazbox/tazbox:441 msgid "Description" msgstr "Descripción" +#: tazbox/tazbox:173 tazbox/tazbox:279 +msgid "Manage" +msgstr "" + #: tazbox/tazbox:188 +#, sh-format +msgid "Locale was set to $locale" +msgstr "" + +#: tazbox/tazbox:201 msgid "SliTaz keymap" msgstr "" -#: tazbox/tazbox:191 +#: tazbox/tazbox:204 msgid "Keyboard configuration" msgstr "Configuración del teclado" -#: tazbox/tazbox:192 +#: tazbox/tazbox:205 msgid "Type" msgstr "Tipo" -#: tazbox/tazbox:218 tazbox/tazbox:245 tazbox/tazbox:257 tazbox/tazbox:270 +#: tazbox/tazbox:243 tazbox/tazbox:271 tazbox/tazbox:287 tazbox/tazbox:300 msgid "SliTaz TZ" msgstr "" -#: tazbox/tazbox:221 +#: tazbox/tazbox:246 msgid "Suggested location:" msgstr "" -#: tazbox/tazbox:222 -msgid "Are you agree?" +#: tazbox/tazbox:247 +msgid "Are you agreed?" msgstr "" -#: tazbox/tazbox:248 tazbox/tazbox:260 tazbox/tazbox:273 +#: tazbox/tazbox:274 tazbox/tazbox:290 tazbox/tazbox:303 msgid "TimeZone Configuration" msgstr "Configuración de la zona horaria" -#: tazbox/tazbox:248 -msgid "Select country" +#: tazbox/tazbox:275 +msgid "Select country and press \"Forward\" or manual select timezone file." msgstr "" -#: tazbox/tazbox:250 -msgid "Flag" +#: tazbox/tazbox:276 +msgid "Tip: manage timezone list by installing/removing locale packages." msgstr "" -#: tazbox/tazbox:250 +#: tazbox/tazbox:278 msgid "Code" msgstr "" -#: tazbox/tazbox:250 +#: tazbox/tazbox:278 msgid "Country" msgstr "" -#: tazbox/tazbox:260 +#: tazbox/tazbox:280 +msgid "Manual" +msgstr "" + +#: tazbox/tazbox:290 msgid "Select time zone" msgstr "" -#: tazbox/tazbox:273 +#: tazbox/tazbox:303 msgid "Select location" msgstr "" -#: tazbox/tazbox:274 +#: tazbox/tazbox:304 msgid "Location/City" msgstr "" -#: tazbox/tazbox:299 +#: tazbox/tazbox:330 #, sh-format msgid "TimeZone was set to $timezone" msgstr "" -#: tazbox/tazbox:306 +#: tazbox/tazbox:366 +msgid "Please wait" +msgstr "" + +#: tazbox/tazbox:435 +msgid "Manage locale packages" +msgstr "" + +#: tazbox/tazbox:438 +msgid "Check only locale packages you need and press \"Install/Remove\"." +msgstr "" + +#: tazbox/tazbox:440 +msgid "Inst." +msgstr "" + +#: tazbox/tazbox:440 +msgid "Package Name" +msgstr "" + +#: tazbox/tazbox:441 +msgid "Size" +msgstr "" + +#: tazbox/tazbox:442 +msgid "Installed" +msgstr "" + +#: tazbox/tazbox:443 +msgid "Recharge list" +msgstr "" + +#: tazbox/tazbox:444 +msgid "Install/Remove" +msgstr "" + +#: tazbox/tazbox:460 +msgid "TazPkg log" +msgstr "" + +#: tazbox/tazbox:463 +#, sh-format +msgid "REMOVE: $pkg" +msgstr "" + +#: tazbox/tazbox:467 +#, sh-format +msgid "INSTALL: $pkg" +msgstr "" + +#: tazbox/tazbox:470 +msgid "Done!" +msgstr "" + +#: tazbox/tazbox:480 msgid "New file" msgstr "Nuevo archivo" -#: tazbox/tazbox:309 +#: tazbox/tazbox:483 msgid "Create a new file or folder on your desktop" msgstr "Crear un nuevo archivo o carpeta en su escritorio" -#: tazbox/tazbox:310 +#: tazbox/tazbox:484 msgid "File name" msgstr "Nombre de archivo" -#: tazbox/tazbox:313 +#: tazbox/tazbox:487 msgid "SHell script" msgstr "Scripts SHell" -#: tazbox/tazbox:314 +#: tazbox/tazbox:488 msgid "Folder" msgstr "Carpeta" -#: tazbox/tazbox:316 +#: tazbox/tazbox:490 msgid "File" msgstr "Archivo" -#: tazbox/tazbox:341 +#: tazbox/tazbox:515 msgid "All Applications" msgstr "Todas las aplicaciónes" -#: tazbox/tazbox:429 +#: tazbox/tazbox:603 msgid "Downloading..." msgstr "" -#: tazbox/tazbox:481 +#: tazbox/tazbox:659 msgid "SliTaz default applications" msgstr "" -#: tazbox/tazbox:483 +#: tazbox/tazbox:661 msgid "SliTaz default applications configuration" msgstr "" -#: tazbox/tazbox:485 +#: tazbox/tazbox:663 msgid "File manager:" msgstr "" -#: tazbox/tazbox:486 +#: tazbox/tazbox:664 msgid "Web browser:" msgstr "" -#: tazbox/tazbox:487 +#: tazbox/tazbox:665 msgid "Text editor:" msgstr "" -#: tazbox/tazbox:488 +#: tazbox/tazbox:666 msgid "Terminal:" msgstr "" -#: tazbox/tazbox:489 +#: tazbox/tazbox:667 msgid "Window manager:" msgstr "" diff -r 3dd4838c69c6 -r 5a8adba12ac2 po/tazbox/fr.po --- a/po/tazbox/fr.po Fri May 02 22:16:37 2014 +0200 +++ b/po/tazbox/fr.po Tue May 06 22:55:12 2014 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-16 13:19+0300\n" +"POT-Creation-Date: 2014-05-06 22:40+0300\n" "PO-Revision-Date: 2012-03-24 14:36+0100\n" "Last-Translator: Christophe Lincoln \n" "Language-Team: French\n" @@ -155,7 +155,7 @@ msgid "Locale" msgstr "" -#: tazbox/tazbox:140 tazbox/tazbox:192 +#: tazbox/tazbox:140 tazbox/tazbox:205 msgid "Keymap" msgstr "Clavier" @@ -163,139 +163,214 @@ msgid "Timezone" msgstr "" -#: tazbox/tazbox:161 +#: tazbox/tazbox:165 msgid "SliTaz locale" msgstr "" -#: tazbox/tazbox:164 +#: tazbox/tazbox:168 msgid "Language configuration" msgstr "Configurer la langue" -#: tazbox/tazbox:165 +#: tazbox/tazbox:169 +msgid "Tip: manage locale list by installing/removing locale packages." +msgstr "" + +#: tazbox/tazbox:170 tazbox/tazbox:278 +msgid "Flag" +msgstr "" + +#: tazbox/tazbox:170 msgid "Name" msgstr "Nom" -#: tazbox/tazbox:165 +#: tazbox/tazbox:171 tazbox/tazbox:441 msgid "Description" msgstr "Description" +#: tazbox/tazbox:173 tazbox/tazbox:279 +msgid "Manage" +msgstr "" + #: tazbox/tazbox:188 +#, sh-format +msgid "Locale was set to $locale" +msgstr "" + +#: tazbox/tazbox:201 msgid "SliTaz keymap" msgstr "" -#: tazbox/tazbox:191 +#: tazbox/tazbox:204 msgid "Keyboard configuration" msgstr "Configurer le clavier" -#: tazbox/tazbox:192 +#: tazbox/tazbox:205 msgid "Type" msgstr "Type" -#: tazbox/tazbox:218 tazbox/tazbox:245 tazbox/tazbox:257 tazbox/tazbox:270 +#: tazbox/tazbox:243 tazbox/tazbox:271 tazbox/tazbox:287 tazbox/tazbox:300 msgid "SliTaz TZ" msgstr "" -#: tazbox/tazbox:221 +#: tazbox/tazbox:246 msgid "Suggested location:" msgstr "" -#: tazbox/tazbox:222 -msgid "Are you agree?" +#: tazbox/tazbox:247 +msgid "Are you agreed?" msgstr "" -#: tazbox/tazbox:248 tazbox/tazbox:260 tazbox/tazbox:273 +#: tazbox/tazbox:274 tazbox/tazbox:290 tazbox/tazbox:303 msgid "TimeZone Configuration" msgstr "Configurer la zone horaire" -#: tazbox/tazbox:248 -msgid "Select country" +#: tazbox/tazbox:275 +msgid "Select country and press \"Forward\" or manual select timezone file." msgstr "" -#: tazbox/tazbox:250 -msgid "Flag" +#: tazbox/tazbox:276 +msgid "Tip: manage timezone list by installing/removing locale packages." msgstr "" -#: tazbox/tazbox:250 +#: tazbox/tazbox:278 msgid "Code" msgstr "" -#: tazbox/tazbox:250 +#: tazbox/tazbox:278 msgid "Country" msgstr "" -#: tazbox/tazbox:260 +#: tazbox/tazbox:280 +msgid "Manual" +msgstr "" + +#: tazbox/tazbox:290 msgid "Select time zone" msgstr "" -#: tazbox/tazbox:273 +#: tazbox/tazbox:303 msgid "Select location" msgstr "" -#: tazbox/tazbox:274 +#: tazbox/tazbox:304 msgid "Location/City" msgstr "" -#: tazbox/tazbox:299 +#: tazbox/tazbox:330 #, sh-format msgid "TimeZone was set to $timezone" msgstr "" -#: tazbox/tazbox:306 +#: tazbox/tazbox:366 +msgid "Please wait" +msgstr "" + +#: tazbox/tazbox:435 +msgid "Manage locale packages" +msgstr "" + +#: tazbox/tazbox:438 +msgid "Check only locale packages you need and press \"Install/Remove\"." +msgstr "" + +#: tazbox/tazbox:440 +msgid "Inst." +msgstr "" + +#: tazbox/tazbox:440 +msgid "Package Name" +msgstr "" + +#: tazbox/tazbox:441 +msgid "Size" +msgstr "" + +#: tazbox/tazbox:442 +msgid "Installed" +msgstr "" + +#: tazbox/tazbox:443 +msgid "Recharge list" +msgstr "" + +#: tazbox/tazbox:444 +msgid "Install/Remove" +msgstr "" + +#: tazbox/tazbox:460 +msgid "TazPkg log" +msgstr "" + +#: tazbox/tazbox:463 +#, sh-format +msgid "REMOVE: $pkg" +msgstr "" + +#: tazbox/tazbox:467 +#, sh-format +msgid "INSTALL: $pkg" +msgstr "" + +#: tazbox/tazbox:470 +msgid "Done!" +msgstr "" + +#: tazbox/tazbox:480 msgid "New file" msgstr "Nouveau fichier" -#: tazbox/tazbox:309 +#: tazbox/tazbox:483 msgid "Create a new file or folder on your desktop" msgstr "Créer un nouveau fichier ou dossier sur le bureau" -#: tazbox/tazbox:310 +#: tazbox/tazbox:484 msgid "File name" msgstr "Nom du fichier" -#: tazbox/tazbox:313 +#: tazbox/tazbox:487 msgid "SHell script" msgstr "Script SHell" -#: tazbox/tazbox:314 +#: tazbox/tazbox:488 msgid "Folder" msgstr "Dossier" -#: tazbox/tazbox:316 +#: tazbox/tazbox:490 msgid "File" msgstr "Fichier" -#: tazbox/tazbox:341 +#: tazbox/tazbox:515 msgid "All Applications" msgstr "Toutes les applications" -#: tazbox/tazbox:429 +#: tazbox/tazbox:603 msgid "Downloading..." msgstr "" -#: tazbox/tazbox:481 +#: tazbox/tazbox:659 msgid "SliTaz default applications" msgstr "" -#: tazbox/tazbox:483 +#: tazbox/tazbox:661 msgid "SliTaz default applications configuration" msgstr "" -#: tazbox/tazbox:485 +#: tazbox/tazbox:663 msgid "File manager:" msgstr "" -#: tazbox/tazbox:486 +#: tazbox/tazbox:664 msgid "Web browser:" msgstr "" -#: tazbox/tazbox:487 +#: tazbox/tazbox:665 msgid "Text editor:" msgstr "" -#: tazbox/tazbox:488 +#: tazbox/tazbox:666 msgid "Terminal:" msgstr "" -#: tazbox/tazbox:489 +#: tazbox/tazbox:667 msgid "Window manager:" msgstr "" diff -r 3dd4838c69c6 -r 5a8adba12ac2 po/tazbox/pl.po --- a/po/tazbox/pl.po Fri May 02 22:16:37 2014 +0200 +++ b/po/tazbox/pl.po Tue May 06 22:55:12 2014 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-16 13:19+0300\n" +"POT-Creation-Date: 2014-05-06 22:40+0300\n" "PO-Revision-Date: 2013-07-23 12:35+0100\n" "Last-Translator: Paweł Pyrczak \n" "Language-Team: Paweł Pyrczak \n" @@ -157,7 +157,7 @@ msgid "Locale" msgstr "Ustawienia regionalne" -#: tazbox/tazbox:140 tazbox/tazbox:192 +#: tazbox/tazbox:140 tazbox/tazbox:205 msgid "Keymap" msgstr "Układ klawiatury" @@ -165,139 +165,214 @@ msgid "Timezone" msgstr "Strefa czasowa" -#: tazbox/tazbox:161 +#: tazbox/tazbox:165 msgid "SliTaz locale" msgstr "" -#: tazbox/tazbox:164 +#: tazbox/tazbox:168 msgid "Language configuration" msgstr "Konfiguracja języka" -#: tazbox/tazbox:165 +#: tazbox/tazbox:169 +msgid "Tip: manage locale list by installing/removing locale packages." +msgstr "" + +#: tazbox/tazbox:170 tazbox/tazbox:278 +msgid "Flag" +msgstr "" + +#: tazbox/tazbox:170 msgid "Name" msgstr "Nazwa" -#: tazbox/tazbox:165 +#: tazbox/tazbox:171 tazbox/tazbox:441 msgid "Description" msgstr "Opis" +#: tazbox/tazbox:173 tazbox/tazbox:279 +msgid "Manage" +msgstr "" + #: tazbox/tazbox:188 +#, sh-format +msgid "Locale was set to $locale" +msgstr "" + +#: tazbox/tazbox:201 msgid "SliTaz keymap" msgstr "" -#: tazbox/tazbox:191 +#: tazbox/tazbox:204 msgid "Keyboard configuration" msgstr "Konfiguracja klawiatury" -#: tazbox/tazbox:192 +#: tazbox/tazbox:205 msgid "Type" msgstr "Typ" -#: tazbox/tazbox:218 tazbox/tazbox:245 tazbox/tazbox:257 tazbox/tazbox:270 +#: tazbox/tazbox:243 tazbox/tazbox:271 tazbox/tazbox:287 tazbox/tazbox:300 msgid "SliTaz TZ" msgstr "" -#: tazbox/tazbox:221 +#: tazbox/tazbox:246 msgid "Suggested location:" msgstr "" -#: tazbox/tazbox:222 -msgid "Are you agree?" +#: tazbox/tazbox:247 +msgid "Are you agreed?" msgstr "" -#: tazbox/tazbox:248 tazbox/tazbox:260 tazbox/tazbox:273 +#: tazbox/tazbox:274 tazbox/tazbox:290 tazbox/tazbox:303 msgid "TimeZone Configuration" msgstr "Konfiguracja Strefy Czasowej" -#: tazbox/tazbox:248 -msgid "Select country" +#: tazbox/tazbox:275 +msgid "Select country and press \"Forward\" or manual select timezone file." msgstr "" -#: tazbox/tazbox:250 -msgid "Flag" +#: tazbox/tazbox:276 +msgid "Tip: manage timezone list by installing/removing locale packages." msgstr "" -#: tazbox/tazbox:250 +#: tazbox/tazbox:278 msgid "Code" msgstr "" -#: tazbox/tazbox:250 +#: tazbox/tazbox:278 msgid "Country" msgstr "" -#: tazbox/tazbox:260 +#: tazbox/tazbox:280 +msgid "Manual" +msgstr "" + +#: tazbox/tazbox:290 msgid "Select time zone" msgstr "" -#: tazbox/tazbox:273 +#: tazbox/tazbox:303 msgid "Select location" msgstr "" -#: tazbox/tazbox:274 +#: tazbox/tazbox:304 msgid "Location/City" msgstr "" -#: tazbox/tazbox:299 +#: tazbox/tazbox:330 #, sh-format msgid "TimeZone was set to $timezone" msgstr "" -#: tazbox/tazbox:306 +#: tazbox/tazbox:366 +msgid "Please wait" +msgstr "" + +#: tazbox/tazbox:435 +msgid "Manage locale packages" +msgstr "" + +#: tazbox/tazbox:438 +msgid "Check only locale packages you need and press \"Install/Remove\"." +msgstr "" + +#: tazbox/tazbox:440 +msgid "Inst." +msgstr "" + +#: tazbox/tazbox:440 +msgid "Package Name" +msgstr "" + +#: tazbox/tazbox:441 +msgid "Size" +msgstr "" + +#: tazbox/tazbox:442 +msgid "Installed" +msgstr "" + +#: tazbox/tazbox:443 +msgid "Recharge list" +msgstr "" + +#: tazbox/tazbox:444 +msgid "Install/Remove" +msgstr "" + +#: tazbox/tazbox:460 +msgid "TazPkg log" +msgstr "" + +#: tazbox/tazbox:463 +#, sh-format +msgid "REMOVE: $pkg" +msgstr "" + +#: tazbox/tazbox:467 +#, sh-format +msgid "INSTALL: $pkg" +msgstr "" + +#: tazbox/tazbox:470 +msgid "Done!" +msgstr "" + +#: tazbox/tazbox:480 msgid "New file" msgstr "Nowy plik" -#: tazbox/tazbox:309 +#: tazbox/tazbox:483 msgid "Create a new file or folder on your desktop" msgstr "Tworzy nowy plik albo katalog na pulpicie" -#: tazbox/tazbox:310 +#: tazbox/tazbox:484 msgid "File name" msgstr "Nazwa pliku:" -#: tazbox/tazbox:313 +#: tazbox/tazbox:487 msgid "SHell script" msgstr "Skrypt SHell" -#: tazbox/tazbox:314 +#: tazbox/tazbox:488 msgid "Folder" msgstr "Klatalog" -#: tazbox/tazbox:316 +#: tazbox/tazbox:490 msgid "File" msgstr "Plik" -#: tazbox/tazbox:341 +#: tazbox/tazbox:515 msgid "All Applications" msgstr "Wszystkie aplikacje" -#: tazbox/tazbox:429 +#: tazbox/tazbox:603 msgid "Downloading..." msgstr "" -#: tazbox/tazbox:481 +#: tazbox/tazbox:659 msgid "SliTaz default applications" msgstr "Domyślne aplikacjie SliTaz" -#: tazbox/tazbox:483 +#: tazbox/tazbox:661 msgid "SliTaz default applications configuration" msgstr "Domyślna konfiguracja aplikacji SliTaz" -#: tazbox/tazbox:485 +#: tazbox/tazbox:663 msgid "File manager:" msgstr "Menadżer plików:" -#: tazbox/tazbox:486 +#: tazbox/tazbox:664 msgid "Web browser:" msgstr "Przeglądarka internetowa:" -#: tazbox/tazbox:487 +#: tazbox/tazbox:665 msgid "Text editor:" msgstr "Edytor textowy:" -#: tazbox/tazbox:488 +#: tazbox/tazbox:666 msgid "Terminal:" msgstr "Terminal:" -#: tazbox/tazbox:489 +#: tazbox/tazbox:667 msgid "Window manager:" msgstr "Menadżer okien:" diff -r 3dd4838c69c6 -r 5a8adba12ac2 po/tazbox/pt_BR.po --- a/po/tazbox/pt_BR.po Fri May 02 22:16:37 2014 +0200 +++ b/po/tazbox/pt_BR.po Tue May 06 22:55:12 2014 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: tazbox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-16 13:19+0300\n" +"POT-Creation-Date: 2014-05-06 22:40+0300\n" "PO-Revision-Date: 2014-03-06 22:12-0300\n" "Last-Translator: Claudinei Pereira \n" "Language-Team: Brazilian Portuguese \n" @@ -152,7 +152,7 @@ msgid "Locale" msgstr "Locale" -#: tazbox/tazbox:140 tazbox/tazbox:192 +#: tazbox/tazbox:140 tazbox/tazbox:205 msgid "Keymap" msgstr "Mapa de teclado" @@ -160,140 +160,218 @@ msgid "Timezone" msgstr "Zona horária" -#: tazbox/tazbox:161 +#: tazbox/tazbox:165 msgid "SliTaz locale" msgstr "Locale do SliTaz" -#: tazbox/tazbox:164 +#: tazbox/tazbox:168 msgid "Language configuration" msgstr "Configuração de linguagem" -#: tazbox/tazbox:165 +#: tazbox/tazbox:169 +msgid "Tip: manage locale list by installing/removing locale packages." +msgstr "" + +#: tazbox/tazbox:170 tazbox/tazbox:278 +msgid "Flag" +msgstr "Flag" + +#: tazbox/tazbox:170 msgid "Name" msgstr "Nome" -#: tazbox/tazbox:165 +#: tazbox/tazbox:171 tazbox/tazbox:441 msgid "Description" msgstr "Descrição" +#: tazbox/tazbox:173 tazbox/tazbox:279 +msgid "Manage" +msgstr "" + #: tazbox/tazbox:188 +#, sh-format +msgid "Locale was set to $locale" +msgstr "" + +#: tazbox/tazbox:201 msgid "SliTaz keymap" msgstr "Mapa de teclado do SliTaz" -#: tazbox/tazbox:191 +#: tazbox/tazbox:204 msgid "Keyboard configuration" msgstr "Configuração do teclado" -#: tazbox/tazbox:192 +#: tazbox/tazbox:205 msgid "Type" msgstr "Tipo" -#: tazbox/tazbox:218 tazbox/tazbox:245 tazbox/tazbox:257 tazbox/tazbox:270 +#: tazbox/tazbox:243 tazbox/tazbox:271 tazbox/tazbox:287 tazbox/tazbox:300 msgid "SliTaz TZ" msgstr "Zona Horária do SliTaz" -#: tazbox/tazbox:221 +#: tazbox/tazbox:246 #, fuzzy msgid "Suggested location:" msgstr "Selecionar localidade" -#: tazbox/tazbox:222 -msgid "Are you agree?" +#: tazbox/tazbox:247 +msgid "Are you agreed?" msgstr "" -#: tazbox/tazbox:248 tazbox/tazbox:260 tazbox/tazbox:273 +#: tazbox/tazbox:274 tazbox/tazbox:290 tazbox/tazbox:303 msgid "TimeZone Configuration" msgstr "Configuração de zona horária" -#: tazbox/tazbox:248 -msgid "Select country" -msgstr "Selecionar país" +#: tazbox/tazbox:275 +msgid "Select country and press \"Forward\" or manual select timezone file." +msgstr "" -#: tazbox/tazbox:250 -msgid "Flag" -msgstr "Flag" +#: tazbox/tazbox:276 +msgid "Tip: manage timezone list by installing/removing locale packages." +msgstr "" -#: tazbox/tazbox:250 +#: tazbox/tazbox:278 msgid "Code" msgstr "Código" -#: tazbox/tazbox:250 +#: tazbox/tazbox:278 msgid "Country" msgstr "País" -#: tazbox/tazbox:260 +#: tazbox/tazbox:280 +msgid "Manual" +msgstr "" + +#: tazbox/tazbox:290 msgid "Select time zone" msgstr "Selecionar zona horária" -#: tazbox/tazbox:273 +#: tazbox/tazbox:303 msgid "Select location" msgstr "Selecionar localidade" -#: tazbox/tazbox:274 +#: tazbox/tazbox:304 msgid "Location/City" msgstr "Localidade/Cidade" -#: tazbox/tazbox:299 +#: tazbox/tazbox:330 #, sh-format msgid "TimeZone was set to $timezone" msgstr "" -#: tazbox/tazbox:306 +#: tazbox/tazbox:366 +msgid "Please wait" +msgstr "" + +#: tazbox/tazbox:435 +msgid "Manage locale packages" +msgstr "" + +#: tazbox/tazbox:438 +msgid "Check only locale packages you need and press \"Install/Remove\"." +msgstr "" + +#: tazbox/tazbox:440 +msgid "Inst." +msgstr "" + +#: tazbox/tazbox:440 +msgid "Package Name" +msgstr "" + +#: tazbox/tazbox:441 +msgid "Size" +msgstr "" + +#: tazbox/tazbox:442 +msgid "Installed" +msgstr "" + +#: tazbox/tazbox:443 +msgid "Recharge list" +msgstr "" + +#: tazbox/tazbox:444 +msgid "Install/Remove" +msgstr "" + +#: tazbox/tazbox:460 +msgid "TazPkg log" +msgstr "" + +#: tazbox/tazbox:463 +#, sh-format +msgid "REMOVE: $pkg" +msgstr "" + +#: tazbox/tazbox:467 +#, sh-format +msgid "INSTALL: $pkg" +msgstr "" + +#: tazbox/tazbox:470 +msgid "Done!" +msgstr "" + +#: tazbox/tazbox:480 msgid "New file" msgstr "Novo arquivo" -#: tazbox/tazbox:309 +#: tazbox/tazbox:483 msgid "Create a new file or folder on your desktop" msgstr "Cria novo arquivo ou pasta na área de trabalho" -#: tazbox/tazbox:310 +#: tazbox/tazbox:484 msgid "File name" msgstr "Nome do arquivo" -#: tazbox/tazbox:313 +#: tazbox/tazbox:487 msgid "SHell script" msgstr "SHell script" -#: tazbox/tazbox:314 +#: tazbox/tazbox:488 msgid "Folder" msgstr "Pasta" -#: tazbox/tazbox:316 +#: tazbox/tazbox:490 msgid "File" msgstr "Arquivo" -#: tazbox/tazbox:341 +#: tazbox/tazbox:515 msgid "All Applications" msgstr "Todos os aplicativos" -#: tazbox/tazbox:429 +#: tazbox/tazbox:603 msgid "Downloading..." msgstr "Baixando..." -#: tazbox/tazbox:481 +#: tazbox/tazbox:659 msgid "SliTaz default applications" msgstr "Aplicativos padrão do SliTaz" -#: tazbox/tazbox:483 +#: tazbox/tazbox:661 msgid "SliTaz default applications configuration" msgstr "Configuração dos aplicativos padrão do SliTaz" -#: tazbox/tazbox:485 +#: tazbox/tazbox:663 msgid "File manager:" msgstr "Gerenciador de arquivos:" -#: tazbox/tazbox:486 +#: tazbox/tazbox:664 msgid "Web browser:" msgstr "Navegador web:" -#: tazbox/tazbox:487 +#: tazbox/tazbox:665 msgid "Text editor:" msgstr "Editor de texto:" -#: tazbox/tazbox:488 +#: tazbox/tazbox:666 msgid "Terminal:" msgstr "Terminal:" -#: tazbox/tazbox:489 +#: tazbox/tazbox:667 msgid "Window manager:" msgstr "Gerenciador de janelas:" + +#~ msgid "Select country" +#~ msgstr "Selecionar país" diff -r 3dd4838c69c6 -r 5a8adba12ac2 po/tazbox/ru.po --- a/po/tazbox/ru.po Fri May 02 22:16:37 2014 +0200 +++ b/po/tazbox/ru.po Tue May 06 22:55:12 2014 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-16 13:19+0300\n" +"POT-Creation-Date: 2014-05-06 22:40+0300\n" "PO-Revision-Date: 2014-04-16 13:34+0300\n" "Last-Translator: Aleksej Bobylev \n" "Language-Team: \n" @@ -18,6 +18,9 @@ "X-Poedit-Language: Russian\n" "X-Poedit-Basepath: ../../\n" "X-Poedit-SearchPath-0: .\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" #: tazbox/tazbox:28 msgid "SliTaz tiny GUI boxes for the desktop" @@ -69,7 +72,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" @@ -145,17 +149,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:192 +#: tazbox/tazbox:140 tazbox/tazbox:205 msgid "Keymap" msgstr "Раскладка" @@ -163,140 +166,220 @@ msgid "Timezone" msgstr "Часовой пояс" -#: tazbox/tazbox:161 +#: tazbox/tazbox:165 msgid "SliTaz locale" msgstr "Локаль SliTaz" -#: tazbox/tazbox:164 +#: tazbox/tazbox:168 msgid "Language configuration" msgstr "Настройка языка" -#: tazbox/tazbox:165 +#: tazbox/tazbox:169 +msgid "Tip: manage locale list by installing/removing locale packages." +msgstr "" +"Подсказка: вы можете управлять списком локалей, устанавливая и удаляя пакеты " +"локалей." + +#: tazbox/tazbox:170 tazbox/tazbox:278 +msgid "Flag" +msgstr "флаг" + +#: tazbox/tazbox:170 msgid "Name" msgstr "Название" -#: tazbox/tazbox:165 +#: tazbox/tazbox:171 tazbox/tazbox:441 msgid "Description" msgstr "Описание" +#: tazbox/tazbox:173 tazbox/tazbox:279 +msgid "Manage" +msgstr "Пакеты" + #: tazbox/tazbox:188 +#, sh-format +msgid "Locale was set to $locale" +msgstr "Установлена локаль «$locale»" + +#: tazbox/tazbox:201 msgid "SliTaz keymap" msgstr "Раскладка клавиатуры SliTaz" -#: tazbox/tazbox:191 +#: tazbox/tazbox:204 msgid "Keyboard configuration" msgstr "Настройка клавиатуры" -#: tazbox/tazbox:192 +#: tazbox/tazbox:205 msgid "Type" msgstr "Тип" -#: tazbox/tazbox:218 tazbox/tazbox:245 tazbox/tazbox:257 tazbox/tazbox:270 +#: tazbox/tazbox:243 tazbox/tazbox:271 tazbox/tazbox:287 tazbox/tazbox:300 msgid "SliTaz TZ" msgstr "Часовой пояс SliTaz" -#: tazbox/tazbox:221 +#: tazbox/tazbox:246 msgid "Suggested location:" msgstr "Предполагаемое местоположение:" -#: tazbox/tazbox:222 -msgid "Are you agree?" +#: tazbox/tazbox:247 +msgid "Are you agreed?" msgstr "Вы согласны?" -#: tazbox/tazbox:248 tazbox/tazbox:260 tazbox/tazbox:273 +#: tazbox/tazbox:274 tazbox/tazbox:290 tazbox/tazbox:303 msgid "TimeZone Configuration" msgstr "Настройка часового пояса" -#: tazbox/tazbox:248 -msgid "Select country" -msgstr "Выберите страну" +#: tazbox/tazbox:275 +msgid "Select country and press \"Forward\" or manual select timezone file." +msgstr "" +"Выберите страну и нажмите «Вперёд» или вручную выберите файл часового пояса." -#: tazbox/tazbox:250 -msgid "Flag" -msgstr "флаг" +#: tazbox/tazbox:276 +msgid "Tip: manage timezone list by installing/removing locale packages." +msgstr "" +"Подсказка: вы можете управлять списком часовых поясов, устанавливая и удаляя " +"пакеты локалей." -#: tazbox/tazbox:250 +#: tazbox/tazbox:278 msgid "Code" msgstr "код" -#: tazbox/tazbox:250 +#: tazbox/tazbox:278 msgid "Country" msgstr "страна" -#: tazbox/tazbox:260 +#: tazbox/tazbox:280 +msgid "Manual" +msgstr "Вручную" + +#: tazbox/tazbox:290 msgid "Select time zone" msgstr "Выберите часовой пояс" -#: tazbox/tazbox:273 +#: tazbox/tazbox:303 msgid "Select location" msgstr "Выберите местоположение" -#: tazbox/tazbox:274 +#: tazbox/tazbox:304 msgid "Location/City" msgstr "местность/город" -#: tazbox/tazbox:299 +#: tazbox/tazbox:330 #, sh-format msgid "TimeZone was set to $timezone" msgstr "Установлен часовой пояс «$timezone»" -#: tazbox/tazbox:306 +#: tazbox/tazbox:366 +msgid "Please wait" +msgstr "Пожалуйста, подождите" + +#: tazbox/tazbox:435 +msgid "Manage locale packages" +msgstr "Управление пакетами локалей" + +#: tazbox/tazbox:438 +msgid "Check only locale packages you need and press \"Install/Remove\"." +msgstr "" +"Отметьте только пакеты с нужными вам локалями и нажмите «Установить/удалить»." + +#: tazbox/tazbox:440 +msgid "Inst." +msgstr "Уст." + +#: tazbox/tazbox:440 +msgid "Package Name" +msgstr "Название пакета" + +#: tazbox/tazbox:441 +msgid "Size" +msgstr "Размер" + +#: tazbox/tazbox:442 +msgid "Installed" +msgstr "Установленный" + +#: tazbox/tazbox:443 +msgid "Recharge list" +msgstr "Обновить список" + +#: tazbox/tazbox:444 +msgid "Install/Remove" +msgstr "Установить/удалить" + +#: tazbox/tazbox:460 +msgid "TazPkg log" +msgstr "Журнал TazPkg" + +#: tazbox/tazbox:463 +#, sh-format +msgid "REMOVE: $pkg" +msgstr "УДАЛЕНИЕ $pkg" + +#: tazbox/tazbox:467 +#, sh-format +msgid "INSTALL: $pkg" +msgstr "УСТАНОВКА $pkg" + +#: tazbox/tazbox:470 +msgid "Done!" +msgstr "Готово!" + +#: tazbox/tazbox:480 msgid "New file" msgstr "Новый файл" -#: tazbox/tazbox:309 +#: tazbox/tazbox:483 msgid "Create a new file or folder on your desktop" msgstr "Создать файл или папку на рабочем столе" -#: tazbox/tazbox:310 +#: tazbox/tazbox:484 msgid "File name" msgstr "Имя файла" -#: tazbox/tazbox:313 +#: tazbox/tazbox:487 msgid "SHell script" msgstr "Скрипт" -#: tazbox/tazbox:314 +#: tazbox/tazbox:488 msgid "Folder" msgstr "Папка" -#: tazbox/tazbox:316 +#: tazbox/tazbox:490 msgid "File" msgstr "Файл" -#: tazbox/tazbox:341 +#: tazbox/tazbox:515 msgid "All Applications" msgstr "Все приложения" -#: tazbox/tazbox:429 +#: tazbox/tazbox:603 msgid "Downloading..." msgstr "Загрузка…" -#: tazbox/tazbox:481 +#: tazbox/tazbox:659 msgid "SliTaz default applications" msgstr "Избранные приложения SliTaz" -#: tazbox/tazbox:483 +#: tazbox/tazbox:661 msgid "SliTaz default applications configuration" msgstr "Настройка избранных приложений SliTaz" -#: tazbox/tazbox:485 +#: tazbox/tazbox:663 msgid "File manager:" msgstr "Файловый менеджер:" -#: tazbox/tazbox:486 +#: tazbox/tazbox:664 msgid "Web browser:" msgstr "Браузер:" -#: tazbox/tazbox:487 +#: tazbox/tazbox:665 msgid "Text editor:" msgstr "Текстовый редактор:" -#: tazbox/tazbox:488 +#: tazbox/tazbox:666 msgid "Terminal:" msgstr "Терминал:" -#: tazbox/tazbox:489 +#: tazbox/tazbox:667 msgid "Window manager:" msgstr "Оконный менеджер:" - diff -r 3dd4838c69c6 -r 5a8adba12ac2 po/tazbox/sv.po --- a/po/tazbox/sv.po Fri May 02 22:16:37 2014 +0200 +++ b/po/tazbox/sv.po Tue May 06 22:55:12 2014 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-16 13:19+0300\n" +"POT-Creation-Date: 2014-05-06 22:40+0300\n" "PO-Revision-Date: 2012-07-12 13:14-0000\n" "Last-Translator: Emil Eklund \n" "Language-Team: Swedish\n" @@ -153,7 +153,7 @@ msgid "Locale" msgstr "" -#: tazbox/tazbox:140 tazbox/tazbox:192 +#: tazbox/tazbox:140 tazbox/tazbox:205 msgid "Keymap" msgstr "Tangentbords layout" @@ -161,139 +161,214 @@ msgid "Timezone" msgstr "" -#: tazbox/tazbox:161 +#: tazbox/tazbox:165 msgid "SliTaz locale" msgstr "" -#: tazbox/tazbox:164 +#: tazbox/tazbox:168 msgid "Language configuration" msgstr "Språk konfiguration" -#: tazbox/tazbox:165 +#: tazbox/tazbox:169 +msgid "Tip: manage locale list by installing/removing locale packages." +msgstr "" + +#: tazbox/tazbox:170 tazbox/tazbox:278 +msgid "Flag" +msgstr "" + +#: tazbox/tazbox:170 msgid "Name" msgstr "Namn" -#: tazbox/tazbox:165 +#: tazbox/tazbox:171 tazbox/tazbox:441 msgid "Description" msgstr "Beskrivning" +#: tazbox/tazbox:173 tazbox/tazbox:279 +msgid "Manage" +msgstr "" + #: tazbox/tazbox:188 +#, sh-format +msgid "Locale was set to $locale" +msgstr "" + +#: tazbox/tazbox:201 msgid "SliTaz keymap" msgstr "" -#: tazbox/tazbox:191 +#: tazbox/tazbox:204 msgid "Keyboard configuration" msgstr "Tangentbords inställning" -#: tazbox/tazbox:192 +#: tazbox/tazbox:205 msgid "Type" msgstr "Typ" -#: tazbox/tazbox:218 tazbox/tazbox:245 tazbox/tazbox:257 tazbox/tazbox:270 +#: tazbox/tazbox:243 tazbox/tazbox:271 tazbox/tazbox:287 tazbox/tazbox:300 msgid "SliTaz TZ" msgstr "" -#: tazbox/tazbox:221 +#: tazbox/tazbox:246 msgid "Suggested location:" msgstr "" -#: tazbox/tazbox:222 -msgid "Are you agree?" +#: tazbox/tazbox:247 +msgid "Are you agreed?" msgstr "" -#: tazbox/tazbox:248 tazbox/tazbox:260 tazbox/tazbox:273 +#: tazbox/tazbox:274 tazbox/tazbox:290 tazbox/tazbox:303 msgid "TimeZone Configuration" msgstr "TidsZon Inställning" -#: tazbox/tazbox:248 -msgid "Select country" +#: tazbox/tazbox:275 +msgid "Select country and press \"Forward\" or manual select timezone file." msgstr "" -#: tazbox/tazbox:250 -msgid "Flag" +#: tazbox/tazbox:276 +msgid "Tip: manage timezone list by installing/removing locale packages." msgstr "" -#: tazbox/tazbox:250 +#: tazbox/tazbox:278 msgid "Code" msgstr "" -#: tazbox/tazbox:250 +#: tazbox/tazbox:278 msgid "Country" msgstr "" -#: tazbox/tazbox:260 +#: tazbox/tazbox:280 +msgid "Manual" +msgstr "" + +#: tazbox/tazbox:290 msgid "Select time zone" msgstr "" -#: tazbox/tazbox:273 +#: tazbox/tazbox:303 msgid "Select location" msgstr "" -#: tazbox/tazbox:274 +#: tazbox/tazbox:304 msgid "Location/City" msgstr "" -#: tazbox/tazbox:299 +#: tazbox/tazbox:330 #, sh-format msgid "TimeZone was set to $timezone" msgstr "" -#: tazbox/tazbox:306 +#: tazbox/tazbox:366 +msgid "Please wait" +msgstr "" + +#: tazbox/tazbox:435 +msgid "Manage locale packages" +msgstr "" + +#: tazbox/tazbox:438 +msgid "Check only locale packages you need and press \"Install/Remove\"." +msgstr "" + +#: tazbox/tazbox:440 +msgid "Inst." +msgstr "" + +#: tazbox/tazbox:440 +msgid "Package Name" +msgstr "" + +#: tazbox/tazbox:441 +msgid "Size" +msgstr "" + +#: tazbox/tazbox:442 +msgid "Installed" +msgstr "" + +#: tazbox/tazbox:443 +msgid "Recharge list" +msgstr "" + +#: tazbox/tazbox:444 +msgid "Install/Remove" +msgstr "" + +#: tazbox/tazbox:460 +msgid "TazPkg log" +msgstr "" + +#: tazbox/tazbox:463 +#, sh-format +msgid "REMOVE: $pkg" +msgstr "" + +#: tazbox/tazbox:467 +#, sh-format +msgid "INSTALL: $pkg" +msgstr "" + +#: tazbox/tazbox:470 +msgid "Done!" +msgstr "" + +#: tazbox/tazbox:480 msgid "New file" msgstr "Ny fil" -#: tazbox/tazbox:309 +#: tazbox/tazbox:483 msgid "Create a new file or folder on your desktop" msgstr "Skapa en ny fil eller mapp på ditt skrivbord" -#: tazbox/tazbox:310 +#: tazbox/tazbox:484 msgid "File name" msgstr "Fil namn" -#: tazbox/tazbox:313 +#: tazbox/tazbox:487 msgid "SHell script" msgstr "SHell skript" -#: tazbox/tazbox:314 +#: tazbox/tazbox:488 msgid "Folder" msgstr "Mapp" -#: tazbox/tazbox:316 +#: tazbox/tazbox:490 msgid "File" msgstr "Fil" -#: tazbox/tazbox:341 +#: tazbox/tazbox:515 msgid "All Applications" msgstr "Alla Applikationer" -#: tazbox/tazbox:429 +#: tazbox/tazbox:603 msgid "Downloading..." msgstr "" -#: tazbox/tazbox:481 +#: tazbox/tazbox:659 msgid "SliTaz default applications" msgstr "" -#: tazbox/tazbox:483 +#: tazbox/tazbox:661 msgid "SliTaz default applications configuration" msgstr "" -#: tazbox/tazbox:485 +#: tazbox/tazbox:663 msgid "File manager:" msgstr "" -#: tazbox/tazbox:486 +#: tazbox/tazbox:664 msgid "Web browser:" msgstr "" -#: tazbox/tazbox:487 +#: tazbox/tazbox:665 msgid "Text editor:" msgstr "" -#: tazbox/tazbox:488 +#: tazbox/tazbox:666 msgid "Terminal:" msgstr "" -#: tazbox/tazbox:489 +#: tazbox/tazbox:667 msgid "Window manager:" msgstr "" diff -r 3dd4838c69c6 -r 5a8adba12ac2 po/tazbox/tazbox.pot --- a/po/tazbox/tazbox.pot Fri May 02 22:16:37 2014 +0200 +++ b/po/tazbox/tazbox.pot Tue May 06 22:55:12 2014 +0300 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-16 13:19+0300\n" +"POT-Creation-Date: 2014-05-06 22:40+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -150,7 +150,7 @@ msgid "Locale" msgstr "" -#: tazbox/tazbox:140 tazbox/tazbox:192 +#: tazbox/tazbox:140 tazbox/tazbox:205 msgid "Keymap" msgstr "" @@ -158,139 +158,214 @@ msgid "Timezone" msgstr "" -#: tazbox/tazbox:161 +#: tazbox/tazbox:165 msgid "SliTaz locale" msgstr "" -#: tazbox/tazbox:164 +#: tazbox/tazbox:168 msgid "Language configuration" msgstr "" -#: tazbox/tazbox:165 +#: tazbox/tazbox:169 +msgid "Tip: manage locale list by installing/removing locale packages." +msgstr "" + +#: tazbox/tazbox:170 tazbox/tazbox:278 +msgid "Flag" +msgstr "" + +#: tazbox/tazbox:170 msgid "Name" msgstr "" -#: tazbox/tazbox:165 +#: tazbox/tazbox:171 tazbox/tazbox:441 msgid "Description" msgstr "" +#: tazbox/tazbox:173 tazbox/tazbox:279 +msgid "Manage" +msgstr "" + #: tazbox/tazbox:188 +#, sh-format +msgid "Locale was set to $locale" +msgstr "" + +#: tazbox/tazbox:201 msgid "SliTaz keymap" msgstr "" -#: tazbox/tazbox:191 +#: tazbox/tazbox:204 msgid "Keyboard configuration" msgstr "" -#: tazbox/tazbox:192 +#: tazbox/tazbox:205 msgid "Type" msgstr "" -#: tazbox/tazbox:218 tazbox/tazbox:245 tazbox/tazbox:257 tazbox/tazbox:270 +#: tazbox/tazbox:243 tazbox/tazbox:271 tazbox/tazbox:287 tazbox/tazbox:300 msgid "SliTaz TZ" msgstr "" -#: tazbox/tazbox:221 +#: tazbox/tazbox:246 msgid "Suggested location:" msgstr "" -#: tazbox/tazbox:222 -msgid "Are you agree?" +#: tazbox/tazbox:247 +msgid "Are you agreed?" msgstr "" -#: tazbox/tazbox:248 tazbox/tazbox:260 tazbox/tazbox:273 +#: tazbox/tazbox:274 tazbox/tazbox:290 tazbox/tazbox:303 msgid "TimeZone Configuration" msgstr "" -#: tazbox/tazbox:248 -msgid "Select country" +#: tazbox/tazbox:275 +msgid "Select country and press \"Forward\" or manual select timezone file." msgstr "" -#: tazbox/tazbox:250 -msgid "Flag" +#: tazbox/tazbox:276 +msgid "Tip: manage timezone list by installing/removing locale packages." msgstr "" -#: tazbox/tazbox:250 +#: tazbox/tazbox:278 msgid "Code" msgstr "" -#: tazbox/tazbox:250 +#: tazbox/tazbox:278 msgid "Country" msgstr "" -#: tazbox/tazbox:260 +#: tazbox/tazbox:280 +msgid "Manual" +msgstr "" + +#: tazbox/tazbox:290 msgid "Select time zone" msgstr "" -#: tazbox/tazbox:273 +#: tazbox/tazbox:303 msgid "Select location" msgstr "" -#: tazbox/tazbox:274 +#: tazbox/tazbox:304 msgid "Location/City" msgstr "" -#: tazbox/tazbox:299 +#: tazbox/tazbox:330 #, sh-format msgid "TimeZone was set to $timezone" msgstr "" -#: tazbox/tazbox:306 +#: tazbox/tazbox:366 +msgid "Please wait" +msgstr "" + +#: tazbox/tazbox:435 +msgid "Manage locale packages" +msgstr "" + +#: tazbox/tazbox:438 +msgid "Check only locale packages you need and press \"Install/Remove\"." +msgstr "" + +#: tazbox/tazbox:440 +msgid "Inst." +msgstr "" + +#: tazbox/tazbox:440 +msgid "Package Name" +msgstr "" + +#: tazbox/tazbox:441 +msgid "Size" +msgstr "" + +#: tazbox/tazbox:442 +msgid "Installed" +msgstr "" + +#: tazbox/tazbox:443 +msgid "Recharge list" +msgstr "" + +#: tazbox/tazbox:444 +msgid "Install/Remove" +msgstr "" + +#: tazbox/tazbox:460 +msgid "TazPkg log" +msgstr "" + +#: tazbox/tazbox:463 +#, sh-format +msgid "REMOVE: $pkg" +msgstr "" + +#: tazbox/tazbox:467 +#, sh-format +msgid "INSTALL: $pkg" +msgstr "" + +#: tazbox/tazbox:470 +msgid "Done!" +msgstr "" + +#: tazbox/tazbox:480 msgid "New file" msgstr "" -#: tazbox/tazbox:309 +#: tazbox/tazbox:483 msgid "Create a new file or folder on your desktop" msgstr "" -#: tazbox/tazbox:310 +#: tazbox/tazbox:484 msgid "File name" msgstr "" -#: tazbox/tazbox:313 +#: tazbox/tazbox:487 msgid "SHell script" msgstr "" -#: tazbox/tazbox:314 +#: tazbox/tazbox:488 msgid "Folder" msgstr "" -#: tazbox/tazbox:316 +#: tazbox/tazbox:490 msgid "File" msgstr "" -#: tazbox/tazbox:341 +#: tazbox/tazbox:515 msgid "All Applications" msgstr "" -#: tazbox/tazbox:429 +#: tazbox/tazbox:603 msgid "Downloading..." msgstr "" -#: tazbox/tazbox:481 +#: tazbox/tazbox:659 msgid "SliTaz default applications" msgstr "" -#: tazbox/tazbox:483 +#: tazbox/tazbox:661 msgid "SliTaz default applications configuration" msgstr "" -#: tazbox/tazbox:485 +#: tazbox/tazbox:663 msgid "File manager:" msgstr "" -#: tazbox/tazbox:486 +#: tazbox/tazbox:664 msgid "Web browser:" msgstr "" -#: tazbox/tazbox:487 +#: tazbox/tazbox:665 msgid "Text editor:" msgstr "" -#: tazbox/tazbox:488 +#: tazbox/tazbox:666 msgid "Terminal:" msgstr "" -#: tazbox/tazbox:489 +#: tazbox/tazbox:667 msgid "Window manager:" msgstr "" diff -r 3dd4838c69c6 -r 5a8adba12ac2 po/tazdrop/tazdrop.pot --- a/po/tazdrop/tazdrop.pot Fri May 02 22:16:37 2014 +0200 +++ b/po/tazdrop/tazdrop.pot Tue May 06 22:55:12 2014 +0300 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: TazDrop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-16 13:19+0300\n" +"POT-Creation-Date: 2014-05-06 22:40+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -r 3dd4838c69c6 -r 5a8adba12ac2 tazbox/iso3166-1.tab --- a/tazbox/iso3166-1.tab Fri May 02 22:16:37 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,255 +0,0 @@ -AD Andorra -AE United Arab Emirates -AF Afghanistan -AG Antigua and Barbuda -AI Anguilla -AL Albania -AM Armenia -AN Netherlands Antilles -AO Angola -AQ Antarctica -AR Argentina -AS American Samoa -AT Austria -AU Australia -AW Aruba -AX Åland Islands -AZ Azerbaijan -BA Bosnia and Herzegovina -BB Barbados -BD Bangladesh -BE Belgium -BF Burkina Faso -BG Bulgaria -BH Bahrain -BI Burundi -BJ Benin -BL Saint Barthélemy -BM Bermuda -BN Brunei Darussalam -BO Bolivia, Plurinational State of -BQ Bonaire, Sint Eustatius and Saba -BR Brazil -BS Bahamas -BT Bhutan -BV Bouvet Island -BW Botswana -BY Belarus -BZ Belize -CA Canada -CC Cocos (Keeling) Islands -#CD Congo, the Democratic Republic of the -CD Congo, The Democratic Republic of the -CF Central African Republic -CG Congo -CH Switzerland -CI Côte d'Ivoire -CK Cook Islands -CL Chile -CM Cameroon -CN China -CO Colombia -CR Costa Rica -CU Cuba -CV Cape Verde -CW Curaçao -CX Christmas Island -CY Cyprus -CZ Czech Republic -DE Germany -DJ Djibouti -DK Denmark -DM Dominica -DO Dominican Republic -DZ Algeria -EC Ecuador -EE Estonia -EG Egypt -EH Western Sahara -ER Eritrea -ES Spain -ET Ethiopia -FI Finland -FJ Fiji -FK Falkland Islands (Malvinas) -FM Micronesia, Federated States of -FO Faroe Islands -FR France -GA Gabon -GB United Kingdom -GD Grenada -GE Georgia -GF French Guiana -GG Guernsey -GH Ghana -GI Gibraltar -GL Greenland -GM Gambia -GN Guinea -GP Guadeloupe -GQ Equatorial Guinea -GR Greece -GS South Georgia and the South Sandwich Islands -GT Guatemala -GU Guam -GW Guinea-Bissau -GY Guyana -HK Hong Kong -HM Heard Island and McDonald Islands -HN Honduras -HR Croatia -HT Haiti -HU Hungary -ID Indonesia -IE Ireland -IL Israel -IM Isle of Man -IN India -IO British Indian Ocean Territory -IQ Iraq -IR Iran, Islamic Republic of -IS Iceland -IT Italy -JE Jersey -JM Jamaica -JO Jordan -JP Japan -KE Kenya -KG Kyrgyzstan -KH Cambodia -KI Kiribati -KM Comoros -KN Saint Kitts and Nevis -KP Korea, Democratic People's Republic of -KR Korea, Republic of -KW Kuwait -KY Cayman Islands -KZ Kazakhstan -LA Lao People's Democratic Republic -LB Lebanon -LC Saint Lucia -LI Liechtenstein -LK Sri Lanka -LR Liberia -LS Lesotho -LT Lithuania -LU Luxembourg -LV Latvia -LY Libya -MA Morocco -MC Monaco -MD Moldova, Republic of -ME Montenegro -MF Saint Martin (French part) -MG Madagascar -MH Marshall Islands -#MK Macedonia, the former Yugoslav Republic of -MK Macedonia, Republic of -ML Mali -MM Myanmar -MN Mongolia -MO Macao -MP Northern Mariana Islands -MQ Martinique -MR Mauritania -MS Montserrat -MT Malta -MU Mauritius -MV Maldives -MW Malawi -MX Mexico -MY Malaysia -MZ Mozambique -NA Namibia -NC New Caledonia -NE Niger -NF Norfolk Island -NG Nigeria -NI Nicaragua -NL Netherlands -NO Norway -NP Nepal -NR Nauru -NU Niue -NZ New Zealand -OM Oman -PA Panama -PE Peru -PF French Polynesia -PG Papua New Guinea -PH Philippines -PK Pakistan -PL Poland -PM Saint Pierre and Miquelon -PN Pitcairn -PR Puerto Rico -#PS Palestine, State of -PS Palestinian Territory, Occupied -PT Portugal -PW Palau -PY Paraguay -QA Qatar -#RE Réunion -RE Reunion -RO Romania -RS Serbia -RU Russian Federation -RW Rwanda -SA Saudi Arabia -SB Solomon Islands -SC Seychelles -SD Sudan -SE Sweden -SG Singapore -SH Saint Helena, Ascension and Tristan da Cunha -SI Slovenia -SJ Svalbard and Jan Mayen -SK Slovakia -SL Sierra Leone -SM San Marino -SN Senegal -SO Somalia -SR Suriname -SS South Sudan -ST Sao Tome and Principe -SV El Salvador -SX Sint Maarten (Dutch part) -SY Syrian Arab Republic -SZ Swaziland -TC Turks and Caicos Islands -TD Chad -TF French Southern Territories -TG Togo -TH Thailand -TJ Tajikistan -TK Tokelau -TL Timor-Leste -TM Turkmenistan -TN Tunisia -TO Tonga -TR Turkey -TT Trinidad and Tobago -TV Tuvalu -TW Taiwan, Province of China -TZ Tanzania, United Republic of -UA Ukraine -UG Uganda -UM United States Minor Outlying Islands -US United States -UY Uruguay -UZ Uzbekistan -VA Holy See (Vatican City State) -VC Saint Vincent and the Grenadines -#VE Venezuela, Bolivarian Republic of -VE Venezuela, Bolivarian republic of -VG Virgin Islands, British -VI Virgin Islands, U.S. -VN Viet Nam -VU Vanuatu -WF Wallis and Futuna -WS Samoa -YE Yemen -YT Mayotte -ZA South Africa -ZM Zambia -ZW Zimbabwe diff -r 3dd4838c69c6 -r 5a8adba12ac2 tazbox/tazbox --- a/tazbox/tazbox Fri May 02 22:16:37 2014 +0200 +++ b/tazbox/tazbox Tue May 06 22:55:12 2014 +0300 @@ -52,7 +52,7 @@ find_icon() { local desktop desktop=$(find $HOME/.local/share/applications /usr/share/applications \ - -name $1.desktop 2&>/dev/null | head -n1) + -name ${1##*/}.desktop 2&>/dev/null | head -n1) [ x$desktop != x ] && cat $desktop | sed '/\[Desktop\ Entry\]/,/^\[/!d' | \ sed '/^Icon=/!d' | head -n1 | cut -d= -f2 } @@ -130,7 +130,7 @@ gen_kmap_list locale=$(ls -1 $db | grep ^[a-z][a-z]_[A-Z][A-Z] | tr "\n" "!") keymap=$(cat $tmp | sort | tr "\n" "!") - timezone=$(find $zi -type f | sed s,$zi,,g | tr "\n" "!") + timezone=$(find $zi -type f | sed s,$zi,,g | grep -v -F '.tab' | tr "\n" "!") yad --title="$(_n 'SliTaz Initial Setup')" --window-icon=$icon \ --width=500 \ --image=$icon --image-on-top \ @@ -151,30 +151,43 @@ [ $timezone ] && echo $timezone > /etc/TZ } + +# # Locale functions +# + locale_main() { icon=preferences-desktop-locale for locale in $(ls -1 $db | grep '[a-z]_[A-Z]'); do desc=$(fgrep -m1 title $db/$locale | cut -d'"' -f2) - echo -e "$locale \n $desc" + echo -e "${locale##*_}\n$locale\n$desc" done | \ yad --title="$(_n 'SliTaz locale')" --window-icon=$icon \ --width=600 --height=380 --sticky --on-top --center \ --image=$icon --image-on-top \ - --text="$(_n 'Language configuration')" \ - --list --column $(_n 'Name') --column $(_n 'Description') \ - --print-column=1 --separator='' + --text="$(_n 'Language configuration') \ +\n\n$(_ 'Tip: manage locale list by installing/removing locale packages.')" \ + --list --column="$(_n 'Flag'):IMG" --column $(_n 'Name') \ + --column $(_n 'Description') \ + --print-column=2 --separator='' \ + --button="$(_n 'Manage')!stock_properties:2" \ + --button="gtk-cancel:1" --button="gtk-ok:0" } locale() { locale=$(locale_main) # Deal with --button values case $? in + 2) tazbox manage_i18n main ;; 1) exit 0 ;; *) continue ;; esac # System language configuration. - [ "$locale" ] && tazlocale $locale + if [ "$locale" ]; then + tazlocale $locale + tazbox notify "$(_ 'Locale was set to $locale')" \ + preferences-desktop-locale 3 + fi } # Keymap functions @@ -204,24 +217,37 @@ # Free GeoIP service # Response: "IP","CountryCode","CountryName", ... - geoip() { [ ! -e $csv ] && wget -q -T3 -O $csv http://freegeoip.net/csv/ 2&>/dev/null [ -e $csv ] && cut -d'"' -f4 $csv } +# # TZ functions +# + +# list of all existing available locations for country +tz_list() { + find $zi | \ + grep -E "$(cat $ztab | grep "^$1 " | cut -d' ' -f2 | tr ' ' '|')" | \ + grep -v -E "posix|right" | \ + sed 's|.*/||g' | sort +} + +# ask for confirmation only if we have what to choose tz_suggest() { CountryCode=$(geoip) - if [ x$CountryCode != x ]; then + if [ "x$CountryCode" != x ]; then + if [ "x$(tz_list $CountryCode)" != x ]; then CountryName=$(cut -d'"' -f6 $csv) yad --title="$(_ 'SliTaz TZ')" --window-icon=$icon \ --on-top --center \ --image=$CountryCode --image-on-top \ --text="$(_ 'Suggested location:') $CountryName\n $(_ 'Are you agreed?')" \ - --button="gtk-yes:0" --button="gtk-no:1" --always-print-result + --button="gtk-yes:0" --button="gtk-no:1" [ $? == 0 ] && echo $CountryCode + fi fi } @@ -239,16 +265,20 @@ cat << EOT $CC $CC -$(gettext iso_3166 "$(grep -m1 "$CC " ${zi}iso3166-1.tab | cut -d' ' -f2)") +$(grep -m1 "$CC " ${zi}iso3166.tab | cut -d' ' -f2) EOT done | \ yad --title="$(_ 'SliTaz TZ')" --window-icon=$icon \ --width=500 --height=380 --on-top --center \ --image=$icon --image-on-top \ - --text="$(_ 'TimeZone Configuration')\n$(_ 'Select country')" \ + --text="$(_ 'TimeZone Configuration') \ +\n$(_ 'Select country and press "Forward" or manual select timezone file.') \ +\n\n$(_ 'Tip: manage timezone list by installing/removing locale packages.')" \ --list \ --column="$(_n 'Flag'):IMG" --column=$(_n 'Code') --column=$(_n 'Country') \ - --button="gtk-index:2" --button="gtk-go-forward:0" \ + --button="$(_n 'Manage')!stock_properties:4" \ + --button="$(_n 'Manual')!gtk-index:2" \ + --button="gtk-go-forward:0" \ --button="gtk-cancel:1" --always-print-result \ --print-column=2 --separator='' ;; @@ -263,7 +293,7 @@ ;; *) # second pass - city/place - list=$(cat $ztab | grep "^$1 " | cut -d' ' -f2 | tr ' ' "\n" | sort) + list=$(tz_list $1) icon=$1 if [ $(echo "$list" | wc -l) != 1 ]; then echo "$list" | \ @@ -280,26 +310,170 @@ } tz() { - icon=config-date + icon=clock arg=$(tz_suggest) timezone=$(tz_select $arg) case $? in 1) exit 0 ;; - 0) [ x$timezone == x ] && exit 0 - [ x$arg == x ] && timezone=$(tz_select "$timezone") - timezone=$(find $zi -name $timezone -regex '.*info/[ABCEIMP].*' | \ + 0) [ x$arg == x ] && timezone=$(tz_select "$timezone") + [ x$timezone == x ] && exit 0 + timezone=$(find $zi -name $timezone | grep -v -E "posix|right" | \ sed "s|$zi||") ;; 2) timezone=$(tz_select "index") ;; + 4) tazbox manage_i18n main;; esac - [ x$timezone == x ] && exit 0 + [ "x$timezone" == x ] && exit 0 echo $timezone > /etc/TZ export TZ=$timezone - tazbox notify "$(_ 'TimeZone was set to $timezone')" config-date 3 + tazbox notify "$(_ 'TimeZone was set to $timezone')" $icon 3 rm -f $tmpcc } +# +# Manage i18n packages +# + +# if installed +if_installed() { + [ -d /var/lib/tazpkg/installed/$1 ] +} + +# get package's description, install flag and sizes +desc_etc() +{ + INFO="$(grep -m1 -A3 -x -F $1 /var/lib/tazpkg/packages.txt)" + DESC=$(echo "$INFO" | sed -n 3p) + if if_installed $1; then + INST="TRUE"; echo $1 >> $ORIG_LIST + else + INST="FALSE" + fi + SIZES=$(echo "$INFO" | sed -n 4p) + SIZE1=${SIZES%% *} + SIZE2=$(echo $SIZES | cut -d' ' -f2 | tr -d '(') + echo -e "$INST\n$1\n$DESC\n${SIZE1//.0}\n${SIZE2//.0}" >> $PKGS_LIST +} + +# remove temp +rm_temp() { + rm -f $PKGS_LIST $ORIG_LIST $ANSWER $NEW_LIST $LIST1 $LIST2 +} + +# install/remove locale packages +manage_i18n() { + tazbox notify "$(_ 'Please wait')" appointment-soon & + + PKGS_LIST=$(mktemp) + ORIG_LIST=$(mktemp) + ANSWER=$(mktemp) + NEW_LIST=$(mktemp) + LIST1=$(mktemp) + LIST2=$(mktemp) + PLIST=/var/lib/tazpkg/packages.list + + for i in $(grep -E '^locale' $PLIST | grep -v 'extra' | \ + sed 's|\(locale-[a-zA-Z_]*\).*|\1|'); do + desc_etc $i + done + + if [ "x$1" != xmain ]; then + for i in $(grep -E '^locale' $PLIST | grep 'extra' | \ + sed 's|\(locale-[a-zA-Z_]*-extra\).*|\1|'); do + desc_etc $i + done + if if_installed libQtCore; then + for i in $(grep -E '^qt-locale' $PLIST | \ + sed 's|\(qt-locale-[a-zA-Z_]*\).*|\1|'); do + desc_etc $i + done + fi + if if_installed razorqt; then + for i in $(grep -E '^razorqt-locale' $PLIST | \ + sed 's|\(razorqt-locale-[a-zA-Z_]*\).*|\1|'); do + desc_etc $i + done + fi + if if_installed firefox; then + for i in $(grep -E '^firefox-langpack' $PLIST | \ + sed 's|\(firefox-langpack-[a-zA-Z_]*\).*|\1|'); do + desc_etc $i + done + fi + if if_installed thunderbird; then + for i in $(grep -E '^thunderbird-langpack' $PLIST | \ + sed 's|\(thunderbird-langpack-[a-zA-Z_]*\).*|\1|'); do + desc_etc $i + done + fi + if if_installed squirrelmail; then + for i in $(grep -E '^squirrelmail' $PLIST | \ + grep -E '^squirrelmail-[a-z][a-z][_-]' | \ + sed 's|\(squirrelmail-[a-zA-Z_]*\)-.*|\1|'); do + desc_etc $i + done + fi + if if_installed aspell; then + for i in $(grep -E '^aspell' $PLIST | \ + grep -E 'aspell-[a-z][a-z][^a-z]' | \ + sed 's|\(aspell-[a-zA-Z_]*\)-.*|\1|'); do + desc_etc $i + done + fi + OTHER_LOCALE="gnome-commander|-i18n gnome-vfs|-i18n gpa|-langpack \ + gucharmap|-i18n lxterminal|-locales lyx|-locales rox-filer|-locales \ + ufraw|-locales qupzilla|-locales" + for i in $OTHER_LOCALE; do + if if_installed ${i%%|*}; then desc_etc ${i/|/}; fi + done + fi + + icon=stock_properties + cat $PKGS_LIST | \ + { + yad --title="$(_n 'Manage locale packages')" --window-icon=$icon \ + --width=600 --height=400 --on-top --center \ + --image=$icon --image-on-top \ + --text="$(_n 'Check only locale packages you need and press "Install/Remove".')" \ + --list --multiple --ellipsize=END --expand-column=3 \ + --column="$(_n 'Inst.'):CHK" --column="$(_n 'Package Name'):TEXT" \ + --column="$(_n 'Description'):TEXT" --column="$(_n 'Size'):TEXT" \ + --column="$(_n 'Installed'):TEXT" \ + --button="$(_n 'Recharge list')!reload:tazbox recharge" \ + --button="$(_n 'Install/Remove')!system-upgrade:2" \ + --button="gtk-cancel:1" \ + --print-all + } > $ANSWER + + if [ "x$?" == "x1" ]; then rm_temp; exit 0; fi + + grep -e 'TRUE' $ANSWER | cut -d'|' -f2 > $NEW_LIST + + # check difference between ORIG_LIST and NEW_LIST + sort -o $LIST1 $ORIG_LIST + sort -o $LIST2 $NEW_LIST + DIFF=$(diff $LIST1 $LIST2 | sed '/---/d;/+++/d;/@@/d') + if [ "x$DIFF" == "x" ]; then rm_temp; exit 0; fi + + # output log to gtk window + title="$(_n 'TazPkg log')"; icon="tazpkg"; opts="--tail" + { + for pkg in $(echo "$DIFF" | grep -e '^-' | sed 's|^-||g'); do + _ 'REMOVE: $pkg' + yes | tazpkg -r $pkg --output="raw" + done + for pkg in $(echo "$DIFF" | grep -e '^+' | sed 's|^+||g'); do + _ 'INSTALL: $pkg' + tazpkg -gi $pkg --output="raw" + done + echo -e "\n\n$(_n 'Done!')\n" + } | output_command + rm_temp +} + + + # New file functions newfile_main() { icon=gtk-new @@ -436,6 +610,10 @@ ask_root $@ && keymap ;; tz) ask_root $@ && tz ;; + manage_i18n) + ask_root $@ && manage_i18n $2 ;; + recharge) + ask_root $@; opts="--on-top"; tazpkg recharge | output_command ;; setup) ask_root $@ && setup ;; new-file) diff -r 3dd4838c69c6 -r 5a8adba12ac2 tazbox/zone-mini.tab --- a/tazbox/zone-mini.tab Fri May 02 22:16:37 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,244 +0,0 @@ -AD Andorra -AE Dubai -AF Kabul -AG Antigua -AI Anguilla -AL Tirane -AM Yerevan -AN Curacao -AO Luanda -AQ McMurdo South_Pole Rothera Palmer Mawson Davis Casey Vostok DumontDUrville Syowa -AR Buenos_Aires Cordoba Salta Jujuy Tucuman Catamarca La_Rioja San_Juan Mendoza San_Luis Rio_Gallegos Ushuaia -AS Pago_Pago -AT Vienna -AU Lord_Howe Hobart Currie Melbourne Sydney Broken_Hill Brisbane Lindeman Adelaide Darwin Perth Eucla -AW Aruba -AX Mariehamn -AZ Baku -BA Sarajevo -BB Barbados -BD Dhaka -BE Brussels -BF Ouagadougou -BG Sofia -BH Bahrain -BI Bujumbura -BJ Porto-Novo -BL St_Barthelemy -BM Bermuda -BN Brunei -BO La_Paz -BR Noronha Belem Fortaleza Recife Araguaina Maceio Bahia Sao_Paulo Campo_Grande Cuiaba Santarem Porto_Velho Boa_Vista Manaus Eirunepe Rio_Branco -BS Nassau -BT Thimphu -BW Gaborone -BY Minsk -BZ Belize -CA St_Johns Halifax Glace_Bay Moncton Goose_Bay Blanc-Sablon Montreal Toronto Nipigon Thunder_Bay Iqaluit Pangnirtung Resolute Atikokan Rankin_Inlet Winnipeg Rainy_River Regina Swift_Current Edmonton Cambridge_Bay Yellowknife Inuvik Dawson_Creek Vancouver Whitehorse Dawson -CC Cocos -CD Kinshasa Lubumbashi -CF Bangui -CG Brazzaville -CH Zurich -CI Abidjan -CK Rarotonga -CL Santiago Easter -CM Douala -CN Shanghai Harbin Chongqing Urumqi Kashgar -CO Bogota -CR Costa_Rica -CU Havana -CV Cape_Verde -CX Christmas -CY Nicosia -CZ Prague -DE Berlin -DJ Djibouti -DK Copenhagen -DM Dominica -DO Santo_Domingo -DZ Algiers -EC Guayaquil Galapagos -EE Tallinn -EG Cairo -EH El_Aaiun -ER Asmara -ES Madrid Ceuta Canary -ET Addis_Ababa -FI Helsinki -FJ Fiji -FK Stanley -FM Truk Ponape Kosrae -FO Faroe -FR Paris -GA Libreville -GB London -GD Grenada -GE Tbilisi -GF Cayenne -GG Guernsey -GH Accra -GI Gibraltar -GL Godthab Danmarkshavn Scoresbysund Thule -GM Banjul -GN Conakry -GP Guadeloupe -GQ Malabo -GR Athens -GS South_Georgia -GT Guatemala -GU Guam -GW Bissau -GY Guyana -HK Hong_Kong -HN Tegucigalpa -HR Zagreb -HT Port-au-Prince -HU Budapest -ID Jakarta Pontianak Makassar Jayapura -IE Dublin -IL Jerusalem -IM Isle_of_Man -IN Kolkata -IO Chagos -IQ Baghdad -IR Tehran -IS Reykjavik -IT Rome -JE Jersey -JM Jamaica -JO Amman -JP Tokyo -KE Nairobi -KG Bishkek -KH Phnom_Penh -KI Tarawa Enderbury Kiritimati -KM Comoro -KN St_Kitts -KP Pyongyang -KR Seoul -KW Kuwait -KY Cayman -KZ Almaty Qyzylorda Aqtobe Aqtau Oral -LA Vientiane -LB Beirut -LC St_Lucia -LI Vaduz -LK Colombo -LR Monrovia -LS Maseru -LT Vilnius -LU Luxembourg -LV Riga -LY Tripoli -MA Casablanca -MC Monaco -MD Chisinau -ME Podgorica -MF Marigot -MG Antananarivo -MH Majuro Kwajalein -MK Skopje -ML Bamako -MM Rangoon -MN Ulaanbaatar Hovd Choibalsan -MO Macau -MP Saipan -MQ Martinique -MR Nouakchott -MS Montserrat -MT Malta -MU Mauritius -MV Maldives -MW Blantyre -MX Mexico_City Cancun Merida Monterrey Mazatlan Chihuahua Hermosillo Tijuana -MY Kuala_Lumpur Kuching -MZ Maputo -NA Windhoek -NC Noumea -NE Niamey -NF Norfolk -NG Lagos -NI Managua -NL Amsterdam -NO Oslo -NP Kathmandu -NR Nauru -NU Niue -NZ Auckland Chatham -OM Muscat -PA Panama -PE Lima -PF Tahiti Marquesas Gambier -PG Port_Moresby -PH Manila -PK Karachi -PL Warsaw -PM Miquelon -PN Pitcairn -PR Puerto_Rico -PS Gaza -PT Lisbon Madeira Azores -PW Palau -PY Asuncion -QA Qatar -RE Reunion -RO Bucharest -RS Belgrade -RU Kaliningrad Moscow Volgograd Samara Yekaterinburg Omsk Novosibirsk Krasnoyarsk Irkutsk Yakutsk Vladivostok Sakhalin Magadan Kamchatka Anadyr -RW Kigali -SA Riyadh -SB Guadalcanal -SC Mahe -SD Khartoum -SE Stockholm -SG Singapore -SH St_Helena -SI Ljubljana -SJ Arctic/Longyearbyen -SK Bratislava -SL Freetown -SM San_Marino -SN Dakar -SO Mogadishu -SR Paramaribo -ST Sao_Tome -SV El_Salvador -SY Damascus -SZ Mbabane -TC Grand_Turk -TD Ndjamena -TF Kerguelen -TG Lome -TH Bangkok -TJ Dushanbe -TK Fakaofo -TL Dili -TM Ashgabat -TN Tunis -TO Tongatapu -TR Istanbul -TT Port_of_Spain -TV Funafuti -TW Taipei -TZ Dar_es_Salaam -UA Kiev Uzhgorod Zaporozhye Simferopol -UG Kampala -UM Johnston Midway Wake -US New_York Detroit Louisville Monticello Indianapolis Vincennes Winamac Marengo Petersburg Vevay Chicago Tell_City Knox Menominee Center New_Salem Denver Boise Shiprock Phoenix Los_Angeles Anchorage Juneau Yakutat Nome Adak Honolulu -UY Montevideo -UZ Samarkand Tashkent -VA Vatican -VC St_Vincent -VE Caracas -VG Tortola -VI St_Thomas -VN Ho_Chi_Minh -VU Efate -WF Wallis -WS Apia -YE Aden -YT Mayotte -ZA Johannesburg -ZM Lusaka -ZW Harare