# HG changeset patch # User Aleksej Bobylev # Date 1341181613 0 # Node ID c5da10e6e7496fee376d6d0591baa8b678a5665d # Parent ea58d117d71afd34c112d06aafde04bc478e47be check i18n: make {pot,msgfmt,clean}; fix Makefile; change i18n; add ru.po diff -r ea58d117d71a -r c5da10e6e749 Makefile --- a/Makefile Mon May 07 09:26:25 2012 +0200 +++ b/Makefile Sun Jul 01 22:26:53 2012 +0000 @@ -26,7 +26,7 @@ @for l in $(LINGUAS); do \ echo "Compiling $$l mo file..."; \ mkdir -p po/mo/$$l/LC_MESSAGES; \ - msgfmt -o po/mo/$$l/LC_MESSAGES/pizza.mo po/$$l.po; \ + msgfmt -o po/mo/$$l/LC_MESSAGES/$(PACKAGE).mo po/$$l.po; \ done; # Client install only. Server part is not packaged @@ -63,3 +63,9 @@ rm -f $(DESTDIR)$(PREFIX)/bin/tazbug* rm -f $(DESTDIR)$(PREFIX)/share/applications/tazbug* rm -f $(DESTDIR)$(PREFIX)/etc/slitaz/tazbug.conf + +# Clean source + +clean: + rm -rf po/mo + rm -f po/*~ diff -r ea58d117d71a -r c5da10e6e749 po/ru.po --- a/po/ru.po Mon May 07 09:26:25 2012 +0200 +++ b/po/ru.po Sun Jul 01 22:26:53 2012 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: SliTaz Bugs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-04 13:13+0300\n" +"POT-Creation-Date: 2012-07-01 22:03+0000\n" "PO-Revision-Date: \n" "Last-Translator: Aleksej Bobylev \n" "Language-Team: Russian\n" @@ -12,71 +12,88 @@ "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Russian\n" "X-Poedit-SourceCharset: utf-8\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-Poedit-Basepath: ../\n" "X-Poedit-SearchPath-0: .\n" -#: tazbug:64 +#: tazbug:60 +msgid "Usage:" +msgstr "Использование:" + +#: tazbug:60 +msgid "[command] [args]" +msgstr "[команда] [аргументы]" + +#: tazbug:62 +msgid "Commands:" +msgstr "Команды:" + +#: tazbug:63 msgid "Recreate the SliTaz secure key." msgstr "Создать ключ безопасности SliTaz." -#: tazbug:65 +#: tazbug:64 msgid "Create a new SliTaz account configuration." msgstr "Настроить новый аккаунт SliTaz." -#: tazbug:66 +#: tazbug:65 msgid "Create a new account on SliTaz Bugs." msgstr "Создать новый аккаунт на баг-трекере SliTaz." -#: tazbug:67 +#: tazbug:66 msgid "Send a new message to an open bug." msgstr "Отослать новое сообщение в открытый баг." -#: tazbug:68 +#: tazbug:67 msgid "Send a new bug report." msgstr "Отослать новый баг-репорт." -#: tazbug:80 +#: tazbug:69 +msgid "Examples:" +msgstr "Примеры:" + +#: tazbug:79 msgid "Missing real name" msgstr "Отсутствуют имя и фамилия" -#: tazbug:81 +#: tazbug:80 msgid "Missing login name" msgstr "Отсутствует логин" -#: tazbug:82 +#: tazbug:81 msgid "Missing email" msgstr "Отсутствует адрес электронной почты" -#: tazbug:83 -#: tazbug:121 +#: tazbug:82 +#: tazbug:120 msgid "Missing password" msgstr "Отсутствует пароль" -#: tazbug:93 +#: tazbug:92 msgid "Creating SliTaz account configuration..." msgstr "Настраивается аккаунт SliTaz…" -#: tazbug:108 +#: tazbug:107 msgid "Creating SliTaz secure key..." msgstr "Создается ключ безопасности SliTaz…" -#: tazbug:150 +#: tazbug:149 msgid "Missing bug ID" msgstr "Отсутствует ID бага" -#: tazbug:151 +#: tazbug:150 msgid "Missing message" msgstr "Отсутствует сообщение" -#: tazbug:160 +#: tazbug:159 msgid "Missing bug title" msgstr "Отсутствует заголовок бага" -#: tazbug:161 +#: tazbug:160 msgid "Missing description" msgstr "Отсутствует описание" -#: tazbug:162 +#: tazbug:161 msgid "Missing bug priority" msgstr "Отсутствует приоритет бага" @@ -99,33 +116,33 @@ msgstr "Новый баг" #: tazbug-box:45 -#: web/bugs.cgi:259 +#: web/bugs.cgi:260 msgid "Send message" msgstr "Отослать сообщение" #: tazbug-box:72 -#: web/bugs.cgi:317 +#: web/bugs.cgi:318 msgid "Bug title" msgstr "Заголовок бага" #: tazbug-box:73 -#: web/bugs.cgi:329 +#: web/bugs.cgi:330 msgid "Priority" msgstr "Приоритет" #: tazbug-box:74 -#: web/bugs.cgi:325 +#: web/bugs.cgi:326 msgid "Packages" msgstr "Пакеты" #: tazbug-box:75 -#: web/bugs.cgi:321 +#: web/bugs.cgi:322 msgid "Description" msgstr "Описание" #: tazbug-box:77 #: tazbug-box:130 -#: web/bugs.cgi:255 +#: web/bugs.cgi:256 msgid "New message" msgstr "Новое сообщение" @@ -139,7 +156,7 @@ msgstr "Имя и фамилия" #: tazbug-box:111 -#: web/bugs.cgi:123 +#: web/bugs.cgi:128 msgid "User name" msgstr "Имя пользователя" @@ -168,88 +185,196 @@ msgstr "Адрес эл. почты" #: tazbug-box:158 -#: web/bugs.cgi:127 +#: web/bugs.cgi:129 msgid "Password" msgstr "Пароль" -#: web/bugs.cgi:109 +#: web/bugs.cgi:88 +msgid "Log out" +msgstr "Выйти" + +#: web/bugs.cgi:95 #: web/bugs.cgi:131 +msgid "Log in" +msgstr "Войти" + +#: web/bugs.cgi:103 +#: web/bugs.cgi:104 +#: web/bugs.cgi:590 +#: web/bugs.cgi:593 +msgid "Search" +msgstr "Поиск" + +#: web/bugs.cgi:117 msgid "Login" -msgstr "Логин" +msgstr "Вход" -#: web/bugs.cgi:112 -msgid "" -"No account yet? Please signup using the SliTaz Bugs reporter\n" -"on your SliTaz system.

Tip: to attach big files or images, you can use\n" -"SliTaz Paste services:" -msgstr "" -"У вас еще нет аккаунта? Войдите, используя программу отчета о багах\n" -"в вашей системе SliTaz.

Совет: чтобы прикрепить большие файлы\n" -"и изображения, вы можете воспользоваться службой SliTaz Paste:" +#: web/bugs.cgi:120 +msgid "No account yet? Please signup using the SliTaz Bugs reporter on your SliTaz system." +msgstr "У вас еще нет аккаунта? Войдите, используя баг-репортер в вашей системе SliTaz." -#: web/bugs.cgi:219 +#: web/bugs.cgi:122 +msgid "Tip: to attach big files or images, you can use SliTaz Paste services:" +msgstr "Совет: чтобы прикрепить большие файлы и изображения, вы можете воспользоваться службой SliTaz Paste:" + +#: web/bugs.cgi:145 +#: web/bugs.cgi:154 +#, sh-format +msgid "Real name : $NAME" +msgstr "Имя и фамилия : $NAME" + +#: web/bugs.cgi:155 +#, sh-format +msgid "Email : $MAIL" +msgstr "Электронная почта : $MAIL" + +#: web/bugs.cgi:156 +#, sh-format +msgid "Secure key : $KEY" +msgstr "Ключ безопасности : $KEY" + +#: web/bugs.cgi:164 +#, sh-format +msgid "$bug Bug" +msgstr "$bug баг" + +#: web/bugs.cgi:174 +msgid "Bug title :" +msgstr "Заголовок бага :" + +#: web/bugs.cgi:174 +#: web/bugs.cgi:605 +msgid "Show" +msgstr "Показать" + +#: web/bugs.cgi:175 +msgid "ID - Date :" +msgstr "ID - Дата :" + +#: web/bugs.cgi:176 +msgid "Creator :" +msgstr "Создатель :" + +#: web/bugs.cgi:200 +#, sh-format +msgid "Bug $id" +msgstr "Баг $id" + +#: web/bugs.cgi:207 +#, sh-format +msgid "Priority $PRIORITY" +msgstr "Приоритет $PRIORITY" + +#: web/bugs.cgi:208 +#: web/bugs.cgi:636 +#, sh-format +msgid "$msgs message" +msgid_plural "$msgs messages" +msgstr[0] "$msgs сообщение" +msgstr[1] "$msgs сообщения" +msgstr[2] "$msgs сообщений" + +#: web/bugs.cgi:220 msgid "Close bug" msgstr "Закрыть баг" -#: web/bugs.cgi:220 +#: web/bugs.cgi:221 msgid "Edit bug" msgstr "Править баг" -#: web/bugs.cgi:224 +#: web/bugs.cgi:225 msgid "Re open bug" msgstr "Повторно открыть баг" -#: web/bugs.cgi:231 +#: web/bugs.cgi:232 msgid "Messages" msgstr "Сообщения" -#: web/bugs.cgi:233 +#: web/bugs.cgi:234 msgid "No messages" msgstr "Нет сообщений" -#: web/bugs.cgi:309 +#: web/bugs.cgi:310 msgid "New Bug" msgstr "Новый баг" -#: web/bugs.cgi:332 +#: web/bugs.cgi:333 msgid "Standard" msgstr "Стандартный" -#: web/bugs.cgi:333 +#: web/bugs.cgi:334 msgid "Critical" msgstr "Критический" -#: web/bugs.cgi:335 +#: web/bugs.cgi:336 msgid "Create Bug" msgstr "Создать баг" -#: web/bugs.cgi:343 +#: web/bugs.cgi:344 msgid "* field is obligatory. You can also specify affected packages." msgstr "* поле обязательно для заполнения. Вы можете также указать соответствующие пакеты." -#: web/bugs.cgi:359 +#: web/bugs.cgi:354 +#, sh-format +msgid "Edit Bug $bug" +msgstr "Править баг $bug" + +#: web/bugs.cgi:360 msgid "Save configuration" msgstr "Сохранить настройки" -#: web/bugs.cgi:466 +#: web/bugs.cgi:476 msgid "Bad login or pass" msgstr "Неверный логин или пароль" -#: web/bugs.cgi:499 +#: web/bugs.cgi:510 msgid "You must be logged in to post a new bug" msgstr "Чтобы отправить новый баг, вы должны прежде войти" -#: web/bugs.cgi:579 -#: web/bugs.cgi:582 -#: web/bugs.cgi:633 -msgid "Search" -msgstr "Поиск" +#: web/bugs.cgi:612 +#, sh-format +msgid "No result found for: $get_search" +msgstr "По запросу «$get_search» ничего не найдено" -#: web/bugs.cgi:609 +#: web/bugs.cgi:630 msgid "Summary" msgstr "Сводка" -#: web/bugs.cgi:628 +#: web/bugs.cgi:633 +#, sh-format +msgid "Bug: $bugs in total -" +msgid_plural "Bugs: $bugs in total -" +msgstr[0] "Всего: $bugs баг -" +msgstr[1] "Всего: $bugs бага -" +msgstr[2] "Всего: $bugs багов -" + +#: web/bugs.cgi:634 +#, sh-format +msgid "$close fixed -" +msgid_plural "$close fixed -" +msgstr[0] "$close закрыт -" +msgstr[1] "$close закрыты -" +msgstr[2] "$close закрыты -" + +#: web/bugs.cgi:635 +#, sh-format +msgid "$fixme to fix -" +msgid_plural "$fixme to fix -" +msgstr[0] "$fixme открыты -" +msgstr[1] "$fixme открыты -" +msgstr[2] "$fixme открыты -" + +#: web/bugs.cgi:643 +msgid "Please read the README for help and more information. You may also be interested by the SliTaz Roadmap and the packages Cooker. To perform a search enter your term and press ENTER." +msgstr "Для получения справки и дополнительной информации, прочитайте README. Вас также может заинтересовать Дорожная карта SliTaz и сборщик пакетов Cooker. Для поиска введите запрос и нажмите Enter." + +#: web/bugs.cgi:651 +msgid "View closed bugs" +msgstr "Показать закрытые баги" + +#: web/bugs.cgi:654 msgid "Create a new bug" msgstr "Создать новый баг" +#~ msgid "Logout" +#~ msgstr "Выйти" diff -r ea58d117d71a -r c5da10e6e749 po/tazbug.pot --- a/po/tazbug.pot Mon May 07 09:26:25 2012 +0200 +++ b/po/tazbug.pot Sun Jul 01 22:26:53 2012 +0000 @@ -1,6 +1,6 @@ -# LANGUAGE translation for SliTaz Bugs. +# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the SliTaz Bugs package. +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # #, fuzzy @@ -8,76 +8,93 @@ msgstr "" "Project-Id-Version: SliTaz Bugs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-04 13:13+0300\n" +"POT-Creation-Date: 2012-07-01 22:03+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: tazbug:64 +#: tazbug:60 +msgid "Usage:" +msgstr "" + +#: tazbug:60 +msgid "[command] [args]" +msgstr "" + +#: tazbug:62 +msgid "Commands:" +msgstr "" + +#: tazbug:63 msgid "Recreate the SliTaz secure key." msgstr "" -#: tazbug:65 +#: tazbug:64 msgid "Create a new SliTaz account configuration." msgstr "" -#: tazbug:66 +#: tazbug:65 msgid "Create a new account on SliTaz Bugs." msgstr "" -#: tazbug:67 +#: tazbug:66 msgid "Send a new message to an open bug." msgstr "" -#: tazbug:68 +#: tazbug:67 msgid "Send a new bug report." msgstr "" -#: tazbug:80 +#: tazbug:69 +msgid "Examples:" +msgstr "" + +#: tazbug:79 msgid "Missing real name" msgstr "" -#: tazbug:81 +#: tazbug:80 msgid "Missing login name" msgstr "" -#: tazbug:82 +#: tazbug:81 msgid "Missing email" msgstr "" -#: tazbug:83 tazbug:121 +#: tazbug:82 tazbug:120 msgid "Missing password" msgstr "" -#: tazbug:93 +#: tazbug:92 msgid "Creating SliTaz account configuration..." msgstr "" -#: tazbug:108 +#: tazbug:107 msgid "Creating SliTaz secure key..." msgstr "" -#: tazbug:150 +#: tazbug:149 msgid "Missing bug ID" msgstr "" -#: tazbug:151 +#: tazbug:150 msgid "Missing message" msgstr "" -#: tazbug:160 +#: tazbug:159 msgid "Missing bug title" msgstr "" -#: tazbug:161 +#: tazbug:160 msgid "Missing description" msgstr "" -#: tazbug:162 +#: tazbug:161 msgid "Missing bug priority" msgstr "" @@ -97,27 +114,27 @@ msgid "New bug" msgstr "" -#: tazbug-box:45 web/bugs.cgi:259 +#: tazbug-box:45 web/bugs.cgi:260 msgid "Send message" msgstr "" -#: tazbug-box:72 web/bugs.cgi:317 +#: tazbug-box:72 web/bugs.cgi:318 msgid "Bug title" msgstr "" -#: tazbug-box:73 web/bugs.cgi:329 +#: tazbug-box:73 web/bugs.cgi:330 msgid "Priority" msgstr "" -#: tazbug-box:74 web/bugs.cgi:325 +#: tazbug-box:74 web/bugs.cgi:326 msgid "Packages" msgstr "" -#: tazbug-box:75 web/bugs.cgi:321 +#: tazbug-box:75 web/bugs.cgi:322 msgid "Description" msgstr "" -#: tazbug-box:77 tazbug-box:130 web/bugs.cgi:255 +#: tazbug-box:77 tazbug-box:130 web/bugs.cgi:256 msgid "New message" msgstr "" @@ -129,7 +146,7 @@ msgid "Real name" msgstr "" -#: tazbug-box:111 web/bugs.cgi:123 +#: tazbug-box:111 web/bugs.cgi:128 msgid "User name" msgstr "" @@ -157,81 +174,189 @@ msgid "Email" msgstr "" -#: tazbug-box:158 web/bugs.cgi:127 +#: tazbug-box:158 web/bugs.cgi:129 msgid "Password" msgstr "" -#: web/bugs.cgi:109 web/bugs.cgi:131 +#: web/bugs.cgi:88 +msgid "Log out" +msgstr "" + +#: web/bugs.cgi:95 web/bugs.cgi:131 +msgid "Log in" +msgstr "" + +#: web/bugs.cgi:103 web/bugs.cgi:104 web/bugs.cgi:590 web/bugs.cgi:593 +msgid "Search" +msgstr "" + +#: web/bugs.cgi:117 msgid "Login" msgstr "" -#: web/bugs.cgi:112 +#: web/bugs.cgi:120 msgid "" -"No account yet? Please signup using the SliTaz Bugs reporter\n" -"on your SliTaz system.

Tip: to attach big files or images, you can use\n" -"SliTaz Paste services:" +"No account yet? Please signup using the SliTaz Bugs reporter on your SliTaz " +"system." msgstr "" -#: web/bugs.cgi:219 +#: web/bugs.cgi:122 +msgid "Tip: to attach big files or images, you can use SliTaz Paste services:" +msgstr "" + +#: web/bugs.cgi:145 web/bugs.cgi:154 +#, sh-format +msgid "Real name : $NAME" +msgstr "" + +#: web/bugs.cgi:155 +#, sh-format +msgid "Email : $MAIL" +msgstr "" + +#: web/bugs.cgi:156 +#, sh-format +msgid "Secure key : $KEY" +msgstr "" + +#: web/bugs.cgi:164 +#, sh-format +msgid "$bug Bug" +msgstr "" + +#: web/bugs.cgi:174 +msgid "Bug title :" +msgstr "" + +#: web/bugs.cgi:174 web/bugs.cgi:605 +msgid "Show" +msgstr "" + +#: web/bugs.cgi:175 +msgid "ID - Date :" +msgstr "" + +#: web/bugs.cgi:176 +msgid "Creator :" +msgstr "" + +#: web/bugs.cgi:200 +#, sh-format +msgid "Bug $id" +msgstr "" + +#: web/bugs.cgi:207 +#, sh-format +msgid "Priority $PRIORITY" +msgstr "" + +#: web/bugs.cgi:208 web/bugs.cgi:636 +#, sh-format +msgid "$msgs message" +msgid_plural "$msgs messages" +msgstr[0] "" +msgstr[1] "" + +#: web/bugs.cgi:220 msgid "Close bug" msgstr "" -#: web/bugs.cgi:220 +#: web/bugs.cgi:221 msgid "Edit bug" msgstr "" -#: web/bugs.cgi:224 +#: web/bugs.cgi:225 msgid "Re open bug" msgstr "" -#: web/bugs.cgi:231 +#: web/bugs.cgi:232 msgid "Messages" msgstr "" -#: web/bugs.cgi:233 +#: web/bugs.cgi:234 msgid "No messages" msgstr "" -#: web/bugs.cgi:309 +#: web/bugs.cgi:310 msgid "New Bug" msgstr "" -#: web/bugs.cgi:332 +#: web/bugs.cgi:333 msgid "Standard" msgstr "" -#: web/bugs.cgi:333 +#: web/bugs.cgi:334 msgid "Critical" msgstr "" -#: web/bugs.cgi:335 +#: web/bugs.cgi:336 msgid "Create Bug" msgstr "" -#: web/bugs.cgi:343 +#: web/bugs.cgi:344 msgid "* field is obligatory. You can also specify affected packages." msgstr "" -#: web/bugs.cgi:359 +#: web/bugs.cgi:354 +#, sh-format +msgid "Edit Bug $bug" +msgstr "" + +#: web/bugs.cgi:360 msgid "Save configuration" msgstr "" -#: web/bugs.cgi:466 +#: web/bugs.cgi:476 msgid "Bad login or pass" msgstr "" -#: web/bugs.cgi:499 +#: web/bugs.cgi:510 msgid "You must be logged in to post a new bug" msgstr "" -#: web/bugs.cgi:579 web/bugs.cgi:582 web/bugs.cgi:633 -msgid "Search" +#: web/bugs.cgi:612 +#, sh-format +msgid "No result found for: $get_search" msgstr "" -#: web/bugs.cgi:609 +#: web/bugs.cgi:630 msgid "Summary" msgstr "" -#: web/bugs.cgi:628 +#: web/bugs.cgi:633 +#, sh-format +msgid "Bug: $bugs in total -" +msgid_plural "Bugs: $bugs in total -" +msgstr[0] "" +msgstr[1] "" + +#: web/bugs.cgi:634 +#, sh-format +msgid "$close fixed -" +msgid_plural "$close fixed -" +msgstr[0] "" +msgstr[1] "" + +#: web/bugs.cgi:635 +#, sh-format +msgid "$fixme to fix -" +msgid_plural "$fixme to fix -" +msgstr[0] "" +msgstr[1] "" + +#: web/bugs.cgi:643 +msgid "" +"Please read the README for help and more " +"information. You may also be interested by the SliTaz Roadmap and the packages Cooker. To perform a search enter your term and press " +"ENTER." +msgstr "" + +#: web/bugs.cgi:651 +msgid "View closed bugs" +msgstr "" + +#: web/bugs.cgi:654 msgid "Create a new bug" msgstr "" diff -r ea58d117d71a -r c5da10e6e749 tazbug --- a/tazbug Mon May 07 09:26:25 2012 +0200 +++ b/tazbug Sun Jul 01 22:26:53 2012 +0000 @@ -50,24 +50,23 @@ # httpd -e dont work with GET URL requests http_urlencode() { #space: + or %20 - sed -e s'/ /+/'g -e s'/!/%21/'g -e s'/"/%22/'g -e s'/#/%23/'g \ - -e s'/%/%25/'g -e s'/&/%26/'g + sed -e 's/ /+/g; s/!/%21/g; s/"/%22/g; s/#/%23/g; s/%/%25/g; s/&/%26/g' } # Usage. usage() { cat << EOT -Usage: $(basename $0) [command] [args] +$(gettext 'Usage:') $(basename $0) $(gettext '[command] [args]') -Commands: +$(gettext 'Commands:') gen-key $(gettext "Recreate the SliTaz secure key.") gen-config $(gettext "Create a new SliTaz account configuration.") signup $(gettext "Create a new account on SliTaz Bugs.") new-msg $(gettext "Send a new message to an open bug.") new-bug $(gettext "Send a new bug report.") -Examples: +$(gettext 'Examples:') $(basename $0) signup --name="Real Name" --user=login \\ --mail=mail@domain --pass=password $(basename $0) new-msg --bug=0 --msg="Message for bug with ID 0" diff -r ea58d117d71a -r c5da10e6e749 web/bugs.cgi --- a/web/bugs.cgi Mon May 07 09:26:25 2012 +0200 +++ b/web/bugs.cgi Sun Jul 01 22:26:53 2012 +0000 @@ -85,14 +85,14 @@ cat << EOT

EOT else cat << EOT EOT fi @@ -100,8 +100,8 @@ @@ -114,21 +114,21 @@ # Login page login_page() { cat << EOT -

$(gettext "Login")

+

$(gettext 'Login')

-$(gettext "No account yet? Please signup using the SliTaz Bugs reporter -on your SliTaz system.

Tip: to attach big files or images, you can use -SliTaz Paste services:") paste.slitaz.org -

+

$(gettext "No account yet? Please signup using the SliTaz Bugs reporter \ +on your SliTaz system.")

+

$(gettext "Tip: to attach big files or images, you can use SliTaz Paste \ +services:") paste.slitaz.org

- - + +
- + $error
@@ -142,7 +142,7 @@ public_people() { cat << EOT 
-Real name : $NAME
+$(eval_gettext 'Real name  : $NAME')
EOT } @@ -151,16 +151,17 @@ auth_people() { cat << EOT 
-Real name  : $NAME
-Email      : $MAIL
-Secure key : $KEY
+$(eval_gettext 'Real name  : $NAME')
+$(eval_gettext 'Email      : $MAIL')
+$(eval_gettext 'Secure key : $KEY')
EOT } # Usage: list_bugs STATUS list_bugs() { - echo "

$1 Bugs

" + bug="$1" + echo "

$(eval_gettext '$bug Bug')

" for pr in critical standard do for bug in $(fgrep -H "$1" $bugdir/*/bug.conf | cut -d ":" -f 1) @@ -170,9 +171,9 @@ if [ "$PRIORITY" == "$pr" ]; then cat << EOT 
-Bug title  : $BUG Show
-ID - Date  : $id - $DATE
-Creator    : $CREATOR
+$(gettext 'Bug title  :') $BUG $(gettext 'Show')
+$(gettext 'ID - Date  :') $id - $DATE
+$(gettext 'Creator    :') $CREATOR
EOT fi @@ -196,12 +197,15 @@ MAIL="default" fi cat << EOT -

Bug $id

+

$(eval_gettext 'Bug $id')

- $(get_gravatar $MAIL 32) $STATUS $BUG - $DATE - Priority $PRIORITY - - $msgs messages + $(get_gravatar $MAIL 32) + $STATUS + $BUG - $DATE - + $(eval_gettext 'Priority $PRIORITY') - + $(eval_ngettext '$msgs message' '$msgs messages' $msgs) 

@@ -253,7 +257,7 @@
 
 		
 		
-		

+
EOT @@ -347,13 +351,13 @@ # Edit/Save a bug configuration file edit_bug() { cat << EOT -

$(gettext "Edit Bug $bug")

+

$(eval_gettext 'Edit Bug $bug')

- +
@@ -363,7 +367,7 @@ save_bug() { bug="$(GET bug)" content="$(GET bugconf)" - sed s'/"/\'/' | sed "s/$(echo -en '\r') /\n/g" > $bugdir/$bug/bug.conf << EOT + sed "s|\"|'|" | sed "s/$(echo -en '\r') /\n/g" > $bugdir/$bug/bug.conf << EOT $content EOT } @@ -386,7 +390,7 @@ [ "$size" ] || size=48 url="http://www.gravatar.com/avatar" md5=$(md5crypt $email) - echo "" + echo "\"\"" } # Create a new user in AUTH_FILE and PEOPLE @@ -469,7 +473,7 @@ *\ login\ *) # The login page [ "$(GET error)" ] && \ - error="$(gettext "Bad login or pass")" + error="$(gettext 'Bad login or pass')" header html_header user_box @@ -503,7 +507,7 @@ if check_auth; then new_bug_page else - echo "

$(gettext "You must be logged in to post a new bug")

" + echo "

$(gettext 'You must be logged in to post a new bug')

" fi html_footer ;; *\ addbug\ *) @@ -586,7 +590,7 @@

$(gettext "Search")

- +
EOT @@ -598,13 +602,14 @@ if [ "$result" ]; then #found=$(($found + 1)) id=${bug#bug/} - echo "

Bug $id $(gettext "Show")

" + echo "

Bug $id "$(gettext 'Show')"

" echo '
'
 				fgrep -i "$(GET search)" $bugdir/$id/* | \
 					sed s"/$(GET search)/$(GET search)<\/span>/"g
 				echo '
' else - gettext "

No result found for:"; echo " $(GET search)

" + get_search=$(GET search) + echo "

$(eval_gettext 'No result found for: $get_search')

" fi done echo '
' @@ -625,26 +630,28 @@

$(gettext "Summary")

- Bugs: $bugs in total - $close fixed - $fixme to fix - $msgs messages + $(eval_ngettext 'Bug: $bugs in total -' 'Bugs: $bugs in total -' $bugs) + $(eval_ngettext '$close fixed -' '$close fixed -' $close) + $(eval_ngettext '$fixme to fix -' '$fixme to fix -' $fixme) + $(eval_ngettext '$msgs message' '$msgs messages' $msgs)

${pct}%
-

- Please read the README for help and more - information. You may also be interested by the SliTaz - Roadmap and the packages - Cooker. To perform a search - enter your term and press ENTER. +

$(gettext "Please read the README for help and more \ +information. You may also be interested by the SliTaz \ +Roadmap and the packages \ +Cooker. To perform a search \ +enter your term and press ENTER.")