tazbug rev 31
check i18n: make {pot,msgfmt,clean}; fix Makefile; change i18n; add ru.po
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sun Jul 01 22:26:53 2012 +0000 (2012-07-01) |
| parents | ea58d117d71a |
| children | db97998089d6 |
| files | Makefile po/ru.po po/tazbug.pot tazbug web/bugs.cgi |
line diff
1.1 --- a/Makefile Mon May 07 09:26:25 2012 +0200 1.2 +++ b/Makefile Sun Jul 01 22:26:53 2012 +0000 1.3 @@ -26,7 +26,7 @@ 1.4 @for l in $(LINGUAS); do \ 1.5 echo "Compiling $$l mo file..."; \ 1.6 mkdir -p po/mo/$$l/LC_MESSAGES; \ 1.7 - msgfmt -o po/mo/$$l/LC_MESSAGES/pizza.mo po/$$l.po; \ 1.8 + msgfmt -o po/mo/$$l/LC_MESSAGES/$(PACKAGE).mo po/$$l.po; \ 1.9 done; 1.10 1.11 # Client install only. Server part is not packaged 1.12 @@ -63,3 +63,9 @@ 1.13 rm -f $(DESTDIR)$(PREFIX)/bin/tazbug* 1.14 rm -f $(DESTDIR)$(PREFIX)/share/applications/tazbug* 1.15 rm -f $(DESTDIR)$(PREFIX)/etc/slitaz/tazbug.conf 1.16 + 1.17 +# Clean source 1.18 + 1.19 +clean: 1.20 + rm -rf po/mo 1.21 + rm -f po/*~
2.1 --- a/po/ru.po Mon May 07 09:26:25 2012 +0200 2.2 +++ b/po/ru.po Sun Jul 01 22:26:53 2012 +0000 2.3 @@ -2,7 +2,7 @@ 2.4 msgstr "" 2.5 "Project-Id-Version: SliTaz Bugs\n" 2.6 "Report-Msgid-Bugs-To: \n" 2.7 -"POT-Creation-Date: 2012-04-04 13:13+0300\n" 2.8 +"POT-Creation-Date: 2012-07-01 22:03+0000\n" 2.9 "PO-Revision-Date: \n" 2.10 "Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n" 2.11 "Language-Team: Russian\n" 2.12 @@ -12,71 +12,88 @@ 2.13 "Content-Transfer-Encoding: 8bit\n" 2.14 "X-Poedit-Language: Russian\n" 2.15 "X-Poedit-SourceCharset: utf-8\n" 2.16 +"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" 2.17 "X-Poedit-Basepath: ../\n" 2.18 "X-Poedit-SearchPath-0: .\n" 2.19 2.20 -#: tazbug:64 2.21 +#: tazbug:60 2.22 +msgid "Usage:" 2.23 +msgstr "Использование:" 2.24 + 2.25 +#: tazbug:60 2.26 +msgid "[command] [args]" 2.27 +msgstr "[команда] [аргументы]" 2.28 + 2.29 +#: tazbug:62 2.30 +msgid "Commands:" 2.31 +msgstr "Команды:" 2.32 + 2.33 +#: tazbug:63 2.34 msgid "Recreate the SliTaz secure key." 2.35 msgstr "Создать ключ безопасности SliTaz." 2.36 2.37 -#: tazbug:65 2.38 +#: tazbug:64 2.39 msgid "Create a new SliTaz account configuration." 2.40 msgstr "Настроить новый аккаунт SliTaz." 2.41 2.42 -#: tazbug:66 2.43 +#: tazbug:65 2.44 msgid "Create a new account on SliTaz Bugs." 2.45 msgstr "Создать новый аккаунт на баг-трекере SliTaz." 2.46 2.47 -#: tazbug:67 2.48 +#: tazbug:66 2.49 msgid "Send a new message to an open bug." 2.50 msgstr "Отослать новое сообщение в открытый баг." 2.51 2.52 -#: tazbug:68 2.53 +#: tazbug:67 2.54 msgid "Send a new bug report." 2.55 msgstr "Отослать новый баг-репорт." 2.56 2.57 -#: tazbug:80 2.58 +#: tazbug:69 2.59 +msgid "Examples:" 2.60 +msgstr "Примеры:" 2.61 + 2.62 +#: tazbug:79 2.63 msgid "Missing real name" 2.64 msgstr "Отсутствуют имя и фамилия" 2.65 2.66 -#: tazbug:81 2.67 +#: tazbug:80 2.68 msgid "Missing login name" 2.69 msgstr "Отсутствует логин" 2.70 2.71 -#: tazbug:82 2.72 +#: tazbug:81 2.73 msgid "Missing email" 2.74 msgstr "Отсутствует адрес электронной почты" 2.75 2.76 -#: tazbug:83 2.77 -#: tazbug:121 2.78 +#: tazbug:82 2.79 +#: tazbug:120 2.80 msgid "Missing password" 2.81 msgstr "Отсутствует пароль" 2.82 2.83 -#: tazbug:93 2.84 +#: tazbug:92 2.85 msgid "Creating SliTaz account configuration..." 2.86 msgstr "Настраивается аккаунт SliTaz…" 2.87 2.88 -#: tazbug:108 2.89 +#: tazbug:107 2.90 msgid "Creating SliTaz secure key..." 2.91 msgstr "Создается ключ безопасности SliTaz…" 2.92 2.93 -#: tazbug:150 2.94 +#: tazbug:149 2.95 msgid "Missing bug ID" 2.96 msgstr "Отсутствует ID бага" 2.97 2.98 -#: tazbug:151 2.99 +#: tazbug:150 2.100 msgid "Missing message" 2.101 msgstr "Отсутствует сообщение" 2.102 2.103 -#: tazbug:160 2.104 +#: tazbug:159 2.105 msgid "Missing bug title" 2.106 msgstr "Отсутствует заголовок бага" 2.107 2.108 -#: tazbug:161 2.109 +#: tazbug:160 2.110 msgid "Missing description" 2.111 msgstr "Отсутствует описание" 2.112 2.113 -#: tazbug:162 2.114 +#: tazbug:161 2.115 msgid "Missing bug priority" 2.116 msgstr "Отсутствует приоритет бага" 2.117 2.118 @@ -99,33 +116,33 @@ 2.119 msgstr "Новый баг" 2.120 2.121 #: tazbug-box:45 2.122 -#: web/bugs.cgi:259 2.123 +#: web/bugs.cgi:260 2.124 msgid "Send message" 2.125 msgstr "Отослать сообщение" 2.126 2.127 #: tazbug-box:72 2.128 -#: web/bugs.cgi:317 2.129 +#: web/bugs.cgi:318 2.130 msgid "Bug title" 2.131 msgstr "Заголовок бага" 2.132 2.133 #: tazbug-box:73 2.134 -#: web/bugs.cgi:329 2.135 +#: web/bugs.cgi:330 2.136 msgid "Priority" 2.137 msgstr "Приоритет" 2.138 2.139 #: tazbug-box:74 2.140 -#: web/bugs.cgi:325 2.141 +#: web/bugs.cgi:326 2.142 msgid "Packages" 2.143 msgstr "Пакеты" 2.144 2.145 #: tazbug-box:75 2.146 -#: web/bugs.cgi:321 2.147 +#: web/bugs.cgi:322 2.148 msgid "Description" 2.149 msgstr "Описание" 2.150 2.151 #: tazbug-box:77 2.152 #: tazbug-box:130 2.153 -#: web/bugs.cgi:255 2.154 +#: web/bugs.cgi:256 2.155 msgid "New message" 2.156 msgstr "Новое сообщение" 2.157 2.158 @@ -139,7 +156,7 @@ 2.159 msgstr "Имя и фамилия" 2.160 2.161 #: tazbug-box:111 2.162 -#: web/bugs.cgi:123 2.163 +#: web/bugs.cgi:128 2.164 msgid "User name" 2.165 msgstr "Имя пользователя" 2.166 2.167 @@ -168,88 +185,196 @@ 2.168 msgstr "Адрес эл. почты" 2.169 2.170 #: tazbug-box:158 2.171 -#: web/bugs.cgi:127 2.172 +#: web/bugs.cgi:129 2.173 msgid "Password" 2.174 msgstr "Пароль" 2.175 2.176 -#: web/bugs.cgi:109 2.177 +#: web/bugs.cgi:88 2.178 +msgid "Log out" 2.179 +msgstr "Выйти" 2.180 + 2.181 +#: web/bugs.cgi:95 2.182 #: web/bugs.cgi:131 2.183 +msgid "Log in" 2.184 +msgstr "Войти" 2.185 + 2.186 +#: web/bugs.cgi:103 2.187 +#: web/bugs.cgi:104 2.188 +#: web/bugs.cgi:590 2.189 +#: web/bugs.cgi:593 2.190 +msgid "Search" 2.191 +msgstr "Поиск" 2.192 + 2.193 +#: web/bugs.cgi:117 2.194 msgid "Login" 2.195 -msgstr "Логин" 2.196 +msgstr "Вход" 2.197 2.198 -#: web/bugs.cgi:112 2.199 -msgid "" 2.200 -"No account yet? Please signup using the SliTaz Bugs reporter\n" 2.201 -"on your SliTaz system. <p>Tip: to attach big files or images, you can use\n" 2.202 -"SliTaz Paste services:" 2.203 -msgstr "" 2.204 -"У вас еще нет аккаунта? Войдите, используя программу отчета о багах\n" 2.205 -"в вашей системе SliTaz. <p>Совет: чтобы прикрепить большие файлы\n" 2.206 -"и изображения, вы можете воспользоваться службой SliTaz Paste:" 2.207 +#: web/bugs.cgi:120 2.208 +msgid "No account yet? Please signup using the SliTaz Bugs reporter on your SliTaz system." 2.209 +msgstr "У вас еще нет аккаунта? Войдите, используя баг-репортер в вашей системе SliTaz." 2.210 2.211 -#: web/bugs.cgi:219 2.212 +#: web/bugs.cgi:122 2.213 +msgid "Tip: to attach big files or images, you can use SliTaz Paste services:" 2.214 +msgstr "Совет: чтобы прикрепить большие файлы и изображения, вы можете воспользоваться службой SliTaz Paste:" 2.215 + 2.216 +#: web/bugs.cgi:145 2.217 +#: web/bugs.cgi:154 2.218 +#, sh-format 2.219 +msgid "Real name : $NAME" 2.220 +msgstr "Имя и фамилия : $NAME" 2.221 + 2.222 +#: web/bugs.cgi:155 2.223 +#, sh-format 2.224 +msgid "Email : $MAIL" 2.225 +msgstr "Электронная почта : $MAIL" 2.226 + 2.227 +#: web/bugs.cgi:156 2.228 +#, sh-format 2.229 +msgid "Secure key : $KEY" 2.230 +msgstr "Ключ безопасности : $KEY" 2.231 + 2.232 +#: web/bugs.cgi:164 2.233 +#, sh-format 2.234 +msgid "$bug Bug" 2.235 +msgstr "$bug баг" 2.236 + 2.237 +#: web/bugs.cgi:174 2.238 +msgid "Bug title :" 2.239 +msgstr "Заголовок бага :" 2.240 + 2.241 +#: web/bugs.cgi:174 2.242 +#: web/bugs.cgi:605 2.243 +msgid "Show" 2.244 +msgstr "Показать" 2.245 + 2.246 +#: web/bugs.cgi:175 2.247 +msgid "ID - Date :" 2.248 +msgstr "ID - Дата :" 2.249 + 2.250 +#: web/bugs.cgi:176 2.251 +msgid "Creator :" 2.252 +msgstr "Создатель :" 2.253 + 2.254 +#: web/bugs.cgi:200 2.255 +#, sh-format 2.256 +msgid "Bug $id" 2.257 +msgstr "Баг $id" 2.258 + 2.259 +#: web/bugs.cgi:207 2.260 +#, sh-format 2.261 +msgid "Priority $PRIORITY" 2.262 +msgstr "Приоритет $PRIORITY" 2.263 + 2.264 +#: web/bugs.cgi:208 2.265 +#: web/bugs.cgi:636 2.266 +#, sh-format 2.267 +msgid "$msgs message" 2.268 +msgid_plural "$msgs messages" 2.269 +msgstr[0] "$msgs сообщение" 2.270 +msgstr[1] "$msgs сообщения" 2.271 +msgstr[2] "$msgs сообщений" 2.272 + 2.273 +#: web/bugs.cgi:220 2.274 msgid "Close bug" 2.275 msgstr "Закрыть баг" 2.276 2.277 -#: web/bugs.cgi:220 2.278 +#: web/bugs.cgi:221 2.279 msgid "Edit bug" 2.280 msgstr "Править баг" 2.281 2.282 -#: web/bugs.cgi:224 2.283 +#: web/bugs.cgi:225 2.284 msgid "Re open bug" 2.285 msgstr "Повторно открыть баг" 2.286 2.287 -#: web/bugs.cgi:231 2.288 +#: web/bugs.cgi:232 2.289 msgid "Messages" 2.290 msgstr "Сообщения" 2.291 2.292 -#: web/bugs.cgi:233 2.293 +#: web/bugs.cgi:234 2.294 msgid "No messages" 2.295 msgstr "Нет сообщений" 2.296 2.297 -#: web/bugs.cgi:309 2.298 +#: web/bugs.cgi:310 2.299 msgid "New Bug" 2.300 msgstr "Новый баг" 2.301 2.302 -#: web/bugs.cgi:332 2.303 +#: web/bugs.cgi:333 2.304 msgid "Standard" 2.305 msgstr "Стандартный" 2.306 2.307 -#: web/bugs.cgi:333 2.308 +#: web/bugs.cgi:334 2.309 msgid "Critical" 2.310 msgstr "Критический" 2.311 2.312 -#: web/bugs.cgi:335 2.313 +#: web/bugs.cgi:336 2.314 msgid "Create Bug" 2.315 msgstr "Создать баг" 2.316 2.317 -#: web/bugs.cgi:343 2.318 +#: web/bugs.cgi:344 2.319 msgid "* field is obligatory. You can also specify affected packages." 2.320 msgstr "* поле обязательно для заполнения. Вы можете также указать соответствующие пакеты." 2.321 2.322 -#: web/bugs.cgi:359 2.323 +#: web/bugs.cgi:354 2.324 +#, sh-format 2.325 +msgid "Edit Bug $bug" 2.326 +msgstr "Править баг $bug" 2.327 + 2.328 +#: web/bugs.cgi:360 2.329 msgid "Save configuration" 2.330 msgstr "Сохранить настройки" 2.331 2.332 -#: web/bugs.cgi:466 2.333 +#: web/bugs.cgi:476 2.334 msgid "Bad login or pass" 2.335 msgstr "Неверный логин или пароль" 2.336 2.337 -#: web/bugs.cgi:499 2.338 +#: web/bugs.cgi:510 2.339 msgid "You must be logged in to post a new bug" 2.340 msgstr "Чтобы отправить новый баг, вы должны прежде войти" 2.341 2.342 -#: web/bugs.cgi:579 2.343 -#: web/bugs.cgi:582 2.344 -#: web/bugs.cgi:633 2.345 -msgid "Search" 2.346 -msgstr "Поиск" 2.347 +#: web/bugs.cgi:612 2.348 +#, sh-format 2.349 +msgid "No result found for: $get_search" 2.350 +msgstr "По запросу «$get_search» ничего не найдено" 2.351 2.352 -#: web/bugs.cgi:609 2.353 +#: web/bugs.cgi:630 2.354 msgid "Summary" 2.355 msgstr "Сводка" 2.356 2.357 -#: web/bugs.cgi:628 2.358 +#: web/bugs.cgi:633 2.359 +#, sh-format 2.360 +msgid "Bug: $bugs in total -" 2.361 +msgid_plural "Bugs: $bugs in total -" 2.362 +msgstr[0] "Всего: $bugs баг -" 2.363 +msgstr[1] "Всего: $bugs бага -" 2.364 +msgstr[2] "Всего: $bugs багов -" 2.365 + 2.366 +#: web/bugs.cgi:634 2.367 +#, sh-format 2.368 +msgid "$close fixed -" 2.369 +msgid_plural "$close fixed -" 2.370 +msgstr[0] "$close закрыт -" 2.371 +msgstr[1] "$close закрыты -" 2.372 +msgstr[2] "$close закрыты -" 2.373 + 2.374 +#: web/bugs.cgi:635 2.375 +#, sh-format 2.376 +msgid "$fixme to fix -" 2.377 +msgid_plural "$fixme to fix -" 2.378 +msgstr[0] "$fixme открыты -" 2.379 +msgstr[1] "$fixme открыты -" 2.380 +msgstr[2] "$fixme открыты -" 2.381 + 2.382 +#: web/bugs.cgi:643 2.383 +msgid "Please read the <a href=\"?README\">README</a> for help and more information. You may also be interested by the SliTaz <a href=\"http://roadmap.slitaz.org/\">Roadmap</a> and the packages <a href=\"http://cook.slitaz.org/\">Cooker</a>. To perform a search enter your term and press ENTER." 2.384 +msgstr "Для получения справки и дополнительной информации, прочитайте <a href=\"?README\">README</a>. Вас также может заинтересовать <a href=\"http://roadmap.slitaz.org/\">Дорожная карта</a> SliTaz и сборщик пакетов <a href=\"http://cook.slitaz.org/\">Cooker</a>. Для поиска введите запрос и нажмите Enter." 2.385 + 2.386 +#: web/bugs.cgi:651 2.387 +msgid "View closed bugs" 2.388 +msgstr "Показать закрытые баги" 2.389 + 2.390 +#: web/bugs.cgi:654 2.391 msgid "Create a new bug" 2.392 msgstr "Создать новый баг" 2.393 2.394 +#~ msgid "Logout" 2.395 +#~ msgstr "Выйти"
3.1 --- a/po/tazbug.pot Mon May 07 09:26:25 2012 +0200 3.2 +++ b/po/tazbug.pot Sun Jul 01 22:26:53 2012 +0000 3.3 @@ -1,6 +1,6 @@ 3.4 -# LANGUAGE translation for SliTaz Bugs. 3.5 +# SOME DESCRIPTIVE TITLE. 3.6 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER 3.7 -# This file is distributed under the same license as the SliTaz Bugs package. 3.8 +# This file is distributed under the same license as the PACKAGE package. 3.9 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. 3.10 # 3.11 #, fuzzy 3.12 @@ -8,76 +8,93 @@ 3.13 msgstr "" 3.14 "Project-Id-Version: SliTaz Bugs\n" 3.15 "Report-Msgid-Bugs-To: \n" 3.16 -"POT-Creation-Date: 2012-04-04 13:13+0300\n" 3.17 +"POT-Creation-Date: 2012-07-01 22:03+0000\n" 3.18 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 3.19 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 3.20 "Language-Team: LANGUAGE <LL@li.org>\n" 3.21 "Language: \n" 3.22 "MIME-Version: 1.0\n" 3.23 -"Content-Type: text/plain; charset=UTF-8\n" 3.24 +"Content-Type: text/plain; charset=CHARSET\n" 3.25 "Content-Transfer-Encoding: 8bit\n" 3.26 +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" 3.27 3.28 -#: tazbug:64 3.29 +#: tazbug:60 3.30 +msgid "Usage:" 3.31 +msgstr "" 3.32 + 3.33 +#: tazbug:60 3.34 +msgid "[command] [args]" 3.35 +msgstr "" 3.36 + 3.37 +#: tazbug:62 3.38 +msgid "Commands:" 3.39 +msgstr "" 3.40 + 3.41 +#: tazbug:63 3.42 msgid "Recreate the SliTaz secure key." 3.43 msgstr "" 3.44 3.45 -#: tazbug:65 3.46 +#: tazbug:64 3.47 msgid "Create a new SliTaz account configuration." 3.48 msgstr "" 3.49 3.50 -#: tazbug:66 3.51 +#: tazbug:65 3.52 msgid "Create a new account on SliTaz Bugs." 3.53 msgstr "" 3.54 3.55 -#: tazbug:67 3.56 +#: tazbug:66 3.57 msgid "Send a new message to an open bug." 3.58 msgstr "" 3.59 3.60 -#: tazbug:68 3.61 +#: tazbug:67 3.62 msgid "Send a new bug report." 3.63 msgstr "" 3.64 3.65 -#: tazbug:80 3.66 +#: tazbug:69 3.67 +msgid "Examples:" 3.68 +msgstr "" 3.69 + 3.70 +#: tazbug:79 3.71 msgid "Missing real name" 3.72 msgstr "" 3.73 3.74 -#: tazbug:81 3.75 +#: tazbug:80 3.76 msgid "Missing login name" 3.77 msgstr "" 3.78 3.79 -#: tazbug:82 3.80 +#: tazbug:81 3.81 msgid "Missing email" 3.82 msgstr "" 3.83 3.84 -#: tazbug:83 tazbug:121 3.85 +#: tazbug:82 tazbug:120 3.86 msgid "Missing password" 3.87 msgstr "" 3.88 3.89 -#: tazbug:93 3.90 +#: tazbug:92 3.91 msgid "Creating SliTaz account configuration..." 3.92 msgstr "" 3.93 3.94 -#: tazbug:108 3.95 +#: tazbug:107 3.96 msgid "Creating SliTaz secure key..." 3.97 msgstr "" 3.98 3.99 -#: tazbug:150 3.100 +#: tazbug:149 3.101 msgid "Missing bug ID" 3.102 msgstr "" 3.103 3.104 -#: tazbug:151 3.105 +#: tazbug:150 3.106 msgid "Missing message" 3.107 msgstr "" 3.108 3.109 -#: tazbug:160 3.110 +#: tazbug:159 3.111 msgid "Missing bug title" 3.112 msgstr "" 3.113 3.114 -#: tazbug:161 3.115 +#: tazbug:160 3.116 msgid "Missing description" 3.117 msgstr "" 3.118 3.119 -#: tazbug:162 3.120 +#: tazbug:161 3.121 msgid "Missing bug priority" 3.122 msgstr "" 3.123 3.124 @@ -97,27 +114,27 @@ 3.125 msgid "New bug" 3.126 msgstr "" 3.127 3.128 -#: tazbug-box:45 web/bugs.cgi:259 3.129 +#: tazbug-box:45 web/bugs.cgi:260 3.130 msgid "Send message" 3.131 msgstr "" 3.132 3.133 -#: tazbug-box:72 web/bugs.cgi:317 3.134 +#: tazbug-box:72 web/bugs.cgi:318 3.135 msgid "Bug title" 3.136 msgstr "" 3.137 3.138 -#: tazbug-box:73 web/bugs.cgi:329 3.139 +#: tazbug-box:73 web/bugs.cgi:330 3.140 msgid "Priority" 3.141 msgstr "" 3.142 3.143 -#: tazbug-box:74 web/bugs.cgi:325 3.144 +#: tazbug-box:74 web/bugs.cgi:326 3.145 msgid "Packages" 3.146 msgstr "" 3.147 3.148 -#: tazbug-box:75 web/bugs.cgi:321 3.149 +#: tazbug-box:75 web/bugs.cgi:322 3.150 msgid "Description" 3.151 msgstr "" 3.152 3.153 -#: tazbug-box:77 tazbug-box:130 web/bugs.cgi:255 3.154 +#: tazbug-box:77 tazbug-box:130 web/bugs.cgi:256 3.155 msgid "New message" 3.156 msgstr "" 3.157 3.158 @@ -129,7 +146,7 @@ 3.159 msgid "Real name" 3.160 msgstr "" 3.161 3.162 -#: tazbug-box:111 web/bugs.cgi:123 3.163 +#: tazbug-box:111 web/bugs.cgi:128 3.164 msgid "User name" 3.165 msgstr "" 3.166 3.167 @@ -157,81 +174,189 @@ 3.168 msgid "Email" 3.169 msgstr "" 3.170 3.171 -#: tazbug-box:158 web/bugs.cgi:127 3.172 +#: tazbug-box:158 web/bugs.cgi:129 3.173 msgid "Password" 3.174 msgstr "" 3.175 3.176 -#: web/bugs.cgi:109 web/bugs.cgi:131 3.177 +#: web/bugs.cgi:88 3.178 +msgid "Log out" 3.179 +msgstr "" 3.180 + 3.181 +#: web/bugs.cgi:95 web/bugs.cgi:131 3.182 +msgid "Log in" 3.183 +msgstr "" 3.184 + 3.185 +#: web/bugs.cgi:103 web/bugs.cgi:104 web/bugs.cgi:590 web/bugs.cgi:593 3.186 +msgid "Search" 3.187 +msgstr "" 3.188 + 3.189 +#: web/bugs.cgi:117 3.190 msgid "Login" 3.191 msgstr "" 3.192 3.193 -#: web/bugs.cgi:112 3.194 +#: web/bugs.cgi:120 3.195 msgid "" 3.196 -"No account yet? Please signup using the SliTaz Bugs reporter\n" 3.197 -"on your SliTaz system. <p>Tip: to attach big files or images, you can use\n" 3.198 -"SliTaz Paste services:" 3.199 +"No account yet? Please signup using the SliTaz Bugs reporter on your SliTaz " 3.200 +"system." 3.201 msgstr "" 3.202 3.203 -#: web/bugs.cgi:219 3.204 +#: web/bugs.cgi:122 3.205 +msgid "Tip: to attach big files or images, you can use SliTaz Paste services:" 3.206 +msgstr "" 3.207 + 3.208 +#: web/bugs.cgi:145 web/bugs.cgi:154 3.209 +#, sh-format 3.210 +msgid "Real name : $NAME" 3.211 +msgstr "" 3.212 + 3.213 +#: web/bugs.cgi:155 3.214 +#, sh-format 3.215 +msgid "Email : $MAIL" 3.216 +msgstr "" 3.217 + 3.218 +#: web/bugs.cgi:156 3.219 +#, sh-format 3.220 +msgid "Secure key : $KEY" 3.221 +msgstr "" 3.222 + 3.223 +#: web/bugs.cgi:164 3.224 +#, sh-format 3.225 +msgid "$bug Bug" 3.226 +msgstr "" 3.227 + 3.228 +#: web/bugs.cgi:174 3.229 +msgid "Bug title :" 3.230 +msgstr "" 3.231 + 3.232 +#: web/bugs.cgi:174 web/bugs.cgi:605 3.233 +msgid "Show" 3.234 +msgstr "" 3.235 + 3.236 +#: web/bugs.cgi:175 3.237 +msgid "ID - Date :" 3.238 +msgstr "" 3.239 + 3.240 +#: web/bugs.cgi:176 3.241 +msgid "Creator :" 3.242 +msgstr "" 3.243 + 3.244 +#: web/bugs.cgi:200 3.245 +#, sh-format 3.246 +msgid "Bug $id" 3.247 +msgstr "" 3.248 + 3.249 +#: web/bugs.cgi:207 3.250 +#, sh-format 3.251 +msgid "Priority $PRIORITY" 3.252 +msgstr "" 3.253 + 3.254 +#: web/bugs.cgi:208 web/bugs.cgi:636 3.255 +#, sh-format 3.256 +msgid "$msgs message" 3.257 +msgid_plural "$msgs messages" 3.258 +msgstr[0] "" 3.259 +msgstr[1] "" 3.260 + 3.261 +#: web/bugs.cgi:220 3.262 msgid "Close bug" 3.263 msgstr "" 3.264 3.265 -#: web/bugs.cgi:220 3.266 +#: web/bugs.cgi:221 3.267 msgid "Edit bug" 3.268 msgstr "" 3.269 3.270 -#: web/bugs.cgi:224 3.271 +#: web/bugs.cgi:225 3.272 msgid "Re open bug" 3.273 msgstr "" 3.274 3.275 -#: web/bugs.cgi:231 3.276 +#: web/bugs.cgi:232 3.277 msgid "Messages" 3.278 msgstr "" 3.279 3.280 -#: web/bugs.cgi:233 3.281 +#: web/bugs.cgi:234 3.282 msgid "No messages" 3.283 msgstr "" 3.284 3.285 -#: web/bugs.cgi:309 3.286 +#: web/bugs.cgi:310 3.287 msgid "New Bug" 3.288 msgstr "" 3.289 3.290 -#: web/bugs.cgi:332 3.291 +#: web/bugs.cgi:333 3.292 msgid "Standard" 3.293 msgstr "" 3.294 3.295 -#: web/bugs.cgi:333 3.296 +#: web/bugs.cgi:334 3.297 msgid "Critical" 3.298 msgstr "" 3.299 3.300 -#: web/bugs.cgi:335 3.301 +#: web/bugs.cgi:336 3.302 msgid "Create Bug" 3.303 msgstr "" 3.304 3.305 -#: web/bugs.cgi:343 3.306 +#: web/bugs.cgi:344 3.307 msgid "* field is obligatory. You can also specify affected packages." 3.308 msgstr "" 3.309 3.310 -#: web/bugs.cgi:359 3.311 +#: web/bugs.cgi:354 3.312 +#, sh-format 3.313 +msgid "Edit Bug $bug" 3.314 +msgstr "" 3.315 + 3.316 +#: web/bugs.cgi:360 3.317 msgid "Save configuration" 3.318 msgstr "" 3.319 3.320 -#: web/bugs.cgi:466 3.321 +#: web/bugs.cgi:476 3.322 msgid "Bad login or pass" 3.323 msgstr "" 3.324 3.325 -#: web/bugs.cgi:499 3.326 +#: web/bugs.cgi:510 3.327 msgid "You must be logged in to post a new bug" 3.328 msgstr "" 3.329 3.330 -#: web/bugs.cgi:579 web/bugs.cgi:582 web/bugs.cgi:633 3.331 -msgid "Search" 3.332 +#: web/bugs.cgi:612 3.333 +#, sh-format 3.334 +msgid "No result found for: $get_search" 3.335 msgstr "" 3.336 3.337 -#: web/bugs.cgi:609 3.338 +#: web/bugs.cgi:630 3.339 msgid "Summary" 3.340 msgstr "" 3.341 3.342 -#: web/bugs.cgi:628 3.343 +#: web/bugs.cgi:633 3.344 +#, sh-format 3.345 +msgid "Bug: $bugs in total -" 3.346 +msgid_plural "Bugs: $bugs in total -" 3.347 +msgstr[0] "" 3.348 +msgstr[1] "" 3.349 + 3.350 +#: web/bugs.cgi:634 3.351 +#, sh-format 3.352 +msgid "$close fixed -" 3.353 +msgid_plural "$close fixed -" 3.354 +msgstr[0] "" 3.355 +msgstr[1] "" 3.356 + 3.357 +#: web/bugs.cgi:635 3.358 +#, sh-format 3.359 +msgid "$fixme to fix -" 3.360 +msgid_plural "$fixme to fix -" 3.361 +msgstr[0] "" 3.362 +msgstr[1] "" 3.363 + 3.364 +#: web/bugs.cgi:643 3.365 +msgid "" 3.366 +"Please read the <a href=\"?README\">README</a> for help and more " 3.367 +"information. You may also be interested by the SliTaz <a href=\"http://" 3.368 +"roadmap.slitaz.org/\">Roadmap</a> and the packages <a href=\"http://cook." 3.369 +"slitaz.org/\">Cooker</a>. To perform a search enter your term and press " 3.370 +"ENTER." 3.371 +msgstr "" 3.372 + 3.373 +#: web/bugs.cgi:651 3.374 +msgid "View closed bugs" 3.375 +msgstr "" 3.376 + 3.377 +#: web/bugs.cgi:654 3.378 msgid "Create a new bug" 3.379 msgstr ""
4.1 --- a/tazbug Mon May 07 09:26:25 2012 +0200 4.2 +++ b/tazbug Sun Jul 01 22:26:53 2012 +0000 4.3 @@ -50,24 +50,23 @@ 4.4 # httpd -e dont work with GET URL requests 4.5 http_urlencode() { 4.6 #space: + or %20 4.7 - sed -e s'/ /+/'g -e s'/!/%21/'g -e s'/"/%22/'g -e s'/#/%23/'g \ 4.8 - -e s'/%/%25/'g -e s'/&/%26/'g 4.9 + sed -e 's/ /+/g; s/!/%21/g; s/"/%22/g; s/#/%23/g; s/%/%25/g; s/&/%26/g' 4.10 } 4.11 4.12 # Usage. 4.13 usage() { 4.14 cat << EOT 4.15 4.16 -Usage: $(basename $0) [command] [args] 4.17 +$(gettext 'Usage:') $(basename $0) $(gettext '[command] [args]') 4.18 4.19 -Commands: 4.20 +$(gettext 'Commands:') 4.21 gen-key $(gettext "Recreate the SliTaz secure key.") 4.22 gen-config $(gettext "Create a new SliTaz account configuration.") 4.23 signup $(gettext "Create a new account on SliTaz Bugs.") 4.24 new-msg $(gettext "Send a new message to an open bug.") 4.25 new-bug $(gettext "Send a new bug report.") 4.26 4.27 -Examples: 4.28 +$(gettext 'Examples:') 4.29 $(basename $0) signup --name="Real Name" --user=login \\ 4.30 --mail=mail@domain --pass=password 4.31 $(basename $0) new-msg --bug=0 --msg="Message for bug with ID 0"
5.1 --- a/web/bugs.cgi Mon May 07 09:26:25 2012 +0200 5.2 +++ b/web/bugs.cgi Sun Jul 01 22:26:53 2012 +0000 5.3 @@ -85,14 +85,14 @@ 5.4 cat << EOT 5.5 <div id="user"> 5.6 <a href="?user=$user">$(get_gravatar $MAIL 20)</a> 5.7 -<a href="?logout">Logout</a> 5.8 +<a href="?logout">$(gettext 'Log out')</a> 5.9 </div> 5.10 EOT 5.11 else 5.12 cat << EOT 5.13 <div id="user"> 5.14 <a href="?login"><img src="images/avatar.png" alt="[ User ]" /></a> 5.15 - <a href="?login">Login</a> 5.16 + <a href="?login">$(gettext 'Log in')</a> 5.17 </div> 5.18 EOT 5.19 fi 5.20 @@ -100,8 +100,8 @@ 5.21 5.22 <div id="search"> 5.23 <form method="get" action="./"> 5.24 - <input type="text" name="search" placeholder="$(gettext "Search")" /> 5.25 - <!-- <input type="submit" value="$(gettext "Search")" /> --> 5.26 + <input type="text" name="search" placeholder="$(gettext 'Search')" /> 5.27 + <!-- <input type="submit" value="$(gettext 'Search')" /> --> 5.28 </form> 5.29 </div> 5.30 5.31 @@ -114,21 +114,21 @@ 5.32 # Login page 5.33 login_page() { 5.34 cat << EOT 5.35 -<h2>$(gettext "Login")</h2> 5.36 +<h2>$(gettext 'Login')</h2> 5.37 5.38 <div id="account-info"> 5.39 -$(gettext "No account yet? Please signup using the SliTaz Bugs reporter 5.40 -on your SliTaz system. <p>Tip: to attach big files or images, you can use 5.41 -SliTaz Paste services:") <a href="http://paste.slitaz.org/">paste.slitaz.org</a> 5.42 -</p> 5.43 +<p>$(gettext "No account yet? Please signup using the SliTaz Bugs reporter \ 5.44 +on your SliTaz system.")</p> 5.45 +<p>$(gettext "Tip: to attach big files or images, you can use SliTaz Paste \ 5.46 +services:") <a href="http://paste.slitaz.org/">paste.slitaz.org</a></p> 5.47 </div> 5.48 5.49 <div id="login"> 5.50 <form method="post" action="$SCRIPT_NAME"> 5.51 - <input type="text" name="auth" placeholder="$(gettext "User name")" /> 5.52 - <input type="password" name="pass" placeholder="$(gettext "Password")" /> 5.53 + <input type="text" name="auth" placeholder="$(gettext 'User name')" /> 5.54 + <input type="password" name="pass" placeholder="$(gettext 'Password')" /> 5.55 <div> 5.56 - <input type="submit" value="Login" /> 5.57 + <input type="submit" value="$(gettext 'Log in')" /> 5.58 $error 5.59 </div> 5.60 </form> 5.61 @@ -142,7 +142,7 @@ 5.62 public_people() { 5.63 cat << EOT 5.64 <pre> 5.65 -Real name : $NAME 5.66 +$(eval_gettext 'Real name : $NAME') 5.67 </pre> 5.68 EOT 5.69 } 5.70 @@ -151,16 +151,17 @@ 5.71 auth_people() { 5.72 cat << EOT 5.73 <pre> 5.74 -Real name : $NAME 5.75 -Email : $MAIL 5.76 -Secure key : $KEY 5.77 +$(eval_gettext 'Real name : $NAME') 5.78 +$(eval_gettext 'Email : $MAIL') 5.79 +$(eval_gettext 'Secure key : $KEY') 5.80 </pre> 5.81 EOT 5.82 } 5.83 5.84 # Usage: list_bugs STATUS 5.85 list_bugs() { 5.86 - echo "<h3>$1 Bugs</h3>" 5.87 + bug="$1" 5.88 + echo "<h3>$(eval_gettext '$bug Bug')</h3>" 5.89 for pr in critical standard 5.90 do 5.91 for bug in $(fgrep -H "$1" $bugdir/*/bug.conf | cut -d ":" -f 1) 5.92 @@ -170,9 +171,9 @@ 5.93 if [ "$PRIORITY" == "$pr" ]; then 5.94 cat << EOT 5.95 <pre> 5.96 -Bug title : <strong>$BUG</strong> <a href="?id=$id">Show</a> 5.97 -ID - Date : $id - $DATE 5.98 -Creator : <a href="?user=$CREATOR">$CREATOR</a> 5.99 +$(gettext 'Bug title :') <strong>$BUG</strong> <a href="?id=$id">$(gettext 'Show')</a> 5.100 +$(gettext 'ID - Date :') $id - $DATE 5.101 +$(gettext 'Creator :') <a href="?user=$CREATOR">$CREATOR</a> 5.102 </pre> 5.103 EOT 5.104 fi 5.105 @@ -196,12 +197,15 @@ 5.106 MAIL="default" 5.107 fi 5.108 cat << EOT 5.109 -<h2>Bug $id</h2> 5.110 +<h2>$(eval_gettext 'Bug $id')</h2> 5.111 <form method="get" action="./"> 5.112 5.113 <p> 5.114 - $(get_gravatar $MAIL 32) <strong>$STATUS</strong> $BUG - $DATE - Priority $PRIORITY 5.115 - - $msgs messages 5.116 + $(get_gravatar $MAIL 32) 5.117 + <strong>$STATUS</strong> 5.118 + $BUG - $DATE - 5.119 + $(eval_gettext 'Priority $PRIORITY') - 5.120 + $(eval_ngettext '$msgs message' '$msgs messages' $msgs) 5.121 </p> 5.122 5.123 <pre> 5.124 @@ -253,7 +257,7 @@ 5.125 5.126 <input type="hidden" name="id" value="$id" /> 5.127 <textarea name="msg" rows="8"></textarea> 5.128 - <p><input type="submit" value="$(gettext "Send message")" /></p> 5.129 + <p><input type="submit" value="$(gettext 'Send message')" /></p> 5.130 </form> 5.131 </div> 5.132 EOT 5.133 @@ -347,13 +351,13 @@ 5.134 # Edit/Save a bug configuration file 5.135 edit_bug() { 5.136 cat << EOT 5.137 -<h2>$(gettext "Edit Bug $bug")</h2> 5.138 +<h2>$(eval_gettext 'Edit Bug $bug')</h2> 5.139 <div id="edit"> 5.140 5.141 <form method="get" action="./"> 5.142 <textarea name="bugconf">$(cat $bugdir/$bug/bug.conf)</textarea> 5.143 <input type="hidden" name="bug" value="$bug" /> 5.144 - <input type="submit" value="$(gettext "Save configuration")" /> 5.145 + <input type="submit" value="$(gettext 'Save configuration')" /> 5.146 </form> 5.147 5.148 </div> 5.149 @@ -363,7 +367,7 @@ 5.150 save_bug() { 5.151 bug="$(GET bug)" 5.152 content="$(GET bugconf)" 5.153 - sed s'/"/\'/' | sed "s/$(echo -en '\r') /\n/g" > $bugdir/$bug/bug.conf << EOT 5.154 + sed "s|\"|'|" | sed "s/$(echo -en '\r') /\n/g" > $bugdir/$bug/bug.conf << EOT 5.155 $content 5.156 EOT 5.157 } 5.158 @@ -386,7 +390,7 @@ 5.159 [ "$size" ] || size=48 5.160 url="http://www.gravatar.com/avatar" 5.161 md5=$(md5crypt $email) 5.162 - echo "<img src='$url/$md5?d=identicon&s=$size' alt='' />" 5.163 + echo "<img src=\"$url/$md5?d=identicon&s=$size\" alt=\"\" />" 5.164 } 5.165 5.166 # Create a new user in AUTH_FILE and PEOPLE 5.167 @@ -469,7 +473,7 @@ 5.168 *\ login\ *) 5.169 # The login page 5.170 [ "$(GET error)" ] && \ 5.171 - error="<span class="error">$(gettext "Bad login or pass")</span>" 5.172 + error="<span class='error'>$(gettext 'Bad login or pass')</span>" 5.173 header 5.174 html_header 5.175 user_box 5.176 @@ -503,7 +507,7 @@ 5.177 if check_auth; then 5.178 new_bug_page 5.179 else 5.180 - echo "<p>$(gettext "You must be logged in to post a new bug")</p>" 5.181 + echo "<p>$(gettext 'You must be logged in to post a new bug')</p>" 5.182 fi 5.183 html_footer ;; 5.184 *\ addbug\ *) 5.185 @@ -586,7 +590,7 @@ 5.186 <h2>$(gettext "Search")</h2> 5.187 <form method="get" action="./"> 5.188 <input type="text" name="search" /> 5.189 - <input type="submit" value="$(gettext "Search")" /> 5.190 + <input type="submit" value="$(gettext 'Search')" /> 5.191 </form> 5.192 <div> 5.193 EOT 5.194 @@ -598,13 +602,14 @@ 5.195 if [ "$result" ]; then 5.196 #found=$(($found + 1)) 5.197 id=${bug#bug/} 5.198 - echo "<p><strong>Bug $id</strong> <a href='?id=$id'>$(gettext "Show")</a></p>" 5.199 + echo "<p><strong>Bug $id</strong> <a href=\"?id=$id\">"$(gettext 'Show')"</a></p>" 5.200 echo '<pre>' 5.201 fgrep -i "$(GET search)" $bugdir/$id/* | \ 5.202 sed s"/$(GET search)/<span class='ok'>$(GET search)<\/span>/"g 5.203 echo '</pre>' 5.204 else 5.205 - gettext "<p>No result found for:"; echo " $(GET search)</p>" 5.206 + get_search=$(GET search) 5.207 + echo "<p>$(eval_gettext 'No result found for: $get_search')</p>" 5.208 fi 5.209 done 5.210 echo '</div>' 5.211 @@ -625,26 +630,28 @@ 5.212 <h2>$(gettext "Summary")</h2> 5.213 5.214 <p> 5.215 - Bugs: $bugs in total - $close fixed - $fixme to fix - $msgs messages 5.216 + $(eval_ngettext 'Bug: $bugs in total -' 'Bugs: $bugs in total -' $bugs) 5.217 + $(eval_ngettext '$close fixed -' '$close fixed -' $close) 5.218 + $(eval_ngettext '$fixme to fix -' '$fixme to fix -' $fixme) 5.219 + $(eval_ngettext '$msgs message' '$msgs messages' $msgs) 5.220 </p> 5.221 5.222 <div class="pctbar"> 5.223 <div class="pct" style="width: ${pct}%;">${pct}%</div> 5.224 </div> 5.225 5.226 -<p> 5.227 - Please read the <a href="?README">README</a> for help and more 5.228 - information. You may also be interested by the SliTaz 5.229 - <a href="http://roadmap.slitaz.org/">Roadmap</a> and the packages 5.230 - <a href="http://cook.slitaz.org/">Cooker</a>. To perform a search 5.231 - enter your term and press ENTER. 5.232 +<p>$(gettext "Please read the <a href=\"?README\">README</a> for help and more \ 5.233 +information. You may also be interested by the SliTaz \ 5.234 +<a href=\"http://roadmap.slitaz.org/\">Roadmap</a> and the packages \ 5.235 +<a href=\"http://cook.slitaz.org/\">Cooker</a>. To perform a search \ 5.236 +enter your term and press ENTER.") 5.237 </p> 5.238 5.239 <div id="tools"> 5.240 - <a href="?closed">View closed bugs</a> 5.241 + <a href="?closed">$(gettext 'View closed bugs')</a> 5.242 EOT 5.243 if check_auth; then 5.244 - echo "<a href='?newbug'>$(gettext "Create a new bug")</a>" 5.245 + echo "<a href='?newbug'>$(gettext 'Create a new bug')</a>" 5.246 fi 5.247 cat << EOT 5.248 </div>