slitaz-base-files rev 301

Make explanations about 'w' for translators; make pot; make msgmerge
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sun Mar 27 11:52:32 2016 +0300 (2016-03-27)
parents d06f093ba734
children a5e6aa408742
files Makefile po/el.po po/es.po po/fa.po po/fr.po po/pl.po po/pt_BR.po po/ru.po po/slitaz-base.pot po/sv.po po/zh_CN.po po/zh_TW.po rootfs/lib/libtaz.sh
line diff
     1.1 --- a/Makefile	Sun Mar 27 02:12:15 2016 -0300
     1.2 +++ b/Makefile	Sun Mar 27 11:52:32 2016 +0300
     1.3 @@ -14,10 +14,10 @@
     1.4  
     1.5  pot:
     1.6  	xgettext -o po/$(PACKAGE).pot -L Shell --package-name="SliTaz Base" \
     1.7 -		--copyright-holder="SliTaz" -k -k_ -klgettext \
     1.8 +		--copyright-holder="SliTaz" -k -k_ -klgettext -cTranslators \
     1.9  		./rootfs/lib/libtaz.sh
    1.10  	xgettext -j -o po/$(PACKAGE).pot -L Shell --package-name="SliTaz Base" \
    1.11 -		--copyright-holder="SliTaz" -k_ -k_n \
    1.12 +		--copyright-holder="SliTaz" -k_ -k_n -cTranslators \
    1.13  		./rootfs/usr/lib/slitaz/libpkg.sh \
    1.14  		./rootfs/var/www/cgi-bin/cgi-env.sh \
    1.15  		./rootfs/var/www/cgi-bin/index.cgi \
    1.16 @@ -40,6 +40,8 @@
    1.17  
    1.18  install-libtaz:
    1.19  	install -m 0744 rootfs/lib/libtaz.sh $(DESTDIR)/lib
    1.20 +	# Strip comments addressed translators
    1.21 +	sed -i '/# Translators:/d' $(DESTDIR)/lib/libtaz.sh
    1.22  	install -m 0755 -d $(DESTDIR)/usr/share/doc/slitaz
    1.23  	install -m 0644 doc/libtaz.txt $(DESTDIR)/usr/share/doc/slitaz
    1.24  
     2.1 --- a/po/el.po	Sun Mar 27 02:12:15 2016 -0300
     2.2 +++ b/po/el.po	Sun Mar 27 11:52:32 2016 +0300
     2.3 @@ -7,7 +7,7 @@
     2.4  msgstr ""
     2.5  "Project-Id-Version: SliTaz Base\n"
     2.6  "Report-Msgid-Bugs-To: \n"
     2.7 -"POT-Creation-Date: 2015-12-30 23:44+0200\n"
     2.8 +"POT-Creation-Date: 2016-03-27 11:49+0300\n"
     2.9  "PO-Revision-Date: 2012-06-09 21:15+0200\n"
    2.10  "Last-Translator: Douros Dimitris <dourosdimitris@gmail.com>\n"
    2.11  "Language-Team: \n"
    2.12 @@ -46,7 +46,8 @@
    2.13  msgid "You must be root to execute:"
    2.14  msgstr "Χρειάζεστε δικαιώματα διαχειριστή για να συνεχίσετε:"
    2.15  
    2.16 -#: rootfs/lib/libtaz.sh:222
    2.17 +#. Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number
    2.18 +#: rootfs/lib/libtaz.sh:223
    2.19  msgid "w"
    2.20  msgstr "16"
    2.21  
    2.22 @@ -110,11 +111,11 @@
    2.23  msgid "Consider installing groff by running: %s"
    2.24  msgstr ""
    2.25  
    2.26 -#: rootfs/usr/bin/man:137
    2.27 +#: rootfs/usr/bin/man:140
    2.28  msgid "%s found in the following sections:\\n%s\\nPlease choose one: "
    2.29  msgstr ""
    2.30  
    2.31 -#: rootfs/usr/bin/man:145
    2.32 +#: rootfs/usr/bin/man:149
    2.33  msgid "No manual entry for %s"
    2.34  msgstr "Δεν υπάρχει καταχώρηση στο εγχειρίδιο για το %s"
    2.35  
     3.1 --- a/po/es.po	Sun Mar 27 02:12:15 2016 -0300
     3.2 +++ b/po/es.po	Sun Mar 27 11:52:32 2016 +0300
     3.3 @@ -7,7 +7,7 @@
     3.4  msgstr ""
     3.5  "Project-Id-Version: SliTaz Base\n"
     3.6  "Report-Msgid-Bugs-To: \n"
     3.7 -"POT-Creation-Date: 2015-12-30 23:44+0200\n"
     3.8 +"POT-Creation-Date: 2016-03-27 11:49+0300\n"
     3.9  "PO-Revision-Date: 2013-03-19 20:55-0300\n"
    3.10  "Last-Translator: René Rivero <arca2@hotmail.com>\n"
    3.11  "Language-Team: Argentinian\n"
    3.12 @@ -44,7 +44,8 @@
    3.13  msgid "You must be root to execute:"
    3.14  msgstr "Tiene que ser root para ejecutar:"
    3.15  
    3.16 -#: rootfs/lib/libtaz.sh:222
    3.17 +#. Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number
    3.18 +#: rootfs/lib/libtaz.sh:223
    3.19  msgid "w"
    3.20  msgstr "9"
    3.21  
    3.22 @@ -108,11 +109,11 @@
    3.23  msgid "Consider installing groff by running: %s"
    3.24  msgstr ""
    3.25  
    3.26 -#: rootfs/usr/bin/man:137
    3.27 +#: rootfs/usr/bin/man:140
    3.28  msgid "%s found in the following sections:\\n%s\\nPlease choose one: "
    3.29  msgstr ""
    3.30  
    3.31 -#: rootfs/usr/bin/man:145
    3.32 +#: rootfs/usr/bin/man:149
    3.33  msgid "No manual entry for %s"
    3.34  msgstr "No hay entrada manual para %s"
    3.35  
     4.1 --- a/po/fa.po	Sun Mar 27 02:12:15 2016 -0300
     4.2 +++ b/po/fa.po	Sun Mar 27 11:52:32 2016 +0300
     4.3 @@ -7,7 +7,7 @@
     4.4  msgstr ""
     4.5  "Project-Id-Version: SliTaz Base\n"
     4.6  "Report-Msgid-Bugs-To: \n"
     4.7 -"POT-Creation-Date: 2015-12-30 23:44+0200\n"
     4.8 +"POT-Creation-Date: 2016-03-27 11:49+0300\n"
     4.9  "PO-Revision-Date: 2014-06-26 08:17+0400\n"
    4.10  "Last-Translator: Ali Rashidi <alirashidi17@yahoo.com>\n"
    4.11  "Language-Team: Ali Rashidi <alirashidi17@yahoo.com>\n"
    4.12 @@ -47,7 +47,8 @@
    4.13  msgid "You must be root to execute:"
    4.14  msgstr "برای اجرا باید کاربر ریشه باشید"
    4.15  
    4.16 -#: rootfs/lib/libtaz.sh:222
    4.17 +#. Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number
    4.18 +#: rootfs/lib/libtaz.sh:223
    4.19  msgid "w"
    4.20  msgstr "14"
    4.21  
    4.22 @@ -111,11 +112,11 @@
    4.23  msgid "Consider installing groff by running: %s"
    4.24  msgstr ""
    4.25  
    4.26 -#: rootfs/usr/bin/man:137
    4.27 +#: rootfs/usr/bin/man:140
    4.28  msgid "%s found in the following sections:\\n%s\\nPlease choose one: "
    4.29  msgstr ""
    4.30  
    4.31 -#: rootfs/usr/bin/man:145
    4.32 +#: rootfs/usr/bin/man:149
    4.33  msgid "No manual entry for %s"
    4.34  msgstr "%s ورودی دستی موجود نیست برای"
    4.35  
     5.1 --- a/po/fr.po	Sun Mar 27 02:12:15 2016 -0300
     5.2 +++ b/po/fr.po	Sun Mar 27 11:52:32 2016 +0300
     5.3 @@ -7,7 +7,7 @@
     5.4  msgstr ""
     5.5  "Project-Id-Version: SliTaz Base\n"
     5.6  "Report-Msgid-Bugs-To: \n"
     5.7 -"POT-Creation-Date: 2015-12-30 23:44+0200\n"
     5.8 +"POT-Creation-Date: 2016-03-27 11:49+0300\n"
     5.9  "PO-Revision-Date: 2015-12-29 23:15+0100\n"
    5.10  "Last-Translator: Lucas Levrel <llevrel@yahoo.fr>\n"
    5.11  "Language-Team: French\n"
    5.12 @@ -46,7 +46,8 @@
    5.13  msgid "You must be root to execute:"
    5.14  msgstr "Vous devez être root pour exécuter:"
    5.15  
    5.16 -#: rootfs/lib/libtaz.sh:222
    5.17 +#. Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number
    5.18 +#: rootfs/lib/libtaz.sh:223
    5.19  msgid "w"
    5.20  msgstr "9"
    5.21  
    5.22 @@ -111,12 +112,12 @@
    5.23  msgid "Consider installing groff by running: %s"
    5.24  msgstr "Envisagez d'installer groff en exécutant : %s"
    5.25  
    5.26 -#: rootfs/usr/bin/man:137
    5.27 +#: rootfs/usr/bin/man:140
    5.28  msgid "%s found in the following sections:\\n%s\\nPlease choose one: "
    5.29  msgstr ""
    5.30  "%s trouvé dans les sections suivantes : \\n%s\\nVeuillez en choisir une :"
    5.31  
    5.32 -#: rootfs/usr/bin/man:145
    5.33 +#: rootfs/usr/bin/man:149
    5.34  msgid "No manual entry for %s"
    5.35  msgstr "Pas de manuel disponible pour %s"
    5.36  
     6.1 --- a/po/pl.po	Sun Mar 27 02:12:15 2016 -0300
     6.2 +++ b/po/pl.po	Sun Mar 27 11:52:32 2016 +0300
     6.3 @@ -7,7 +7,7 @@
     6.4  msgstr ""
     6.5  "Project-Id-Version: SliTaz Base\n"
     6.6  "Report-Msgid-Bugs-To: \n"
     6.7 -"POT-Creation-Date: 2015-12-30 23:44+0200\n"
     6.8 +"POT-Creation-Date: 2016-03-27 11:49+0300\n"
     6.9  "PO-Revision-Date: 2013-07-23 12:34+0100\n"
    6.10  "Last-Translator: Paweł Pyrczak <tkr.tkr.pl@gmail.com>\n"
    6.11  "Language-Team: \n"
    6.12 @@ -49,7 +49,8 @@
    6.13  msgid "You must be root to execute:"
    6.14  msgstr "Musisz być administratorem (root) aby wykonać:"
    6.15  
    6.16 -#: rootfs/lib/libtaz.sh:222
    6.17 +#. Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number
    6.18 +#: rootfs/lib/libtaz.sh:223
    6.19  msgid "w"
    6.20  msgstr "17"
    6.21  
    6.22 @@ -113,11 +114,11 @@
    6.23  msgid "Consider installing groff by running: %s"
    6.24  msgstr ""
    6.25  
    6.26 -#: rootfs/usr/bin/man:137
    6.27 +#: rootfs/usr/bin/man:140
    6.28  msgid "%s found in the following sections:\\n%s\\nPlease choose one: "
    6.29  msgstr ""
    6.30  
    6.31 -#: rootfs/usr/bin/man:145
    6.32 +#: rootfs/usr/bin/man:149
    6.33  msgid "No manual entry for %s"
    6.34  msgstr "Brak ręcznego wpisu dla %s"
    6.35  
     7.1 --- a/po/pt_BR.po	Sun Mar 27 02:12:15 2016 -0300
     7.2 +++ b/po/pt_BR.po	Sun Mar 27 11:52:32 2016 +0300
     7.3 @@ -7,7 +7,7 @@
     7.4  msgstr ""
     7.5  "Project-Id-Version: SliTaz Base\n"
     7.6  "Report-Msgid-Bugs-To: \n"
     7.7 -"POT-Creation-Date: 2015-12-30 23:44+0200\n"
     7.8 +"POT-Creation-Date: 2016-03-27 11:49+0300\n"
     7.9  "PO-Revision-Date: 2016-03-27 02:07-0300\n"
    7.10  "Last-Translator: Leonardo Laporte <hackdorte@sapo.pt>\n"
    7.11  "Language-Team: Brazilian Portuguese <i18n@slitaz.org>\n"
    7.12 @@ -46,9 +46,10 @@
    7.13  msgid "You must be root to execute:"
    7.14  msgstr "Você deve ser usuário root para executar"
    7.15  
    7.16 -#: rootfs/lib/libtaz.sh:222
    7.17 +#. Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number
    7.18 +#: rootfs/lib/libtaz.sh:223
    7.19  msgid "w"
    7.20 -msgstr "w"
    7.21 +msgstr "13"
    7.22  
    7.23  #: rootfs/usr/lib/slitaz/libpkg.sh:32
    7.24  msgid "Mirror is unreachable"
    7.25 @@ -110,11 +111,11 @@
    7.26  msgid "Consider installing groff by running: %s"
    7.27  msgstr "Considere instalar groff executando: %s"
    7.28  
    7.29 -#: rootfs/usr/bin/man:137
    7.30 +#: rootfs/usr/bin/man:140
    7.31  msgid "%s found in the following sections:\\n%s\\nPlease choose one: "
    7.32  msgstr "%s encontrados nas seções:\\n%s\\nPor favor faça uma escolha: "
    7.33  
    7.34 -#: rootfs/usr/bin/man:145
    7.35 +#: rootfs/usr/bin/man:149
    7.36  msgid "No manual entry for %s"
    7.37  msgstr "Nenhuma entrada para %s"
    7.38  
     8.1 --- a/po/ru.po	Sun Mar 27 02:12:15 2016 -0300
     8.2 +++ b/po/ru.po	Sun Mar 27 11:52:32 2016 +0300
     8.3 @@ -7,7 +7,7 @@
     8.4  msgstr ""
     8.5  "Project-Id-Version: SliTaz Base\n"
     8.6  "Report-Msgid-Bugs-To: \n"
     8.7 -"POT-Creation-Date: 2015-12-30 23:44+0200\n"
     8.8 +"POT-Creation-Date: 2016-03-27 11:49+0300\n"
     8.9  "PO-Revision-Date: 2015-12-31 00:00+0200\n"
    8.10  "Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n"
    8.11  "Language-Team: \n"
    8.12 @@ -47,7 +47,8 @@
    8.13  msgid "You must be root to execute:"
    8.14  msgstr "Вы должны обладать правами root для запуска:"
    8.15  
    8.16 -#: rootfs/lib/libtaz.sh:222
    8.17 +#. Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number
    8.18 +#: rootfs/lib/libtaz.sh:223
    8.19  msgid "w"
    8.20  msgstr "10"
    8.21  
    8.22 @@ -110,12 +111,12 @@
    8.23  msgid "Consider installing groff by running: %s"
    8.24  msgstr "Рассмотрите возможность установки Groff, выполнив команду «%s»"
    8.25  
    8.26 -#: rootfs/usr/bin/man:137
    8.27 +#: rootfs/usr/bin/man:140
    8.28  msgid "%s found in the following sections:\\n%s\\nPlease choose one: "
    8.29  msgstr ""
    8.30  "Руководство по %s найдено в следующих разделах:\\n%s\\nВыберите раздел: "
    8.31  
    8.32 -#: rootfs/usr/bin/man:145
    8.33 +#: rootfs/usr/bin/man:149
    8.34  msgid "No manual entry for %s"
    8.35  msgstr "Руководство по %s отсутствует"
    8.36  
     9.1 --- a/po/slitaz-base.pot	Sun Mar 27 02:12:15 2016 -0300
     9.2 +++ b/po/slitaz-base.pot	Sun Mar 27 11:52:32 2016 +0300
     9.3 @@ -8,7 +8,7 @@
     9.4  msgstr ""
     9.5  "Project-Id-Version: SliTaz Base\n"
     9.6  "Report-Msgid-Bugs-To: \n"
     9.7 -"POT-Creation-Date: 2015-12-30 23:44+0200\n"
     9.8 +"POT-Creation-Date: 2016-03-27 11:49+0300\n"
     9.9  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    9.10  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    9.11  "Language-Team: LANGUAGE <LL@li.org>\n"
    9.12 @@ -45,7 +45,8 @@
    9.13  msgid "You must be root to execute:"
    9.14  msgstr ""
    9.15  
    9.16 -#: rootfs/lib/libtaz.sh:222
    9.17 +#. Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number
    9.18 +#: rootfs/lib/libtaz.sh:223
    9.19  msgid "w"
    9.20  msgstr ""
    9.21  
    9.22 @@ -104,10 +105,10 @@
    9.23  msgid "Consider installing groff by running: %s"
    9.24  msgstr ""
    9.25  
    9.26 -#: rootfs/usr/bin/man:137
    9.27 +#: rootfs/usr/bin/man:140
    9.28  msgid "%s found in the following sections:\\n%s\\nPlease choose one: "
    9.29  msgstr ""
    9.30  
    9.31 -#: rootfs/usr/bin/man:145
    9.32 +#: rootfs/usr/bin/man:149
    9.33  msgid "No manual entry for %s"
    9.34  msgstr ""
    10.1 --- a/po/sv.po	Sun Mar 27 02:12:15 2016 -0300
    10.2 +++ b/po/sv.po	Sun Mar 27 11:52:32 2016 +0300
    10.3 @@ -7,7 +7,7 @@
    10.4  msgstr ""
    10.5  "Project-Id-Version: SliTaz Base\n"
    10.6  "Report-Msgid-Bugs-To: \n"
    10.7 -"POT-Creation-Date: 2015-12-30 23:44+0200\n"
    10.8 +"POT-Creation-Date: 2016-03-27 11:49+0300\n"
    10.9  "PO-Revision-Date: 2012-07-10 18:24-0000\n"
   10.10  "Last-Translator: Emil Eklund <emileklund123@gmail.com>\n"
   10.11  "Language-Team: Swedish\n"
   10.12 @@ -45,7 +45,8 @@
   10.13  msgid "You must be root to execute:"
   10.14  msgstr "Du måste vara root-användare för att utföra:"
   10.15  
   10.16 -#: rootfs/lib/libtaz.sh:222
   10.17 +#. Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number
   10.18 +#: rootfs/lib/libtaz.sh:223
   10.19  msgid "w"
   10.20  msgstr "8"
   10.21  
   10.22 @@ -108,11 +109,11 @@
   10.23  msgid "Consider installing groff by running: %s"
   10.24  msgstr ""
   10.25  
   10.26 -#: rootfs/usr/bin/man:137
   10.27 +#: rootfs/usr/bin/man:140
   10.28  msgid "%s found in the following sections:\\n%s\\nPlease choose one: "
   10.29  msgstr ""
   10.30  
   10.31 -#: rootfs/usr/bin/man:145
   10.32 +#: rootfs/usr/bin/man:149
   10.33  msgid "No manual entry for %s"
   10.34  msgstr "Inget manualinlägg för %s"
   10.35  
    11.1 --- a/po/zh_CN.po	Sun Mar 27 02:12:15 2016 -0300
    11.2 +++ b/po/zh_CN.po	Sun Mar 27 11:52:32 2016 +0300
    11.3 @@ -7,7 +7,7 @@
    11.4  msgstr ""
    11.5  "Project-Id-Version: SliTaz Base\n"
    11.6  "Report-Msgid-Bugs-To: \n"
    11.7 -"POT-Creation-Date: 2015-12-30 23:44+0200\n"
    11.8 +"POT-Creation-Date: 2016-03-27 11:49+0300\n"
    11.9  "PO-Revision-Date: 2014-06-14 21:31+0800\n"
   11.10  "Last-Translator: 张文宇 <jame987165702@gmail.com>\n"
   11.11  "Language-Team: 张文宇 <jame987165702@gmail.com>\n"
   11.12 @@ -46,7 +46,8 @@
   11.13  msgid "You must be root to execute:"
   11.14  msgstr "你需要以root权限运行"
   11.15  
   11.16 -#: rootfs/lib/libtaz.sh:222
   11.17 +#. Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number
   11.18 +#: rootfs/lib/libtaz.sh:223
   11.19  msgid "w"
   11.20  msgstr "8"
   11.21  
   11.22 @@ -107,11 +108,11 @@
   11.23  msgid "Consider installing groff by running: %s"
   11.24  msgstr ""
   11.25  
   11.26 -#: rootfs/usr/bin/man:137
   11.27 +#: rootfs/usr/bin/man:140
   11.28  msgid "%s found in the following sections:\\n%s\\nPlease choose one: "
   11.29  msgstr ""
   11.30  
   11.31 -#: rootfs/usr/bin/man:145
   11.32 +#: rootfs/usr/bin/man:149
   11.33  msgid "No manual entry for %s"
   11.34  msgstr "沒有 %s 项"
   11.35  
    12.1 --- a/po/zh_TW.po	Sun Mar 27 02:12:15 2016 -0300
    12.2 +++ b/po/zh_TW.po	Sun Mar 27 11:52:32 2016 +0300
    12.3 @@ -7,7 +7,7 @@
    12.4  msgstr ""
    12.5  "Project-Id-Version: SliTaz Base\n"
    12.6  "Report-Msgid-Bugs-To: \n"
    12.7 -"POT-Creation-Date: 2015-12-30 23:44+0200\n"
    12.8 +"POT-Creation-Date: 2016-03-27 11:49+0300\n"
    12.9  "PO-Revision-Date: 2012-06-04 19:00+0800\n"
   12.10  "Last-Translator: lunglungyu <lunglungyu2004@gmail.com>\n"
   12.11  "Language-Team: Traditional Chinese\n"
   12.12 @@ -44,7 +44,8 @@
   12.13  msgid "You must be root to execute:"
   12.14  msgstr "你需要以root權限運行"
   12.15  
   12.16 -#: rootfs/lib/libtaz.sh:222
   12.17 +#. Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number
   12.18 +#: rootfs/lib/libtaz.sh:223
   12.19  msgid "w"
   12.20  msgstr "8"
   12.21  
   12.22 @@ -105,11 +106,11 @@
   12.23  msgid "Consider installing groff by running: %s"
   12.24  msgstr ""
   12.25  
   12.26 -#: rootfs/usr/bin/man:137
   12.27 +#: rootfs/usr/bin/man:140
   12.28  msgid "%s found in the following sections:\\n%s\\nPlease choose one: "
   12.29  msgstr ""
   12.30  
   12.31 -#: rootfs/usr/bin/man:145
   12.32 +#: rootfs/usr/bin/man:149
   12.33  msgid "No manual entry for %s"
   12.34  msgstr "沒有 %s 項"
   12.35  
    13.1 --- a/rootfs/lib/libtaz.sh	Sun Mar 27 02:12:15 2016 -0300
    13.2 +++ b/rootfs/lib/libtaz.sh	Sun Mar 27 11:52:32 2016 +0300
    13.3 @@ -219,6 +219,7 @@
    13.4  	saved_action="$1"
    13.5  	[ -n "$quiet" -a -z "$2" ] && return
    13.6  	local w c scol msg chars
    13.7 +	# Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number
    13.8  	w=$(_ 'w'); w=${w/w/10}
    13.9  	c=$(get_cols)
   13.10  	scol=$(( $c - $w ))