# HG changeset patch # User Aleksej Bobylev # Date 1459068752 -10800 # Node ID 2d181ce6f795b397c044e8e4e1c5aae5b70abef9 # Parent d06f093ba734ed496d001679edd8c285cf339dcc Make explanations about 'w' for translators; make pot; make msgmerge diff -r d06f093ba734 -r 2d181ce6f795 Makefile --- a/Makefile Sun Mar 27 02:12:15 2016 -0300 +++ b/Makefile Sun Mar 27 11:52:32 2016 +0300 @@ -14,10 +14,10 @@ pot: xgettext -o po/$(PACKAGE).pot -L Shell --package-name="SliTaz Base" \ - --copyright-holder="SliTaz" -k -k_ -klgettext \ + --copyright-holder="SliTaz" -k -k_ -klgettext -cTranslators \ ./rootfs/lib/libtaz.sh xgettext -j -o po/$(PACKAGE).pot -L Shell --package-name="SliTaz Base" \ - --copyright-holder="SliTaz" -k_ -k_n \ + --copyright-holder="SliTaz" -k_ -k_n -cTranslators \ ./rootfs/usr/lib/slitaz/libpkg.sh \ ./rootfs/var/www/cgi-bin/cgi-env.sh \ ./rootfs/var/www/cgi-bin/index.cgi \ @@ -40,6 +40,8 @@ install-libtaz: install -m 0744 rootfs/lib/libtaz.sh $(DESTDIR)/lib + # Strip comments addressed translators + sed -i '/# Translators:/d' $(DESTDIR)/lib/libtaz.sh install -m 0755 -d $(DESTDIR)/usr/share/doc/slitaz install -m 0644 doc/libtaz.txt $(DESTDIR)/usr/share/doc/slitaz diff -r d06f093ba734 -r 2d181ce6f795 po/el.po --- a/po/el.po Sun Mar 27 02:12:15 2016 -0300 +++ b/po/el.po Sun Mar 27 11:52:32 2016 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Base\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-30 23:44+0200\n" +"POT-Creation-Date: 2016-03-27 11:49+0300\n" "PO-Revision-Date: 2012-06-09 21:15+0200\n" "Last-Translator: Douros Dimitris \n" "Language-Team: \n" @@ -46,7 +46,8 @@ msgid "You must be root to execute:" msgstr "Χρειάζεστε δικαιώματα διαχειριστή για να συνεχίσετε:" -#: rootfs/lib/libtaz.sh:222 +#. Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number +#: rootfs/lib/libtaz.sh:223 msgid "w" msgstr "16" @@ -110,11 +111,11 @@ msgid "Consider installing groff by running: %s" msgstr "" -#: rootfs/usr/bin/man:137 +#: rootfs/usr/bin/man:140 msgid "%s found in the following sections:\\n%s\\nPlease choose one: " msgstr "" -#: rootfs/usr/bin/man:145 +#: rootfs/usr/bin/man:149 msgid "No manual entry for %s" msgstr "Δεν υπάρχει καταχώρηση στο εγχειρίδιο για το %s" diff -r d06f093ba734 -r 2d181ce6f795 po/es.po --- a/po/es.po Sun Mar 27 02:12:15 2016 -0300 +++ b/po/es.po Sun Mar 27 11:52:32 2016 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Base\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-30 23:44+0200\n" +"POT-Creation-Date: 2016-03-27 11:49+0300\n" "PO-Revision-Date: 2013-03-19 20:55-0300\n" "Last-Translator: René Rivero \n" "Language-Team: Argentinian\n" @@ -44,7 +44,8 @@ msgid "You must be root to execute:" msgstr "Tiene que ser root para ejecutar:" -#: rootfs/lib/libtaz.sh:222 +#. Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number +#: rootfs/lib/libtaz.sh:223 msgid "w" msgstr "9" @@ -108,11 +109,11 @@ msgid "Consider installing groff by running: %s" msgstr "" -#: rootfs/usr/bin/man:137 +#: rootfs/usr/bin/man:140 msgid "%s found in the following sections:\\n%s\\nPlease choose one: " msgstr "" -#: rootfs/usr/bin/man:145 +#: rootfs/usr/bin/man:149 msgid "No manual entry for %s" msgstr "No hay entrada manual para %s" diff -r d06f093ba734 -r 2d181ce6f795 po/fa.po --- a/po/fa.po Sun Mar 27 02:12:15 2016 -0300 +++ b/po/fa.po Sun Mar 27 11:52:32 2016 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Base\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-30 23:44+0200\n" +"POT-Creation-Date: 2016-03-27 11:49+0300\n" "PO-Revision-Date: 2014-06-26 08:17+0400\n" "Last-Translator: Ali Rashidi \n" "Language-Team: Ali Rashidi \n" @@ -47,7 +47,8 @@ msgid "You must be root to execute:" msgstr "برای اجرا باید کاربر ریشه باشید" -#: rootfs/lib/libtaz.sh:222 +#. Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number +#: rootfs/lib/libtaz.sh:223 msgid "w" msgstr "14" @@ -111,11 +112,11 @@ msgid "Consider installing groff by running: %s" msgstr "" -#: rootfs/usr/bin/man:137 +#: rootfs/usr/bin/man:140 msgid "%s found in the following sections:\\n%s\\nPlease choose one: " msgstr "" -#: rootfs/usr/bin/man:145 +#: rootfs/usr/bin/man:149 msgid "No manual entry for %s" msgstr "%s ورودی دستی موجود نیست برای" diff -r d06f093ba734 -r 2d181ce6f795 po/fr.po --- a/po/fr.po Sun Mar 27 02:12:15 2016 -0300 +++ b/po/fr.po Sun Mar 27 11:52:32 2016 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Base\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-30 23:44+0200\n" +"POT-Creation-Date: 2016-03-27 11:49+0300\n" "PO-Revision-Date: 2015-12-29 23:15+0100\n" "Last-Translator: Lucas Levrel \n" "Language-Team: French\n" @@ -46,7 +46,8 @@ msgid "You must be root to execute:" msgstr "Vous devez être root pour exécuter:" -#: rootfs/lib/libtaz.sh:222 +#. Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number +#: rootfs/lib/libtaz.sh:223 msgid "w" msgstr "9" @@ -111,12 +112,12 @@ msgid "Consider installing groff by running: %s" msgstr "Envisagez d'installer groff en exécutant : %s" -#: rootfs/usr/bin/man:137 +#: rootfs/usr/bin/man:140 msgid "%s found in the following sections:\\n%s\\nPlease choose one: " msgstr "" "%s trouvé dans les sections suivantes : \\n%s\\nVeuillez en choisir une :" -#: rootfs/usr/bin/man:145 +#: rootfs/usr/bin/man:149 msgid "No manual entry for %s" msgstr "Pas de manuel disponible pour %s" diff -r d06f093ba734 -r 2d181ce6f795 po/pl.po --- a/po/pl.po Sun Mar 27 02:12:15 2016 -0300 +++ b/po/pl.po Sun Mar 27 11:52:32 2016 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Base\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-30 23:44+0200\n" +"POT-Creation-Date: 2016-03-27 11:49+0300\n" "PO-Revision-Date: 2013-07-23 12:34+0100\n" "Last-Translator: Paweł Pyrczak \n" "Language-Team: \n" @@ -49,7 +49,8 @@ msgid "You must be root to execute:" msgstr "Musisz być administratorem (root) aby wykonać:" -#: rootfs/lib/libtaz.sh:222 +#. Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number +#: rootfs/lib/libtaz.sh:223 msgid "w" msgstr "17" @@ -113,11 +114,11 @@ msgid "Consider installing groff by running: %s" msgstr "" -#: rootfs/usr/bin/man:137 +#: rootfs/usr/bin/man:140 msgid "%s found in the following sections:\\n%s\\nPlease choose one: " msgstr "" -#: rootfs/usr/bin/man:145 +#: rootfs/usr/bin/man:149 msgid "No manual entry for %s" msgstr "Brak ręcznego wpisu dla %s" diff -r d06f093ba734 -r 2d181ce6f795 po/pt_BR.po --- a/po/pt_BR.po Sun Mar 27 02:12:15 2016 -0300 +++ b/po/pt_BR.po Sun Mar 27 11:52:32 2016 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Base\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-30 23:44+0200\n" +"POT-Creation-Date: 2016-03-27 11:49+0300\n" "PO-Revision-Date: 2016-03-27 02:07-0300\n" "Last-Translator: Leonardo Laporte \n" "Language-Team: Brazilian Portuguese \n" @@ -46,9 +46,10 @@ msgid "You must be root to execute:" msgstr "Você deve ser usuário root para executar" -#: rootfs/lib/libtaz.sh:222 +#. Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number +#: rootfs/lib/libtaz.sh:223 msgid "w" -msgstr "w" +msgstr "13" #: rootfs/usr/lib/slitaz/libpkg.sh:32 msgid "Mirror is unreachable" @@ -110,11 +111,11 @@ msgid "Consider installing groff by running: %s" msgstr "Considere instalar groff executando: %s" -#: rootfs/usr/bin/man:137 +#: rootfs/usr/bin/man:140 msgid "%s found in the following sections:\\n%s\\nPlease choose one: " msgstr "%s encontrados nas seções:\\n%s\\nPor favor faça uma escolha: " -#: rootfs/usr/bin/man:145 +#: rootfs/usr/bin/man:149 msgid "No manual entry for %s" msgstr "Nenhuma entrada para %s" diff -r d06f093ba734 -r 2d181ce6f795 po/ru.po --- a/po/ru.po Sun Mar 27 02:12:15 2016 -0300 +++ b/po/ru.po Sun Mar 27 11:52:32 2016 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Base\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-30 23:44+0200\n" +"POT-Creation-Date: 2016-03-27 11:49+0300\n" "PO-Revision-Date: 2015-12-31 00:00+0200\n" "Last-Translator: Aleksej Bobylev \n" "Language-Team: \n" @@ -47,7 +47,8 @@ msgid "You must be root to execute:" msgstr "Вы должны обладать правами root для запуска:" -#: rootfs/lib/libtaz.sh:222 +#. Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number +#: rootfs/lib/libtaz.sh:223 msgid "w" msgstr "10" @@ -110,12 +111,12 @@ msgid "Consider installing groff by running: %s" msgstr "Рассмотрите возможность установки Groff, выполнив команду «%s»" -#: rootfs/usr/bin/man:137 +#: rootfs/usr/bin/man:140 msgid "%s found in the following sections:\\n%s\\nPlease choose one: " msgstr "" "Руководство по %s найдено в следующих разделах:\\n%s\\nВыберите раздел: " -#: rootfs/usr/bin/man:145 +#: rootfs/usr/bin/man:149 msgid "No manual entry for %s" msgstr "Руководство по %s отсутствует" diff -r d06f093ba734 -r 2d181ce6f795 po/slitaz-base.pot --- a/po/slitaz-base.pot Sun Mar 27 02:12:15 2016 -0300 +++ b/po/slitaz-base.pot Sun Mar 27 11:52:32 2016 +0300 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: SliTaz Base\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-30 23:44+0200\n" +"POT-Creation-Date: 2016-03-27 11:49+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,7 +45,8 @@ msgid "You must be root to execute:" msgstr "" -#: rootfs/lib/libtaz.sh:222 +#. Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number +#: rootfs/lib/libtaz.sh:223 msgid "w" msgstr "" @@ -104,10 +105,10 @@ msgid "Consider installing groff by running: %s" msgstr "" -#: rootfs/usr/bin/man:137 +#: rootfs/usr/bin/man:140 msgid "%s found in the following sections:\\n%s\\nPlease choose one: " msgstr "" -#: rootfs/usr/bin/man:145 +#: rootfs/usr/bin/man:149 msgid "No manual entry for %s" msgstr "" diff -r d06f093ba734 -r 2d181ce6f795 po/sv.po --- a/po/sv.po Sun Mar 27 02:12:15 2016 -0300 +++ b/po/sv.po Sun Mar 27 11:52:32 2016 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Base\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-30 23:44+0200\n" +"POT-Creation-Date: 2016-03-27 11:49+0300\n" "PO-Revision-Date: 2012-07-10 18:24-0000\n" "Last-Translator: Emil Eklund \n" "Language-Team: Swedish\n" @@ -45,7 +45,8 @@ msgid "You must be root to execute:" msgstr "Du måste vara root-användare för att utföra:" -#: rootfs/lib/libtaz.sh:222 +#. Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number +#: rootfs/lib/libtaz.sh:223 msgid "w" msgstr "8" @@ -108,11 +109,11 @@ msgid "Consider installing groff by running: %s" msgstr "" -#: rootfs/usr/bin/man:137 +#: rootfs/usr/bin/man:140 msgid "%s found in the following sections:\\n%s\\nPlease choose one: " msgstr "" -#: rootfs/usr/bin/man:145 +#: rootfs/usr/bin/man:149 msgid "No manual entry for %s" msgstr "Inget manualinlägg för %s" diff -r d06f093ba734 -r 2d181ce6f795 po/zh_CN.po --- a/po/zh_CN.po Sun Mar 27 02:12:15 2016 -0300 +++ b/po/zh_CN.po Sun Mar 27 11:52:32 2016 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Base\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-30 23:44+0200\n" +"POT-Creation-Date: 2016-03-27 11:49+0300\n" "PO-Revision-Date: 2014-06-14 21:31+0800\n" "Last-Translator: 张文宇 \n" "Language-Team: 张文宇 \n" @@ -46,7 +46,8 @@ msgid "You must be root to execute:" msgstr "你需要以root权限运行" -#: rootfs/lib/libtaz.sh:222 +#. Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number +#: rootfs/lib/libtaz.sh:223 msgid "w" msgstr "8" @@ -107,11 +108,11 @@ msgid "Consider installing groff by running: %s" msgstr "" -#: rootfs/usr/bin/man:137 +#: rootfs/usr/bin/man:140 msgid "%s found in the following sections:\\n%s\\nPlease choose one: " msgstr "" -#: rootfs/usr/bin/man:145 +#: rootfs/usr/bin/man:149 msgid "No manual entry for %s" msgstr "沒有 %s 项" diff -r d06f093ba734 -r 2d181ce6f795 po/zh_TW.po --- a/po/zh_TW.po Sun Mar 27 02:12:15 2016 -0300 +++ b/po/zh_TW.po Sun Mar 27 11:52:32 2016 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Base\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-30 23:44+0200\n" +"POT-Creation-Date: 2016-03-27 11:49+0300\n" "PO-Revision-Date: 2012-06-04 19:00+0800\n" "Last-Translator: lunglungyu \n" "Language-Team: Traditional Chinese\n" @@ -44,7 +44,8 @@ msgid "You must be root to execute:" msgstr "你需要以root權限運行" -#: rootfs/lib/libtaz.sh:222 +#. Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number +#: rootfs/lib/libtaz.sh:223 msgid "w" msgstr "8" @@ -105,11 +106,11 @@ msgid "Consider installing groff by running: %s" msgstr "" -#: rootfs/usr/bin/man:137 +#: rootfs/usr/bin/man:140 msgid "%s found in the following sections:\\n%s\\nPlease choose one: " msgstr "" -#: rootfs/usr/bin/man:145 +#: rootfs/usr/bin/man:149 msgid "No manual entry for %s" msgstr "沒有 %s 項" diff -r d06f093ba734 -r 2d181ce6f795 rootfs/lib/libtaz.sh --- a/rootfs/lib/libtaz.sh Sun Mar 27 02:12:15 2016 -0300 +++ b/rootfs/lib/libtaz.sh Sun Mar 27 11:52:32 2016 +0300 @@ -219,6 +219,7 @@ saved_action="$1" [ -n "$quiet" -a -z "$2" ] && return local w c scol msg chars + # Translators: 'w' is the width the wider translated message ('[ Done ]' or '[ Failed ]') take in terminal; place here the number w=$(_ 'w'); w=${w/w/10} c=$(get_cols) scol=$(( $c - $w ))