Mercurial > kallithea
changeset 5483:da5de5692722 stable
i18n: refresh POT, regenerate POs
| author | Andrew Shadura <andrew@shadura.me> |
|---|---|
| date | Tue, 08 Sep 2015 10:37:51 +0200 |
| parents | cffe29ccb974 |
| children | ffb3eb3f49d8 98b7c332c9f2 |
| files | kallithea/i18n/be/LC_MESSAGES/kallithea.po kallithea/i18n/cs/LC_MESSAGES/kallithea.po kallithea/i18n/de/LC_MESSAGES/kallithea.po kallithea/i18n/fr/LC_MESSAGES/kallithea.po kallithea/i18n/hu/LC_MESSAGES/kallithea.po kallithea/i18n/ja/LC_MESSAGES/kallithea.po kallithea/i18n/kallithea.pot kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po kallithea/i18n/pl/LC_MESSAGES/kallithea.po kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po kallithea/i18n/ru/LC_MESSAGES/kallithea.po kallithea/i18n/sk/LC_MESSAGES/kallithea.po kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po |
| diffstat | 14 files changed, 5451 insertions(+), 5888 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/i18n/be/LC_MESSAGES/kallithea.po Tue Sep 08 10:21:46 2015 +0000 +++ b/kallithea/i18n/be/LC_MESSAGES/kallithea.po Tue Sep 08 10:37:51 2015 +0200 @@ -1,4 +1,4 @@ -# Translations template for Kallithea. +# Belarusian translations for Kallithea. # Copyright (C) 2015 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. # Automatically generated, 2015. @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2015-04-01 03:17+0200\n" +"POT-Creation-Date: 2015-09-08 10:34+0200\n" "PO-Revision-Date: 2015-08-08 12:03+0300\n" "Last-Translator: Andrew Shadura <andrew@shadura.me>\n" "Language-Team: Belarusian " @@ -21,7 +21,7 @@ "X-Generator: Weblate 2.4-dev\n" #: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:241 kallithea/lib/base.py:512 +#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 msgid "There are no changesets yet" msgstr "Яшчэ не было змен" @@ -37,7 +37,7 @@ msgid "None" msgstr "Нічога" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(зачынена)" @@ -55,8 +55,8 @@ msgid "Increase diff context to %(num)s lines" msgstr "Павялічыць кантэкст да %(num)s радкоў" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:743 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 msgid "Such revision does not exist for this repository" msgstr "Няма такой рэвізіі ў гэтым рэпазітары" @@ -66,11 +66,11 @@ "not allowed" msgstr "Нельга рэдагаваць статус змен, злучаных з зачыненымі pull-request'ами" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:42 +#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 msgid "Select changeset" msgstr "Выбраць набор змен" -#: kallithea/controllers/compare.py:258 +#: kallithea/controllers/compare.py:261 msgid "Cannot compare repositories without using common ancestor" msgstr "Немагчыма параўноўваць рэпазітары без агульнага продка" @@ -121,8 +121,8 @@ #: kallithea/templates/changeset/changeset.html:195 #: kallithea/templates/compare/compare_diff.html:78 #: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Changeset was too big and was cut off..." msgstr "Змены апынуліся занадта вялікімі і былі выразаныя..." @@ -131,113 +131,113 @@ msgid "%s committed on %s" msgstr "%s выканаў каміт у %s" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:91 msgid "Click here to add new file" msgstr "Націсніце каб дадаць новы файл" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:92 #, python-format msgid "There are no files yet. %s" msgstr "Няма файлаў. %s" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "%s (%s)" -#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 -#: kallithea/controllers/files.py:433 +#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 +#: kallithea/controllers/files.py:432 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Рэпазітар заблакаваў %s у %s" -#: kallithea/controllers/files.py:318 +#: kallithea/controllers/files.py:317 msgid "You can only delete files with revision being a valid branch " msgstr "Вы можаце выдаляць файлы толькі ў рэвізіі, злучанай з існай галінкай " -#: kallithea/controllers/files.py:329 +#: kallithea/controllers/files.py:328 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Файл %s выдалены з дапамогай Kallithea" -#: kallithea/controllers/files.py:351 +#: kallithea/controllers/files.py:350 #, python-format msgid "Successfully deleted file %s" msgstr "Файл %s выдалены" -#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 -#: kallithea/controllers/files.py:502 +#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 +#: kallithea/controllers/files.py:501 msgid "Error occurred during commit" msgstr "Падчас каміта адбылася памылка" -#: kallithea/controllers/files.py:378 +#: kallithea/controllers/files.py:377 msgid "You can only edit files with revision being a valid branch " msgstr "Вы можаце рэдагаваць файлы толькі ў рэвізіі, злучанай з існай галінкай " -#: kallithea/controllers/files.py:392 +#: kallithea/controllers/files.py:391 #, python-format msgid "Edited file %s via Kallithea" msgstr "Файл %s адрэдагаваны з дапамогай Kallithea" -#: kallithea/controllers/files.py:408 +#: kallithea/controllers/files.py:407 msgid "No changes" msgstr "Без змен" -#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 +#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 #, python-format msgid "Successfully committed to %s" msgstr "Змены ўжыты ў %s" -#: kallithea/controllers/files.py:444 +#: kallithea/controllers/files.py:443 msgid "Added file via Kallithea" msgstr "Файл дададзены з дапамогай Kallithea" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:464 msgid "No content" msgstr "Пуста" -#: kallithea/controllers/files.py:469 +#: kallithea/controllers/files.py:468 msgid "No filename" msgstr "Безназоўны" -#: kallithea/controllers/files.py:494 +#: kallithea/controllers/files.py:493 msgid "Location must be relative path and must not contain .. in path" msgstr "" "Размяшчэнне павінна быць адносным шляхам, і не можа ўтрымліваць \"..\" у " "шляхі" -#: kallithea/controllers/files.py:527 +#: kallithea/controllers/files.py:526 msgid "Downloads disabled" msgstr "Магчымасць спампоўваць адключана" -#: kallithea/controllers/files.py:538 +#: kallithea/controllers/files.py:537 #, python-format msgid "Unknown revision %s" msgstr "Невядомая рэвізія %s" -#: kallithea/controllers/files.py:540 +#: kallithea/controllers/files.py:539 msgid "Empty repository" msgstr "Пусты рэпазітар" -#: kallithea/controllers/files.py:542 +#: kallithea/controllers/files.py:541 msgid "Unknown archive type" msgstr "Невядомы тып архіва" -#: kallithea/controllers/files.py:772 +#: kallithea/controllers/files.py:771 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:15 #: kallithea/templates/pullrequests/pullrequest.html:97 msgid "Changesets" msgstr "Набор змен" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:821 kallithea/templates/switch_to_list.html:3 +#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 +#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "Галінкі" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:832 kallithea/templates/switch_to_list.html:25 +#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 +#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "Тэгі" @@ -258,9 +258,9 @@ #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:131 -#: kallithea/templates/base/base.html:397 -#: kallithea/templates/base/base.html:569 +#: kallithea/templates/base/base.html:124 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "Рэпазітары" @@ -286,29 +286,36 @@ msgstr "Публічны часопіс" #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:229 +#: kallithea/templates/base/base.html:222 #: kallithea/templates/journal/journal.html:4 #: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "Часопіс" -#: kallithea/controllers/login.py:150 kallithea/controllers/login.py:196 +#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 msgid "Bad captcha" msgstr "Няслушная капча" -#: kallithea/controllers/login.py:156 +#: kallithea/controllers/login.py:157 msgid "You have successfully registered into Kallithea" msgstr "Рэгістрацыя ў Kallithea прайшла паспяхова" -#: kallithea/controllers/login.py:201 -msgid "Your password reset link was sent" +#: kallithea/controllers/login.py:202 +#, fuzzy +#| msgid "Your password reset link was sent" +msgid "A password reset confirmation code has been sent" msgstr "Спасылка для скідання пароля адпраўлена" -#: kallithea/controllers/login.py:222 -msgid "" -"Your password reset was successful, new password has been sent to your " -"email" -msgstr "Пароль скінуты паспяхова, новы пароль быў адпраўлены на ваш email" +#: kallithea/controllers/login.py:251 +#, fuzzy +#| msgid "Password reset link" +msgid "Invalid password reset token" +msgstr "Спасылка скіду пароля" + +#: kallithea/controllers/login.py:256 +#: kallithea/controllers/admin/my_account.py:167 +msgid "Successfully updated password" +msgstr "Пароль абноўлены" #: kallithea/controllers/pullrequests.py:124 #, python-format @@ -329,112 +336,112 @@ msgid "Peer branches" msgstr "Галінкі ўдзельніка" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:827 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Закладкі" -#: kallithea/controllers/pullrequests.py:306 +#: kallithea/controllers/pullrequests.py:310 #, python-format msgid "Error creating pull request: %s" msgstr "Памылка пры стварэнні pull-запыту: %s" -#: kallithea/controllers/pullrequests.py:352 -#: kallithea/controllers/pullrequests.py:499 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:503 msgid "No description" msgstr "Няма апісання" -#: kallithea/controllers/pullrequests.py:359 +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "Pull-запыт створаны паспяхова" -#: kallithea/controllers/pullrequests.py:362 -#: kallithea/controllers/pullrequests.py:449 -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:453 +#: kallithea/controllers/pullrequests.py:509 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:365 -#: kallithea/controllers/pullrequests.py:452 +#: kallithea/controllers/pullrequests.py:369 +#: kallithea/controllers/pullrequests.py:456 msgid "Error occurred while creating pull request" msgstr "Адбылася памылка пры стварэнні pull-запыту" -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:401 msgid "Missing changesets since the previous pull request:" msgstr "Адсутныя рэвізіі адносна папярэдняга pull-запыту:" -#: kallithea/controllers/pullrequests.py:404 +#: kallithea/controllers/pullrequests.py:408 #, python-format msgid "New changesets on %s %s since the previous pull request:" msgstr "Новыя рэвізіі на %s %s адносна папярэдняга pull-запыту:" -#: kallithea/controllers/pullrequests.py:411 +#: kallithea/controllers/pullrequests.py:415 msgid "Ancestor didn't change - show diff since previous version:" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:422 #, python-format msgid "" "This pull request is based on another %s revision and there is no simple " "diff." msgstr "Гэты pull-запыт заснаваны на іншай рэвізіі %s, просты diff немагчымы." -#: kallithea/controllers/pullrequests.py:420 +#: kallithea/controllers/pullrequests.py:424 #, python-format msgid "No changes found on %s %s since previous version." msgstr "Няма змен на %s %s адносна папярэдняй версіі." -#: kallithea/controllers/pullrequests.py:458 +#: kallithea/controllers/pullrequests.py:462 #, python-format msgid "Closed, replaced by %s ." msgstr "Зачынены, замешчаны %s." -#: kallithea/controllers/pullrequests.py:466 +#: kallithea/controllers/pullrequests.py:470 msgid "Pull request update created" msgstr "Абнаўленне для pull-запыту створана" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:513 msgid "Pull request updated" msgstr "Pull-запыт абноўлены" -#: kallithea/controllers/pullrequests.py:523 +#: kallithea/controllers/pullrequests.py:528 msgid "Successfully deleted pull request" msgstr "Pull-запыт паспяхова выдалены" -#: kallithea/controllers/pullrequests.py:582 +#: kallithea/controllers/pullrequests.py:594 #, python-format msgid "This pull request has already been merged to %s." msgstr "Гэты pull-запыт ужо прыняты на галінку %s." -#: kallithea/controllers/pullrequests.py:584 +#: kallithea/controllers/pullrequests.py:596 msgid "This pull request has been closed and can not be updated." msgstr "Гэты pull-запыт быў зачынены і не можа быць абноўлены." -#: kallithea/controllers/pullrequests.py:602 +#: kallithea/controllers/pullrequests.py:614 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "Гэты pull-запыт можа быць абноўлены з %s:" -#: kallithea/controllers/pullrequests.py:605 +#: kallithea/controllers/pullrequests.py:617 msgid "No changesets found for updating this pull request." msgstr "Няма змен для абнаўлення гэтага pull-запыту." -#: kallithea/controllers/pullrequests.py:613 +#: kallithea/controllers/pullrequests.py:625 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Увага: Галінка %s мае яшчэ адну верхавіну: %s." -#: kallithea/controllers/pullrequests.py:619 +#: kallithea/controllers/pullrequests.py:631 msgid "Git pull requests don't support updates yet." msgstr "Абнаўленне pull-запытаў git не падтрымліваецца." -#: kallithea/controllers/pullrequests.py:710 +#: kallithea/controllers/pullrequests.py:722 msgid "No permission to change pull request status" msgstr "Няма правоў змяняць статус pull-запыту" -#: kallithea/controllers/pullrequests.py:715 +#: kallithea/controllers/pullrequests.py:727 msgid "Closing." msgstr "Зачынены." @@ -478,37 +485,37 @@ #: kallithea/controllers/admin/gists.py:59 #: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:283 +#: kallithea/controllers/admin/users.py:285 msgid "Forever" msgstr "Назаўжды" #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/users.py:286 msgid "5 minutes" msgstr "5 хвілін" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/users.py:287 msgid "1 hour" msgstr "1 гадзіна" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/users.py:288 msgid "1 day" msgstr "1 дзень" #: kallithea/controllers/admin/gists.py:63 #: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/users.py:289 msgid "1 month" msgstr "1 месяц" #: kallithea/controllers/admin/gists.py:67 #: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/users.py:291 msgid "Lifetime" msgstr "Тэрмін" @@ -538,8 +545,8 @@ msgid "Error occurred during update of gist %s" msgstr "Адбылася памылка пры абнаўленні gist-запісы %s" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:208 -#: kallithea/model/user.py:230 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 +#: kallithea/model/user.py:237 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Вы не можаце змяніць дадзеныя гэтага карыстача, паколькі ён важны для " @@ -550,47 +557,43 @@ msgstr "Ваш уліковы запіс паспяхова абноўлены" #: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:204 +#: kallithea/controllers/admin/users.py:202 #, python-format msgid "Error occurred during update of user %s" msgstr "Адбылася памылка пры абнаўленні карыстача %s" -#: kallithea/controllers/admin/my_account.py:167 -msgid "Successfully updated password" -msgstr "Пароль абноўлены" - #: kallithea/controllers/admin/my_account.py:178 msgid "Error occurred during update of user password" msgstr "Памылка пры абнаўленні пароля" #: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:413 +#: kallithea/controllers/admin/users.py:415 #, python-format msgid "Added email %s to user" msgstr "Карыстачу дададзены e-mail %s" #: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:419 +#: kallithea/controllers/admin/users.py:421 msgid "An error occurred during email saving" msgstr "Адбылася памылка пры захаванні e-mail" #: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:431 +#: kallithea/controllers/admin/users.py:433 msgid "Removed email from user" msgstr "E-mail карыстача выдалены" #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:306 +#: kallithea/controllers/admin/users.py:308 msgid "API key successfully created" msgstr "API-ключ паспяхова створаны" #: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:319 +#: kallithea/controllers/admin/users.py:321 msgid "API key successfully reset" msgstr "API-ключ паспяхова скінуты" #: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:323 +#: kallithea/controllers/admin/users.py:325 msgid "API key successfully deleted" msgstr "API-ключ паспяхова выдалены" @@ -640,10 +643,10 @@ #: kallithea/templates/admin/users/user_edit_profile.html:105 #: kallithea/templates/admin/users/users.html:10 #: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:252 +#: kallithea/templates/base/base.html:253 #: kallithea/templates/base/base.html:259 #: kallithea/templates/base/base.html:260 -#: kallithea/templates/base/base.html:266 -#: kallithea/templates/base/base.html:267 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Адміністратар" @@ -861,7 +864,7 @@ msgstr "Рэпазітар заблакаваны" #: kallithea/controllers/admin/repos.py:540 -#: kallithea/controllers/admin/repos.py: +#: kallithea/controllers/admin/repos.py:561 msgid "Repository has been unlocked" msgstr "Рэпазітар адблакаваны" @@ -903,48 +906,48 @@ "адсутнічае" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:274 +#: kallithea/controllers/admin/settings.py:277 msgid "Error occurred while updating application settings" msgstr "Адбылася памылка пры абнаўленні налад прыкладання" -#: kallithea/controllers/admin/settings.py:213 +#: kallithea/controllers/admin/settings.py:216 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "Рэпазітары паспяхова перасканіраваны, дададзена: %s, выдалена: %s." -#: kallithea/controllers/admin/settings.py:270 +#: kallithea/controllers/admin/settings.py:273 msgid "Updated application settings" msgstr "Абноўленыя параметры налады прыкладання" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "Налады візуалізацыі абноўленыя" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:335 msgid "Error occurred during updating visualisation settings" msgstr "Адбылася памылка пры абнаўленні налад візуалізацыі" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:361 msgid "Please enter email address" msgstr "Калі ласка, увядзіце email-адрас" -#: kallithea/controllers/admin/settings.py:373 +#: kallithea/controllers/admin/settings.py:376 msgid "Send email task created" msgstr "Задача адпраўкі e-mail створаная" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Added new hook" msgstr "Дададзены новы хук" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:421 msgid "Updated hooks" msgstr "Абноўленыя хукі" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:425 msgid "Error occurred during hook creation" msgstr "адбылася памылка пры стварэнні хука" -#: kallithea/controllers/admin/settings.py:448 +#: kallithea/controllers/admin/settings.py:451 msgid "Whoosh reindex task scheduled" msgstr "Запланавана пераіндэксаванне базы Whoosh" @@ -985,68 +988,68 @@ msgstr "Прывілеі групы карыстачоў абноўлены" #: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:382 +#: kallithea/controllers/admin/users.py:384 msgid "Updated permissions" msgstr "Абноўлены прывілеі" #: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:386 +#: kallithea/controllers/admin/users.py:388 msgid "An error occurred during permissions saving" msgstr "Адбылася памылка пры захаванні прывілеяў" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:134 #, python-format msgid "Created user %s" msgstr "Карыстач %s створаны" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "Адбылася памылка пры стварэнні карыстача %s" -#: kallithea/controllers/admin/users.py:184 +#: kallithea/controllers/admin/users.py:182 msgid "User updated successfully" msgstr "Карыстач паспяхова абноўлены" -#: kallithea/controllers/admin/users.py:220 +#: kallithea/controllers/admin/users.py:218 msgid "Successfully deleted user" msgstr "Карыстач паспяхова выдалены" -#: kallithea/controllers/admin/users.py:225 +#: kallithea/controllers/admin/users.py:223 msgid "An error occurred during deletion of user" msgstr "Адбылася памылка пры выдаленні карыстача" -#: kallithea/controllers/admin/users.py:238 +#: kallithea/controllers/admin/users.py:236 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:461 +#: kallithea/controllers/admin/users.py:463 #, python-format msgid "Added IP address %s to user whitelist" msgstr "Дададзены IP %s у белы спіс карыстача" -#: kallithea/controllers/admin/users.py:467 +#: kallithea/controllers/admin/users.py:469 msgid "An error occurred while adding IP address" msgstr "Адбылася памылка пры захаванні IP" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 msgid "Removed IP address from user whitelist" msgstr "Выдалены IP %s з белага спісу карыстача" -#: kallithea/lib/auth.py:744 +#: kallithea/lib/auth.py:743 #, python-format msgid "IP %s not allowed" msgstr "IP %s заблакаваны" -#: kallithea/lib/auth.py:757 +#: kallithea/lib/auth.py:756 msgid "Invalid API key" msgstr "Няслушны API-ключ" -#: kallithea/lib/auth.py:795 +#: kallithea/lib/auth.py:812 msgid "You need to be a registered user to perform this action" msgstr "Вы павінны быць зарэгістраваным карыстачом, каб выканаць гэта дзеянне" -#: kallithea/lib/auth.py:827 +#: kallithea/lib/auth.py:844 msgid "You need to be signed in to view this page" msgstr "Старонка даступная толькі аўтарызаваным карыстачам" @@ -1089,7 +1092,6 @@ #: kallithea/lib/helpers.py:677 #, fuzzy -#| msgid "compare view" msgid "Compare view" msgstr "параўнанне" @@ -1203,7 +1205,7 @@ #: kallithea/lib/helpers.py:1128 #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "Няма файлаў" @@ -1756,13 +1758,11 @@ #: kallithea/model/db.py:1668 #, fuzzy -#| msgid "Unauthorized access to resource" msgid "Default user has read access to new repositories" msgstr "Несанкцыянаваны доступ да рэсурсу" #: kallithea/model/db.py:1669 #, fuzzy -#| msgid "Unauthorized access to resource" msgid "Default user has write access to new repositories" msgstr "Несанкцыянаваны доступ да рэсурсу" @@ -1803,74 +1803,62 @@ msgstr "" #: kallithea/model/db.py:1682 -#, fuzzy, python-format -#| msgid "Created repository group %s" +#, fuzzy msgid "Only admins can create repository groups" msgstr "Створана новая група рэпазітароў %s" #: kallithea/model/db.py:1683 -#, fuzzy, python-format -#| msgid "Created repository group %s" +#, fuzzy msgid "Non-admins can create repository groups" msgstr "Створана новая група рэпазітароў %s" #: kallithea/model/db.py:1685 #, fuzzy -#| msgid "Create user groups" msgid "Only admins can create user groups" msgstr "Ствараць групы карыстачоў" #: kallithea/model/db.py:1686 #, fuzzy -#| msgid "Create user groups" msgid "Non-admins can create user groups" msgstr "Ствараць групы карыстачоў" #: kallithea/model/db.py:1688 #, fuzzy -#| msgid "Top level repositories" msgid "Only admins can create top level repositories" msgstr "Рэпазітары верхняга ўзроўню" #: kallithea/model/db.py:1689 #, fuzzy -#| msgid "Top level repositories" msgid "Non-admins can create top level repositories" msgstr "Рэпазітары верхняга ўзроўню" #: kallithea/model/db.py:1694 #, fuzzy -#| msgid "Location of repositories" msgid "Only admins can fork repositories" msgstr "Месцазнаходжанне рэпазітароў" #: kallithea/model/db.py:1695 #, fuzzy -#| msgid "Invalidate cache for all repositories" msgid "Non-admins can can fork repositories" msgstr "Скінуць кэш для ўсіх рэпазітароў" #: kallithea/model/db.py:1698 #, fuzzy -#| msgid "User Registration with manual account activation" msgid "User registration with manual account activation" msgstr "Рэгістрацыя карыстача з ручной актывацыяй уліковага запісу" #: kallithea/model/db.py:1699 #, fuzzy -#| msgid "User Registration with automatic account activation" msgid "User registration with automatic account activation" msgstr "Рэгістрацыя карыстача з аўтаматычнай актывацыяй" #: kallithea/model/db.py:2228 #, fuzzy -#| msgid "Not Reviewed" msgid "Not reviewed" msgstr "Не прагледжана" #: kallithea/model/db.py:2231 #, fuzzy -#| msgid "Under Review" msgid "Under review" msgstr "На разглядзе" @@ -1958,9 +1946,7 @@ #: kallithea/model/notification.py:302 #, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s changeset %(short_id)s " -"on %(branch)s" +msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" #: kallithea/model/notification.py:305 @@ -1969,18 +1955,17 @@ msgstr "Новы карыстач \"%(new_username)s\" зарэгістраваны" #: kallithea/model/notification.py:307 -#, python-format -msgid "" -"[Added by %(pr_username)s] %(repo_name)s pull request %(pr_nice_id)s from" -" %(ref)s" -msgstr "" +#, fuzzy, python-format +#| msgid "%(user)s wants you to review pull request %(pr_nice_id)s: +#| %(pr_title)s" +msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgstr "%(user)s просіць вас разгледзець pull request %(pr_nice_id)s: %(pr_title)s" #: kallithea/model/notification.py:308 -#, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s pull request " -"%(pr_nice_id)s from %(ref)s" -msgstr "" +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgstr "[пракаменціравана] у запыце на занясенне змен для" #: kallithea/model/notification.py:321 msgid "Closing" @@ -1991,59 +1976,65 @@ msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "%(user)s просіць вас разгледзець pull request %(pr_nice_id)s: %(pr_title)s" -#: kallithea/model/scm.py:813 +#: kallithea/model/scm.py:812 msgid "latest tip" msgstr "апошняя версія" -#: kallithea/model/user.py:185 +#: kallithea/model/user.py:192 msgid "New user registration" msgstr "Рэгістрацыя новага карыстача" -#: kallithea/model/user.py:249 +#: kallithea/model/user.py:256 msgid "You can't remove this user since it is crucial for the entire application" msgstr "" "Вы не можаце выдаліць карыстача, паколькі гэта крытычна для працы ўсяго " "прыкладання" -#: kallithea/model/user.py:254 +#: kallithea/model/user.py:261 #, python-format msgid "" -"User \"%s\" still owns %s repositories and cannot be removed. Switch owners " -"or remove those repositories: %s" -msgstr "" -"Карыстач \"%s\" усё яшчэ з'яўляецца ўладальнікам %s рэпазітароў і таму не " -"можа быць выдалены. Зменіце ўладальніка ці выдаліце гэтыя рэпазітары: %s" - -#: kallithea/model/user.py:259 -#, python-format -msgid "" -"User \"%s\" still owns %s repository groups and cannot be removed. Switch " -"owners or remove those repository groups: %s" -msgstr "" -"Карыстач \"%s\" усё яшчэ з'яўляецца ўладальнікам %s груп рэпазітароў і таму " -"не можа быць выдалены. Зменіце ўладальніка ці выдаліце дадзеныя групы: %s" +"User \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories: %s" +msgstr "" +"Карыстач \"%s\" усё яшчэ з'яўляецца ўладальнікам %s рэпазітароў і таму не" +" можа быць выдалены. Зменіце ўладальніка ці выдаліце гэтыя рэпазітары: %s" #: kallithea/model/user.py:266 #, python-format msgid "" -"User \"%s\" still owns %s user groups and cannot be removed. Switch owners " -"or remove those user groups: %s" -msgstr "" -"Карыстач \"%s\" усё яшчэ з'яўляецца ўладальнікам %s груп карыстачоў і таму " -"не можа быць выдалены. Зменіце ўладальніка ці выдаліце дадзеныя групы: %s" - -#: kallithea/model/user.py:296 +"User \"%s\" still owns %s repository groups and cannot be removed. Switch" +" owners or remove those repository groups: %s" +msgstr "" +"Карыстач \"%s\" усё яшчэ з'яўляецца ўладальнікам %s груп рэпазітароў і " +"таму не можа быць выдалены. Зменіце ўладальніка ці выдаліце дадзеныя " +"групы: %s" + +#: kallithea/model/user.py:273 +#, python-format +msgid "" +"User \"%s\" still owns %s user groups and cannot be removed. Switch " +"owners or remove those user groups: %s" +msgstr "" +"Карыстач \"%s\" усё яшчэ з'яўляецца ўладальнікам %s груп карыстачоў і " +"таму не можа быць выдалены. Зменіце ўладальніка ці выдаліце дадзеныя " +"групы: %s" + +#: kallithea/model/user.py:360 msgid "Password reset link" msgstr "Спасылка скіду пароля" -#: kallithea/model/user.py:319 -msgid "Your new password" -msgstr "Ваш новы пароль" - -#: kallithea/model/user.py:320 -#, python-format -msgid "Your new Kallithea password:%s" -msgstr "Ваш новы пароль ад Kallithea: %s" +#: kallithea/model/user.py:408 +#, fuzzy +#| msgid "Password reset link" +msgid "Password reset notification" +msgstr "Спасылка скіду пароля" + +#: kallithea/model/user.py:409 +#, python-format +msgid "" +"The password to your account %s has been changed using password reset " +"form." +msgstr "" #: kallithea/model/validators.py:77 kallithea/model/validators.py:78 msgid "Value cannot be an empty list" @@ -2092,8 +2083,8 @@ "periods or dashes and must begin with alphanumeric character" msgstr "" "імя групы карыстачоў можа ўтрымоўваць толькі літары, лічбы, знакі " -"падкрэслення, кропкі і працяжнік; а гэтак жа павінна пачынацца з літары ці " -"лічбы" +"падкрэслення, кропкі і працяжнік; а гэтак жа павінна пачынацца з літары " +"ці лічбы" #: kallithea/model/validators.py:193 msgid "Cannot assign this group as parent" @@ -2159,7 +2150,8 @@ "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -"Няслушны URL рэпазітара. Ён мусіць быць карэктным URL http, https, ssh, svn+http ці svn+https" +"Няслушны URL рэпазітара. Ён мусіць быць карэктным URL http, https, ssh, " +"svn+http ці svn+https" #: kallithea/model/validators.py:489 msgid "Fork has to be the same type as parent" @@ -2191,7 +2183,6 @@ #: kallithea/model/validators.py:725 #, fuzzy, python-format -#| msgid "email \"%(email)s\" does not exist." msgid "Email address \"%(email)s\" not found" msgstr "\"%(email)s\" не існуе." @@ -2211,13 +2202,14 @@ #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -"Значэнне маскі падсеткі павінна быць у межах ад 0 да 32 (%(bits)r - няслушна)" +"Значэнне маскі падсеткі павінна быць у межах ад 0 да 32 (%(bits)r - " +"няслушна)" #: kallithea/model/validators.py:808 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -"Ключавое імя можа толькі складацца з літар, знака падкрэслення, працяжнік ці " -"лікаў" +"Ключавое імя можа толькі складацца з літар, знака падкрэслення, працяжнік" +" ці лікаў" #: kallithea/model/validators.py:822 msgid "Filename cannot be inside a directory" @@ -2348,7 +2340,9 @@ #: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:229 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/pullrequests/pullrequest_show.html:156 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 #: kallithea/templates/summary/summary.html:134 msgid "Owner" msgstr "Уладальнік" @@ -2356,7 +2350,7 @@ #: kallithea/templates/index_base.html:140 #: kallithea/templates/admin/my_account/my_account_repos.html:57 #: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:44 +#: kallithea/templates/base/root.html:43 #: kallithea/templates/bookmarks/bookmarks.html:79 #: kallithea/templates/branches/branches.html:79 #: kallithea/templates/journal/journal.html:198 @@ -2368,7 +2362,7 @@ #: kallithea/templates/index_base.html:141 #: kallithea/templates/admin/my_account/my_account_repos.html:58 #: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:45 +#: kallithea/templates/base/root.html:44 #: kallithea/templates/bookmarks/bookmarks.html:80 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:199 @@ -2384,7 +2378,7 @@ #: kallithea/templates/index_base.html:143 #: kallithea/templates/admin/my_account/my_account_repos.html:60 #: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:46 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:201 @@ -2396,7 +2390,7 @@ #: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:147 kallithea/templates/base/root.html:48 +#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:202 @@ -2406,7 +2400,7 @@ msgstr "Загрузка..." #: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:333 +#: kallithea/templates/base/base.html:326 msgid "Log In" msgstr "Увайсці" @@ -2421,14 +2415,15 @@ #: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:24 #: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/pullrequests/pullrequest_show.html:166 msgid "Username" msgstr "Імя карыстача" #: kallithea/templates/login.html:33 kallithea/templates/register.html:33 #: kallithea/templates/admin/my_account/my_account.html:37 #: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:311 msgid "Password" msgstr "Пароль" @@ -2440,7 +2435,7 @@ msgid "Forgot your password ?" msgstr "Забыліся пароль?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:329 +#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 msgid "Don't have an account ?" msgstr "Няма акаўнта?" @@ -2453,11 +2448,14 @@ msgstr "Скід пароля" #: kallithea/templates/password_reset.html:12 +#: kallithea/templates/password_reset_confirmation.html:12 #, python-format msgid "Reset Your Password to %s" msgstr "Забыліся пароль для %s?" #: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset_confirmation.html:5 +#: kallithea/templates/password_reset_confirmation.html:14 msgid "Reset Your Password" msgstr "Скінуць Ваш пароль" @@ -2475,10 +2473,45 @@ msgstr "Паслаць спасылку скіду пароля" #: kallithea/templates/password_reset.html:47 +#, fuzzy +#| msgid "" "Password reset link will be sent to the email address matching +#| your " "username." msgid "" -"Password reset link will be sent to the email address matching your username." +"A password reset link will be sent to the specified email address if it " +"is registered in the system." msgstr "Спасылка для скіду пароля была адпраўлена на адпаведны e-mail." +#: kallithea/templates/password_reset_confirmation.html:19 +#, python-format +msgid "You are about to set a new password for the email address %s." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:20 +msgid "" +"Note that you must use the same browser session for this as the one used " +"to request the password reset." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:30 +msgid "Code you received in the email" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:39 +#, fuzzy +#| msgid "New password" +msgid "New Password" +msgstr "Новы пароль" + +#: kallithea/templates/password_reset_confirmation.html:48 +#, fuzzy +#| msgid "Confirm new password" +msgid "Confirm New Password" +msgstr "Пацвердзіце новы пароль" + +#: kallithea/templates/password_reset_confirmation.html:56 +msgid "Confirm" +msgstr "" + #: kallithea/templates/register.html:5 kallithea/templates/register.html:14 #: kallithea/templates/register.html:90 msgid "Sign Up" @@ -2523,8 +2556,7 @@ #: kallithea/templates/register.html:94 msgid "Please wait for an administrator to activate your account." -msgstr "" -"Калі ласка, пачакайце, пакуль адміністратар пацвердзіць Вашу рэгістрацыю." +msgstr "Калі ласка, пачакайце, пакуль адміністратар пацвердзіць Вашу рэгістрацыю." #: kallithea/templates/switch_to_list.html:10 #: kallithea/templates/branches/branches_data.html:69 @@ -2624,8 +2656,6 @@ #: kallithea/templates/admin/auth/auth_settings.html:33 #, fuzzy -#| msgid "" "Comma separated list of plugins. Order of plugins is also order in -#| which " "Kallithea will try to authenticate user" msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" @@ -2765,7 +2795,6 @@ #: kallithea/templates/admin/users/user_edit_api_keys.html:8 #: kallithea/templates/admin/users/user_edit_api_keys.html:27 #, fuzzy -#| msgid "never" msgid "Never" msgstr "ніколі" @@ -2797,7 +2826,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:244 +#: kallithea/templates/base/base.html:237 msgid "Create New Gist" msgstr "Стварыць новую gist-запіс" @@ -2939,7 +2968,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/base/base.html:343 msgid "My Account" msgstr "Мой Акаўнт" @@ -2950,7 +2979,6 @@ #: kallithea/templates/admin/my_account/my_account.html:36 #, fuzzy -#| msgid "New email address" msgid "Email Addresses" msgstr "Новы E-mail" @@ -2961,14 +2989,12 @@ #: kallithea/templates/admin/my_account/my_account.html:39 #, fuzzy -#| msgid "repositories" msgid "Owned Repositories" msgstr "рэпазітары" #: kallithea/templates/admin/my_account/my_account.html:40 #: kallithea/templates/journal/journal.html:53 #, fuzzy -#| msgid "Create repositories" msgid "Watched Repositories" msgstr "Стварыць рэпазітары" @@ -2977,7 +3003,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 #, fuzzy -#| msgid "Copy permissions" msgid "Show Permissions" msgstr "Скапіяваць прывілеі" @@ -2989,42 +3014,36 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #, fuzzy, python-format -#| msgid "Confirm to reset this api key: %s" msgid "Confirm to reset this API key: %s" msgstr "Пацвердзіце скід гэтага API-ключа: %s" #: kallithea/templates/admin/my_account/my_account_api_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:30 #, fuzzy -#| msgid "expires" msgid "Expired" msgstr "мінае" #: kallithea/templates/admin/my_account/my_account_api_keys.html:40 #: kallithea/templates/admin/users/user_edit_api_keys.html:40 #, fuzzy, python-format -#| msgid "Confirm to remove this api key: %s" msgid "Confirm to remove this API key: %s" msgstr "Пацвердзіце выдаленне гэтага API-ключа: %s" #: kallithea/templates/admin/my_account/my_account_api_keys.html:42 #: kallithea/templates/admin/users/user_edit_api_keys.html:42 #, fuzzy -#| msgid "remove" msgid "Remove" msgstr "выдаліць" #: kallithea/templates/admin/my_account/my_account_api_keys.html:49 #: kallithea/templates/admin/users/user_edit_api_keys.html:49 #, fuzzy -#| msgid "No additional emails specified." msgid "No additional API keys specified" msgstr "Дадатковыя адрасы e-mail не пазначаны." #: kallithea/templates/admin/my_account/my_account_api_keys.html:61 #: kallithea/templates/admin/users/user_edit_api_keys.html:61 #, fuzzy -#| msgid "New field key" msgid "New API key" msgstr "Ключ" @@ -3103,7 +3122,6 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:16 #: kallithea/templates/admin/users/user_edit_profile.html:15 #, fuzzy -#| msgid "current IP" msgid "Current IP" msgstr "бягучы IP-адрас" @@ -3113,7 +3131,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:45 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:200 @@ -3140,7 +3158,7 @@ msgstr "Каментары" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 msgid "Pull Requests" msgstr "Pull-запыты" @@ -3158,7 +3176,7 @@ msgstr "Паказаць апавяшчэнне" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:342 msgid "Notifications" msgstr "Апавяшчэнні" @@ -3200,7 +3218,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:26 #, fuzzy -#| msgid "Import existing repository ?" msgid "Apply to all existing repositories" msgstr "Імпартаваць існы рэпазітар?" @@ -3228,7 +3245,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:40 #, fuzzy -#| msgid "Import existing repository ?" msgid "Apply to all existing repository groups" msgstr "Імпартаваць існы рэпазітар?" @@ -3243,9 +3259,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:53 #, fuzzy -#| msgid "" "All default permissions on each user group will be reset to chosen -#| " "permission, note that all custom default permission on repository groups -#| " "will be lost" msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " @@ -3265,7 +3278,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:60 #, fuzzy -#| msgid "Repository creation" msgid "Top level repository creation" msgstr "Стварэнне рэпазітара" @@ -3317,7 +3329,6 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:13 #: kallithea/templates/admin/users/user_edit_ips.html:23 #, fuzzy, python-format -#| msgid "Confirm to delete this ip: %s" msgid "Confirm to delete this IP address: %s" msgstr "Пацвердзіце выдаленне IP %s" @@ -3375,7 +3386,7 @@ #: kallithea/templates/admin/repos/repo_edit.html:40 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:158 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 #: kallithea/templates/data_table/_dt_elements.html:45 #: kallithea/templates/data_table/_dt_elements.html:49 msgid "Settings" @@ -3414,7 +3425,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:146 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 msgid "Created on" msgstr "Створана" @@ -3435,7 +3446,6 @@ #: kallithea/templates/admin/repos/repo_edit_permissions.html:12 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 #, fuzzy -#| msgid "user groups" msgid "User/User Group" msgstr "групы карыстальнікаў" @@ -3446,7 +3456,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 #, fuzzy -#| msgid "default" msgid "Default" msgstr "па змаўчанні" @@ -3457,7 +3466,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 #, fuzzy -#| msgid "revoke" msgid "Revoke" msgstr "адклікаць" @@ -3469,7 +3477,6 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 #, fuzzy -#| msgid "apply to children" msgid "Apply to children" msgstr "дастасаваць да даччыным" @@ -3522,7 +3529,6 @@ #: kallithea/templates/admin/repos/repo_add_base.html:17 #, fuzzy -#| msgid "[created] repository" msgid "Clone remote repository" msgstr "[створаны] рэпазітар" @@ -3779,25 +3785,21 @@ #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 #, fuzzy -#| msgid "private repository" msgid "Private Repository" msgstr "прыватны рэпазітар" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 -#, fuzzy, python-format -#| msgid "Created repository %s" +#, fuzzy msgid "Remote repository URL" msgstr "Рэпазітар %s створаны" #: kallithea/templates/admin/repos/repo_edit_remote.html:9 #, fuzzy -#| msgid "[pulled from remote] into repository" msgid "Pull Changes from Remote Repository" msgstr "[занесены змены з выдаленага рэпазітара] у рэпазітар" #: kallithea/templates/admin/repos/repo_edit_remote.html:11 #, fuzzy -#| msgid "Confirm to pull changes from remote side." msgid "Confirm to pull changes from remote repository." msgstr "Пацвердзіце спампоўку змен." @@ -3807,7 +3809,6 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:11 #, fuzzy -#| msgid "private repository" msgid "Permanent Repository ID" msgstr "прыватны рэпазітар" @@ -3831,13 +3832,11 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:21 #, fuzzy -#| msgid "[created] repository" msgid "Remote repository" msgstr "[створаны] рэпазітар" #: kallithea/templates/admin/repos/repo_edit_settings.html:25 #, fuzzy -#| msgid "Repository" msgid "Repository URL" msgstr "Рэпазітар" @@ -3978,7 +3977,7 @@ msgid "Custom Hooks" msgstr "Карыстацкія хуки" -#: kallithea/templates/admin/settings/settings_hooks.html:68 +#: kallithea/templates/admin/settings/settings_hooks.html:67 msgid "Failed to remove hook" msgstr "Не атрымалася выдаліць хук" @@ -3988,7 +3987,6 @@ #: kallithea/templates/admin/settings/settings_mapping.html:11 #, fuzzy -#| msgid "Search in repositories" msgid "Delete records of missing repositories" msgstr "Пошук па рэпазітарах" @@ -4016,7 +4014,18 @@ "Current hooks will be updated to the latest version." msgstr "" +#: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "Overwrite existing Git hooks" +msgstr "" + #: kallithea/templates/admin/settings/settings_mapping.html:30 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any" +" custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:35 msgid "Rescan Repositories" msgstr "" @@ -4044,7 +4053,6 @@ #: kallithea/templates/admin/settings/settings_system.html:4 #, fuzzy -#| msgid "check for updates" msgid "Check for updates" msgstr "праверыць наяўнасць абнаўленняў" @@ -4249,7 +4257,6 @@ #: kallithea/templates/admin/settings/settings_visual.html:92 #, fuzzy -#| msgid "Meta-Tagging" msgid "Meta Tagging" msgstr "Метатэгіраванне" @@ -4291,7 +4298,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit.html:33 #, fuzzy -#| msgid "members" msgid "Show Members" msgstr "удзельнікі" @@ -4436,47 +4442,47 @@ msgid "Git repository" msgstr "Git рэпазітар" -#: kallithea/templates/base/base.html:126 +#: kallithea/templates/base/base.html:119 msgid "Create Fork" msgstr "Стварыць форк" -#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:130 #: kallithea/templates/data_table/_dt_elements.html:13 #: kallithea/templates/data_table/_dt_elements.html:17 #: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "Агульныя звесткі" -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:141 +#: kallithea/templates/base/base.html:132 +#: kallithea/templates/base/base.html:134 #: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:21 #: kallithea/templates/data_table/_dt_elements.html:25 msgid "Changelog" msgstr "Гісторыя змен" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:136 #: kallithea/templates/data_table/_dt_elements.html:29 #: kallithea/templates/data_table/_dt_elements.html:33 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "Файлы" -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:138 msgid "Switch To" msgstr "Пераключыцца на" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/base/base.html:154 +#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:147 msgid "Options" msgstr "Опцыі" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:155 #: kallithea/templates/forks/forks_data.html:21 msgid "Compare Fork" msgstr "Параўнаць форк" -#: kallithea/templates/base/base.html:164 +#: kallithea/templates/base/base.html:157 #: kallithea/templates/bookmarks/bookmarks.html:56 #: kallithea/templates/bookmarks/bookmarks_data.html:13 #: kallithea/templates/branches/branches.html:56 @@ -4486,117 +4492,116 @@ msgid "Compare" msgstr "Параўнаць" -#: kallithea/templates/base/base.html:166 -#: kallithea/templates/base/base.html:254 +#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:247 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:54 msgid "Search" msgstr "Пошук" -#: kallithea/templates/base/base.html:170 +#: kallithea/templates/base/base.html:163 msgid "Unlock" msgstr "Разблакаваць" -#: kallithea/templates/base/base.html:172 +#: kallithea/templates/base/base.html:165 msgid "Lock" msgstr "Заблакаваць" -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:173 msgid "Follow" msgstr "Назіраць" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:174 msgid "Unfollow" msgstr "Не назіраць" -#: kallithea/templates/base/base.html:184 +#: kallithea/templates/base/base.html:177 #: kallithea/templates/data_table/_dt_elements.html:37 #: kallithea/templates/data_table/_dt_elements.html:41 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "Форк" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:178 #: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "Стварыць Pull запыт" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 #, python-format msgid "Show Pull Requests for %s" msgstr "Паказаць pull-запыты для %s" -#: kallithea/templates/base/base.html:228 +#: kallithea/templates/base/base.html:221 msgid "Show recent activity" msgstr "Паказаць апошнюю актыўнасць" +#: kallithea/templates/base/base.html:227 +#: kallithea/templates/base/base.html:228 +msgid "Public journal" +msgstr "Агульнадаступны часопіс" + +#: kallithea/templates/base/base.html:233 +msgid "Show public gists" +msgstr "Паказаць публічныя запісы" + #: kallithea/templates/base/base.html:234 -#: kallithea/templates/base/base.html:235 -msgid "Public journal" -msgstr "Агульнадаступны часопіс" +msgid "Gists" +msgstr "Gist" + +#: kallithea/templates/base/base.html:238 +msgid "All Public Gists" +msgstr "Усе публічныя Gist-запісы" #: kallithea/templates/base/base.html:240 -msgid "Show public gists" -msgstr "Паказаць публічныя запісы" +msgid "My Public Gists" +msgstr "Мае публічныя Gist-запісы" #: kallithea/templates/base/base.html:241 -msgid "Gists" -msgstr "Gist" - -#: kallithea/templates/base/base.html:245 -msgid "All Public Gists" -msgstr "Усе публічныя Gist-запісы" - -#: kallithea/templates/base/base.html:247 -msgid "My Public Gists" -msgstr "Мае публічныя Gist-запісы" - -#: kallithea/templates/base/base.html:248 msgid "My Private Gists" msgstr "Мае прыватныя Gist-запісы" -#: kallithea/templates/base/base.html:253 +#: kallithea/templates/base/base.html:246 msgid "Search in repositories" msgstr "Пошук па рэпазітарах" -#: kallithea/templates/base/base.html:276 -#: kallithea/templates/base/base.html:277 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +#: kallithea/templates/base/base.html:269 +#: kallithea/templates/base/base.html:270 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "Мае Pull-запыты" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:289 msgid "Not Logged In" msgstr "Не аўтарызаваны" -#: kallithea/templates/base/base.html:303 +#: kallithea/templates/base/base.html:296 msgid "Login to Your Account" msgstr "Аўтарызавацца" -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:319 msgid "Forgot password ?" msgstr "Забыліся пароль?" -#: kallithea/templates/base/base.html:353 +#: kallithea/templates/base/base.html:346 msgid "Log Out" msgstr "Выйсце" -#: kallithea/templates/base/base.html:402 +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "Супадзенняў не знойдзена" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "Гарачыя клавішы" -#: kallithea/templates/base/base.html:540 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" #: kallithea/templates/base/default_perms_box.html:14 #, fuzzy -#| msgid "Repository Defaults" msgid "Inherit defaults" msgstr "Значэнні па змаўчанні" @@ -4694,52 +4699,51 @@ msgstr "Няма супадзенняў" #: kallithea/templates/base/root.html:31 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 -msgid "Open New Pull Request" -msgstr "Стварыць новы pull-запыт" +#, fuzzy +#| msgid "on pull request" +msgid "Open New Pull Request from {0}" +msgstr "Каментар у pull-запыце" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for Selected Changesets" -msgstr "Адкрыць новы pull-request для абраных набораў змен" +msgid "Open New Pull Request for {0} → {1}" +msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets __S → __E" +#, fuzzy +#| msgid "Show Selected Changesets __S → __E" +msgid "Show Selected Changesets {0} → {1}" msgstr "Паказаць абраныя наборы змен: __S → __E" #: kallithea/templates/base/root.html:34 -msgid "Show Selected Changeset __S" -msgstr "Паказаць абраны набор змен: __S" +msgid "Selection Link" +msgstr "Спасылка выбару" #: kallithea/templates/base/root.html:35 -msgid "Selection Link" -msgstr "Спасылка выбару" - -#: kallithea/templates/base/root.html:36 #: kallithea/templates/changeset/diff_block.html:8 msgid "Collapse Diff" msgstr "Згарнуць параўнанне" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:36 msgid "Expand Diff" msgstr "Расчыніць параўнанне" +#: kallithea/templates/base/root.html:37 +msgid "Failed to revoke permission" +msgstr "Не атрымалася адклікаць прывілеі" + #: kallithea/templates/base/root.html:38 -msgid "Failed to revoke permission" -msgstr "Не атрымалася адклікаць прывілеі" - -#: kallithea/templates/base/root.html:39 msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "Пацвердзіце выдаленне прывілею для {0}: {1} ?" -#: kallithea/templates/base/root.html:40 +#: kallithea/templates/base/root.html:39 msgid "enabled" msgstr "уключана" -#: kallithea/templates/base/root.html:41 +#: kallithea/templates/base/root.html:40 msgid "disabled" msgstr "адключана" -#: kallithea/templates/base/root.html:43 +#: kallithea/templates/base/root.html:42 msgid "Specify changeset" msgstr "Абраць набор змен" @@ -4757,7 +4761,6 @@ #: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 #: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" @@ -4798,7 +4801,7 @@ msgstr[1] "Паказаны %d з %d рэвізій" msgstr[2] "Паказаны %d з %d рэвізій" -#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/templates/changelog/changelog.html:49 msgid "Clear selection" msgstr "Ачысціць выбар" @@ -4825,8 +4828,6 @@ #: kallithea/templates/changelog/changelog.html:92 #: kallithea/templates/changelog/changelog_summary_data.html:20 #, fuzzy, python-format -#| msgid "" "Changeset status: %s\n" "Click to open associated pull request -#| #%s" msgid "" "Changeset status: %s\n" "Click to open associated pull request %s" @@ -4874,7 +4875,7 @@ msgid "Branch %s" msgstr "Галінка %s" -#: kallithea/templates/changelog/changelog.html:291 +#: kallithea/templates/changelog/changelog.html:310 msgid "There are no changes yet" msgstr "Змен яшчэ няма" @@ -4932,7 +4933,6 @@ #: kallithea/templates/changelog/changelog_summary_data.html:90 #, fuzzy -#| msgid "Push new repo" msgid "Push new repository" msgstr "Адправіць новы рэпазітар" @@ -4978,7 +4978,6 @@ #: kallithea/templates/changeset/changeset.html:89 #: kallithea/templates/changeset/changeset_range.html:88 #, fuzzy -#| msgid "merge" msgid "Merge" msgstr "звесці" @@ -4992,19 +4991,17 @@ #: kallithea/templates/changeset/changeset.html:135 #, fuzzy -#| msgid "Created by" msgid "Replaced by:" msgstr "Створана" #: kallithea/templates/changeset/changeset.html:149 #, fuzzy -#| msgid "Created by" msgid "Preceded by:" msgstr "Створана" #: kallithea/templates/changeset/changeset.html:166 #: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:314 +#: kallithea/templates/pullrequests/pullrequest_show.html:318 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -5014,7 +5011,7 @@ #: kallithea/templates/changeset/changeset.html:168 #: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:320 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -5024,21 +5021,19 @@ #: kallithea/templates/changeset/changeset.html:182 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Show full diff anyway" msgstr "Паказаць поўны diff" #: kallithea/templates/changeset/changeset.html:247 #: kallithea/templates/changeset/changeset.html:284 #, fuzzy -#| msgid "no revisions" msgid "No revisions" msgstr "няма рэвізій" #: kallithea/templates/changeset/changeset_file_comment.html:21 #, fuzzy -#| msgid "Comment from pull request" msgid "on pull request" msgstr "Каментар у pull-запыце" @@ -5048,7 +5043,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:24 #, fuzzy -#| msgid "No changesets" msgid "on this changeset" msgstr "Няма змен" @@ -5058,7 +5052,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:37 #, fuzzy -#| msgid "Latest Changes" msgid "Status change" msgstr "Апошнія змены" @@ -5135,7 +5128,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:150 #, fuzzy -#| msgid "Use @username inside this text to notify another user" msgid "Use @username inside this text to notify another user." msgstr "" "Выкарыстоўвайце @імя_карыстача ў тэксце, каб адправіць абвестку пэўнаму " @@ -5214,7 +5206,7 @@ msgstr "Паказаць merge diff" #: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:306 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 msgid "Common ancestor" msgstr "Агульны продак" @@ -5255,7 +5247,7 @@ msgstr "" #: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:301 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5320,18 +5312,26 @@ msgstr "Добры дзень, %s" #: kallithea/templates/email_templates/password_reset.html:6 -msgid "We received a request to create a new password for your account." +#, fuzzy +#| msgid "We received a request to create a new password for your account." +msgid "We have received a request to reset the password for your account." msgstr "Мы атрымалі запыт на стварэнне новага пароля для вашага акаўнта." #: kallithea/templates/email_templates/password_reset.html:7 -msgid "You can generate it by clicking following URL" -msgstr "Вы можаце нанова згенераваць яго, пяройдучы па наступнай спасылцы" +msgid "To set a new password, click the following link" +msgstr "" #: kallithea/templates/email_templates/password_reset.html:10 -msgid "Please ignore this email if you did not request a new password ." -msgstr "" -"Калі ласка, праігнаруйце дадзенае паведамленне, калі вы не запытвалі новы" -" пароль." +msgid "" +"Should you not be able to use the link above, please type the following " +"code into the password reset form" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:12 +msgid "" +"If it weren't you who requested the password reset, just disregard this " +"message." +msgstr "" #: kallithea/templates/email_templates/pull_request.html:5 #, python-format @@ -5694,7 +5694,6 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:14 #, fuzzy -#| msgid "revoke" msgid "Vote" msgstr "адклікаць" @@ -5735,19 +5734,16 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:70 #, fuzzy, python-format -#| msgid "Confirm to delete this pull request" msgid "Confirm again to delete this pull request with %s comments" msgstr "Пацвердзіце выдаленне гэтага pull-request'а" #: kallithea/templates/pullrequests/pullrequest_show.html:6 #, fuzzy, python-format -#| msgid "%s Pull Request #%s" msgid "%s Pull Request %s" msgstr "%s Pull-запыт #%s" #: kallithea/templates/pullrequests/pullrequest_show.html:10 #, fuzzy, python-format -#| msgid "Pull request #%s from %s#%s" msgid "Pull request %s from %s#%s" msgstr "Pull-запыты №%s ад %s#%s" @@ -5796,98 +5792,104 @@ msgid "Target" msgstr "Цэль" -#: kallithea/templates/pullrequests/pullrequest_show.html:131 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +msgid "" +"This is just a range of changesets and doesn't have a target or a real " +"merge ancestor." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:133 msgid "Pull changes" msgstr "Прыняць змены" -#: kallithea/templates/pullrequests/pullrequest_show.html:154 -msgid "Created by" -msgstr "Створана" - -#: kallithea/templates/pullrequests/pullrequest_show.html:169 +#: kallithea/templates/pullrequests/pullrequest_show.html:173 msgid "Update" msgstr "Абнавіць" -#: kallithea/templates/pullrequests/pullrequest_show.html:187 +#: kallithea/templates/pullrequests/pullrequest_show.html:191 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:209 +#: kallithea/templates/pullrequests/pullrequest_show.html:213 msgid "Pull Request Reviewers" msgstr "Рэцэнзенты pull-запытаў" -#: kallithea/templates/pullrequests/pullrequest_show.html:234 +#: kallithea/templates/pullrequests/pullrequest_show.html:238 msgid "Remove reviewer" msgstr "Выдаліць рэцэнзента" -#: kallithea/templates/pullrequests/pullrequest_show.html:246 +#: kallithea/templates/pullrequests/pullrequest_show.html:250 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:254 +#: kallithea/templates/pullrequests/pullrequest_show.html:258 msgid "Potential Reviewers" msgstr "Патэнцыйныя рэцэнзенты" -#: kallithea/templates/pullrequests/pullrequest_show.html:257 +#: kallithea/templates/pullrequests/pullrequest_show.html:261 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:280 +#: kallithea/templates/pullrequests/pullrequest_show.html:284 msgid "Save Changes" msgstr "Захаваць змены" -#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/templates/pullrequests/pullrequest_show.html:285 msgid "Save as New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:282 +#: kallithea/templates/pullrequests/pullrequest_show.html:286 msgid "Cancel Changes" msgstr "Адмяніць змены" -#: kallithea/templates/pullrequests/pullrequest_show.html:292 +#: kallithea/templates/pullrequests/pullrequest_show.html:296 msgid "Pull Request Content" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" msgstr "%s Запыты на занясенне змен" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, python-format msgid "Pull Requests from %s'" msgstr "Pull-запыты ад %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:13 #, python-format msgid "Pull Requests to '%s'" msgstr "Pull-запыты для %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +msgid "Open New Pull Request" +msgstr "Стварыць новы pull-запыт" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 #, python-format msgid "Show Pull Requests to %s" msgstr "Паказаць pull-запыты да %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 #, python-format msgid "Show Pull Requests from '%s'" msgstr "Паказаць pull-запыты ад %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 -msgid "Hide closed pull requests (only show open pull requests)" -msgstr "" - #: kallithea/templates/pullrequests/pullrequest_show_all.html:49 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 msgid "Pull Requests I Participate In" msgstr "" @@ -6056,7 +6058,6 @@ #: kallithea/templates/summary/summary.html:125 #, fuzzy -#| msgid "with subrepos" msgid "With subrepos" msgstr "з даччынымі рэпазітарамі" @@ -6127,21 +6128,6 @@ #~ msgstr "Файлаў няма" #~ msgid "" -#~ "Comment on %(repo_name)s changeset " -#~ "%(short_id)s on %(branch)s by " -#~ "%(comment_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Review request on %(repo_name)s pull " -#~ "request #%(pr_id)s from %(ref)s by " -#~ "%(pr_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Comment on %(repo_name)s pull request " -#~ "#%(pr_id)s from %(ref)s by " -#~ "%(comment_username)s" #~ msgstr "" #~ msgid "Username \"%(username)s\" is forbidden" @@ -6158,9 +6144,6 @@ #~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" #~ msgstr "" -#~ "Няслушны URL кланаванні, падайце карэктны " -#~ "URL для кланавання ў фармаце " -#~ "http(s)/svn+http(s)/ssh" #~ msgid "Revisions %(revs)s are already part of pull request or have set status" #~ msgstr "Рэвізіі %(revs)s ужо ўключаны ў pull-request ці маюць усталяваны статус" @@ -6192,12 +6175,6 @@ #~ msgid "delete" #~ msgstr "выдаліць" -#~ msgid "" -#~ "Your user is in an external source" -#~ " of record; some details cannot be" -#~ " managed here" -#~ msgstr "" - #~ msgid "Permissions Administration" #~ msgstr "Кіраванне прывілеямі" @@ -6207,12 +6184,6 @@ #~ msgid "Overwrite existing settings" #~ msgstr "Перазапісаць існыя налады" -#~ msgid "" -#~ "Write permission to a repository group" -#~ " allows creating repositories inside that" -#~ " group." -#~ msgstr "" - #~ msgid "Default IP Whitelist for All Users" #~ msgstr "Белы спіс IP для ўсіх карыстачоў" @@ -6252,20 +6223,6 @@ #~ msgid "Non-changeable id" #~ msgstr "Нязменлівы id" -#~ msgid "" -#~ "In case this repository is renamed " -#~ "or moved into another group the " -#~ "repository URL changes.\n" -#~ " Using the above " -#~ "URL guarantees that this repository will" -#~ " always be accessible under such URL." -#~ "\n" -#~ " Useful for CI " -#~ "systems, or any other cases that " -#~ "you need to hardcode the URL into" -#~ " 3rd party service." -#~ msgstr "" - #~ msgid "edit" #~ msgstr "рэдагаваць" @@ -6311,30 +6268,12 @@ #~ msgid "Destroy old data" #~ msgstr "Знішчыць усе дадзеныя" -#~ msgid "" -#~ "Check this option to remove references" -#~ " to repositories that no longer exist" -#~ " in on the filesystem." -#~ msgstr "" - #~ msgid "Default permissions" #~ msgstr "Стандартныя прывілеі" -#~ msgid "" -#~ "This user is in an external source" -#~ " of record (%s); some details cannot" -#~ " be managed here." -#~ msgstr "" - #~ msgid "Inherit from defaults" #~ msgstr "" -#~ msgid "" -#~ "Select to inherit permissions from %s" -#~ " permissions settings, and default IP " -#~ "address whitelist." -#~ msgstr "" - #~ msgid "show" #~ msgstr "паказа́ць" @@ -6374,3 +6313,48 @@ #~ msgid "reviewer" #~ msgstr "рэцэнзент" +#~ msgid "" +#~ "Your password reset was successful, new" +#~ " password has been sent to your " +#~ "email" +#~ msgstr "Пароль скінуты паспяхова, новы пароль быў адпраўлены на ваш email" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Added by %(pr_username)s] %(repo_name)s pull" +#~ " request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "Your new password" +#~ msgstr "Ваш новы пароль" + +#~ msgid "Your new Kallithea password:%s" +#~ msgstr "Ваш новы пароль ад Kallithea: %s" + +#~ msgid "Open New Pull Request for Selected Changesets" +#~ msgstr "Адкрыць новы pull-request для абраных набораў змен" + +#~ msgid "Show Selected Changeset __S" +#~ msgstr "Паказаць абраны набор змен: __S" + +#~ msgid "You can generate it by clicking following URL" +#~ msgstr "Вы можаце нанова згенераваць яго, пяройдучы па наступнай спасылцы" + +#~ msgid "Please ignore this email if you did not request a new password ." +#~ msgstr "" +#~ "Калі ласка, праігнаруйце дадзенае " +#~ "паведамленне, калі вы не запытвалі новы" +#~ " пароль." + +#~ msgid "Created by" +#~ msgstr "Створана" +
--- a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Tue Sep 08 10:21:46 2015 +0000 +++ b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Tue Sep 08 10:37:51 2015 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2015-08-25 11:37+0200\n" +"POT-Creation-Date: 2015-09-08 10:34+0200\n" "PO-Revision-Date: 2015-02-13 15:26+0200\n" "Last-Translator: Andrew Shadura <andrew@shadura.me>\n" "Language-Team: Czech " @@ -19,7 +19,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:241 kallithea/lib/base.py:512 +#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 msgid "There are no changesets yet" msgstr "" @@ -35,7 +35,7 @@ msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(zavřeno)" @@ -53,8 +53,8 @@ msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:743 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 msgid "Such revision does not exist for this repository" msgstr "Taková revize neexistuje" @@ -64,17 +64,16 @@ "not allowed" msgstr "" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:42 +#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 msgid "Select changeset" msgstr "" -#: kallithea/controllers/compare.py:258 +#: kallithea/controllers/compare.py:261 msgid "Cannot compare repositories without using common ancestor" msgstr "" #: kallithea/controllers/error.py:71 -#, fuzzy, python-format -#| msgid "Unknown revision %s" +#, fuzzy msgid "No response" msgstr "Neznámá revize %s" @@ -119,8 +118,8 @@ #: kallithea/templates/changeset/changeset.html:195 #: kallithea/templates/compare/compare_diff.html:78 #: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Changeset was too big and was cut off..." msgstr "" @@ -129,111 +128,111 @@ msgid "%s committed on %s" msgstr "" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:91 msgid "Click here to add new file" msgstr "Klikněte pro přidání nového souboru" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:92 #, python-format msgid "There are no files yet. %s" msgstr "Zatím nejsou žádné soubory. %s" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 -#: kallithea/controllers/files.py:433 +#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 +#: kallithea/controllers/files.py:432 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:318 +#: kallithea/controllers/files.py:317 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:329 +#: kallithea/controllers/files.py:328 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:351 +#: kallithea/controllers/files.py:350 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 -#: kallithea/controllers/files.py:502 +#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 +#: kallithea/controllers/files.py:501 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:378 +#: kallithea/controllers/files.py:377 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:392 +#: kallithea/controllers/files.py:391 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:408 +#: kallithea/controllers/files.py:407 msgid "No changes" msgstr "Žádné změny" -#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 +#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:444 +#: kallithea/controllers/files.py:443 msgid "Added file via Kallithea" msgstr "Přidaný soubor přes Kallithea" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:464 msgid "No content" msgstr "Žádný obsah" -#: kallithea/controllers/files.py:469 +#: kallithea/controllers/files.py:468 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:494 +#: kallithea/controllers/files.py:493 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:527 +#: kallithea/controllers/files.py:526 msgid "Downloads disabled" msgstr "Stahování vypnuto" -#: kallithea/controllers/files.py:538 +#: kallithea/controllers/files.py:537 #, python-format msgid "Unknown revision %s" msgstr "Neznámá revize %s" -#: kallithea/controllers/files.py:540 +#: kallithea/controllers/files.py:539 msgid "Empty repository" msgstr "Prázdný repozitář" -#: kallithea/controllers/files.py:542 +#: kallithea/controllers/files.py:541 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:772 +#: kallithea/controllers/files.py:771 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:15 #: kallithea/templates/pullrequests/pullrequest.html:97 msgid "Changesets" msgstr "Změny" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:821 kallithea/templates/switch_to_list.html:3 +#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 +#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "Větve" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:832 kallithea/templates/switch_to_list.html:25 +#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 +#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "Tagy" @@ -254,9 +253,9 @@ #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:131 -#: kallithea/templates/base/base.html:397 -#: kallithea/templates/base/base.html:569 +#: kallithea/templates/base/base.html:124 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "Repozitáře" @@ -282,31 +281,33 @@ msgstr "" #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:229 +#: kallithea/templates/base/base.html:222 #: kallithea/templates/journal/journal.html:4 #: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:150 kallithea/controllers/login.py:196 +#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 #, fuzzy -#| msgid "bad captcha" msgid "Bad captcha" msgstr "špatná captcha" -#: kallithea/controllers/login.py:156 +#: kallithea/controllers/login.py:157 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:201 -msgid "Your password reset link was sent" -msgstr "" - -#: kallithea/controllers/login.py:222 -msgid "" -"Your password reset was successful, new password has been sent to your " -"email" -msgstr "" +#: kallithea/controllers/login.py:202 +msgid "A password reset confirmation code has been sent" +msgstr "" + +#: kallithea/controllers/login.py:251 +msgid "Invalid password reset token" +msgstr "" + +#: kallithea/controllers/login.py:256 +#: kallithea/controllers/admin/my_account.py:167 +msgid "Successfully updated password" +msgstr "Úspěšně aktualizované heslo" #: kallithea/controllers/pullrequests.py:124 #, fuzzy, python-format @@ -327,112 +328,112 @@ msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:827 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Záložky" -#: kallithea/controllers/pullrequests.py:306 +#: kallithea/controllers/pullrequests.py:310 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:352 -#: kallithea/controllers/pullrequests.py:499 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:503 msgid "No description" msgstr "" -#: kallithea/controllers/pullrequests.py:359 +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:362 -#: kallithea/controllers/pullrequests.py:449 -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:453 +#: kallithea/controllers/pullrequests.py:509 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:365 -#: kallithea/controllers/pullrequests.py:452 +#: kallithea/controllers/pullrequests.py:369 +#: kallithea/controllers/pullrequests.py:456 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:401 msgid "Missing changesets since the previous pull request:" msgstr "" -#: kallithea/controllers/pullrequests.py:404 +#: kallithea/controllers/pullrequests.py:408 #, python-format msgid "New changesets on %s %s since the previous pull request:" msgstr "" -#: kallithea/controllers/pullrequests.py:411 +#: kallithea/controllers/pullrequests.py:415 msgid "Ancestor didn't change - show diff since previous version:" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:422 #, python-format msgid "" "This pull request is based on another %s revision and there is no simple " "diff." msgstr "" -#: kallithea/controllers/pullrequests.py:420 +#: kallithea/controllers/pullrequests.py:424 #, python-format msgid "No changes found on %s %s since previous version." msgstr "" -#: kallithea/controllers/pullrequests.py:458 +#: kallithea/controllers/pullrequests.py:462 #, python-format msgid "Closed, replaced by %s ." msgstr "" -#: kallithea/controllers/pullrequests.py:466 +#: kallithea/controllers/pullrequests.py:470 msgid "Pull request update created" msgstr "" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:513 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:523 +#: kallithea/controllers/pullrequests.py:528 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:582 +#: kallithea/controllers/pullrequests.py:594 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:584 +#: kallithea/controllers/pullrequests.py:596 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:602 +#: kallithea/controllers/pullrequests.py:614 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:605 +#: kallithea/controllers/pullrequests.py:617 msgid "No changesets found for updating this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:613 +#: kallithea/controllers/pullrequests.py:625 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:619 +#: kallithea/controllers/pullrequests.py:631 msgid "Git pull requests don't support updates yet." msgstr "" -#: kallithea/controllers/pullrequests.py:710 +#: kallithea/controllers/pullrequests.py:722 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:715 +#: kallithea/controllers/pullrequests.py:727 msgid "Closing." msgstr "" @@ -477,37 +478,37 @@ #: kallithea/controllers/admin/gists.py:59 #: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:283 +#: kallithea/controllers/admin/users.py:285 msgid "Forever" msgstr "" #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/users.py:286 msgid "5 minutes" msgstr "5 minut" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/users.py:287 msgid "1 hour" msgstr "1 hodina" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/users.py:288 msgid "1 day" msgstr "1 den" #: kallithea/controllers/admin/gists.py:63 #: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/users.py:289 msgid "1 month" msgstr "1 měsíc" #: kallithea/controllers/admin/gists.py:67 #: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/users.py:291 msgid "Lifetime" msgstr "" @@ -537,8 +538,8 @@ msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:208 -#: kallithea/model/user.py:230 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 +#: kallithea/model/user.py:237 msgid "You can't edit this user since it's crucial for entire application" msgstr "" @@ -547,47 +548,43 @@ msgstr "" #: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:204 +#: kallithea/controllers/admin/users.py:202 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:167 -msgid "Successfully updated password" -msgstr "Úspěšně aktualizované heslo" - #: kallithea/controllers/admin/my_account.py:178 msgid "Error occurred during update of user password" msgstr "Došlo k chybě při aktualizaci hesla uživatele" #: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:413 +#: kallithea/controllers/admin/users.py:415 #, python-format msgid "Added email %s to user" msgstr "" #: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:419 +#: kallithea/controllers/admin/users.py:421 msgid "An error occurred during email saving" msgstr "Došlo k chybě při ukládání e-mailové adresy" #: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:431 +#: kallithea/controllers/admin/users.py:433 msgid "Removed email from user" msgstr "" #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:306 +#: kallithea/controllers/admin/users.py:308 msgid "API key successfully created" msgstr "" #: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:319 +#: kallithea/controllers/admin/users.py:321 msgid "API key successfully reset" msgstr "" #: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:323 +#: kallithea/controllers/admin/users.py:325 msgid "API key successfully deleted" msgstr "" @@ -637,10 +634,10 @@ #: kallithea/templates/admin/users/user_edit_profile.html:105 #: kallithea/templates/admin/users/users.html:10 #: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:252 +#: kallithea/templates/base/base.html:253 #: kallithea/templates/base/base.html:259 #: kallithea/templates/base/base.html:260 -#: kallithea/templates/base/base.html:266 -#: kallithea/templates/base/base.html:267 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "" @@ -854,17 +851,13 @@ #: kallithea/controllers/admin/repos.py:537 #: kallithea/controllers/admin/repos.py:564 -#, fuzzy, python-format -#| msgid "This repository has %s fork" -#| msgid_plural "This repository has %s forks" +#, fuzzy msgid "Repository has been locked" msgstr "" #: kallithea/controllers/admin/repos.py:540 #: kallithea/controllers/admin/repos.py:561 -#, fuzzy, python-format -#| msgid "This repository has %s fork" -#| msgid_plural "This repository has %s forks" +#, fuzzy msgid "Repository has been unlocked" msgstr "" @@ -904,48 +897,48 @@ msgstr "" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:274 +#: kallithea/controllers/admin/settings.py:277 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:213 +#: kallithea/controllers/admin/settings.py:216 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:270 +#: kallithea/controllers/admin/settings.py:273 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:335 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:361 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:373 +#: kallithea/controllers/admin/settings.py:376 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:421 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:425 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:448 +#: kallithea/controllers/admin/settings.py:451 msgid "Whoosh reindex task scheduled" msgstr "" @@ -986,68 +979,68 @@ msgstr "" #: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:382 +#: kallithea/controllers/admin/users.py:384 msgid "Updated permissions" msgstr "" #: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:386 +#: kallithea/controllers/admin/users.py:388 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:134 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:184 +#: kallithea/controllers/admin/users.py:182 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:220 +#: kallithea/controllers/admin/users.py:218 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:225 +#: kallithea/controllers/admin/users.py:223 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:238 +#: kallithea/controllers/admin/users.py:236 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:461 +#: kallithea/controllers/admin/users.py:463 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:467 +#: kallithea/controllers/admin/users.py:469 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:744 +#: kallithea/lib/auth.py:743 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:757 +#: kallithea/lib/auth.py:756 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:795 +#: kallithea/lib/auth.py:812 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:827 +#: kallithea/lib/auth.py:844 msgid "You need to be signed in to view this page" msgstr "" @@ -1200,7 +1193,7 @@ #: kallithea/lib/helpers.py:1128 #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "" @@ -1818,13 +1811,11 @@ #: kallithea/model/db.py:1694 #, fuzzy -#| msgid "Location of repositories" msgid "Only admins can fork repositories" msgstr "Chyba při vytváření repozitáře %s" #: kallithea/model/db.py:1695 #, fuzzy -#| msgid "Location of repositories" msgid "Non-admins can can fork repositories" msgstr "Chyba při vytváření repozitáře %s" @@ -1837,16 +1828,12 @@ msgstr "" #: kallithea/model/db.py:2228 -#, fuzzy, python-format -#| msgid "%d reviewer" -#| msgid_plural "%d reviewers" +#, fuzzy msgid "Not reviewed" msgstr "" #: kallithea/model/db.py:2231 -#, fuzzy, python-format -#| msgid "%d reviewer" -#| msgid_plural "%d reviewers" +#, fuzzy msgid "Under review" msgstr "" @@ -1934,9 +1921,7 @@ #: kallithea/model/notification.py:302 #, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s changeset %(short_id)s " -"on %(branch)s" +msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" #: kallithea/model/notification.py:305 @@ -1946,16 +1931,12 @@ #: kallithea/model/notification.py:307 #, python-format -msgid "" -"[Added by %(pr_username)s] %(repo_name)s pull request %(pr_nice_id)s from" -" %(ref)s" +msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" #: kallithea/model/notification.py:308 #, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s pull request " -"%(pr_nice_id)s from %(ref)s" +msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" #: kallithea/model/notification.py:321 @@ -1967,50 +1948,52 @@ msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:813 +#: kallithea/model/scm.py:812 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:185 +#: kallithea/model/user.py:192 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:249 +#: kallithea/model/user.py:256 msgid "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:254 +#: kallithea/model/user.py:261 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "" -#: kallithea/model/user.py:259 -#, python-format -msgid "" -"User \"%s\" still owns %s repository groups and cannot be removed. Switch" -" owners or remove those repository groups: %s" -msgstr "" - #: kallithea/model/user.py:266 #, python-format msgid "" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch" +" owners or remove those repository groups: %s" +msgstr "" + +#: kallithea/model/user.py:273 +#, python-format +msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "" -#: kallithea/model/user.py:296 +#: kallithea/model/user.py:360 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:319 -msgid "Your new password" -msgstr "" - -#: kallithea/model/user.py:320 -#, python-format -msgid "Your new Kallithea password:%s" +#: kallithea/model/user.py:408 +msgid "Password reset notification" +msgstr "" + +#: kallithea/model/user.py:409 +#, python-format +msgid "" +"The password to your account %s has been changed using password reset " +"form." msgstr "" #: kallithea/model/validators.py:77 kallithea/model/validators.py:78 @@ -2113,7 +2096,6 @@ #: kallithea/model/validators.py:465 #, fuzzy -#| msgid "Unlock Repository" msgid "Invalid repository URL" msgstr "Prázdný repozitář" @@ -2304,7 +2286,9 @@ #: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:229 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/pullrequests/pullrequest_show.html:156 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 #: kallithea/templates/summary/summary.html:134 msgid "Owner" msgstr "" @@ -2312,7 +2296,7 @@ #: kallithea/templates/index_base.html:140 #: kallithea/templates/admin/my_account/my_account_repos.html:57 #: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:44 +#: kallithea/templates/base/root.html:43 #: kallithea/templates/bookmarks/bookmarks.html:79 #: kallithea/templates/branches/branches.html:79 #: kallithea/templates/journal/journal.html:198 @@ -2324,7 +2308,7 @@ #: kallithea/templates/index_base.html:141 #: kallithea/templates/admin/my_account/my_account_repos.html:58 #: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:45 +#: kallithea/templates/base/root.html:44 #: kallithea/templates/bookmarks/bookmarks.html:80 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:199 @@ -2340,7 +2324,7 @@ #: kallithea/templates/index_base.html:143 #: kallithea/templates/admin/my_account/my_account_repos.html:60 #: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:46 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:201 @@ -2352,7 +2336,7 @@ #: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:147 kallithea/templates/base/root.html:48 +#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:202 @@ -2362,7 +2346,7 @@ msgstr "" #: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:333 +#: kallithea/templates/base/base.html:326 msgid "Log In" msgstr "" @@ -2377,14 +2361,15 @@ #: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:24 #: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/pullrequests/pullrequest_show.html:166 msgid "Username" msgstr "" #: kallithea/templates/login.html:33 kallithea/templates/register.html:33 #: kallithea/templates/admin/my_account/my_account.html:37 #: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:311 msgid "Password" msgstr "" @@ -2396,7 +2381,7 @@ msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:329 +#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 msgid "Don't have an account ?" msgstr "" @@ -2409,11 +2394,14 @@ msgstr "" #: kallithea/templates/password_reset.html:12 +#: kallithea/templates/password_reset_confirmation.html:12 #, python-format msgid "Reset Your Password to %s" msgstr "" #: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset_confirmation.html:5 +#: kallithea/templates/password_reset_confirmation.html:14 msgid "Reset Your Password" msgstr "" @@ -2432,8 +2420,35 @@ #: kallithea/templates/password_reset.html:47 msgid "" -"Password reset link will be sent to the email address matching your " -"username." +"A password reset link will be sent to the specified email address if it " +"is registered in the system." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:19 +#, python-format +msgid "You are about to set a new password for the email address %s." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:20 +msgid "" +"Note that you must use the same browser session for this as the one used " +"to request the password reset." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:30 +msgid "Code you received in the email" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:39 +msgid "New Password" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:48 +msgid "Confirm New Password" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:56 +msgid "Confirm" msgstr "" #: kallithea/templates/register.html:5 kallithea/templates/register.html:14 @@ -2747,7 +2762,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:244 +#: kallithea/templates/base/base.html:237 msgid "Create New Gist" msgstr "" @@ -2889,7 +2904,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/base/base.html:343 msgid "My Account" msgstr "" @@ -2909,14 +2924,12 @@ #: kallithea/templates/admin/my_account/my_account.html:39 #, fuzzy -#| msgid "Repositories" msgid "Owned Repositories" msgstr "Repozitáře" #: kallithea/templates/admin/my_account/my_account.html:40 #: kallithea/templates/journal/journal.html:53 #, fuzzy -#| msgid "Repositories" msgid "Watched Repositories" msgstr "Repozitáře" @@ -3048,7 +3061,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:45 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:200 @@ -3076,7 +3089,7 @@ msgstr "" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 msgid "Pull Requests" msgstr "" @@ -3094,7 +3107,7 @@ msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:342 msgid "Notifications" msgstr "" @@ -3134,7 +3147,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:26 #, fuzzy -#| msgid "Location of repositories" msgid "Apply to all existing repositories" msgstr "Chyba při vytváření repozitáře %s" @@ -3237,8 +3249,6 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:13 #: kallithea/templates/admin/users/user_edit_ips.html:23 #, fuzzy, python-format -#| msgid "Confirm to delete this group: %s with %s repository" -#| msgid_plural "Confirm to delete this group: %s with %s repositories" msgid "Confirm to delete this IP address: %s" msgstr "" @@ -3296,7 +3306,7 @@ #: kallithea/templates/admin/repos/repo_edit.html:40 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:158 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 #: kallithea/templates/data_table/_dt_elements.html:45 #: kallithea/templates/data_table/_dt_elements.html:49 msgid "Settings" @@ -3335,7 +3345,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:146 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 msgid "Created on" msgstr "" @@ -3434,7 +3444,6 @@ #: kallithea/templates/admin/repos/repo_add_base.html:17 #, fuzzy -#| msgid "Empty repository" msgid "Clone remote repository" msgstr "Prázdný repozitář" @@ -3691,25 +3700,21 @@ #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 #, fuzzy -#| msgid "Empty repository" msgid "Private Repository" msgstr "Prázdný repozitář" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 #, fuzzy -#| msgid "Empty repository" msgid "Remote repository URL" msgstr "Prázdný repozitář" #: kallithea/templates/admin/repos/repo_edit_remote.html:9 -#, fuzzy, python-format -#| msgid "Changes on %s repository" +#, fuzzy msgid "Pull Changes from Remote Repository" msgstr "Změny na repozitáři %s" #: kallithea/templates/admin/repos/repo_edit_remote.html:11 #, fuzzy -#| msgid "Confirm to lock repository." msgid "Confirm to pull changes from remote repository." msgstr "Prázdný repozitář" @@ -3719,7 +3724,6 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:11 #, fuzzy -#| msgid "Empty repository" msgid "Permanent Repository ID" msgstr "Prázdný repozitář" @@ -3743,13 +3747,11 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:21 #, fuzzy -#| msgid "Empty repository" msgid "Remote repository" msgstr "Prázdný repozitář" #: kallithea/templates/admin/repos/repo_edit_settings.html:25 #, fuzzy -#| msgid "Repository Defaults" msgid "Repository URL" msgstr "Repozitáře" @@ -3890,7 +3892,7 @@ msgid "Custom Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:68 +#: kallithea/templates/admin/settings/settings_hooks.html:67 msgid "Failed to remove hook" msgstr "" @@ -3926,7 +3928,18 @@ "Current hooks will be updated to the latest version." msgstr "" +#: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "Overwrite existing Git hooks" +msgstr "" + #: kallithea/templates/admin/settings/settings_mapping.html:30 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any" +" custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:35 msgid "Rescan Repositories" msgstr "" @@ -4154,7 +4167,6 @@ #: kallithea/templates/admin/settings/settings_visual.html:92 #, fuzzy -#| msgid "Settings" msgid "Meta Tagging" msgstr "Nastavení" @@ -4339,47 +4351,47 @@ msgid "Git repository" msgstr "" -#: kallithea/templates/base/base.html:126 +#: kallithea/templates/base/base.html:119 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:130 #: kallithea/templates/data_table/_dt_elements.html:13 #: kallithea/templates/data_table/_dt_elements.html:17 #: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:141 +#: kallithea/templates/base/base.html:132 +#: kallithea/templates/base/base.html:134 #: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:21 #: kallithea/templates/data_table/_dt_elements.html:25 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:136 #: kallithea/templates/data_table/_dt_elements.html:29 #: kallithea/templates/data_table/_dt_elements.html:33 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:138 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/base/base.html:154 +#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:147 msgid "Options" msgstr "" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:155 #: kallithea/templates/forks/forks_data.html:21 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:164 +#: kallithea/templates/base/base.html:157 #: kallithea/templates/bookmarks/bookmarks.html:56 #: kallithea/templates/bookmarks/bookmarks_data.html:13 #: kallithea/templates/branches/branches.html:56 @@ -4389,117 +4401,116 @@ msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:166 -#: kallithea/templates/base/base.html:254 +#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:247 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:54 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:170 +#: kallithea/templates/base/base.html:163 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:172 +#: kallithea/templates/base/base.html:165 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:173 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:174 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:184 +#: kallithea/templates/base/base.html:177 #: kallithea/templates/data_table/_dt_elements.html:37 #: kallithea/templates/data_table/_dt_elements.html:41 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:178 #: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 #, python-format msgid "Show Pull Requests for %s" msgstr "" +#: kallithea/templates/base/base.html:221 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:227 #: kallithea/templates/base/base.html:228 -msgid "Show recent activity" +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:233 +msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:234 -#: kallithea/templates/base/base.html:235 -msgid "Public journal" +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:238 +msgid "All Public Gists" msgstr "" #: kallithea/templates/base/base.html:240 -msgid "Show public gists" +msgid "My Public Gists" msgstr "" #: kallithea/templates/base/base.html:241 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:245 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:247 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:248 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:253 +#: kallithea/templates/base/base.html:246 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:276 -#: kallithea/templates/base/base.html:277 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +#: kallithea/templates/base/base.html:269 +#: kallithea/templates/base/base.html:270 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" +#: kallithea/templates/base/base.html:289 +msgid "Not Logged In" +msgstr "" + #: kallithea/templates/base/base.html:296 -msgid "Not Logged In" -msgstr "" - -#: kallithea/templates/base/base.html:303 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:319 msgid "Forgot password ?" msgstr "" -#: kallithea/templates/base/base.html:353 +#: kallithea/templates/base/base.html:346 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:402 +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:540 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" #: kallithea/templates/base/default_perms_box.html:14 #, fuzzy -#| msgid "Repository Defaults" msgid "Inherit defaults" msgstr "Repozitáře" @@ -4596,52 +4607,49 @@ msgstr "" #: kallithea/templates/base/root.html:31 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 -msgid "Open New Pull Request" -msgstr "" +#, fuzzy +#| msgid "on pull request" +msgid "Open New Pull Request from {0}" +msgstr "Změna stavu-> %s" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for Selected Changesets" +msgid "Open New Pull Request for {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets __S → __E" +msgid "Show Selected Changesets {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:34 -msgid "Show Selected Changeset __S" +msgid "Selection Link" msgstr "" #: kallithea/templates/base/root.html:35 -msgid "Selection Link" +#: kallithea/templates/changeset/diff_block.html:8 +msgid "Collapse Diff" msgstr "" #: kallithea/templates/base/root.html:36 -#: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse Diff" +msgid "Expand Diff" msgstr "" #: kallithea/templates/base/root.html:37 -msgid "Expand Diff" +msgid "Failed to revoke permission" msgstr "" #: kallithea/templates/base/root.html:38 -msgid "Failed to revoke permission" +msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "" #: kallithea/templates/base/root.html:39 -msgid "Confirm to revoke permission for {0}: {1} ?" +msgid "enabled" msgstr "" #: kallithea/templates/base/root.html:40 -msgid "enabled" -msgstr "" - -#: kallithea/templates/base/root.html:41 msgid "disabled" msgstr "" -#: kallithea/templates/base/root.html:43 +#: kallithea/templates/base/root.html:42 msgid "Specify changeset" msgstr "" @@ -4659,7 +4667,6 @@ #: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 #: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" @@ -4700,7 +4707,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/templates/changelog/changelog.html:49 msgid "Clear selection" msgstr "" @@ -4773,7 +4780,7 @@ msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:291 +#: kallithea/templates/changelog/changelog.html:310 msgid "There are no changes yet" msgstr "" @@ -4831,7 +4838,6 @@ #: kallithea/templates/changelog/changelog_summary_data.html:90 #, fuzzy -#| msgid "Empty repository" msgid "Push new repository" msgstr "Prázdný repozitář" @@ -4897,7 +4903,7 @@ #: kallithea/templates/changeset/changeset.html:166 #: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:314 +#: kallithea/templates/pullrequests/pullrequest_show.html:318 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -4907,7 +4913,7 @@ #: kallithea/templates/changeset/changeset.html:168 #: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:320 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -4917,21 +4923,19 @@ #: kallithea/templates/changeset/changeset.html:182 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Show full diff anyway" msgstr "" #: kallithea/templates/changeset/changeset.html:247 #: kallithea/templates/changeset/changeset.html:284 -#, fuzzy, python-format -#| msgid "Unknown revision %s" +#, fuzzy msgid "No revisions" msgstr "Neznámá revize %s" #: kallithea/templates/changeset/changeset_file_comment.html:21 #, fuzzy -#| msgid "Status change from pull request" msgid "on pull request" msgstr "Změna stavu-> %s" @@ -4941,7 +4945,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:24 #, fuzzy -#| msgid "No changes" msgid "on this changeset" msgstr "Žádné změny" @@ -4952,7 +4955,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:37 #, fuzzy -#| msgid "Latest Changes" msgid "Status change" msgstr "Změna stavu-> %s" @@ -5105,7 +5107,7 @@ msgstr "" #: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:306 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 msgid "Common ancestor" msgstr "" @@ -5146,7 +5148,7 @@ msgstr "" #: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:301 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5211,15 +5213,23 @@ msgstr "" #: kallithea/templates/email_templates/password_reset.html:6 -msgid "We received a request to create a new password for your account." +msgid "We have received a request to reset the password for your account." msgstr "" #: kallithea/templates/email_templates/password_reset.html:7 -msgid "You can generate it by clicking following URL" +msgid "To set a new password, click the following link" msgstr "" #: kallithea/templates/email_templates/password_reset.html:10 -msgid "Please ignore this email if you did not request a new password ." +msgid "" +"Should you not be able to use the link above, please type the following " +"code into the password reset form" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:12 +msgid "" +"If it weren't you who requested the password reset, just disregard this " +"message." msgstr "" #: kallithea/templates/email_templates/pull_request.html:5 @@ -5621,8 +5631,6 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:70 #, fuzzy, python-format -#| msgid "Confirm to delete this group: %s with %s repository" -#| msgid_plural "Confirm to delete this group: %s with %s repositories" msgid "Confirm again to delete this pull request with %s comments" msgstr "" @@ -5682,101 +5690,107 @@ msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:131 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +msgid "" +"This is just a range of changesets and doesn't have a target or a real " +"merge ancestor." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:133 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:154 -msgid "Created by" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:169 +#: kallithea/templates/pullrequests/pullrequest_show.html:173 msgid "Update" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:187 +#: kallithea/templates/pullrequests/pullrequest_show.html:191 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:209 +#: kallithea/templates/pullrequests/pullrequest_show.html:213 msgid "Pull Request Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:234 +#: kallithea/templates/pullrequests/pullrequest_show.html:238 #, fuzzy msgid "Remove reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:246 +#: kallithea/templates/pullrequests/pullrequest_show.html:250 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:254 +#: kallithea/templates/pullrequests/pullrequest_show.html:258 #, fuzzy msgid "Potential Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:257 +#: kallithea/templates/pullrequests/pullrequest_show.html:261 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:280 +#: kallithea/templates/pullrequests/pullrequest_show.html:284 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/templates/pullrequests/pullrequest_show.html:285 msgid "Save as New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:282 +#: kallithea/templates/pullrequests/pullrequest_show.html:286 #, fuzzy msgid "Cancel Changes" msgstr "Žádné změny" -#: kallithea/templates/pullrequests/pullrequest_show.html:292 +#: kallithea/templates/pullrequests/pullrequest_show.html:296 msgid "Pull Request Content" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 -#, python-format -msgid "Pull Requests from %s'" -msgstr "" - #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, python-format +msgid "Pull Requests from %s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:13 +#, python-format msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 -#, python-format -msgid "Show Pull Requests to %s" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +msgid "Open New Pull Request" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:37 #, python-format +msgid "Show Pull Requests to %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 -msgid "Hide closed pull requests (only show open pull requests)" -msgstr "" - #: kallithea/templates/pullrequests/pullrequest_show_all.html:49 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 msgid "Pull Requests I Participate In" msgstr "" @@ -6036,21 +6050,6 @@ #~ msgstr "" #~ msgid "" -#~ "Comment on %(repo_name)s changeset " -#~ "%(short_id)s on %(branch)s by " -#~ "%(comment_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Review request on %(repo_name)s pull " -#~ "request #%(pr_id)s from %(ref)s by " -#~ "%(pr_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Comment on %(repo_name)s pull request " -#~ "#%(pr_id)s from %(ref)s by " -#~ "%(comment_username)s" #~ msgstr "" #~ msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" @@ -6062,13 +6061,6 @@ #~ msgid "Username \"%(username)s\" is forbidden" #~ msgstr "" -#~ msgid "" -#~ "Username may only contain alphanumeric " -#~ "characters underscores, periods or dashes " -#~ "and must begin with alphanumeric " -#~ "character or underscore" -#~ msgstr "" - #~ msgid "invalid password" #~ msgstr "" @@ -6096,13 +6088,6 @@ #~ msgid "Revisions %(revs)s are already part of pull request or have set status" #~ msgstr "" -#~ msgid "" -#~ "Comma separated list of plugins. Order" -#~ " of plugins is also order in " -#~ "which Kallithea will try to authenticate" -#~ " user" -#~ msgstr "" - #~ msgid "Defaults" #~ msgstr "" @@ -6148,12 +6133,6 @@ #~ msgid "current IP" #~ msgstr "" -#~ msgid "" -#~ "Your user is in an external source" -#~ " of record; some details cannot be" -#~ " managed here" -#~ msgstr "" - #~ msgid "Permissions Administration" #~ msgstr "" @@ -6163,23 +6142,9 @@ #~ msgid "Overwrite existing settings" #~ msgstr "" -#~ msgid "" -#~ "All default permissions on each user " -#~ "group will be reset to chosen " -#~ "permission, note that all custom default" -#~ " permission on repository groups will " -#~ "be lost" -#~ msgstr "" - #~ msgid "Repository creation" #~ msgstr "" -#~ msgid "" -#~ "Write permission to a repository group" -#~ " allows creating repositories inside that" -#~ " group." -#~ msgstr "" - #~ msgid "Default IP Whitelist for All Users" #~ msgstr "" @@ -6240,20 +6205,6 @@ #~ msgid "Non-changeable id" #~ msgstr "" -#~ msgid "" -#~ "In case this repository is renamed " -#~ "or moved into another group the " -#~ "repository URL changes.\n" -#~ " Using the above " -#~ "URL guarantees that this repository will" -#~ " always be accessible under such URL." -#~ "\n" -#~ " Useful for CI " -#~ "systems, or any other cases that " -#~ "you need to hardcode the URL into" -#~ " 3rd party service." -#~ msgstr "" - #~ msgid "edit" #~ msgstr "" @@ -6299,12 +6250,6 @@ #~ msgid "Destroy old data" #~ msgstr "" -#~ msgid "" -#~ "Check this option to remove references" -#~ " to repositories that no longer exist" -#~ " in on the filesystem." -#~ msgstr "" - #~ msgid "check for updates" #~ msgstr "" @@ -6317,29 +6262,12 @@ #~ msgid "user groups" #~ msgstr "" -#~ msgid "" -#~ "This user is in an external source" -#~ " of record (%s); some details cannot" -#~ " be managed here." -#~ msgstr "" - #~ msgid "Inherit from defaults" #~ msgstr "" -#~ msgid "" -#~ "Select to inherit permissions from %s" -#~ " permissions settings, and default IP " -#~ "address whitelist." -#~ msgstr "" - #~ msgid "show" #~ msgstr "" -#~ msgid "" -#~ "Changeset status: %s\n" -#~ "Click to open associated pull request #%s" -#~ msgstr "" - #~ msgid "Push new repo" #~ msgstr "" @@ -6364,11 +6292,6 @@ #~ msgid "Comment on changeset" #~ msgstr "" -#~ msgid "" -#~ "Use @username inside this text to " -#~ "send notification to another local user." -#~ msgstr "" - #~ msgid "revision" #~ msgstr "" @@ -6399,3 +6322,60 @@ #~ msgid "with subrepos" #~ msgstr "" +#~ msgid "Your password reset link was sent" +#~ msgstr "" + +#~ msgid "" +#~ "Your password reset was successful, new" +#~ " password has been sent to your " +#~ "email" +#~ msgstr "" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Added by %(pr_username)s] %(repo_name)s pull" +#~ " request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "Your new password" +#~ msgstr "" + +#~ msgid "Your new Kallithea password:%s" +#~ msgstr "" + +#~ msgid "" +#~ "Password reset link will be sent " +#~ "to the email address matching your " +#~ "username." +#~ msgstr "" + +#~ msgid "Open New Pull Request for Selected Changesets" +#~ msgstr "" + +#~ msgid "Show Selected Changesets __S → __E" +#~ msgstr "" + +#~ msgid "Show Selected Changeset __S" +#~ msgstr "" + +#~ msgid "We received a request to create a new password for your account." +#~ msgstr "" + +#~ msgid "You can generate it by clicking following URL" +#~ msgstr "" + +#~ msgid "Please ignore this email if you did not request a new password ." +#~ msgstr "" + +#~ msgid "Created by" +#~ msgstr "" +
--- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po Tue Sep 08 10:21:46 2015 +0000 +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po Tue Sep 08 10:37:51 2015 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2015-08-25 11:37+0200\n" +"POT-Creation-Date: 2015-09-08 10:34+0200\n" "PO-Revision-Date: 2015-09-08 10:21+0200\n" "Last-Translator: Michael Pohl <michael@mipapo.de>\n" "Language-Team: German " @@ -20,7 +20,7 @@ "X-Generator: Weblate 2.4-dev\n" #: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:241 kallithea/lib/base.py:512 +#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 msgid "There are no changesets yet" msgstr "Es gibt noch keine Änderungssätze" @@ -36,7 +36,7 @@ msgid "None" msgstr "Keine" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(geschlossen)" @@ -51,12 +51,11 @@ #: kallithea/controllers/changeset.py:169 #, python-format -#| msgid "increase diff context to %(num)s lines" msgid "Increase diff context to %(num)s lines" msgstr "Erhöhe diff-Kontext auf %(num)s Zeilen" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:743 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 msgid "Such revision does not exist for this repository" msgstr "Die angegebene Version existiert nicht in diesem Repository" @@ -68,11 +67,11 @@ "Eine Änderung des Status eines Änderungssatzes, der mit einem geschlossen" " Pull-Request assoziert ist, ist nicht erlaubt" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:42 +#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 msgid "Select changeset" msgstr "Änderungssätze auswählen" -#: kallithea/controllers/compare.py:258 +#: kallithea/controllers/compare.py:261 msgid "Cannot compare repositories without using common ancestor" msgstr "" "Ohne einen gemeinsamen Vorfahren ist ein Vergleich der Repositories nicht" @@ -80,7 +79,6 @@ #: kallithea/controllers/error.py:71 #, fuzzy -#| msgid "revisions" msgid "No response" msgstr "revisionen" @@ -129,8 +127,8 @@ #: kallithea/templates/changeset/changeset.html:195 #: kallithea/templates/compare/compare_diff.html:78 #: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Changeset was too big and was cut off..." msgstr "Der Änderungssatz war zu groß und wurde abgeschnitten..." @@ -139,113 +137,113 @@ msgid "%s committed on %s" msgstr "" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:91 msgid "Click here to add new file" msgstr "Hier klicken, um eine neue Datei hinzuzufügen" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:92 #, python-format msgid "There are no files yet. %s" msgstr "Es gibt hier noch keine Dateien. %s" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "%s auf %s" -#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 -#: kallithea/controllers/files.py:433 +#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 +#: kallithea/controllers/files.py:432 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Dieses Repository ist von %s am %s gesperrt worden" -#: kallithea/controllers/files.py:318 +#: kallithea/controllers/files.py:317 msgid "You can only delete files with revision being a valid branch " msgstr "" -"Du kannst nur Dateien mit einer Revision löschen, die einen gültigen Branch " -"besitzen" - -#: kallithea/controllers/files.py:329 +"Du kannst nur Dateien mit einer Revision löschen, die einen gültigen " +"Branch besitzen" + +#: kallithea/controllers/files.py:328 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Datei %s via Kallithea gelöscht" -#: kallithea/controllers/files.py:351 +#: kallithea/controllers/files.py:350 #, python-format msgid "Successfully deleted file %s" msgstr "Datei %s erfolgreich gelöscht" -#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 -#: kallithea/controllers/files.py:502 +#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 +#: kallithea/controllers/files.py:501 msgid "Error occurred during commit" msgstr "Während des Commits trat ein Fehler auf" -#: kallithea/controllers/files.py:378 +#: kallithea/controllers/files.py:377 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:392 +#: kallithea/controllers/files.py:391 #, python-format msgid "Edited file %s via Kallithea" msgstr "Datei %s via Kallithea editiert" -#: kallithea/controllers/files.py:408 +#: kallithea/controllers/files.py:407 msgid "No changes" msgstr "Keine Änderungen" -#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 +#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 #, python-format msgid "Successfully committed to %s" msgstr "Der Commit zu %s war erfolgreich" -#: kallithea/controllers/files.py:444 +#: kallithea/controllers/files.py:443 msgid "Added file via Kallithea" msgstr "Datei via Kallithea hinzugefügt" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:464 msgid "No content" msgstr "Kein Inhalt" -#: kallithea/controllers/files.py:469 +#: kallithea/controllers/files.py:468 msgid "No filename" msgstr "Kein Dateiname" -#: kallithea/controllers/files.py:494 +#: kallithea/controllers/files.py:493 msgid "Location must be relative path and must not contain .. in path" msgstr "Der Ort muss ein relativer Pfad sein und darf nicht .. enthalten" -#: kallithea/controllers/files.py:527 +#: kallithea/controllers/files.py:526 msgid "Downloads disabled" msgstr "Downloads gesperrt" -#: kallithea/controllers/files.py:538 +#: kallithea/controllers/files.py:537 #, python-format msgid "Unknown revision %s" msgstr "Unbekannte Revision %s" -#: kallithea/controllers/files.py:540 +#: kallithea/controllers/files.py:539 msgid "Empty repository" msgstr "Leeres Repository" -#: kallithea/controllers/files.py:542 +#: kallithea/controllers/files.py:541 msgid "Unknown archive type" msgstr "Unbekannter Archivtyp" -#: kallithea/controllers/files.py:772 +#: kallithea/controllers/files.py:771 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:15 #: kallithea/templates/pullrequests/pullrequest.html:97 msgid "Changesets" msgstr "Änderungssätze" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:821 kallithea/templates/switch_to_list.html:3 +#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 +#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "Entwicklungszweige" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:832 kallithea/templates/switch_to_list.html:25 +#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 +#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "Tags" @@ -266,9 +264,9 @@ #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:131 -#: kallithea/templates/base/base.html:397 -#: kallithea/templates/base/base.html:569 +#: kallithea/templates/base/base.html:124 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "Repositories" @@ -294,33 +292,37 @@ msgstr "Öffentliches Logbuch" #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:229 +#: kallithea/templates/base/base.html:222 #: kallithea/templates/journal/journal.html:4 #: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "Logbuch" -#: kallithea/controllers/login.py:150 kallithea/controllers/login.py:196 +#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 #, fuzzy -#| msgid "bad captcha" msgid "Bad captcha" msgstr "falsches Captcha" -#: kallithea/controllers/login.py:156 +#: kallithea/controllers/login.py:157 msgid "You have successfully registered into Kallithea" msgstr "Sie haben sich erfolgreich bei Kallithea registriert" -#: kallithea/controllers/login.py:201 -msgid "Your password reset link was sent" +#: kallithea/controllers/login.py:202 +#, fuzzy +#| msgid "Your password reset link was sent" +msgid "A password reset confirmation code has been sent" msgstr "Ihr Passwort Zurücksetzen link wurde versendet" -#: kallithea/controllers/login.py:222 -msgid "" -"Your password reset was successful, new password has been sent to your " -"email" -msgstr "" -"Das Zurücksetzen des Passworted war erfolgreich, ein neues Passwort wurde" -" an ihre EMail Addresse gesendet" +#: kallithea/controllers/login.py:251 +#, fuzzy +#| msgid "Password reset link" +msgid "Invalid password reset token" +msgstr "Link zum Zurücksetzen des Passworts" + +#: kallithea/controllers/login.py:256 +#: kallithea/controllers/admin/my_account.py:167 +msgid "Successfully updated password" +msgstr "Erfolgreich Kennwort geändert" #: kallithea/controllers/pullrequests.py:124 #, python-format @@ -341,52 +343,52 @@ msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:827 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Lesezeichen" -#: kallithea/controllers/pullrequests.py:306 +#: kallithea/controllers/pullrequests.py:310 #, python-format msgid "Error creating pull request: %s" msgstr "Fehler beim Erstellen des Pull-Requests: %s" -#: kallithea/controllers/pullrequests.py:352 -#: kallithea/controllers/pullrequests.py:499 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:503 msgid "No description" msgstr "Keine Beschreibung" -#: kallithea/controllers/pullrequests.py:359 +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "Es wurde erfolgreich ein neuer Pullrequest eröffnet" -#: kallithea/controllers/pullrequests.py:362 -#: kallithea/controllers/pullrequests.py:449 -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:453 +#: kallithea/controllers/pullrequests.py:509 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:365 -#: kallithea/controllers/pullrequests.py:452 +#: kallithea/controllers/pullrequests.py:369 +#: kallithea/controllers/pullrequests.py:456 msgid "Error occurred while creating pull request" msgstr "Während des Erstellens des Pull Requests trat ein Fehler auf" -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:401 msgid "Missing changesets since the previous pull request:" msgstr "" -#: kallithea/controllers/pullrequests.py:404 +#: kallithea/controllers/pullrequests.py:408 #, python-format msgid "New changesets on %s %s since the previous pull request:" msgstr "Neue Changesets in %s %s seit dem letzten Pull Request:" -#: kallithea/controllers/pullrequests.py:411 +#: kallithea/controllers/pullrequests.py:415 msgid "Ancestor didn't change - show diff since previous version:" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:422 #, python-format msgid "" "This pull request is based on another %s revision and there is no simple " @@ -395,62 +397,62 @@ "Dieser Pull Request basiert auf einer anderen %s Revision. Daher ist kein" " Simple Diff verfügbar." -#: kallithea/controllers/pullrequests.py:420 +#: kallithea/controllers/pullrequests.py:424 #, python-format msgid "No changes found on %s %s since previous version." msgstr "Keine Änderungen seit der letzten Version gefunden in %s %s." -#: kallithea/controllers/pullrequests.py:458 +#: kallithea/controllers/pullrequests.py:462 #, python-format msgid "Closed, replaced by %s ." msgstr "Geschlossen, ersetzt durch %s." -#: kallithea/controllers/pullrequests.py:466 +#: kallithea/controllers/pullrequests.py:470 msgid "Pull request update created" msgstr "Pull Request Update erstellt" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:513 msgid "Pull request updated" msgstr "Pull Request aktualisiert" -#: kallithea/controllers/pullrequests.py:523 +#: kallithea/controllers/pullrequests.py:528 msgid "Successfully deleted pull request" msgstr "Erfolgreich Pull-Request gelöscht" -#: kallithea/controllers/pullrequests.py:582 +#: kallithea/controllers/pullrequests.py:594 #, python-format msgid "This pull request has already been merged to %s." msgstr "Dieser Pull Request wurde bereits in %s integriert." -#: kallithea/controllers/pullrequests.py:584 +#: kallithea/controllers/pullrequests.py:596 msgid "This pull request has been closed and can not be updated." msgstr "" "Dieser Pull Request wurde geschlossen und kann daher nicht aktualisiert " "werden." -#: kallithea/controllers/pullrequests.py:602 +#: kallithea/controllers/pullrequests.py:614 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "Dieser Pull Request kann mit Änderungen in %s aktualisiert werden:" -#: kallithea/controllers/pullrequests.py:605 +#: kallithea/controllers/pullrequests.py:617 msgid "No changesets found for updating this pull request." msgstr "Keine Changesets gefunden, um den Pull Request zu aktualisieren." -#: kallithea/controllers/pullrequests.py:613 +#: kallithea/controllers/pullrequests.py:625 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Hinweis: Branch %s hat einen anderen Head: %s." -#: kallithea/controllers/pullrequests.py:619 +#: kallithea/controllers/pullrequests.py:631 msgid "Git pull requests don't support updates yet." msgstr "Git Pull Request unterstützen bisher keine Updates." -#: kallithea/controllers/pullrequests.py:710 +#: kallithea/controllers/pullrequests.py:722 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:715 +#: kallithea/controllers/pullrequests.py:727 msgid "Closing." msgstr "Schließen." @@ -494,39 +496,38 @@ #: kallithea/controllers/admin/gists.py:59 #: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:283 +#: kallithea/controllers/admin/users.py:285 #, fuzzy -#| msgid "forever" msgid "Forever" msgstr "immer" #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/users.py:286 msgid "5 minutes" msgstr "5 Minuten" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/users.py:287 msgid "1 hour" msgstr "1 Stunde" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/users.py:288 msgid "1 day" msgstr "1 Tag" #: kallithea/controllers/admin/gists.py:63 #: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/users.py:289 msgid "1 month" msgstr "1 Monat" #: kallithea/controllers/admin/gists.py:67 #: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/users.py:291 msgid "Lifetime" msgstr "Lebenszeit" @@ -541,7 +542,6 @@ #: kallithea/controllers/admin/gists.py:233 #, fuzzy -#| msgid "unmodified" msgid "Unmodified" msgstr "ungeändert" @@ -558,8 +558,8 @@ msgid "Error occurred during update of gist %s" msgstr "Fehler beim Aktualisieren der Kerndaten %s" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:208 -#: kallithea/model/user.py:230 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 +#: kallithea/model/user.py:237 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Sie können diesen Benutzer nicht editieren, da er von entscheidender " @@ -570,47 +570,43 @@ msgstr "Ihr Account wurde erfolgreich aktualisiert" #: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:204 +#: kallithea/controllers/admin/users.py:202 #, python-format msgid "Error occurred during update of user %s" msgstr "Fehler beim Aktualisieren der Benutzer %s" -#: kallithea/controllers/admin/my_account.py:167 -msgid "Successfully updated password" -msgstr "Erfolgreich Kennwort geändert" - #: kallithea/controllers/admin/my_account.py:178 msgid "Error occurred during update of user password" msgstr "Fehler bei der Änderung des Kennworts" #: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:413 +#: kallithea/controllers/admin/users.py:415 #, python-format msgid "Added email %s to user" msgstr "Die EMail Addresse %s wurde zum Benutzer hinzugefügt" #: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:419 +#: kallithea/controllers/admin/users.py:421 msgid "An error occurred during email saving" msgstr "Währen der Speicherung der EMail Addresse trat ein Fehler auf" #: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:431 +#: kallithea/controllers/admin/users.py:433 msgid "Removed email from user" msgstr "Die EMail Addresse wurde vom Benutzer entfernt" #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:306 +#: kallithea/controllers/admin/users.py:308 msgid "API key successfully created" msgstr "API Key wurde erfolgreich erstellt" #: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:319 +#: kallithea/controllers/admin/users.py:321 msgid "API key successfully reset" msgstr "API-Schlüssel erfolgreich zurückgesetzt" #: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:323 +#: kallithea/controllers/admin/users.py:325 msgid "API key successfully deleted" msgstr "API-Schlüssel erfolgreich gelöscht" @@ -660,10 +656,10 @@ #: kallithea/templates/admin/users/user_edit_profile.html:105 #: kallithea/templates/admin/users/users.html:10 #: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:252 +#: kallithea/templates/base/base.html:253 #: kallithea/templates/base/base.html:259 #: kallithea/templates/base/base.html:260 -#: kallithea/templates/base/base.html:266 -#: kallithea/templates/base/base.html:267 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Admin" @@ -830,7 +826,6 @@ #: kallithea/controllers/admin/repos.py:321 #, fuzzy, python-format -#| msgid "Cannot delete %s it still contains attached forks" msgid "Cannot delete repository %s which still has forks" msgstr "%s konnte nicht gelöscht werden da es immernoch Forks enthält" @@ -881,14 +876,12 @@ #: kallithea/controllers/admin/repos.py:537 #: kallithea/controllers/admin/repos.py:564 #, fuzzy -#| msgid "Repository is not locked" msgid "Repository has been locked" msgstr "Repository ist nicht gesperrt" #: kallithea/controllers/admin/repos.py:540 #: kallithea/controllers/admin/repos.py:561 #, fuzzy -#| msgid "Repository is not locked" msgid "Repository has been unlocked" msgstr "Repository ist nicht gesperrt" @@ -932,54 +925,54 @@ "\"hgsubversion\"-Bibliothek fehlt" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:274 +#: kallithea/controllers/admin/settings.py:277 msgid "Error occurred while updating application settings" msgstr "" "Ein Fehler ist während der Aktualisierung der Applikationseinstellungen " "aufgetreten" -#: kallithea/controllers/admin/settings.py:213 +#: kallithea/controllers/admin/settings.py:216 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" "Die Repositories wurden erfolgreich überprüft. Hinzugefügt: %s. Entfernt:" " %s." -#: kallithea/controllers/admin/settings.py:270 +#: kallithea/controllers/admin/settings.py:273 msgid "Updated application settings" msgstr "Anwendungseinstellungen aktualisiert" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "Visualisierungseinstellungen aktualisiert" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:335 msgid "Error occurred during updating visualisation settings" msgstr "" "Es ist ein Fehler während der Aktualisierung der Layouteinstellung " "aufgetreten" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:361 msgid "Please enter email address" msgstr "Bitte gebe eine E-Mailadresse an" -#: kallithea/controllers/admin/settings.py:373 +#: kallithea/controllers/admin/settings.py:376 msgid "Send email task created" msgstr "Task zum Versenden von E-Mails erstellt" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Added new hook" msgstr "Neuer Hook hinzugefügt" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:421 msgid "Updated hooks" msgstr "Die Hooks wurden aktutalisiert" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:425 msgid "Error occurred during hook creation" msgstr "Während der Erzeugung des Hooks ist ein Fehler aufgetreten" -#: kallithea/controllers/admin/settings.py:448 +#: kallithea/controllers/admin/settings.py:451 msgid "Whoosh reindex task scheduled" msgstr "Whoosh Reindizierungs Aufgabe wurde zur Ausführung geplant" @@ -1020,70 +1013,69 @@ msgstr "Berechtigungen der Benutzergruppe wurden aktualisiert" #: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:382 +#: kallithea/controllers/admin/users.py:384 msgid "Updated permissions" msgstr "Berechtigungen wurden aktualisiert" #: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:386 +#: kallithea/controllers/admin/users.py:388 msgid "An error occurred during permissions saving" msgstr "Es ist ein Fehler während des Speicherns der Berechtigungen aufgetreten" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:134 #, python-format msgid "Created user %s" msgstr "Nutzer %s erstellt" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "Während des Erstellens des Benutzers %s ist ein Fehler aufgetreten" -#: kallithea/controllers/admin/users.py:184 +#: kallithea/controllers/admin/users.py:182 msgid "User updated successfully" msgstr "Der Benutzer wurde erfolgreich aktualisiert" -#: kallithea/controllers/admin/users.py:220 +#: kallithea/controllers/admin/users.py:218 msgid "Successfully deleted user" msgstr "Der Nutzer wurde erfolgreich gelöscht" -#: kallithea/controllers/admin/users.py:225 +#: kallithea/controllers/admin/users.py:223 msgid "An error occurred during deletion of user" msgstr "Während der Löschen des Benutzers trat ein Fehler auf" -#: kallithea/controllers/admin/users.py:238 +#: kallithea/controllers/admin/users.py:236 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:461 +#: kallithea/controllers/admin/users.py:463 #, python-format msgid "Added IP address %s to user whitelist" msgstr "Die IP-Adresse %s wurde zur Nutzerwhitelist hinzugefügt" -#: kallithea/controllers/admin/users.py:467 +#: kallithea/controllers/admin/users.py:469 msgid "An error occurred while adding IP address" msgstr "Während des Speicherns der IP-Adresse ist ein Fehler aufgetreten" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 msgid "Removed IP address from user whitelist" msgstr "IP-Adresse wurde von der Nutzerwhitelist entfernt" -#: kallithea/lib/auth.py:744 +#: kallithea/lib/auth.py:743 #, python-format msgid "IP %s not allowed" msgstr "IP-Adresse %s ist nicht erlaubt" -#: kallithea/lib/auth.py:757 +#: kallithea/lib/auth.py:756 #, fuzzy -#| msgid "New api key" msgid "Invalid API key" msgstr "Neuer API Key" -#: kallithea/lib/auth.py:795 +#: kallithea/lib/auth.py:812 msgid "You need to be a registered user to perform this action" msgstr "Sie müssen ein Registrierter Nutzer sein um diese Aktion durchzuführen" -#: kallithea/lib/auth.py:827 +#: kallithea/lib/auth.py:844 msgid "You need to be signed in to view this page" msgstr "Sie müssen sich anmelden um diese Seite aufzurufen" @@ -1126,7 +1118,6 @@ #: kallithea/lib/helpers.py:677 #, fuzzy -#| msgid "compare view" msgid "Compare view" msgstr "vergleichsansicht" @@ -1145,13 +1136,11 @@ #: kallithea/lib/helpers.py:722 #, fuzzy, python-format -#| msgid "fork name %s" msgid "Fork name %s" msgstr "Fork Name %s" #: kallithea/lib/helpers.py:742 #, fuzzy, python-format -#| msgid "Pull request #%s" msgid "Pull request %s" msgstr "Pull Request #%s" @@ -1242,7 +1231,7 @@ #: kallithea/lib/helpers.py:1128 #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "" @@ -1793,13 +1782,11 @@ #: kallithea/model/db.py:1668 #, fuzzy -#| msgid "Unauthorized access to resource" msgid "Default user has read access to new repositories" msgstr "Unauthorisierter Zugang zur Ressource" #: kallithea/model/db.py:1669 #, fuzzy -#| msgid "Unauthorized access to resource" msgid "Default user has write access to new repositories" msgstr "Unauthorisierter Zugang zur Ressource" @@ -1840,74 +1827,62 @@ msgstr "" #: kallithea/model/db.py:1682 -#, fuzzy, python-format -#| msgid "Created repository group %s" +#, fuzzy msgid "Only admins can create repository groups" msgstr "Repositoriumsgruppe %s erstellt" #: kallithea/model/db.py:1683 -#, fuzzy, python-format -#| msgid "Created repository group %s" +#, fuzzy msgid "Non-admins can create repository groups" msgstr "Repositoriumsgruppe %s erstellt" #: kallithea/model/db.py:1685 #, fuzzy -#| msgid "[created] user group" msgid "Only admins can create user groups" msgstr "Benutzergruppe [erstellt]" #: kallithea/model/db.py:1686 #, fuzzy -#| msgid "[created] user group" msgid "Non-admins can create user groups" msgstr "Benutzergruppe [erstellt]" #: kallithea/model/db.py:1688 #, fuzzy -#| msgid "Top level repositories" msgid "Only admins can create top level repositories" msgstr "Repositories oberster Ebene" #: kallithea/model/db.py:1689 #, fuzzy -#| msgid "Top level repositories" msgid "Non-admins can create top level repositories" msgstr "Repositories oberster Ebene" #: kallithea/model/db.py:1694 #, fuzzy -#| msgid "Location of repositories" msgid "Only admins can fork repositories" msgstr "Ort der Repositories" #: kallithea/model/db.py:1695 #, fuzzy -#| msgid "Location of repositories" msgid "Non-admins can can fork repositories" msgstr "Ort der Repositories" #: kallithea/model/db.py:1698 #, fuzzy -#| msgid "User Registration with manual account activation" msgid "User registration with manual account activation" msgstr "Benutzerregistrierung mit manueller Kontoaktivierung" #: kallithea/model/db.py:1699 #, fuzzy -#| msgid "User Registration with automatic account activation" msgid "User registration with automatic account activation" msgstr "Benutzerregistrierung mit automatische Kontoaktivierung" #: kallithea/model/db.py:2228 #, fuzzy -#| msgid "Not Reviewed" msgid "Not reviewed" msgstr "Nicht Begutachtet" #: kallithea/model/db.py:2231 #, fuzzy -#| msgid "Under Review" msgid "Under review" msgstr "In Begutachtung" @@ -1935,37 +1910,31 @@ #: kallithea/model/notification.py:254 #, fuzzy, python-format -#| msgid "%(user)s commented on changeset at %(when)s" msgid "%(user)s commented on changeset %(age)s" msgstr "%(user)s hat am %(when)s ein Changeset kommentiert" #: kallithea/model/notification.py:255 #, fuzzy, python-format -#| msgid "%(user)s sent message at %(when)s" msgid "%(user)s sent message %(age)s" msgstr "%(user)s hat am %(when)s eine Nachricht gesendet" #: kallithea/model/notification.py:256 #, fuzzy, python-format -#| msgid "%(user)s mentioned you at %(when)s" msgid "%(user)s mentioned you %(age)s" msgstr "%(user)s hat Sie am %(when)s erwähnt" #: kallithea/model/notification.py:257 #, fuzzy, python-format -#| msgid "%(user)s registered in Kallithea at %(when)s" msgid "%(user)s registered in Kallithea %(age)s" msgstr "%(user)s hat sich am %(when)s bei Kallithea registriert" #: kallithea/model/notification.py:258 #, fuzzy, python-format -#| msgid "%(user)s opened new pull request at %(when)s" msgid "%(user)s opened new pull request %(age)s" msgstr "%(user)s hat am %(when)s einen neuen Pull Request eröffnet" #: kallithea/model/notification.py:259 #, fuzzy, python-format -#| msgid "%(user)s commented on pull request at %(when)s" msgid "%(user)s commented on pull request %(age)s" msgstr "%(user)s hat am %(when)s einen Pull Request kommentiert" @@ -2001,11 +1970,9 @@ #: kallithea/model/notification.py:302 #, fuzzy, python-format -#| msgid "" "Comment on %(repo_name)s changeset %(short_id)s on %(branch)s by " -#| "%(comment_username)s" -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s changeset %(short_id)s " -"on %(branch)s" +#| msgid "" "[Comment from %(comment_username)s] %(repo_name)s changeset +#| %(short_id)s " "on %(branch)s" +msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" "Kommentar für %(repo_name)s Changeset %(short_id)s in %(branch)s erstellt" " von %(comment_username)s" @@ -2017,21 +1984,18 @@ #: kallithea/model/notification.py:307 #, fuzzy, python-format -#| msgid "" " -msgid "" -"[Added by %(pr_username)s] %(repo_name)s pull request %(pr_nice_id)s from" -" %(ref)s" +#| msgid "" "[Added by %(pr_username)s] %(repo_name)s pull request +#| %(pr_nice_id)s from" " %(ref)s" +msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" "Review Request für %(repo_name)s Pull Request #%(pr_id)s von %(ref)s " "erstellt von %(pr_username)s" #: kallithea/model/notification.py:308 #, fuzzy, python-format -#| msgid "" "Comment on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " -#| "%(comment_username)s" -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s pull request " -"%(pr_nice_id)s from %(ref)s" +#| msgid "" "[Comment from %(comment_username)s] %(repo_name)s pull request " +#| "%(pr_nice_id)s from %(ref)s" +msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" "Kommentar von %(comment_username)s für %(repo_name)s Pull Request " "#%(pr_id)s von %(ref)s" @@ -2042,27 +2006,25 @@ #: kallithea/model/pull_request.py:137 #, fuzzy, python-format -#| msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "%(user)s möchte ein Review des Pull Request #%(pr_id)s: %(pr_title)s" -#: kallithea/model/scm.py:813 +#: kallithea/model/scm.py:812 msgid "latest tip" msgstr "Letzter Tip" -#: kallithea/model/user.py:185 +#: kallithea/model/user.py:192 msgid "New user registration" msgstr "Neue Benutzerregistrierung" -#: kallithea/model/user.py:249 +#: kallithea/model/user.py:256 #, fuzzy -#| msgid "You can't remove this user since it's crucial for entire application" msgid "You can't remove this user since it is crucial for the entire application" msgstr "" "Sie können diesen Benutzer nicht löschen, da er von entscheidender " "Bedeutung für die gesamte Applikation ist" -#: kallithea/model/user.py:254 +#: kallithea/model/user.py:261 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -2072,7 +2034,7 @@ "nicht entfernt werden. Entweder muss der Besitzer geändert oder das " "Repository entfernt werden: %s" -#: kallithea/model/user.py:259 +#: kallithea/model/user.py:266 #, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch" @@ -2082,7 +2044,7 @@ "kann daher nicht entfernt werden. Entweder muss der Besitzer geändert " "oder die Repositorygruppen müssen entfernt werden: %s" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:273 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -2092,18 +2054,22 @@ "nicht entfernt werden. Entweder muss der Besitzer geändert oder die " "Benutzergruppen müssen gelöscht werden: %s" -#: kallithea/model/user.py:296 +#: kallithea/model/user.py:360 msgid "Password reset link" msgstr "Link zum Zurücksetzen des Passworts" -#: kallithea/model/user.py:319 -msgid "Your new password" -msgstr "Dein neues Passwort" - -#: kallithea/model/user.py:320 -#, python-format -msgid "Your new Kallithea password:%s" -msgstr "Ihr neues Kallithea-Passwort: %s" +#: kallithea/model/user.py:408 +#, fuzzy +#| msgid "Password reset link" +msgid "Password reset notification" +msgstr "Link zum Zurücksetzen des Passworts" + +#: kallithea/model/user.py:409 +#, python-format +msgid "" +"The password to your account %s has been changed using password reset " +"form." +msgstr "" #: kallithea/model/validators.py:77 kallithea/model/validators.py:78 msgid "Value cannot be an empty list" @@ -2116,13 +2082,11 @@ #: kallithea/model/validators.py:97 #, fuzzy, python-format -#| msgid "Username %(username)s is not valid" msgid "Username \"%(username)s\" cannot be used" msgstr "Benutzername \"%(username)s\" ist ungültig" #: kallithea/model/validators.py:99 #, fuzzy -#| msgid "" " msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with an alphanumeric character or underscore" @@ -2186,7 +2150,6 @@ #: kallithea/model/validators.py:300 #, fuzzy -#| msgid "invalid password" msgid "Invalid username or password" msgstr "Ungültiges Passwort" @@ -2196,7 +2159,6 @@ #: kallithea/model/validators.py:345 #, fuzzy, python-format -#| msgid "Repository name %(repo)s is disallowed" msgid "Repository name %(repo)s is not allowed" msgstr "Repository Name \"%(repo)s\" ist verboten" @@ -2219,7 +2181,6 @@ #: kallithea/model/validators.py:465 #, fuzzy -#| msgid "private repository" msgid "Invalid repository URL" msgstr "privates Repository" @@ -2257,13 +2218,11 @@ #: kallithea/model/validators.py:705 #, fuzzy -#| msgid "This email address is already taken" msgid "This email address is already in use" msgstr "Diese E-Mailaddresse ist bereits in Benutzung" #: kallithea/model/validators.py:725 #, fuzzy, python-format -#| msgid "email \"%(email)s\" does not exist." msgid "Email address \"%(email)s\" not found" msgstr "E-MailAddresse \"%(email)s\" existiert nicht." @@ -2423,7 +2382,9 @@ #: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:229 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/pullrequests/pullrequest_show.html:156 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 #: kallithea/templates/summary/summary.html:134 msgid "Owner" msgstr "Besitzer" @@ -2431,7 +2392,7 @@ #: kallithea/templates/index_base.html:140 #: kallithea/templates/admin/my_account/my_account_repos.html:57 #: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:44 +#: kallithea/templates/base/root.html:43 #: kallithea/templates/bookmarks/bookmarks.html:79 #: kallithea/templates/branches/branches.html:79 #: kallithea/templates/journal/journal.html:198 @@ -2443,7 +2404,7 @@ #: kallithea/templates/index_base.html:141 #: kallithea/templates/admin/my_account/my_account_repos.html:58 #: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:45 +#: kallithea/templates/base/root.html:44 #: kallithea/templates/bookmarks/bookmarks.html:80 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:199 @@ -2459,7 +2420,7 @@ #: kallithea/templates/index_base.html:143 #: kallithea/templates/admin/my_account/my_account_repos.html:60 #: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:46 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:201 @@ -2471,7 +2432,7 @@ #: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:147 kallithea/templates/base/root.html:48 +#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:202 @@ -2481,7 +2442,7 @@ msgstr "Lade..." #: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:333 +#: kallithea/templates/base/base.html:326 msgid "Log In" msgstr "Log In" @@ -2496,14 +2457,15 @@ #: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:24 #: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/pullrequests/pullrequest_show.html:166 msgid "Username" msgstr "Benutzername" #: kallithea/templates/login.html:33 kallithea/templates/register.html:33 #: kallithea/templates/admin/my_account/my_account.html:37 #: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:311 msgid "Password" msgstr "Passwort" @@ -2515,7 +2477,7 @@ msgid "Forgot your password ?" msgstr "Passowrt Vergessen?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:329 +#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 msgid "Don't have an account ?" msgstr "Kein Account?" @@ -2528,11 +2490,14 @@ msgstr "Passwort zurücksetzen" #: kallithea/templates/password_reset.html:12 +#: kallithea/templates/password_reset_confirmation.html:12 #, python-format msgid "Reset Your Password to %s" msgstr "Setze dein Passwort auf %s zurück" #: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset_confirmation.html:5 +#: kallithea/templates/password_reset_confirmation.html:14 msgid "Reset Your Password" msgstr "Setze dein Passwort zurück" @@ -2550,13 +2515,47 @@ msgstr "E-Mail zum Zurücksetzen des Passworts anfordern" #: kallithea/templates/password_reset.html:47 +#, fuzzy +#| msgid "" "Password reset link will be sent to the email address matching +#| your " "username." msgid "" -"Password reset link will be sent to the email address matching your " -"username." +"A password reset link will be sent to the specified email address if it " +"is registered in the system." msgstr "" "Der Link zum Zurücksetzen des Passworts wird an die zum Benutzernamen " "zugehörige E-Mailaddresse gesendet." +#: kallithea/templates/password_reset_confirmation.html:19 +#, python-format +msgid "You are about to set a new password for the email address %s." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:20 +msgid "" +"Note that you must use the same browser session for this as the one used " +"to request the password reset." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:30 +msgid "Code you received in the email" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:39 +#, fuzzy +#| msgid "New password" +msgid "New Password" +msgstr "Neues Passwort" + +#: kallithea/templates/password_reset_confirmation.html:48 +#, fuzzy +#| msgid "Confirm new password" +msgid "Confirm New Password" +msgstr "Bestätige neues Passwort" + +#: kallithea/templates/password_reset_confirmation.html:56 +msgid "Confirm" +msgstr "" + #: kallithea/templates/register.html:5 kallithea/templates/register.html:14 #: kallithea/templates/register.html:90 msgid "Sign Up" @@ -2702,7 +2701,6 @@ #: kallithea/templates/admin/auth/auth_settings.html:33 #, fuzzy -#| msgid "" " msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" @@ -2847,7 +2845,6 @@ #: kallithea/templates/admin/users/user_edit_api_keys.html:8 #: kallithea/templates/admin/users/user_edit_api_keys.html:27 #, fuzzy -#| msgid "never" msgid "Never" msgstr "nie" @@ -2879,7 +2876,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:244 +#: kallithea/templates/base/base.html:237 msgid "Create New Gist" msgstr "Neuen Gist erstellen" @@ -3021,7 +3018,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/base/base.html:343 msgid "My Account" msgstr "Mein Account" @@ -3032,7 +3029,6 @@ #: kallithea/templates/admin/my_account/my_account.html:36 #, fuzzy -#| msgid "New email address" msgid "Email Addresses" msgstr "Neue E-Mailadresse" @@ -3043,14 +3039,12 @@ #: kallithea/templates/admin/my_account/my_account.html:39 #, fuzzy -#| msgid "repositories" msgid "Owned Repositories" msgstr "Repositories" #: kallithea/templates/admin/my_account/my_account.html:40 #: kallithea/templates/journal/journal.html:53 #, fuzzy -#| msgid "repositories" msgid "Watched Repositories" msgstr "Repositories" @@ -3059,7 +3053,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 #, fuzzy -#| msgid "Copy permissions" msgid "Show Permissions" msgstr "Berechtigungen kopieren" @@ -3071,42 +3064,36 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #, fuzzy, python-format -#| msgid "Confirm to reset this api key: %s" msgid "Confirm to reset this API key: %s" msgstr "Zurücksetzen des API Keys \"%s\" bestätigen" #: kallithea/templates/admin/my_account/my_account_api_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:30 #, fuzzy -#| msgid "expired" msgid "Expired" msgstr "verfallen" #: kallithea/templates/admin/my_account/my_account_api_keys.html:40 #: kallithea/templates/admin/users/user_edit_api_keys.html:40 #, fuzzy, python-format -#| msgid "Confirm to remove this api key: %s" msgid "Confirm to remove this API key: %s" msgstr "Entfernen des API Keys \"%s\" bestätigen" #: kallithea/templates/admin/my_account/my_account_api_keys.html:42 #: kallithea/templates/admin/users/user_edit_api_keys.html:42 #, fuzzy -#| msgid "remove" msgid "Remove" msgstr "entfernen" #: kallithea/templates/admin/my_account/my_account_api_keys.html:49 #: kallithea/templates/admin/users/user_edit_api_keys.html:49 #, fuzzy -#| msgid "No additional api keys specified" msgid "No additional API keys specified" msgstr "Keine weiteren API Keys spezifiziert" #: kallithea/templates/admin/my_account/my_account_api_keys.html:61 #: kallithea/templates/admin/users/user_edit_api_keys.html:61 #, fuzzy -#| msgid "New api key" msgid "New API key" msgstr "Neuer API Key" @@ -3185,7 +3172,6 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:16 #: kallithea/templates/admin/users/user_edit_profile.html:15 #, fuzzy -#| msgid "current IP" msgid "Current IP" msgstr "Aktuelle IP-Adresse" @@ -3195,7 +3181,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:45 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:200 @@ -3222,7 +3208,7 @@ msgstr "Kommentare" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 msgid "Pull Requests" msgstr "Pull Requests" @@ -3240,7 +3226,7 @@ msgstr "Zeige Benachrichtigung" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:342 msgid "Notifications" msgstr "Benachrichtigungen" @@ -3285,7 +3271,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:26 #, fuzzy -#| msgid "Import existing repository ?" msgid "Apply to all existing repositories" msgstr "Bestehendes Repository importieren?" @@ -3313,13 +3298,11 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:40 #, fuzzy -#| msgid "Import existing repository ?" msgid "Apply to all existing repository groups" msgstr "Bestehendes Repository importieren?" #: kallithea/templates/admin/permissions/permissions_globals.html:41 #, fuzzy -#| msgid "Copy permission set from parent repository group." msgid "Permissions for the Default user on new repository groups." msgstr "Rechte der übergeordneten Repositorygruppe kopieren." @@ -3330,9 +3313,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:53 #, fuzzy -#| msgid "" " -#| " " -#| " "will be lost" msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " @@ -3352,7 +3332,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:60 #, fuzzy -#| msgid "Repository creation" msgid "Top level repository creation" msgstr "Repository erstellung" @@ -3372,7 +3351,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:74 #, fuzzy -#| msgid "" " msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " @@ -3408,7 +3386,6 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:13 #: kallithea/templates/admin/users/user_edit_ips.html:23 #, fuzzy, python-format -#| msgid "Confirm to delete this ip: %s" msgid "Confirm to delete this IP address: %s" msgstr "Bestätigen diese IP zu löschen: %s" @@ -3466,7 +3443,7 @@ #: kallithea/templates/admin/repos/repo_edit.html:40 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:158 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 #: kallithea/templates/data_table/_dt_elements.html:45 #: kallithea/templates/data_table/_dt_elements.html:49 msgid "Settings" @@ -3505,7 +3482,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:146 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 msgid "Created on" msgstr "Erstellt am" @@ -3525,7 +3502,6 @@ #: kallithea/templates/admin/repos/repo_edit_permissions.html:12 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 #, fuzzy -#| msgid "user/user group" msgid "User/User Group" msgstr "Benutzer/Benutzergruppe" @@ -3536,7 +3512,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 #, fuzzy -#| msgid "default" msgid "Default" msgstr "standart" @@ -3547,7 +3522,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 #, fuzzy -#| msgid "revoke" msgid "Revoke" msgstr "entziehen" @@ -3608,7 +3582,6 @@ #: kallithea/templates/admin/repos/repo_add_base.html:17 #, fuzzy -#| msgid "[created] repository" msgid "Clone remote repository" msgstr "[erstellt] Repository" @@ -3864,25 +3837,21 @@ #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 #, fuzzy -#| msgid "private repository" msgid "Private Repository" msgstr "privates Repository" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 -#, fuzzy, python-format -#| msgid "Created repository %s" +#, fuzzy msgid "Remote repository URL" msgstr "Repositorium erzeugt %s" #: kallithea/templates/admin/repos/repo_edit_remote.html:9 #, fuzzy -#| msgid "[pulled from remote] into repository" msgid "Pull Changes from Remote Repository" msgstr "[Pulled von Remote] in Repository" #: kallithea/templates/admin/repos/repo_edit_remote.html:11 #, fuzzy -#| msgid "[pulled from remote] into repository" msgid "Confirm to pull changes from remote repository." msgstr "[Pulled von Remote] in Repository" @@ -3892,7 +3861,6 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:11 #, fuzzy -#| msgid "private repository" msgid "Permanent Repository ID" msgstr "privates Repository" @@ -3916,13 +3884,11 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:21 #, fuzzy -#| msgid "[created] repository" msgid "Remote repository" msgstr "[erstellt] Repository" #: kallithea/templates/admin/repos/repo_edit_settings.html:25 #, fuzzy -#| msgid "Repository" msgid "Repository URL" msgstr "Repository" @@ -4061,7 +4027,7 @@ msgid "Custom Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:68 +#: kallithea/templates/admin/settings/settings_hooks.html:67 msgid "Failed to remove hook" msgstr "" @@ -4097,7 +4063,18 @@ "Current hooks will be updated to the latest version." msgstr "" +#: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "Overwrite existing Git hooks" +msgstr "" + #: kallithea/templates/admin/settings/settings_mapping.html:30 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any" +" custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:35 msgid "Rescan Repositories" msgstr "" @@ -4125,7 +4102,6 @@ #: kallithea/templates/admin/settings/settings_system.html:4 #, fuzzy -#| msgid "check for updates" msgid "Check for updates" msgstr "Auf Updates prüfen" @@ -4328,7 +4304,6 @@ #: kallithea/templates/admin/settings/settings_visual.html:92 #, fuzzy -#| msgid "Settings" msgid "Meta Tagging" msgstr "Einstellungen" @@ -4370,7 +4345,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit.html:33 #, fuzzy -#| msgid "members" msgid "Show Members" msgstr "mitglieder" @@ -4515,47 +4489,47 @@ msgid "Git repository" msgstr "Git Repository" -#: kallithea/templates/base/base.html:126 +#: kallithea/templates/base/base.html:119 msgid "Create Fork" msgstr "Fork erstellen" -#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:130 #: kallithea/templates/data_table/_dt_elements.html:13 #: kallithea/templates/data_table/_dt_elements.html:17 #: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "Zusammenfassung" -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:141 +#: kallithea/templates/base/base.html:132 +#: kallithea/templates/base/base.html:134 #: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:21 #: kallithea/templates/data_table/_dt_elements.html:25 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:136 #: kallithea/templates/data_table/_dt_elements.html:29 #: kallithea/templates/data_table/_dt_elements.html:33 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "Dateien" -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:138 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/base/base.html:154 +#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:147 msgid "Options" msgstr "Optionen" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:155 #: kallithea/templates/forks/forks_data.html:21 msgid "Compare Fork" msgstr "Fork vergleichen" -#: kallithea/templates/base/base.html:164 +#: kallithea/templates/base/base.html:157 #: kallithea/templates/bookmarks/bookmarks.html:56 #: kallithea/templates/bookmarks/bookmarks_data.html:13 #: kallithea/templates/branches/branches.html:56 @@ -4565,117 +4539,116 @@ msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:166 -#: kallithea/templates/base/base.html:254 +#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:247 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:54 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:170 +#: kallithea/templates/base/base.html:163 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:172 +#: kallithea/templates/base/base.html:165 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:173 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:174 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:184 +#: kallithea/templates/base/base.html:177 #: kallithea/templates/data_table/_dt_elements.html:37 #: kallithea/templates/data_table/_dt_elements.html:41 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:178 #: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 #, python-format msgid "Show Pull Requests for %s" msgstr "" +#: kallithea/templates/base/base.html:221 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:227 #: kallithea/templates/base/base.html:228 -msgid "Show recent activity" +msgid "Public journal" +msgstr "Öffentliches Logbuch" + +#: kallithea/templates/base/base.html:233 +msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:234 -#: kallithea/templates/base/base.html:235 -msgid "Public journal" -msgstr "Öffentliches Logbuch" +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:238 +msgid "All Public Gists" +msgstr "" #: kallithea/templates/base/base.html:240 -msgid "Show public gists" +msgid "My Public Gists" msgstr "" #: kallithea/templates/base/base.html:241 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:245 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:247 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:248 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:253 +#: kallithea/templates/base/base.html:246 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:276 -#: kallithea/templates/base/base.html:277 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +#: kallithea/templates/base/base.html:269 +#: kallithea/templates/base/base.html:270 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "Meine Pull Requests" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:289 msgid "Not Logged In" msgstr "Nicht eingeloggt" -#: kallithea/templates/base/base.html:303 +#: kallithea/templates/base/base.html:296 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:319 msgid "Forgot password ?" msgstr "Passwort vergessen?" -#: kallithea/templates/base/base.html:353 +#: kallithea/templates/base/base.html:346 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:402 +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "Keine Übereinstimmungen gefunden" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:540 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" #: kallithea/templates/base/default_perms_box.html:14 #, fuzzy -#| msgid "Repository Defaults" msgid "Inherit defaults" msgstr "Repositorystandards" @@ -4771,52 +4744,51 @@ msgstr "" #: kallithea/templates/base/root.html:31 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 -msgid "Open New Pull Request" -msgstr "Einen neuen Pull Request eröffnen" +#, fuzzy +#| msgid "on pull request" +msgid "Open New Pull Request from {0}" +msgstr "Kommentar von Pull Request" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for Selected Changesets" +msgid "Open New Pull Request for {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets __S → __E" -msgstr "" +#, fuzzy +#| msgid "Show Selected Changeset __S" +msgid "Show Selected Changesets {0} → {1}" +msgstr "Ausgewähltes Changeset anzeigen __S" #: kallithea/templates/base/root.html:34 -msgid "Show Selected Changeset __S" -msgstr "Ausgewähltes Changeset anzeigen __S" +msgid "Selection Link" +msgstr "" #: kallithea/templates/base/root.html:35 -msgid "Selection Link" +#: kallithea/templates/changeset/diff_block.html:8 +msgid "Collapse Diff" msgstr "" #: kallithea/templates/base/root.html:36 -#: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse Diff" +msgid "Expand Diff" msgstr "" #: kallithea/templates/base/root.html:37 -msgid "Expand Diff" +msgid "Failed to revoke permission" msgstr "" #: kallithea/templates/base/root.html:38 -msgid "Failed to revoke permission" -msgstr "" +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "Widerruf der Rechte für {0}: {1} bestätigen?" #: kallithea/templates/base/root.html:39 -msgid "Confirm to revoke permission for {0}: {1} ?" -msgstr "Widerruf der Rechte für {0}: {1} bestätigen?" +msgid "enabled" +msgstr "Aktiviert" #: kallithea/templates/base/root.html:40 -msgid "enabled" -msgstr "Aktiviert" - -#: kallithea/templates/base/root.html:41 msgid "disabled" msgstr "Deaktiviert" -#: kallithea/templates/base/root.html:43 +#: kallithea/templates/base/root.html:42 msgid "Specify changeset" msgstr "Changeset angeben" @@ -4834,7 +4806,6 @@ #: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 #: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" @@ -4874,7 +4845,7 @@ msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/templates/changelog/changelog.html:49 msgid "Clear selection" msgstr "" @@ -4946,7 +4917,7 @@ msgid "Branch %s" msgstr "Branch %s" -#: kallithea/templates/changelog/changelog.html:291 +#: kallithea/templates/changelog/changelog.html:310 msgid "There are no changes yet" msgstr "Bisher gibt es keine Änderungen" @@ -5004,7 +4975,6 @@ #: kallithea/templates/changelog/changelog_summary_data.html:90 #, fuzzy -#| msgid "private repository" msgid "Push new repository" msgstr "privates Repository" @@ -5062,19 +5032,17 @@ #: kallithea/templates/changeset/changeset.html:135 #, fuzzy -#| msgid "Created by" msgid "Replaced by:" msgstr "Erstellt von" #: kallithea/templates/changeset/changeset.html:149 #, fuzzy -#| msgid "Created by" msgid "Preceded by:" msgstr "Erstellt von" #: kallithea/templates/changeset/changeset.html:166 #: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:314 +#: kallithea/templates/pullrequests/pullrequest_show.html:318 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -5083,7 +5051,7 @@ #: kallithea/templates/changeset/changeset.html:168 #: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:320 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -5092,21 +5060,19 @@ #: kallithea/templates/changeset/changeset.html:182 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Show full diff anyway" msgstr "" #: kallithea/templates/changeset/changeset.html:247 #: kallithea/templates/changeset/changeset.html:284 #, fuzzy -#| msgid "revisions" msgid "No revisions" msgstr "revisionen" #: kallithea/templates/changeset/changeset_file_comment.html:21 #, fuzzy -#| msgid "Comment from pull request" msgid "on pull request" msgstr "Kommentar von Pull Request" @@ -5115,8 +5081,7 @@ msgstr "Kein Titel" #: kallithea/templates/changeset/changeset_file_comment.html:24 -#, fuzzy, python-format -#| msgid "%s changesets" +#, fuzzy msgid "on this changeset" msgstr "%s Changesets" @@ -5126,7 +5091,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:37 #, fuzzy -#| msgid "Latest Changes" msgid "Status change" msgstr "Letzte Änderungen" @@ -5273,7 +5237,7 @@ msgstr "" #: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:306 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 msgid "Common ancestor" msgstr "" @@ -5314,7 +5278,7 @@ msgstr "" #: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:301 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5378,20 +5342,28 @@ msgstr "Hallo %s" #: kallithea/templates/email_templates/password_reset.html:6 -msgid "We received a request to create a new password for your account." +#, fuzzy +#| msgid "We received a request to create a new password for your account." +msgid "We have received a request to reset the password for your account." msgstr "" "Wir haben eine Anforderung erhalten, für deinen Account ein neues " "Passwort zu erstellen." #: kallithea/templates/email_templates/password_reset.html:7 -msgid "You can generate it by clicking following URL" -msgstr "Du kannst es über die folgende URL erstellen" +msgid "To set a new password, click the following link" +msgstr "" #: kallithea/templates/email_templates/password_reset.html:10 -msgid "Please ignore this email if you did not request a new password ." -msgstr "" -"Bitte ignoriere diese E-Mail, wenn du kein neues Passwort angefordert " -"hast." +msgid "" +"Should you not be able to use the link above, please type the following " +"code into the password reset form" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:12 +msgid "" +"If it weren't you who requested the password reset, just disregard this " +"message." +msgstr "" #: kallithea/templates/email_templates/pull_request.html:5 #, python-format @@ -5751,7 +5723,6 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:14 #, fuzzy -#| msgid "revoke" msgid "Vote" msgstr "entziehen" @@ -5792,20 +5763,16 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:70 #, fuzzy, python-format -#| msgid "Confirm to delete this group: %s with %s repository" -#| msgid_plural "Confirm to delete this group: %s with %s repositories" msgid "Confirm again to delete this pull request with %s comments" msgstr "Löschen der Gruppe bestätigen: %s mit %s Repository" #: kallithea/templates/pullrequests/pullrequest_show.html:6 #, fuzzy, python-format -#| msgid "Pull request #%s" msgid "%s Pull Request %s" msgstr "Pull Request #%s" #: kallithea/templates/pullrequests/pullrequest_show.html:10 #, fuzzy, python-format -#| msgid "Pull request #%s from %s#%s" msgid "Pull request %s from %s#%s" msgstr "Pull Request #%s von %s#%s" @@ -5853,98 +5820,104 @@ msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:131 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +msgid "" +"This is just a range of changesets and doesn't have a target or a real " +"merge ancestor." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:133 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:154 -msgid "Created by" -msgstr "Erstellt von" - -#: kallithea/templates/pullrequests/pullrequest_show.html:169 +#: kallithea/templates/pullrequests/pullrequest_show.html:173 msgid "Update" msgstr "Aktualisierung" -#: kallithea/templates/pullrequests/pullrequest_show.html:187 +#: kallithea/templates/pullrequests/pullrequest_show.html:191 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:209 +#: kallithea/templates/pullrequests/pullrequest_show.html:213 msgid "Pull Request Reviewers" msgstr "Pull Request Reviewers" -#: kallithea/templates/pullrequests/pullrequest_show.html:234 +#: kallithea/templates/pullrequests/pullrequest_show.html:238 msgid "Remove reviewer" msgstr "Reviewer entfernen" -#: kallithea/templates/pullrequests/pullrequest_show.html:246 +#: kallithea/templates/pullrequests/pullrequest_show.html:250 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:254 +#: kallithea/templates/pullrequests/pullrequest_show.html:258 msgid "Potential Reviewers" msgstr "Potentielle Reviewer" -#: kallithea/templates/pullrequests/pullrequest_show.html:257 +#: kallithea/templates/pullrequests/pullrequest_show.html:261 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:280 +#: kallithea/templates/pullrequests/pullrequest_show.html:284 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/templates/pullrequests/pullrequest_show.html:285 msgid "Save as New Pull Request" msgstr "Als neuen Pull Request speichern" -#: kallithea/templates/pullrequests/pullrequest_show.html:282 +#: kallithea/templates/pullrequests/pullrequest_show.html:286 msgid "Cancel Changes" msgstr "Änderungen verwerfen" -#: kallithea/templates/pullrequests/pullrequest_show.html:292 +#: kallithea/templates/pullrequests/pullrequest_show.html:296 msgid "Pull Request Content" msgstr "Inhalt des Pull Requests" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, python-format msgid "Pull Requests from %s'" msgstr "Pull Requests von '%s'" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:13 #, python-format msgid "Pull Requests to '%s'" msgstr "Pull Requests für '%s'" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +msgid "Open New Pull Request" +msgstr "Einen neuen Pull Request eröffnen" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 #, python-format msgid "Show Pull Requests to %s" msgstr "Zeige Pull Requests für '%s'" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 #, python-format msgid "Show Pull Requests from '%s'" msgstr "Zeige Pull Requests von '%s'" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 -msgid "Hide closed pull requests (only show open pull requests)" -msgstr "" - #: kallithea/templates/pullrequests/pullrequest_show_all.html:49 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 msgid "Pull Requests Created by Me" msgstr "Von mir erstellte Pull Requests" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 msgid "Pull Requests I Participate In" msgstr "" @@ -6195,14 +6168,9 @@ #~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" #~ msgstr "" -#~ "Ungültige Clone-URL, gültige Clone-URL" -#~ " (http(s)/svn+http(s)/ssh) angeben" #~ msgid "Revisions %(revs)s are already part of pull request or have set status" #~ msgstr "" -#~ "Die Revisionen %(revs)s sind bereits " -#~ "Bestandteil des Pull Requests oder haben" -#~ " den Status" #~ msgid "Defaults" #~ msgstr "Voreinstellungen" @@ -6226,9 +6194,6 @@ #~ msgstr "löschen" #~ msgid "" -#~ "Your user is in an external source" -#~ " of record; some details cannot be" -#~ " managed here" #~ msgstr "" #~ msgid "Permissions Administration" @@ -6282,20 +6247,6 @@ #~ msgid "Non-changeable id" #~ msgstr "" -#~ msgid "" -#~ "In case this repository is renamed " -#~ "or moved into another group the " -#~ "repository URL changes.\n" -#~ " Using the above " -#~ "URL guarantees that this repository will" -#~ " always be accessible under such URL." -#~ "\n" -#~ " Useful for CI " -#~ "systems, or any other cases that " -#~ "you need to hardcode the URL into" -#~ " 3rd party service." -#~ msgstr "" - #~ msgid "edit" #~ msgstr "bearbeiten" @@ -6341,12 +6292,6 @@ #~ msgid "Destroy old data" #~ msgstr "" -#~ msgid "" -#~ "Check this option to remove references" -#~ " to repositories that no longer exist" -#~ " in on the filesystem." -#~ msgstr "" - #~ msgid "Meta-Tagging" #~ msgstr "" @@ -6356,29 +6301,12 @@ #~ msgid "user groups" #~ msgstr "Benutzergruppen" -#~ msgid "" -#~ "This user is in an external source" -#~ " of record (%s); some details cannot" -#~ " be managed here." -#~ msgstr "" - #~ msgid "Inherit from defaults" #~ msgstr "" -#~ msgid "" -#~ "Select to inherit permissions from %s" -#~ " permissions settings, and default IP " -#~ "address whitelist." -#~ msgstr "" - #~ msgid "show" #~ msgstr "" -#~ msgid "" -#~ "Changeset status: %s\n" -#~ "Click to open associated pull request #%s" -#~ msgstr "" - #~ msgid "Push new repo" #~ msgstr "" @@ -6403,11 +6331,6 @@ #~ msgid "Comment on changeset" #~ msgstr "" -#~ msgid "" -#~ "Use @username inside this text to " -#~ "send notification to another local user." -#~ msgstr "" - #~ msgid "revision" #~ msgstr "" @@ -6434,3 +6357,36 @@ #~ msgid "with subrepos" #~ msgstr "" + +#~ msgid "" +#~ "Your password reset was successful, new" +#~ " password has been sent to your " +#~ "email" +#~ msgstr "" +#~ "Das Zurücksetzen des Passworted war " +#~ "erfolgreich, ein neues Passwort wurde an" +#~ " ihre EMail Addresse gesendet" + +#~ msgid "Your new password" +#~ msgstr "Dein neues Passwort" + +#~ msgid "Your new Kallithea password:%s" +#~ msgstr "Ihr neues Kallithea-Passwort: %s" + +#~ msgid "Open New Pull Request for Selected Changesets" +#~ msgstr "" + +#~ msgid "Show Selected Changesets __S → __E" +#~ msgstr "" + +#~ msgid "You can generate it by clicking following URL" +#~ msgstr "Du kannst es über die folgende URL erstellen" + +#~ msgid "Please ignore this email if you did not request a new password ." +#~ msgstr "" +#~ "Bitte ignoriere diese E-Mail, wenn du" +#~ " kein neues Passwort angefordert hast." + +#~ msgid "Created by" +#~ msgstr "Erstellt von" +
--- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Tue Sep 08 10:21:46 2015 +0000 +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Tue Sep 08 10:37:51 2015 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2015-08-25 11:37+0200\n" +"POT-Creation-Date: 2015-09-08 10:34+0200\n" "PO-Revision-Date: 2015-09-07 16:35+0200\n" "Last-Translator: Andrew Shadura <andrew@shadura.me>\n" "Language-Team: French " @@ -20,7 +20,7 @@ "X-Generator: Weblate 2.4-dev\n" #: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:241 kallithea/lib/base.py:512 +#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 msgid "There are no changesets yet" msgstr "Il n’y a aucun changement pour le moment" @@ -36,7 +36,7 @@ msgid "None" msgstr "Aucun" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(fermé)" @@ -51,12 +51,11 @@ #: kallithea/controllers/changeset.py:169 #, fuzzy, python-format -#| msgid "increase diff context to %(num)s lines" msgid "Increase diff context to %(num)s lines" msgstr "augmenter le contexte du diff à %(num)s lignes" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:743 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 msgid "Such revision does not exist for this repository" msgstr "Une telle révision n'existe pas pour ce dépôt" @@ -68,16 +67,15 @@ "La modification de l'état sur un ensemble de modifications associé à une " "demande de tirage fermé n'est pas autorisé" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:42 +#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 msgid "Select changeset" msgstr "Sélectionner le changeset" -#: kallithea/controllers/compare.py:258 +#: kallithea/controllers/compare.py:261 msgid "Cannot compare repositories without using common ancestor" msgstr "Impossible de comparer des dépôts sans utiliser un ancêtre commun" #: kallithea/controllers/error.py:71 -#| msgid "revisions" msgid "No response" msgstr "Pas de réponse" @@ -126,8 +124,8 @@ #: kallithea/templates/changeset/changeset.html:195 #: kallithea/templates/compare/compare_diff.html:78 #: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Changeset was too big and was cut off..." msgstr "Cet ensemble de changements était trop important et a été découpé…" @@ -136,117 +134,117 @@ msgid "%s committed on %s" msgstr "%s a commité, le %s" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:91 msgid "Click here to add new file" msgstr "Ajouter un nouveau fichier" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:92 #, python-format msgid "There are no files yet. %s" msgstr "Il n'y a actuellement pas de fichiers. %s" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "%s à %s" -#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 -#: kallithea/controllers/files.py:433 +#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 +#: kallithea/controllers/files.py:432 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Ce dépôt a été verrouillé par %s sur %s" -#: kallithea/controllers/files.py:318 +#: kallithea/controllers/files.py:317 msgid "You can only delete files with revision being a valid branch " msgstr "" "Vous pouvez supprimer uniquement les fichiers avec révision étant dans " "une branche valide " -#: kallithea/controllers/files.py:329 +#: kallithea/controllers/files.py:328 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Le fichier %s a été supprimé via Kallithea" -#: kallithea/controllers/files.py:351 +#: kallithea/controllers/files.py:350 #, python-format msgid "Successfully deleted file %s" msgstr "Suppression du fichier %s effectuée avec succès" -#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 -#: kallithea/controllers/files.py:502 +#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 +#: kallithea/controllers/files.py:501 msgid "Error occurred during commit" msgstr "Une erreur est survenue durant le commit" -#: kallithea/controllers/files.py:378 +#: kallithea/controllers/files.py:377 msgid "You can only edit files with revision being a valid branch " msgstr "" "Vous pouvez modifier uniquement les fichiers dont la révision est dans " "une branche valide " -#: kallithea/controllers/files.py:392 +#: kallithea/controllers/files.py:391 #, python-format msgid "Edited file %s via Kallithea" msgstr "%s édité via Kallithea" -#: kallithea/controllers/files.py:408 +#: kallithea/controllers/files.py:407 msgid "No changes" msgstr "Aucun changement" -#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 +#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 #, python-format msgid "Successfully committed to %s" msgstr "Commit réalisé avec succès sur %s" -#: kallithea/controllers/files.py:444 +#: kallithea/controllers/files.py:443 msgid "Added file via Kallithea" msgstr "%s ajouté par Kallithea" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:464 msgid "No content" msgstr "Aucun contenu" -#: kallithea/controllers/files.py:469 +#: kallithea/controllers/files.py:468 msgid "No filename" msgstr "Aucun nom de fichier" -#: kallithea/controllers/files.py:494 +#: kallithea/controllers/files.py:493 msgid "Location must be relative path and must not contain .. in path" msgstr "" "Le chemin doit être un chemin relatif et ne doit pas contenir .. dans le " "chemin" -#: kallithea/controllers/files.py:527 +#: kallithea/controllers/files.py:526 msgid "Downloads disabled" msgstr "Les téléchargements sont désactivés" -#: kallithea/controllers/files.py:538 +#: kallithea/controllers/files.py:537 #, python-format msgid "Unknown revision %s" msgstr "Révision %s inconnue" -#: kallithea/controllers/files.py:540 +#: kallithea/controllers/files.py:539 msgid "Empty repository" msgstr "Dépôt vide" -#: kallithea/controllers/files.py:542 +#: kallithea/controllers/files.py:541 msgid "Unknown archive type" msgstr "Type d’archive inconnu" -#: kallithea/controllers/files.py:772 +#: kallithea/controllers/files.py:771 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:15 #: kallithea/templates/pullrequests/pullrequest.html:97 msgid "Changesets" msgstr "Changesets" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:821 kallithea/templates/switch_to_list.html:3 +#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 +#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "Branches" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:832 kallithea/templates/switch_to_list.html:25 +#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 +#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "Tags" @@ -267,9 +265,9 @@ #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:131 -#: kallithea/templates/base/base.html:397 -#: kallithea/templates/base/base.html:569 +#: kallithea/templates/base/base.html:124 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "Dépôts" @@ -295,32 +293,36 @@ msgstr "Journal public" #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:229 +#: kallithea/templates/base/base.html:222 #: kallithea/templates/journal/journal.html:4 #: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "Historique" -#: kallithea/controllers/login.py:150 kallithea/controllers/login.py:196 -#| msgid "bad captcha" +#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 msgid "Bad captcha" msgstr "Mauvais captcha" -#: kallithea/controllers/login.py:156 +#: kallithea/controllers/login.py:157 msgid "You have successfully registered into Kallithea" msgstr "Vous vous êtes inscrits avec succès à Kallithea" -#: kallithea/controllers/login.py:201 -msgid "Your password reset link was sent" +#: kallithea/controllers/login.py:202 +#, fuzzy +#| msgid "Your password reset link was sent" +msgid "A password reset confirmation code has been sent" msgstr "Un lien de rénitialisation de votre mot de passe vous a été envoyé" -#: kallithea/controllers/login.py:222 -msgid "" -"Your password reset was successful, new password has been sent to your " -"email" -msgstr "" -"Votre mot de passe a été réinitialisé. Votre nouveau mot de passe vous a " -"été envoyé par e-mail" +#: kallithea/controllers/login.py:251 +#, fuzzy +#| msgid "Password reset link" +msgid "Invalid password reset token" +msgstr "Lien de remise à zéro du mot de passe" + +#: kallithea/controllers/login.py:256 +#: kallithea/controllers/admin/my_account.py:167 +msgid "Successfully updated password" +msgstr "Mot de passe mis à jour avec succès" #: kallithea/controllers/pullrequests.py:124 #, python-format @@ -341,54 +343,54 @@ msgid "Peer branches" msgstr "Branches appairées" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:827 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Signets" -#: kallithea/controllers/pullrequests.py:306 +#: kallithea/controllers/pullrequests.py:310 #, python-format msgid "Error creating pull request: %s" msgstr "Erreur de création de la demande de pull : %s" -#: kallithea/controllers/pullrequests.py:352 -#: kallithea/controllers/pullrequests.py:499 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:503 msgid "No description" msgstr "Aucune description" -#: kallithea/controllers/pullrequests.py:359 +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "La requête de pull a été ouverte avec succès" -#: kallithea/controllers/pullrequests.py:362 -#: kallithea/controllers/pullrequests.py:449 -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:453 +#: kallithea/controllers/pullrequests.py:509 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "Reviewer spécifié \"%s\" non valide" -#: kallithea/controllers/pullrequests.py:365 -#: kallithea/controllers/pullrequests.py:452 +#: kallithea/controllers/pullrequests.py:369 +#: kallithea/controllers/pullrequests.py:456 msgid "Error occurred while creating pull request" msgstr "Une erreur est survenue durant la création de la pull request" -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:401 msgid "Missing changesets since the previous pull request:" msgstr "Changeset manquant depuis la précédente pull request :" -#: kallithea/controllers/pullrequests.py:404 +#: kallithea/controllers/pullrequests.py:408 #, python-format msgid "New changesets on %s %s since the previous pull request:" msgstr "Nouveau changeset sur %s %s depuis la précédente pull request :" -#: kallithea/controllers/pullrequests.py:411 +#: kallithea/controllers/pullrequests.py:415 msgid "Ancestor didn't change - show diff since previous version:" msgstr "" "L'ancêtre n'a pas changé - montrer les différences avec la version " "précédente :" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:422 #, python-format msgid "" "This pull request is based on another %s revision and there is no simple " @@ -397,60 +399,60 @@ "Cette demande de pull est basée sur une autre révision %s et il n'y a pas" " de diff simple." -#: kallithea/controllers/pullrequests.py:420 +#: kallithea/controllers/pullrequests.py:424 #, python-format msgid "No changes found on %s %s since previous version." msgstr "Aucun changement constaté sur %s %s depuis la version précédente." -#: kallithea/controllers/pullrequests.py:458 +#: kallithea/controllers/pullrequests.py:462 #, python-format msgid "Closed, replaced by %s ." msgstr "Fermé, remplacé par %s." -#: kallithea/controllers/pullrequests.py:466 +#: kallithea/controllers/pullrequests.py:470 msgid "Pull request update created" msgstr "Mise à jour de la pull request créée" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:513 msgid "Pull request updated" msgstr "Pull request mise à jour" -#: kallithea/controllers/pullrequests.py:523 +#: kallithea/controllers/pullrequests.py:528 msgid "Successfully deleted pull request" msgstr "La requête de pull a été supprimée avec succès" -#: kallithea/controllers/pullrequests.py:582 +#: kallithea/controllers/pullrequests.py:594 #, python-format msgid "This pull request has already been merged to %s." msgstr "Cette pull request a déjà été fusionnée à %s." -#: kallithea/controllers/pullrequests.py:584 +#: kallithea/controllers/pullrequests.py:596 msgid "This pull request has been closed and can not be updated." msgstr "Cette pull request a été fermée et ne peut pas être mise à jour." -#: kallithea/controllers/pullrequests.py:602 +#: kallithea/controllers/pullrequests.py:614 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "Cette demande de pull peut être mise à jour avec les modifications de %s :" -#: kallithea/controllers/pullrequests.py:605 +#: kallithea/controllers/pullrequests.py:617 msgid "No changesets found for updating this pull request." msgstr "Pas de changeset trouvé pour ce pull request" -#: kallithea/controllers/pullrequests.py:613 +#: kallithea/controllers/pullrequests.py:625 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Note: La branche %s a une autre tête: %s." -#: kallithea/controllers/pullrequests.py:619 +#: kallithea/controllers/pullrequests.py:631 msgid "Git pull requests don't support updates yet." msgstr "Le smises à jour des Git pull requests ne sont pas encore supportées." -#: kallithea/controllers/pullrequests.py:710 +#: kallithea/controllers/pullrequests.py:722 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:715 +#: kallithea/controllers/pullrequests.py:727 msgid "Closing." msgstr "Fermeture." @@ -498,39 +500,38 @@ #: kallithea/controllers/admin/gists.py:59 #: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:283 -#, fuzzy -#| msgid "forever" +#: kallithea/controllers/admin/users.py:285 +#, fuzzy msgid "Forever" msgstr "pour toujours" #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/users.py:286 msgid "5 minutes" msgstr "5 minute" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/users.py:287 msgid "1 hour" msgstr "1 heure" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/users.py:288 msgid "1 day" msgstr "1 jour" #: kallithea/controllers/admin/gists.py:63 #: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/users.py:289 msgid "1 month" msgstr "1 mois" #: kallithea/controllers/admin/gists.py:67 #: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/users.py:291 msgid "Lifetime" msgstr "Toujours" @@ -545,7 +546,6 @@ #: kallithea/controllers/admin/gists.py:233 #, fuzzy -#| msgid "unmodified" msgid "Unmodified" msgstr "non modifié" @@ -562,8 +562,8 @@ msgid "Error occurred during update of gist %s" msgstr "Une erreur est survenue durant la mise à jour du gist %s" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:208 -#: kallithea/model/user.py:230 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 +#: kallithea/model/user.py:237 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon" @@ -574,15 +574,11 @@ msgstr "Votre compte a été mis à jour avec succès" #: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:204 +#: kallithea/controllers/admin/users.py:202 #, python-format msgid "Error occurred during update of user %s" msgstr "Une erreur est survenue durant la mise à jour de l'utilisateur %s" -#: kallithea/controllers/admin/my_account.py:167 -msgid "Successfully updated password" -msgstr "Mot de passe mis à jour avec succès" - #: kallithea/controllers/admin/my_account.py:178 msgid "Error occurred during update of user password" msgstr "" @@ -590,33 +586,33 @@ "l'utilisateur" #: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:413 +#: kallithea/controllers/admin/users.py:415 #, python-format msgid "Added email %s to user" msgstr "L’e-mail « %s » a été ajouté à l’utilisateur" #: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:419 +#: kallithea/controllers/admin/users.py:421 msgid "An error occurred during email saving" msgstr "Une erreur est survenue durant l’enregistrement de l’e-mail" #: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:431 +#: kallithea/controllers/admin/users.py:433 msgid "Removed email from user" msgstr "L’e-mail a été enlevé de l’utilisateur" #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:306 +#: kallithea/controllers/admin/users.py:308 msgid "API key successfully created" msgstr "Clé d'API créée avec succès" #: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:319 +#: kallithea/controllers/admin/users.py:321 msgid "API key successfully reset" msgstr "Clé d'API remise à zéro avec succès" #: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:323 +#: kallithea/controllers/admin/users.py:325 msgid "API key successfully deleted" msgstr "Clé d'API supprimée avec succès" @@ -666,10 +662,10 @@ #: kallithea/templates/admin/users/user_edit_profile.html:105 #: kallithea/templates/admin/users/users.html:10 #: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:252 +#: kallithea/templates/base/base.html:253 #: kallithea/templates/base/base.html:259 #: kallithea/templates/base/base.html:260 -#: kallithea/templates/base/base.html:266 -#: kallithea/templates/base/base.html:267 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Administration" @@ -836,7 +832,6 @@ #: kallithea/controllers/admin/repos.py:321 #, fuzzy, python-format -#| msgid "Cannot delete %s it still contains attached forks" msgid "Cannot delete repository %s which still has forks" msgstr "Impossible de supprimer le dépôt %s : Des forks y sont attachés" @@ -887,14 +882,12 @@ #: kallithea/controllers/admin/repos.py:537 #: kallithea/controllers/admin/repos.py:564 #, fuzzy -#| msgid "Repository is not locked" msgid "Repository has been locked" msgstr "Ce dépôt n’est pas verrouillé" #: kallithea/controllers/admin/repos.py:540 #: kallithea/controllers/admin/repos.py:561 #, fuzzy -#| msgid "Repository is not locked" msgid "Repository has been unlocked" msgstr "Ce dépôt n’est pas verrouillé" @@ -936,52 +929,52 @@ "« hgsubversion » est manquante" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:274 +#: kallithea/controllers/admin/settings.py:277 msgid "Error occurred while updating application settings" msgstr "" "Une erreur est survenue durant la mise à jour des réglages de " "l'application" -#: kallithea/controllers/admin/settings.py:213 +#: kallithea/controllers/admin/settings.py:216 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "Dépôts ré-analysés avec succès. Ajouté : %s. Supprimé : %s." -#: kallithea/controllers/admin/settings.py:270 +#: kallithea/controllers/admin/settings.py:273 msgid "Updated application settings" msgstr "Réglages mis à jour" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "Réglages d’affichage mis à jour" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:335 msgid "Error occurred during updating visualisation settings" msgstr "" "Une erreur est survenue durant la mise à jour des réglages de " "visualisation" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:361 msgid "Please enter email address" msgstr "Veuillez entrer votre adresse e-mail" -#: kallithea/controllers/admin/settings.py:373 +#: kallithea/controllers/admin/settings.py:376 msgid "Send email task created" msgstr "Tâche d'envoi d'e-mail créée" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Added new hook" msgstr "Le nouveau hook a été ajouté" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:421 msgid "Updated hooks" msgstr "Hooks mis à jour" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:425 msgid "Error occurred during hook creation" msgstr "Une erreur est survenue durant la création du hook" -#: kallithea/controllers/admin/settings.py:448 +#: kallithea/controllers/admin/settings.py:451 msgid "Whoosh reindex task scheduled" msgstr "La tâche de réindexation Whoosh a été planifiée" @@ -1022,70 +1015,69 @@ msgstr "Permissions du groupe d'utilisateurs mises à jour" #: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:382 +#: kallithea/controllers/admin/users.py:384 msgid "Updated permissions" msgstr "Permissions mises à jour" #: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:386 +#: kallithea/controllers/admin/users.py:388 msgid "An error occurred during permissions saving" msgstr "Une erreur est survenue durant l’enregistrement des permissions" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:134 #, python-format msgid "Created user %s" msgstr "Utilisateur %s créé" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "Une erreur est survenue durant la création de l'utilisateur %s" -#: kallithea/controllers/admin/users.py:184 +#: kallithea/controllers/admin/users.py:182 msgid "User updated successfully" msgstr "L’utilisateur a été mis à jour avec succès" -#: kallithea/controllers/admin/users.py:220 +#: kallithea/controllers/admin/users.py:218 msgid "Successfully deleted user" msgstr "Utilisateur supprimé avec succès" -#: kallithea/controllers/admin/users.py:225 +#: kallithea/controllers/admin/users.py:223 msgid "An error occurred during deletion of user" msgstr "Une erreur est survenue durant la suppression de l’utilisateur" -#: kallithea/controllers/admin/users.py:238 +#: kallithea/controllers/admin/users.py:236 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:461 +#: kallithea/controllers/admin/users.py:463 #, python-format msgid "Added IP address %s to user whitelist" msgstr "L'adresse IP %s a été ajoutée à la liste blanche" -#: kallithea/controllers/admin/users.py:467 +#: kallithea/controllers/admin/users.py:469 msgid "An error occurred while adding IP address" msgstr "Une erreur est survenue durant la sauvegarde d'IP" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 msgid "Removed IP address from user whitelist" msgstr "L'adresse IP a été supprimée de la liste blanche" -#: kallithea/lib/auth.py:744 +#: kallithea/lib/auth.py:743 #, python-format msgid "IP %s not allowed" msgstr "IP %s non autorisée" -#: kallithea/lib/auth.py:757 -#, fuzzy -#| msgid "New api key" +#: kallithea/lib/auth.py:756 +#, fuzzy msgid "Invalid API key" msgstr "Nouvelle clé d'API" -#: kallithea/lib/auth.py:795 +#: kallithea/lib/auth.py:812 msgid "You need to be a registered user to perform this action" msgstr "Vous devez être un utilisateur enregistré pour effectuer cette action" -#: kallithea/lib/auth.py:827 +#: kallithea/lib/auth.py:844 msgid "You need to be signed in to view this page" msgstr "Vous devez être connecté pour visualiser cette page" @@ -1128,7 +1120,6 @@ #: kallithea/lib/helpers.py:677 #, fuzzy -#| msgid "compare view" msgid "Compare view" msgstr "vue de comparaison" @@ -1147,13 +1138,11 @@ #: kallithea/lib/helpers.py:722 #, fuzzy, python-format -#| msgid "fork name %s" msgid "Fork name %s" msgstr "nom du fork %s" #: kallithea/lib/helpers.py:742 #, fuzzy, python-format -#| msgid "Pull request #%s" msgid "Pull request %s" msgstr "Requête de pull #%s" @@ -1244,7 +1233,7 @@ #: kallithea/lib/helpers.py:1128 #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "" @@ -1795,13 +1784,11 @@ #: kallithea/model/db.py:1668 #, fuzzy -#| msgid "Unauthorized access to resource" msgid "Default user has read access to new repositories" msgstr "Accès interdit à cette ressource" #: kallithea/model/db.py:1669 #, fuzzy -#| msgid "Unauthorized access to resource" msgid "Default user has write access to new repositories" msgstr "Accès interdit à cette ressource" @@ -1842,74 +1829,62 @@ msgstr "" #: kallithea/model/db.py:1682 -#, fuzzy, python-format -#| msgid "Created repository group %s" +#, fuzzy msgid "Only admins can create repository groups" msgstr "Groupe de dépôts %s créé" #: kallithea/model/db.py:1683 -#, fuzzy, python-format -#| msgid "Created repository group %s" +#, fuzzy msgid "Non-admins can create repository groups" msgstr "Groupe de dépôts %s créé" #: kallithea/model/db.py:1685 #, fuzzy -#| msgid "[created] user group" msgid "Only admins can create user groups" msgstr "[créé] groupe d'utilisateurs" #: kallithea/model/db.py:1686 #, fuzzy -#| msgid "[created] user group" msgid "Non-admins can create user groups" msgstr "[créé] groupe d'utilisateurs" #: kallithea/model/db.py:1688 #, fuzzy -#| msgid "Top level repositories" msgid "Only admins can create top level repositories" msgstr "Dépôts de niveau supérieur" #: kallithea/model/db.py:1689 #, fuzzy -#| msgid "Top level repositories" msgid "Non-admins can create top level repositories" msgstr "Dépôts de niveau supérieur" #: kallithea/model/db.py:1694 #, fuzzy -#| msgid "Location of repositories" msgid "Only admins can fork repositories" msgstr "Dépôts totaux" #: kallithea/model/db.py:1695 #, fuzzy -#| msgid "Invalidate cache for all repositories" msgid "Non-admins can can fork repositories" msgstr "Invalider le cache pour tous les dépôts" #: kallithea/model/db.py:1698 #, fuzzy -#| msgid "User Registration with manual account activation" msgid "User registration with manual account activation" msgstr "Enregistrement des utilisateurs avec activation de compte manuelle" #: kallithea/model/db.py:1699 #, fuzzy -#| msgid "User Registration with automatic account activation" msgid "User registration with automatic account activation" msgstr "Enregistrement des utilisateurs avec activation de compte automatique" #: kallithea/model/db.py:2228 #, fuzzy -#| msgid "Not Reviewed" msgid "Not reviewed" msgstr "Pas encore relue" #: kallithea/model/db.py:2231 #, fuzzy -#| msgid "Under Review" msgid "Under review" msgstr "En cours de relecture" @@ -1937,37 +1912,31 @@ #: kallithea/model/notification.py:254 #, fuzzy, python-format -#| msgid "%(user)s commented on changeset at %(when)s" msgid "%(user)s commented on changeset %(age)s" msgstr "%(user)s a commenté sur le changeset à %(when)s" #: kallithea/model/notification.py:255 #, fuzzy, python-format -#| msgid "%(user)s sent message at %(when)s" msgid "%(user)s sent message %(age)s" msgstr "%(user)s a envoyé un message à %(when)s" #: kallithea/model/notification.py:256 #, fuzzy, python-format -#| msgid "%(user)s mentioned you at %(when)s" msgid "%(user)s mentioned you %(age)s" msgstr "%(user)s vous a mentionné à %(when)s" #: kallithea/model/notification.py:257 #, fuzzy, python-format -#| msgid "%(user)s registered in Kallithea at %(when)s" msgid "%(user)s registered in Kallithea %(age)s" msgstr "%(user)s s'est enregistré sur Kallithea à %(when)s" #: kallithea/model/notification.py:258 #, fuzzy, python-format -#| msgid "%(user)s opened new pull request at %(when)s" msgid "%(user)s opened new pull request %(age)s" msgstr "%(user)s a ouvert une nouvelle demande de pull à %(when)s" #: kallithea/model/notification.py:259 #, fuzzy, python-format -#| msgid "%(user)s commented on pull request at %(when)s" msgid "%(user)s commented on pull request %(age)s" msgstr "%(user)s a commenté la demande de pull à %(when)s" @@ -2003,9 +1972,7 @@ #: kallithea/model/notification.py:302 #, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s changeset %(short_id)s " -"on %(branch)s" +msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" #: kallithea/model/notification.py:305 @@ -2014,18 +1981,19 @@ msgstr "Nouvel utilisateur %(new_username)s enregistré" #: kallithea/model/notification.py:307 -#, python-format -msgid "" -"[Added by %(pr_username)s] %(repo_name)s pull request %(pr_nice_id)s from" -" %(ref)s" -msgstr "" +#, fuzzy, python-format +#| msgid "%(user)s wants you to review pull request %(pr_nice_id)s: +#| %(pr_title)s" +msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgstr "" +"%(user)s veut que vous regardiez la demande de pull #%(pr_id)s : " +"%(pr_title)s" #: kallithea/model/notification.py:308 -#, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s pull request " -"%(pr_nice_id)s from %(ref)s" -msgstr "" +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgstr "[a commenté] la requête de pull pour" #: kallithea/model/notification.py:321 msgid "Closing" @@ -2033,29 +2001,27 @@ #: kallithea/model/pull_request.py:137 #, fuzzy, python-format -#| msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" "%(user)s veut que vous regardiez la demande de pull #%(pr_id)s : " "%(pr_title)s" -#: kallithea/model/scm.py:813 +#: kallithea/model/scm.py:812 msgid "latest tip" msgstr "Dernier sommet" -#: kallithea/model/user.py:185 +#: kallithea/model/user.py:192 msgid "New user registration" msgstr "Nouveau enregistrement d'utilisateur" -#: kallithea/model/user.py:249 -#, fuzzy -#| msgid "You can't remove this user since it's crucial for entire application" +#: kallithea/model/user.py:256 +#, fuzzy msgid "You can't remove this user since it is crucial for the entire application" msgstr "" "Vous ne pouvez pas supprimer cet utilisateur ; il est nécessaire pour le " "bon fonctionnement de l’application" -#: kallithea/model/user.py:254 +#: kallithea/model/user.py:261 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -2064,7 +2030,7 @@ "L’utilisateur \"%s\" possède %s dépôts et ne peut être supprimé. Changez " "les propriétaires ou supprimez ces dépôts : %s" -#: kallithea/model/user.py:259 +#: kallithea/model/user.py:266 #, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch" @@ -2073,7 +2039,7 @@ "L’utilisateur \"%s\" possède %s groupes de dépôt et ne peut être " "supprimé. Changez les propriétaires ou supprimez ces dépôts : %s" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:273 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -2082,18 +2048,22 @@ "L’utilisateur « %s » possède %s dépôts et ne peut être supprimé. Changez " "les propriétaires de ces dépôts. %s" -#: kallithea/model/user.py:296 +#: kallithea/model/user.py:360 msgid "Password reset link" msgstr "Lien de remise à zéro du mot de passe" -#: kallithea/model/user.py:319 -msgid "Your new password" -msgstr "Votre nouveau mot de passe" - -#: kallithea/model/user.py:320 -#, python-format -msgid "Your new Kallithea password:%s" -msgstr "Votre nouveau mot de passe Kallithea : %s" +#: kallithea/model/user.py:408 +#, fuzzy +#| msgid "Password reset link" +msgid "Password reset notification" +msgstr "Lien de remise à zéro du mot de passe" + +#: kallithea/model/user.py:409 +#, python-format +msgid "" +"The password to your account %s has been changed using password reset " +"form." +msgstr "" #: kallithea/model/validators.py:77 kallithea/model/validators.py:78 msgid "Value cannot be an empty list" @@ -2106,13 +2076,11 @@ #: kallithea/model/validators.py:97 #, fuzzy, python-format -#| msgid "Username %(username)s is not valid" msgid "Username \"%(username)s\" cannot be used" msgstr "Le nom d’utilisateur « %(username)s » n’est pas valide" #: kallithea/model/validators.py:99 #, fuzzy -#| msgid "" " msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with an alphanumeric character or underscore" @@ -2176,7 +2144,6 @@ #: kallithea/model/validators.py:300 #, fuzzy -#| msgid "invalid password" msgid "Invalid username or password" msgstr "mot de passe invalide" @@ -2186,7 +2153,6 @@ #: kallithea/model/validators.py:345 #, fuzzy, python-format -#| msgid "Repository name %(repo)s is disallowed" msgid "Repository name %(repo)s is not allowed" msgstr "Le nom de dépôt « %(repo)s » n’est pas autorisé" @@ -2207,7 +2173,6 @@ #: kallithea/model/validators.py:465 #, fuzzy -#| msgid "private repository" msgid "Invalid repository URL" msgstr "Dépôt privé" @@ -2243,13 +2208,11 @@ #: kallithea/model/validators.py:705 #, fuzzy -#| msgid "This email address is already taken" msgid "This email address is already in use" msgstr "Cette adresse e-mail est déjà enregistrée" #: kallithea/model/validators.py:725 #, fuzzy, python-format -#| msgid "email \"%(email)s\" does not exist." msgid "Email address \"%(email)s\" not found" msgstr "L’adresse e-mail « %(email)s » n’existe pas." @@ -2407,7 +2370,9 @@ #: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:229 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/pullrequests/pullrequest_show.html:156 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 #: kallithea/templates/summary/summary.html:134 msgid "Owner" msgstr "Propriétaire" @@ -2415,7 +2380,7 @@ #: kallithea/templates/index_base.html:140 #: kallithea/templates/admin/my_account/my_account_repos.html:57 #: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:44 +#: kallithea/templates/base/root.html:43 #: kallithea/templates/bookmarks/bookmarks.html:79 #: kallithea/templates/branches/branches.html:79 #: kallithea/templates/journal/journal.html:198 @@ -2427,7 +2392,7 @@ #: kallithea/templates/index_base.html:141 #: kallithea/templates/admin/my_account/my_account_repos.html:58 #: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:45 +#: kallithea/templates/base/root.html:44 #: kallithea/templates/bookmarks/bookmarks.html:80 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:199 @@ -2443,7 +2408,7 @@ #: kallithea/templates/index_base.html:143 #: kallithea/templates/admin/my_account/my_account_repos.html:60 #: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:46 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:201 @@ -2455,7 +2420,7 @@ #: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:147 kallithea/templates/base/root.html:48 +#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:202 @@ -2465,7 +2430,7 @@ msgstr "Chargement…" #: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:333 +#: kallithea/templates/base/base.html:326 msgid "Log In" msgstr "Connexion" @@ -2480,14 +2445,15 @@ #: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:24 #: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/pullrequests/pullrequest_show.html:166 msgid "Username" msgstr "Nom d’utilisateur" #: kallithea/templates/login.html:33 kallithea/templates/register.html:33 #: kallithea/templates/admin/my_account/my_account.html:37 #: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:311 msgid "Password" msgstr "Mot de passe" @@ -2499,7 +2465,7 @@ msgid "Forgot your password ?" msgstr "Mot de passe oublié ?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:329 +#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 msgid "Don't have an account ?" msgstr "Vous n’avez pas de compte ?" @@ -2512,11 +2478,14 @@ msgstr "Remettre le mot de passe à zéro" #: kallithea/templates/password_reset.html:12 +#: kallithea/templates/password_reset_confirmation.html:12 #, python-format msgid "Reset Your Password to %s" msgstr "Réinitialiser votre mot de passe à %s" #: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset_confirmation.html:5 +#: kallithea/templates/password_reset_confirmation.html:14 msgid "Reset Your Password" msgstr "Réinitialiser votre mot de passe" @@ -2534,13 +2503,47 @@ msgstr "Envoyer l'E-mail de réinitialisation du mot de passe" #: kallithea/templates/password_reset.html:47 +#, fuzzy +#| msgid "" "Password reset link will be sent to the email address matching +#| your " "username." msgid "" -"Password reset link will be sent to the email address matching your " -"username." +"A password reset link will be sent to the specified email address if it " +"is registered in the system." msgstr "" "Le lien de réinitialisation du mot de passe sera envoyé à l'adresse " "e-mail correspondant à votre nom d'utilisateur." +#: kallithea/templates/password_reset_confirmation.html:19 +#, python-format +msgid "You are about to set a new password for the email address %s." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:20 +msgid "" +"Note that you must use the same browser session for this as the one used " +"to request the password reset." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:30 +msgid "Code you received in the email" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:39 +#, fuzzy +#| msgid "New password" +msgid "New Password" +msgstr "Nouveau mot de passe" + +#: kallithea/templates/password_reset_confirmation.html:48 +#, fuzzy +#| msgid "Confirm new password" +msgid "Confirm New Password" +msgstr "Confirmer le nouveau mot de passe" + +#: kallithea/templates/password_reset_confirmation.html:56 +msgid "Confirm" +msgstr "" + #: kallithea/templates/register.html:5 kallithea/templates/register.html:14 #: kallithea/templates/register.html:90 msgid "Sign Up" @@ -2684,7 +2687,6 @@ #: kallithea/templates/admin/auth/auth_settings.html:33 #, fuzzy -#| msgid "" " msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" @@ -2829,7 +2831,6 @@ #: kallithea/templates/admin/users/user_edit_api_keys.html:8 #: kallithea/templates/admin/users/user_edit_api_keys.html:27 #, fuzzy -#| msgid "never" msgid "Never" msgstr "jamais" @@ -2861,7 +2862,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:244 +#: kallithea/templates/base/base.html:237 msgid "Create New Gist" msgstr "Créer un nouveau gist" @@ -3003,7 +3004,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/base/base.html:343 msgid "My Account" msgstr "Mon compte" @@ -3014,7 +3015,6 @@ #: kallithea/templates/admin/my_account/my_account.html:36 #, fuzzy -#| msgid "New email address" msgid "Email Addresses" msgstr "Nouvelle adrese" @@ -3025,14 +3025,12 @@ #: kallithea/templates/admin/my_account/my_account.html:39 #, fuzzy -#| msgid "repositories" msgid "Owned Repositories" msgstr "Dépôts" #: kallithea/templates/admin/my_account/my_account.html:40 #: kallithea/templates/journal/journal.html:53 #, fuzzy -#| msgid "Create repositories" msgid "Watched Repositories" msgstr "Création de dépôts" @@ -3041,7 +3039,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 #, fuzzy -#| msgid "Copy permissions" msgid "Show Permissions" msgstr "Copier les permissions" @@ -3053,42 +3050,36 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #, fuzzy, python-format -#| msgid "Confirm to reset this api key: %s" msgid "Confirm to reset this API key: %s" msgstr "Confirmer la remise à zéro de cette clé d'API : %s" #: kallithea/templates/admin/my_account/my_account_api_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:30 #, fuzzy -#| msgid "expired" msgid "Expired" msgstr "a expiré" #: kallithea/templates/admin/my_account/my_account_api_keys.html:40 #: kallithea/templates/admin/users/user_edit_api_keys.html:40 #, fuzzy, python-format -#| msgid "Confirm to remove this api key: %s" msgid "Confirm to remove this API key: %s" msgstr "Confirmer la suppression de cette clé d'API : %s" #: kallithea/templates/admin/my_account/my_account_api_keys.html:42 #: kallithea/templates/admin/users/user_edit_api_keys.html:42 #, fuzzy -#| msgid "remove" msgid "Remove" msgstr "supprimer" #: kallithea/templates/admin/my_account/my_account_api_keys.html:49 #: kallithea/templates/admin/users/user_edit_api_keys.html:49 #, fuzzy -#| msgid "No additional api keys specified" msgid "No additional API keys specified" msgstr "Pas de clés d'API supplémentaires spécifiées" #: kallithea/templates/admin/my_account/my_account_api_keys.html:61 #: kallithea/templates/admin/users/user_edit_api_keys.html:61 #, fuzzy -#| msgid "New api key" msgid "New API key" msgstr "Nouvelle clé d'API" @@ -3167,7 +3158,6 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:16 #: kallithea/templates/admin/users/user_edit_profile.html:15 #, fuzzy -#| msgid "current IP" msgid "Current IP" msgstr "adresse IP actuelle" @@ -3177,7 +3167,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:45 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:200 @@ -3204,7 +3194,7 @@ msgstr "Commentaires" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 msgid "Pull Requests" msgstr "Demandes de pull" @@ -3222,7 +3212,7 @@ msgstr "Montrer Notification" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:342 msgid "Notifications" msgstr "Notifications" @@ -3265,7 +3255,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:26 #, fuzzy -#| msgid "Import existing repository ?" msgid "Apply to all existing repositories" msgstr "Importer un dépôt existant ?" @@ -3290,7 +3279,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:40 #, fuzzy -#| msgid "Import existing repository ?" msgid "Apply to all existing repository groups" msgstr "Importer un dépôt existant ?" @@ -3320,7 +3308,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:60 #, fuzzy -#| msgid "Repository creation" msgid "Top level repository creation" msgstr "Création de dépôt" @@ -3372,7 +3359,6 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:13 #: kallithea/templates/admin/users/user_edit_ips.html:23 #, fuzzy, python-format -#| msgid "Confirm to delete this ip: %s" msgid "Confirm to delete this IP address: %s" msgstr "Confirmer la suppression de cette adresse IP : %s" @@ -3431,7 +3417,7 @@ #: kallithea/templates/admin/repos/repo_edit.html:40 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:158 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 #: kallithea/templates/data_table/_dt_elements.html:45 #: kallithea/templates/data_table/_dt_elements.html:49 msgid "Settings" @@ -3470,7 +3456,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:146 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 msgid "Created on" msgstr "Créé le" @@ -3490,7 +3476,6 @@ #: kallithea/templates/admin/repos/repo_edit_permissions.html:12 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 #, fuzzy -#| msgid "user/user group" msgid "User/User Group" msgstr "utilisateur/groupe d'utilisateurs" @@ -3501,7 +3486,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 #, fuzzy -#| msgid "default" msgid "Default" msgstr "[Par défaut]" @@ -3512,7 +3496,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 #, fuzzy -#| msgid "revoke" msgid "Revoke" msgstr "Révoquer" @@ -3524,7 +3507,6 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 #, fuzzy -#| msgid "apply to children" msgid "Apply to children" msgstr "Appliquer aux enfants" @@ -3580,7 +3562,6 @@ #: kallithea/templates/admin/repos/repo_add_base.html:17 #, fuzzy -#| msgid "[created] repository" msgid "Clone remote repository" msgstr "[a créé] le dépôt" @@ -3854,25 +3835,21 @@ #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 #, fuzzy -#| msgid "private repository" msgid "Private Repository" msgstr "Dépôt privé" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 -#, fuzzy, python-format -#| msgid "Created repository %s" +#, fuzzy msgid "Remote repository URL" msgstr "Dépôt %s créé" #: kallithea/templates/admin/repos/repo_edit_remote.html:9 #, fuzzy -#| msgid "[pulled from remote] into repository" msgid "Pull Changes from Remote Repository" msgstr "[a pullé depuis un site distant] dans le dépôt" #: kallithea/templates/admin/repos/repo_edit_remote.html:11 #, fuzzy -#| msgid "Confirm to pull changes from remote side." msgid "Confirm to pull changes from remote repository." msgstr "Voulez-vous vraiment récupérer les changements depuis le site distant ?" @@ -3882,7 +3859,6 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:11 #, fuzzy -#| msgid "private repository" msgid "Permanent Repository ID" msgstr "Dépôt privé" @@ -3906,13 +3882,11 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:21 #, fuzzy -#| msgid "[created] repository" msgid "Remote repository" msgstr "[a créé] le dépôt" #: kallithea/templates/admin/repos/repo_edit_settings.html:25 #, fuzzy -#| msgid "Repository" msgid "Repository URL" msgstr "Dépôt" @@ -4063,7 +4037,7 @@ msgid "Custom Hooks" msgstr "Hooks personnalisés" -#: kallithea/templates/admin/settings/settings_hooks.html:68 +#: kallithea/templates/admin/settings/settings_hooks.html:67 msgid "Failed to remove hook" msgstr "Erreur lors de la suppression du hook" @@ -4100,7 +4074,18 @@ "Current hooks will be updated to the latest version." msgstr "" +#: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "Overwrite existing Git hooks" +msgstr "" + #: kallithea/templates/admin/settings/settings_mapping.html:30 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any" +" custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:35 msgid "Rescan Repositories" msgstr "" @@ -4128,7 +4113,6 @@ #: kallithea/templates/admin/settings/settings_system.html:4 #, fuzzy -#| msgid "check for updates" msgid "Check for updates" msgstr "vérifier les mises à jour" @@ -4345,7 +4329,6 @@ #: kallithea/templates/admin/settings/settings_visual.html:92 #, fuzzy -#| msgid "Meta-Tagging" msgid "Meta Tagging" msgstr "Meta-tagging" @@ -4387,7 +4370,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit.html:33 #, fuzzy -#| msgid "members" msgid "Show Members" msgstr "Membres" @@ -4534,49 +4516,49 @@ msgid "Git repository" msgstr "Dépôt Git" -#: kallithea/templates/base/base.html:126 +#: kallithea/templates/base/base.html:119 #, fuzzy msgid "Create Fork" msgstr "créé" -#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:130 #: kallithea/templates/data_table/_dt_elements.html:13 #: kallithea/templates/data_table/_dt_elements.html:17 #: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "Résumé" -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:141 +#: kallithea/templates/base/base.html:132 +#: kallithea/templates/base/base.html:134 #: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:21 #: kallithea/templates/data_table/_dt_elements.html:25 msgid "Changelog" msgstr "Historique" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:136 #: kallithea/templates/data_table/_dt_elements.html:29 #: kallithea/templates/data_table/_dt_elements.html:33 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "Fichiers" -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:138 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/base/base.html:154 +#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:147 msgid "Options" msgstr "Options" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:155 #: kallithea/templates/forks/forks_data.html:21 #, fuzzy msgid "Compare Fork" msgstr "Comparer le fork" -#: kallithea/templates/base/base.html:164 +#: kallithea/templates/base/base.html:157 #: kallithea/templates/bookmarks/bookmarks.html:56 #: kallithea/templates/bookmarks/bookmarks_data.html:13 #: kallithea/templates/branches/branches.html:56 @@ -4586,122 +4568,121 @@ msgid "Compare" msgstr "Comparer" -#: kallithea/templates/base/base.html:166 -#: kallithea/templates/base/base.html:254 +#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:247 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:54 msgid "Search" msgstr "Rechercher" -#: kallithea/templates/base/base.html:170 +#: kallithea/templates/base/base.html:163 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:172 +#: kallithea/templates/base/base.html:165 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:173 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:174 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:184 +#: kallithea/templates/base/base.html:177 #: kallithea/templates/data_table/_dt_elements.html:37 #: kallithea/templates/data_table/_dt_elements.html:41 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "Fork" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:178 #: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 #, python-format msgid "Show Pull Requests for %s" msgstr "" +#: kallithea/templates/base/base.html:221 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:227 #: kallithea/templates/base/base.html:228 -msgid "Show recent activity" +msgid "Public journal" +msgstr "Journal public" + +#: kallithea/templates/base/base.html:233 +msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:234 -#: kallithea/templates/base/base.html:235 -msgid "Public journal" -msgstr "Journal public" - -#: kallithea/templates/base/base.html:240 -msgid "Show public gists" -msgstr "" - -#: kallithea/templates/base/base.html:241 msgid "Gists" msgstr "" -#: kallithea/templates/base/base.html:245 +#: kallithea/templates/base/base.html:238 #, fuzzy msgid "All Public Gists" msgstr "Gists publics" -#: kallithea/templates/base/base.html:247 +#: kallithea/templates/base/base.html:240 #, fuzzy msgid "My Public Gists" msgstr "Gists publics" -#: kallithea/templates/base/base.html:248 +#: kallithea/templates/base/base.html:241 #, fuzzy msgid "My Private Gists" msgstr "Gist privé" -#: kallithea/templates/base/base.html:253 +#: kallithea/templates/base/base.html:246 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:276 -#: kallithea/templates/base/base.html:277 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +#: kallithea/templates/base/base.html:269 +#: kallithea/templates/base/base.html:270 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 #, fuzzy msgid "My Pull Requests" msgstr "Requêtes de pull" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:289 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:303 +#: kallithea/templates/base/base.html:296 #, fuzzy msgid "Login to Your Account" msgstr "Connexion à votre compte" -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:319 msgid "Forgot password ?" msgstr "Mot de passe oublié ?" -#: kallithea/templates/base/base.html:353 +#: kallithea/templates/base/base.html:346 msgid "Log Out" msgstr "Se déconnecter" -#: kallithea/templates/base/base.html:402 +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:540 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" #: kallithea/templates/base/default_perms_box.html:14 #, fuzzy -#| msgid "Repository Defaults" msgid "Inherit defaults" msgstr "Réglages par défaut du dépôt" @@ -4798,57 +4779,53 @@ msgstr "" #: kallithea/templates/base/root.html:31 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 -#, fuzzy -msgid "Open New Pull Request" -msgstr "Nouvelle requête de pull" +#, fuzzy +#| msgid "on pull request" +msgid "Open New Pull Request from {0}" +msgstr "[a commenté] la requête de pull pour" #: kallithea/templates/base/root.html:32 -#, fuzzy -msgid "Open New Pull Request for Selected Changesets" -msgstr "Nouvelle requête de pull" +msgid "Open New Pull Request for {0} → {1}" +msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets __S → __E" -msgstr "" +#, fuzzy +#| msgid "Show Selected Changeset __S" +msgid "Show Selected Changesets {0} → {1}" +msgstr "Sélectionner le changeset" #: kallithea/templates/base/root.html:34 #, fuzzy -msgid "Show Selected Changeset __S" -msgstr "Sélectionner le changeset" - -#: kallithea/templates/base/root.html:35 -#, fuzzy msgid "Selection Link" msgstr "Lien vers la sélection" -#: kallithea/templates/base/root.html:36 +#: kallithea/templates/base/root.html:35 #: kallithea/templates/changeset/diff_block.html:8 msgid "Collapse Diff" msgstr "Replier le Diff" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:36 msgid "Expand Diff" msgstr "Déplier le Diff" +#: kallithea/templates/base/root.html:37 +msgid "Failed to revoke permission" +msgstr "" + #: kallithea/templates/base/root.html:38 -msgid "Failed to revoke permission" -msgstr "" - -#: kallithea/templates/base/root.html:39 #, fuzzy msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "Impossible de révoquer votre permission d'administrateur" -#: kallithea/templates/base/root.html:40 +#: kallithea/templates/base/root.html:39 msgid "enabled" msgstr "activé" -#: kallithea/templates/base/root.html:41 +#: kallithea/templates/base/root.html:40 msgid "disabled" msgstr "désactivé" -#: kallithea/templates/base/root.html:43 +#: kallithea/templates/base/root.html:42 #, fuzzy msgid "Specify changeset" msgstr "Sélectionner le changeset" @@ -4867,7 +4844,6 @@ #: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 #: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" @@ -4907,7 +4883,7 @@ msgstr[0] "Affichage de %d révision sur %d" msgstr[1] "Affichage de %d révisions sur %d" -#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/templates/changelog/changelog.html:49 msgid "Clear selection" msgstr "" @@ -4981,7 +4957,7 @@ msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:291 +#: kallithea/templates/changelog/changelog.html:310 msgid "There are no changes yet" msgstr "Il n’y a aucun changement pour le moment" @@ -5039,7 +5015,6 @@ #: kallithea/templates/changelog/changelog_summary_data.html:90 #, fuzzy -#| msgid "Push new repo" msgid "Push new repository" msgstr "Pusher le nouveau dépôt" @@ -5085,7 +5060,6 @@ #: kallithea/templates/changeset/changeset.html:89 #: kallithea/templates/changeset/changeset_range.html:88 #, fuzzy -#| msgid "merge" msgid "Merge" msgstr "Fusion" @@ -5100,19 +5074,17 @@ #: kallithea/templates/changeset/changeset.html:135 #, fuzzy -#| msgid "Created by" msgid "Replaced by:" msgstr "créé" #: kallithea/templates/changeset/changeset.html:149 #, fuzzy -#| msgid "Created by" msgid "Preceded by:" msgstr "créé" #: kallithea/templates/changeset/changeset.html:166 #: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:314 +#: kallithea/templates/pullrequests/pullrequest_show.html:318 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -5121,7 +5093,7 @@ #: kallithea/templates/changeset/changeset.html:168 #: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:320 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -5130,21 +5102,19 @@ #: kallithea/templates/changeset/changeset.html:182 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Show full diff anyway" msgstr "" #: kallithea/templates/changeset/changeset.html:247 #: kallithea/templates/changeset/changeset.html:284 #, fuzzy -#| msgid "revisions" msgid "No revisions" msgstr "révisions" #: kallithea/templates/changeset/changeset_file_comment.html:21 #, fuzzy -#| msgid "Comment from pull request" msgid "on pull request" msgstr "[a commenté] la requête de pull pour" @@ -5155,7 +5125,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:24 #, fuzzy -#| msgid "No changesets" msgid "on this changeset" msgstr "Aucun changeset" @@ -5166,7 +5135,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:37 #, fuzzy -#| msgid "Latest Changes" msgid "Status change" msgstr "fichiers modifiés" @@ -5244,7 +5212,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:150 #, fuzzy -#| msgid "Use @username inside this text to notify another user" msgid "Use @username inside this text to notify another user." msgstr "" "Utilisez @nomutilisateur dans ce texte pour envoyer une notification à " @@ -5328,7 +5295,7 @@ msgstr "" #: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:306 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 msgid "Common ancestor" msgstr "Ancêtre commun" @@ -5371,7 +5338,7 @@ msgstr "" #: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:301 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5435,15 +5402,23 @@ msgstr "" #: kallithea/templates/email_templates/password_reset.html:6 -msgid "We received a request to create a new password for your account." +msgid "We have received a request to reset the password for your account." msgstr "" #: kallithea/templates/email_templates/password_reset.html:7 -msgid "You can generate it by clicking following URL" +msgid "To set a new password, click the following link" msgstr "" #: kallithea/templates/email_templates/password_reset.html:10 -msgid "Please ignore this email if you did not request a new password ." +msgid "" +"Should you not be able to use the link above, please type the following " +"code into the password reset form" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:12 +msgid "" +"If it weren't you who requested the password reset, just disregard this " +"message." msgstr "" #: kallithea/templates/email_templates/pull_request.html:5 @@ -5813,7 +5788,6 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:14 #, fuzzy -#| msgid "revoke" msgid "Vote" msgstr "Révoquer" @@ -5855,19 +5829,16 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:70 #, fuzzy, python-format -#| msgid "Confirm to delete this pull request" msgid "Confirm again to delete this pull request with %s comments" msgstr "Veuillez confirmer la suppression de cette requête de pull" #: kallithea/templates/pullrequests/pullrequest_show.html:6 #, fuzzy, python-format -#| msgid "Pull request #%s" msgid "%s Pull Request %s" msgstr "Requête de pull #%s" #: kallithea/templates/pullrequests/pullrequest_show.html:10 #, fuzzy, python-format -#| msgid "Pull Requests from %s'" msgid "Pull request %s from %s#%s" msgstr "Requête de pull #%s" @@ -5918,107 +5889,113 @@ msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:131 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +msgid "" +"This is just a range of changesets and doesn't have a target or a real " +"merge ancestor." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:133 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:154 -#, fuzzy -msgid "Created by" -msgstr "créé" - -#: kallithea/templates/pullrequests/pullrequest_show.html:169 +#: kallithea/templates/pullrequests/pullrequest_show.html:173 #, fuzzy msgid "Update" msgstr "[a mis à jour] l’utilisateur" -#: kallithea/templates/pullrequests/pullrequest_show.html:187 +#: kallithea/templates/pullrequests/pullrequest_show.html:191 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:209 +#: kallithea/templates/pullrequests/pullrequest_show.html:213 #, fuzzy msgid "Pull Request Reviewers" msgstr "Relecteurs de la requête de pull" -#: kallithea/templates/pullrequests/pullrequest_show.html:234 +#: kallithea/templates/pullrequests/pullrequest_show.html:238 #, fuzzy msgid "Remove reviewer" msgstr "%d relecteur" -#: kallithea/templates/pullrequests/pullrequest_show.html:246 +#: kallithea/templates/pullrequests/pullrequest_show.html:250 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:254 +#: kallithea/templates/pullrequests/pullrequest_show.html:258 #, fuzzy msgid "Potential Reviewers" msgstr "%d relecteur" -#: kallithea/templates/pullrequests/pullrequest_show.html:257 +#: kallithea/templates/pullrequests/pullrequest_show.html:261 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:280 +#: kallithea/templates/pullrequests/pullrequest_show.html:284 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/templates/pullrequests/pullrequest_show.html:285 #, fuzzy msgid "Save as New Pull Request" msgstr "Nouvelle requête de pull" -#: kallithea/templates/pullrequests/pullrequest_show.html:282 +#: kallithea/templates/pullrequests/pullrequest_show.html:286 #, fuzzy msgid "Cancel Changes" msgstr "Sélectionner le changeset" -#: kallithea/templates/pullrequests/pullrequest_show.html:292 +#: kallithea/templates/pullrequests/pullrequest_show.html:296 #, fuzzy msgid "Pull Request Content" msgstr "Requêtes de pull" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, fuzzy, python-format msgid "Pull Requests from %s'" msgstr "Requête de pull #%s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:13 #, fuzzy, python-format msgid "Pull Requests to '%s'" msgstr "Requête de pull #%s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 -#, fuzzy, python-format -msgid "Show Pull Requests to %s" -msgstr "Requête de pull #%s" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#, fuzzy +msgid "Open New Pull Request" +msgstr "Nouvelle requête de pull" #: kallithea/templates/pullrequests/pullrequest_show_all.html:37 #, fuzzy, python-format +msgid "Show Pull Requests to %s" +msgstr "Requête de pull #%s" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#, fuzzy, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 -msgid "Hide closed pull requests (only show open pull requests)" -msgstr "" - #: kallithea/templates/pullrequests/pullrequest_show_all.html:49 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 #, fuzzy msgid "Pull Requests Created by Me" msgstr "Relecteurs de la requête de pull" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 #, fuzzy msgid "Pull Requests I Participate In" msgstr "Je participe à" @@ -6189,7 +6166,6 @@ #: kallithea/templates/summary/summary.html:125 #, fuzzy -#| msgid "with subrepos" msgid "With subrepos" msgstr "avec les sous-dépôts" @@ -6260,21 +6236,6 @@ #~ msgstr "Aucun fichier" #~ msgid "" -#~ "Comment on %(repo_name)s changeset " -#~ "%(short_id)s on %(branch)s by " -#~ "%(comment_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Review request on %(repo_name)s pull " -#~ "request #%(pr_id)s from %(ref)s by " -#~ "%(pr_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Comment on %(repo_name)s pull request " -#~ "#%(pr_id)s from %(ref)s by " -#~ "%(comment_username)s" #~ msgstr "" #~ msgid "Username \"%(username)s\" is forbidden" @@ -6291,15 +6252,9 @@ #~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" #~ msgstr "" -#~ "URL à cloner invalide, veuillez fournir" -#~ " une URL à cloner valide " -#~ "http(s)/svn+http(s)/ssh" #~ msgid "Revisions %(revs)s are already part of pull request or have set status" #~ msgstr "" -#~ "Les révisions %(revs)s font déjà partie" -#~ " de la requête de pull ou on" -#~ " des statuts définis" #~ msgid "Defaults" #~ msgstr "Par défaut" @@ -6322,12 +6277,6 @@ #~ msgid "delete" #~ msgstr "Supprimer" -#~ msgid "" -#~ "Your user is in an external source" -#~ " of record; some details cannot be" -#~ " managed here" -#~ msgstr "" - #~ msgid "Permissions Administration" #~ msgstr "Administration des permissions" @@ -6337,20 +6286,6 @@ #~ msgid "Overwrite existing settings" #~ msgstr "Écraser les paramètres existants" -#~ msgid "" -#~ "All default permissions on each user " -#~ "group will be reset to chosen " -#~ "permission, note that all custom default" -#~ " permission on repository groups will " -#~ "be lost" -#~ msgstr "" - -#~ msgid "" -#~ "Write permission to a repository group" -#~ " allows creating repositories inside that" -#~ " group." -#~ msgstr "" - #~ msgid "Default IP Whitelist for All Users" #~ msgstr "Liste blanche d'adresses IP par défaut pour tous les utilisateurs" @@ -6387,20 +6322,6 @@ #~ msgid "Non-changeable id" #~ msgstr "" -#~ msgid "" -#~ "In case this repository is renamed " -#~ "or moved into another group the " -#~ "repository URL changes.\n" -#~ " Using the above " -#~ "URL guarantees that this repository will" -#~ " always be accessible under such URL." -#~ "\n" -#~ " Useful for CI " -#~ "systems, or any other cases that " -#~ "you need to hardcode the URL into" -#~ " 3rd party service." -#~ msgstr "" - #~ msgid "edit" #~ msgstr "éditer" @@ -6446,41 +6367,18 @@ #~ msgid "Destroy old data" #~ msgstr "Détruire les anciennes données" -#~ msgid "" -#~ "Check this option to remove references" -#~ " to repositories that no longer exist" -#~ " in on the filesystem." -#~ msgstr "" - #~ msgid "Default permissions" #~ msgstr "Permissions par défaut" #~ msgid "user groups" #~ msgstr "" -#~ msgid "" -#~ "This user is in an external source" -#~ " of record (%s); some details cannot" -#~ " be managed here." -#~ msgstr "" - #~ msgid "Inherit from defaults" #~ msgstr "" -#~ msgid "" -#~ "Select to inherit permissions from %s" -#~ " permissions settings, and default IP " -#~ "address whitelist." -#~ msgstr "" - #~ msgid "show" #~ msgstr "" -#~ msgid "" -#~ "Changeset status: %s\n" -#~ "Click to open associated pull request #%s" -#~ msgstr "" - #~ msgid "parent rev." #~ msgstr "" @@ -6499,14 +6397,6 @@ #~ msgid "Comment on changeset" #~ msgstr "" -#~ msgid "" -#~ "Use @username inside this text to " -#~ "send notification to another local user." -#~ msgstr "" -#~ "Utilisez @nomutilisateur dans ce texte " -#~ "pour envoyer une notification à " -#~ "l’utilisateur Kallithea en question" - #~ msgid "revision" #~ msgstr "" @@ -6533,3 +6423,52 @@ #~ msgid "reviewer" #~ msgstr "" + +#~ msgid "" +#~ "Your password reset was successful, new" +#~ " password has been sent to your " +#~ "email" +#~ msgstr "" +#~ "Votre mot de passe a été " +#~ "réinitialisé. Votre nouveau mot de passe" +#~ " vous a été envoyé par e-mail" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Added by %(pr_username)s] %(repo_name)s pull" +#~ " request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "Your new password" +#~ msgstr "Votre nouveau mot de passe" + +#~ msgid "Your new Kallithea password:%s" +#~ msgstr "Votre nouveau mot de passe Kallithea : %s" + +#~ msgid "Open New Pull Request for Selected Changesets" +#~ msgstr "Nouvelle requête de pull" + +#~ msgid "Show Selected Changesets __S → __E" +#~ msgstr "" + +#~ msgid "We received a request to create a new password for your account." +#~ msgstr "" + +#~ msgid "You can generate it by clicking following URL" +#~ msgstr "" + +#~ msgid "Please ignore this email if you did not request a new password ." +#~ msgstr "" + +#~ msgid "Created by" +#~ msgstr "créé" +
--- a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po Tue Sep 08 10:21:46 2015 +0000 +++ b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po Tue Sep 08 10:37:51 2015 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2015-08-25 11:37+0200\n" +"POT-Creation-Date: 2015-09-08 10:34+0200\n" "PO-Revision-Date: 2015-04-11 00:59+0200\n" "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n" "Language-Team: Hungarian " @@ -20,7 +20,7 @@ "X-Generator: Weblate 2.3-dev\n" #: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:241 kallithea/lib/base.py:512 +#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 msgid "There are no changesets yet" msgstr "" @@ -36,7 +36,7 @@ msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "" @@ -54,8 +54,8 @@ msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:743 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 msgid "Such revision does not exist for this repository" msgstr "" @@ -65,11 +65,11 @@ "not allowed" msgstr "" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:42 +#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 msgid "Select changeset" msgstr "" -#: kallithea/controllers/compare.py:258 +#: kallithea/controllers/compare.py:261 msgid "Cannot compare repositories without using common ancestor" msgstr "" @@ -118,8 +118,8 @@ #: kallithea/templates/changeset/changeset.html:195 #: kallithea/templates/compare/compare_diff.html:78 #: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Changeset was too big and was cut off..." msgstr "" @@ -128,111 +128,111 @@ msgid "%s committed on %s" msgstr "" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:91 msgid "Click here to add new file" msgstr "" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:92 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 -#: kallithea/controllers/files.py:433 +#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 +#: kallithea/controllers/files.py:432 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:318 +#: kallithea/controllers/files.py:317 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:329 +#: kallithea/controllers/files.py:328 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:351 +#: kallithea/controllers/files.py:350 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 -#: kallithea/controllers/files.py:502 +#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 +#: kallithea/controllers/files.py:501 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:378 +#: kallithea/controllers/files.py:377 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:392 +#: kallithea/controllers/files.py:391 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:408 +#: kallithea/controllers/files.py:407 msgid "No changes" msgstr "" -#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 +#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:444 +#: kallithea/controllers/files.py:443 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:464 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:469 +#: kallithea/controllers/files.py:468 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:494 +#: kallithea/controllers/files.py:493 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:527 +#: kallithea/controllers/files.py:526 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:538 +#: kallithea/controllers/files.py:537 #, python-format msgid "Unknown revision %s" msgstr "" -#: kallithea/controllers/files.py:540 +#: kallithea/controllers/files.py:539 msgid "Empty repository" msgstr "" -#: kallithea/controllers/files.py:542 +#: kallithea/controllers/files.py:541 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:772 +#: kallithea/controllers/files.py:771 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:15 #: kallithea/templates/pullrequests/pullrequest.html:97 msgid "Changesets" msgstr "" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:821 kallithea/templates/switch_to_list.html:3 +#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 +#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:832 kallithea/templates/switch_to_list.html:25 +#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 +#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "" @@ -253,9 +253,9 @@ #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:131 -#: kallithea/templates/base/base.html:397 -#: kallithea/templates/base/base.html:569 +#: kallithea/templates/base/base.html:124 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "" @@ -281,28 +281,31 @@ msgstr "" #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:229 +#: kallithea/templates/base/base.html:222 #: kallithea/templates/journal/journal.html:4 #: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:150 kallithea/controllers/login.py:196 +#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:156 +#: kallithea/controllers/login.py:157 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:201 -msgid "Your password reset link was sent" -msgstr "" - -#: kallithea/controllers/login.py:222 -msgid "" -"Your password reset was successful, new password has been sent to your " -"email" +#: kallithea/controllers/login.py:202 +msgid "A password reset confirmation code has been sent" +msgstr "" + +#: kallithea/controllers/login.py:251 +msgid "Invalid password reset token" +msgstr "" + +#: kallithea/controllers/login.py:256 +#: kallithea/controllers/admin/my_account.py:167 +msgid "Successfully updated password" msgstr "" #: kallithea/controllers/pullrequests.py:124 @@ -324,112 +327,112 @@ msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:827 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:306 +#: kallithea/controllers/pullrequests.py:310 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:352 -#: kallithea/controllers/pullrequests.py:499 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:503 msgid "No description" msgstr "" -#: kallithea/controllers/pullrequests.py:359 +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:362 -#: kallithea/controllers/pullrequests.py:449 -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:453 +#: kallithea/controllers/pullrequests.py:509 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:365 -#: kallithea/controllers/pullrequests.py:452 +#: kallithea/controllers/pullrequests.py:369 +#: kallithea/controllers/pullrequests.py:456 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:401 msgid "Missing changesets since the previous pull request:" msgstr "" -#: kallithea/controllers/pullrequests.py:404 +#: kallithea/controllers/pullrequests.py:408 #, python-format msgid "New changesets on %s %s since the previous pull request:" msgstr "" -#: kallithea/controllers/pullrequests.py:411 +#: kallithea/controllers/pullrequests.py:415 msgid "Ancestor didn't change - show diff since previous version:" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:422 #, python-format msgid "" "This pull request is based on another %s revision and there is no simple " "diff." msgstr "" -#: kallithea/controllers/pullrequests.py:420 +#: kallithea/controllers/pullrequests.py:424 #, python-format msgid "No changes found on %s %s since previous version." msgstr "" -#: kallithea/controllers/pullrequests.py:458 +#: kallithea/controllers/pullrequests.py:462 #, python-format msgid "Closed, replaced by %s ." msgstr "" -#: kallithea/controllers/pullrequests.py:466 +#: kallithea/controllers/pullrequests.py:470 msgid "Pull request update created" msgstr "" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:513 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:523 +#: kallithea/controllers/pullrequests.py:528 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:582 +#: kallithea/controllers/pullrequests.py:594 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:584 +#: kallithea/controllers/pullrequests.py:596 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:602 +#: kallithea/controllers/pullrequests.py:614 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:605 +#: kallithea/controllers/pullrequests.py:617 msgid "No changesets found for updating this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:613 +#: kallithea/controllers/pullrequests.py:625 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:619 +#: kallithea/controllers/pullrequests.py:631 msgid "Git pull requests don't support updates yet." msgstr "" -#: kallithea/controllers/pullrequests.py:710 +#: kallithea/controllers/pullrequests.py:722 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:715 +#: kallithea/controllers/pullrequests.py:727 msgid "Closing." msgstr "" @@ -473,37 +476,37 @@ #: kallithea/controllers/admin/gists.py:59 #: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:283 +#: kallithea/controllers/admin/users.py:285 msgid "Forever" msgstr "" #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/users.py:286 msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/users.py:287 msgid "1 hour" msgstr "" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/users.py:288 msgid "1 day" msgstr "" #: kallithea/controllers/admin/gists.py:63 #: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/users.py:289 msgid "1 month" msgstr "" #: kallithea/controllers/admin/gists.py:67 #: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/users.py:291 msgid "Lifetime" msgstr "" @@ -533,8 +536,8 @@ msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:208 -#: kallithea/model/user.py:230 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 +#: kallithea/model/user.py:237 msgid "You can't edit this user since it's crucial for entire application" msgstr "" @@ -543,47 +546,43 @@ msgstr "" #: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:204 +#: kallithea/controllers/admin/users.py:202 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:167 -msgid "Successfully updated password" -msgstr "" - #: kallithea/controllers/admin/my_account.py:178 msgid "Error occurred during update of user password" msgstr "" #: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:413 +#: kallithea/controllers/admin/users.py:415 #, python-format msgid "Added email %s to user" msgstr "" #: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:419 +#: kallithea/controllers/admin/users.py:421 msgid "An error occurred during email saving" msgstr "" #: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:431 +#: kallithea/controllers/admin/users.py:433 msgid "Removed email from user" msgstr "" #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:306 +#: kallithea/controllers/admin/users.py:308 msgid "API key successfully created" msgstr "" #: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:319 +#: kallithea/controllers/admin/users.py:321 msgid "API key successfully reset" msgstr "" #: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:323 +#: kallithea/controllers/admin/users.py:325 msgid "API key successfully deleted" msgstr "" @@ -633,10 +632,10 @@ #: kallithea/templates/admin/users/user_edit_profile.html:105 #: kallithea/templates/admin/users/users.html:10 #: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:252 +#: kallithea/templates/base/base.html:253 #: kallithea/templates/base/base.html:259 #: kallithea/templates/base/base.html:260 -#: kallithea/templates/base/base.html:266 -#: kallithea/templates/base/base.html:267 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "" @@ -850,17 +849,13 @@ #: kallithea/controllers/admin/repos.py:537 #: kallithea/controllers/admin/repos.py:564 -#, fuzzy, python-format -#| msgid "This repository has %s fork" -#| msgid_plural "This repository has %s forks" +#, fuzzy msgid "Repository has been locked" msgstr "Ennek a tárolónak %s elágazása van" #: kallithea/controllers/admin/repos.py:540 #: kallithea/controllers/admin/repos.py:561 -#, fuzzy, python-format -#| msgid "This repository has %s fork" -#| msgid_plural "This repository has %s forks" +#, fuzzy msgid "Repository has been unlocked" msgstr "Ennek a tárolónak %s elágazása van" @@ -900,48 +895,48 @@ msgstr "" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:274 +#: kallithea/controllers/admin/settings.py:277 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:213 +#: kallithea/controllers/admin/settings.py:216 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:270 +#: kallithea/controllers/admin/settings.py:273 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:335 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:361 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:373 +#: kallithea/controllers/admin/settings.py:376 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:421 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:425 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:448 +#: kallithea/controllers/admin/settings.py:451 msgid "Whoosh reindex task scheduled" msgstr "" @@ -982,68 +977,68 @@ msgstr "" #: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:382 +#: kallithea/controllers/admin/users.py:384 msgid "Updated permissions" msgstr "" #: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:386 +#: kallithea/controllers/admin/users.py:388 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:134 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:184 +#: kallithea/controllers/admin/users.py:182 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:220 +#: kallithea/controllers/admin/users.py:218 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:225 +#: kallithea/controllers/admin/users.py:223 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:238 +#: kallithea/controllers/admin/users.py:236 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:461 +#: kallithea/controllers/admin/users.py:463 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:467 +#: kallithea/controllers/admin/users.py:469 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:744 +#: kallithea/lib/auth.py:743 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:757 +#: kallithea/lib/auth.py:756 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:795 +#: kallithea/lib/auth.py:812 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:827 +#: kallithea/lib/auth.py:844 msgid "You need to be signed in to view this page" msgstr "" @@ -1196,7 +1191,7 @@ #: kallithea/lib/helpers.py:1128 #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "" @@ -1823,16 +1818,12 @@ msgstr "" #: kallithea/model/db.py:2228 -#, fuzzy, python-format -#| msgid "%d reviewer" -#| msgid_plural "%d reviewers" +#, fuzzy msgid "Not reviewed" msgstr "" #: kallithea/model/db.py:2231 -#, fuzzy, python-format -#| msgid "%d reviewer" -#| msgid_plural "%d reviewers" +#, fuzzy msgid "Under review" msgstr "" @@ -1920,9 +1911,7 @@ #: kallithea/model/notification.py:302 #, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s changeset %(short_id)s " -"on %(branch)s" +msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" #: kallithea/model/notification.py:305 @@ -1932,16 +1921,12 @@ #: kallithea/model/notification.py:307 #, python-format -msgid "" -"[Added by %(pr_username)s] %(repo_name)s pull request %(pr_nice_id)s from" -" %(ref)s" +msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" #: kallithea/model/notification.py:308 #, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s pull request " -"%(pr_nice_id)s from %(ref)s" +msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" #: kallithea/model/notification.py:321 @@ -1953,50 +1938,52 @@ msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:813 +#: kallithea/model/scm.py:812 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:185 +#: kallithea/model/user.py:192 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:249 +#: kallithea/model/user.py:256 msgid "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:254 +#: kallithea/model/user.py:261 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "" -#: kallithea/model/user.py:259 -#, python-format -msgid "" -"User \"%s\" still owns %s repository groups and cannot be removed. Switch" -" owners or remove those repository groups: %s" -msgstr "" - #: kallithea/model/user.py:266 #, python-format msgid "" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch" +" owners or remove those repository groups: %s" +msgstr "" + +#: kallithea/model/user.py:273 +#, python-format +msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "" -#: kallithea/model/user.py:296 +#: kallithea/model/user.py:360 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:319 -msgid "Your new password" -msgstr "" - -#: kallithea/model/user.py:320 -#, python-format -msgid "Your new Kallithea password:%s" +#: kallithea/model/user.py:408 +msgid "Password reset notification" +msgstr "" + +#: kallithea/model/user.py:409 +#, python-format +msgid "" +"The password to your account %s has been changed using password reset " +"form." msgstr "" #: kallithea/model/validators.py:77 kallithea/model/validators.py:78 @@ -2288,7 +2275,9 @@ #: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:229 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/pullrequests/pullrequest_show.html:156 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 #: kallithea/templates/summary/summary.html:134 msgid "Owner" msgstr "" @@ -2296,7 +2285,7 @@ #: kallithea/templates/index_base.html:140 #: kallithea/templates/admin/my_account/my_account_repos.html:57 #: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:44 +#: kallithea/templates/base/root.html:43 #: kallithea/templates/bookmarks/bookmarks.html:79 #: kallithea/templates/branches/branches.html:79 #: kallithea/templates/journal/journal.html:198 @@ -2308,7 +2297,7 @@ #: kallithea/templates/index_base.html:141 #: kallithea/templates/admin/my_account/my_account_repos.html:58 #: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:45 +#: kallithea/templates/base/root.html:44 #: kallithea/templates/bookmarks/bookmarks.html:80 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:199 @@ -2324,7 +2313,7 @@ #: kallithea/templates/index_base.html:143 #: kallithea/templates/admin/my_account/my_account_repos.html:60 #: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:46 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:201 @@ -2336,7 +2325,7 @@ #: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:147 kallithea/templates/base/root.html:48 +#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:202 @@ -2346,7 +2335,7 @@ msgstr "" #: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:333 +#: kallithea/templates/base/base.html:326 msgid "Log In" msgstr "" @@ -2361,14 +2350,15 @@ #: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:24 #: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/pullrequests/pullrequest_show.html:166 msgid "Username" msgstr "" #: kallithea/templates/login.html:33 kallithea/templates/register.html:33 #: kallithea/templates/admin/my_account/my_account.html:37 #: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:311 msgid "Password" msgstr "" @@ -2380,7 +2370,7 @@ msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:329 +#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 msgid "Don't have an account ?" msgstr "" @@ -2393,11 +2383,14 @@ msgstr "" #: kallithea/templates/password_reset.html:12 +#: kallithea/templates/password_reset_confirmation.html:12 #, python-format msgid "Reset Your Password to %s" msgstr "" #: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset_confirmation.html:5 +#: kallithea/templates/password_reset_confirmation.html:14 msgid "Reset Your Password" msgstr "" @@ -2416,8 +2409,35 @@ #: kallithea/templates/password_reset.html:47 msgid "" -"Password reset link will be sent to the email address matching your " -"username." +"A password reset link will be sent to the specified email address if it " +"is registered in the system." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:19 +#, python-format +msgid "You are about to set a new password for the email address %s." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:20 +msgid "" +"Note that you must use the same browser session for this as the one used " +"to request the password reset." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:30 +msgid "Code you received in the email" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:39 +msgid "New Password" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:48 +msgid "Confirm New Password" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:56 +msgid "Confirm" msgstr "" #: kallithea/templates/register.html:5 kallithea/templates/register.html:14 @@ -2729,7 +2749,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:244 +#: kallithea/templates/base/base.html:237 msgid "Create New Gist" msgstr "" @@ -2871,7 +2891,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/base/base.html:343 msgid "My Account" msgstr "" @@ -2913,7 +2933,6 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #, fuzzy, python-format -#| msgid "Confirm to delete this group" msgid "Confirm to reset this API key: %s" msgstr "A csoport törlésének megerősítése" @@ -2925,7 +2944,6 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:40 #: kallithea/templates/admin/users/user_edit_api_keys.html:40 #, fuzzy, python-format -#| msgid "Confirm to delete this group" msgid "Confirm to remove this API key: %s" msgstr "A csoport törlésének megerősítése" @@ -3027,7 +3045,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:45 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:200 @@ -3054,7 +3072,7 @@ msgstr "" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 msgid "Pull Requests" msgstr "" @@ -3072,7 +3090,7 @@ msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:342 msgid "Notifications" msgstr "" @@ -3213,7 +3231,6 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:13 #: kallithea/templates/admin/users/user_edit_ips.html:23 #, fuzzy, python-format -#| msgid "Confirm to delete this group" msgid "Confirm to delete this IP address: %s" msgstr "A csoport törlésének megerősítése" @@ -3271,7 +3288,7 @@ #: kallithea/templates/admin/repos/repo_edit.html:40 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:158 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 #: kallithea/templates/data_table/_dt_elements.html:45 #: kallithea/templates/data_table/_dt_elements.html:49 msgid "Settings" @@ -3310,7 +3327,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:146 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 msgid "Created on" msgstr "" @@ -3407,7 +3424,6 @@ #: kallithea/templates/admin/repos/repo_add_base.html:17 #, fuzzy -#| msgid "Delete this Repository" msgid "Clone remote repository" msgstr "Tároló törlése" @@ -3659,13 +3675,11 @@ #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 #, fuzzy -#| msgid "Delete this Repository" msgid "Private Repository" msgstr "Tároló törlése" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 #, fuzzy -#| msgid "Delete this Repository" msgid "Remote repository URL" msgstr "Tároló törlése" @@ -3705,7 +3719,6 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:21 #, fuzzy -#| msgid "Delete this Repository" msgid "Remote repository" msgstr "Tároló törlése" @@ -3848,7 +3861,7 @@ msgid "Custom Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:68 +#: kallithea/templates/admin/settings/settings_hooks.html:67 msgid "Failed to remove hook" msgstr "" @@ -3884,7 +3897,18 @@ "Current hooks will be updated to the latest version." msgstr "" +#: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "Overwrite existing Git hooks" +msgstr "" + #: kallithea/templates/admin/settings/settings_mapping.html:30 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any" +" custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:35 msgid "Rescan Repositories" msgstr "" @@ -4294,47 +4318,47 @@ msgid "Git repository" msgstr "" -#: kallithea/templates/base/base.html:126 +#: kallithea/templates/base/base.html:119 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:130 #: kallithea/templates/data_table/_dt_elements.html:13 #: kallithea/templates/data_table/_dt_elements.html:17 #: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:141 +#: kallithea/templates/base/base.html:132 +#: kallithea/templates/base/base.html:134 #: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:21 #: kallithea/templates/data_table/_dt_elements.html:25 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:136 #: kallithea/templates/data_table/_dt_elements.html:29 #: kallithea/templates/data_table/_dt_elements.html:33 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:138 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/base/base.html:154 +#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:147 msgid "Options" msgstr "" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:155 #: kallithea/templates/forks/forks_data.html:21 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:164 +#: kallithea/templates/base/base.html:157 #: kallithea/templates/bookmarks/bookmarks.html:56 #: kallithea/templates/bookmarks/bookmarks_data.html:13 #: kallithea/templates/branches/branches.html:56 @@ -4344,111 +4368,111 @@ msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:166 -#: kallithea/templates/base/base.html:254 +#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:247 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:54 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:170 +#: kallithea/templates/base/base.html:163 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:172 +#: kallithea/templates/base/base.html:165 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:173 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:174 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:184 +#: kallithea/templates/base/base.html:177 #: kallithea/templates/data_table/_dt_elements.html:37 #: kallithea/templates/data_table/_dt_elements.html:41 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:178 #: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 #, python-format msgid "Show Pull Requests for %s" msgstr "" +#: kallithea/templates/base/base.html:221 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:227 #: kallithea/templates/base/base.html:228 -msgid "Show recent activity" +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:233 +msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:234 -#: kallithea/templates/base/base.html:235 -msgid "Public journal" +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:238 +msgid "All Public Gists" msgstr "" #: kallithea/templates/base/base.html:240 -msgid "Show public gists" +msgid "My Public Gists" msgstr "" #: kallithea/templates/base/base.html:241 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:245 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:247 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:248 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:253 +#: kallithea/templates/base/base.html:246 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:276 -#: kallithea/templates/base/base.html:277 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +#: kallithea/templates/base/base.html:269 +#: kallithea/templates/base/base.html:270 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" +#: kallithea/templates/base/base.html:289 +msgid "Not Logged In" +msgstr "" + #: kallithea/templates/base/base.html:296 -msgid "Not Logged In" -msgstr "" - -#: kallithea/templates/base/base.html:303 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:319 msgid "Forgot password ?" msgstr "" -#: kallithea/templates/base/base.html:353 +#: kallithea/templates/base/base.html:346 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:402 +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:540 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" @@ -4548,52 +4572,47 @@ msgstr "" #: kallithea/templates/base/root.html:31 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 -msgid "Open New Pull Request" +msgid "Open New Pull Request from {0}" msgstr "" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for Selected Changesets" +msgid "Open New Pull Request for {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets __S → __E" +msgid "Show Selected Changesets {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:34 -msgid "Show Selected Changeset __S" +msgid "Selection Link" msgstr "" #: kallithea/templates/base/root.html:35 -msgid "Selection Link" +#: kallithea/templates/changeset/diff_block.html:8 +msgid "Collapse Diff" msgstr "" #: kallithea/templates/base/root.html:36 -#: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse Diff" +msgid "Expand Diff" msgstr "" #: kallithea/templates/base/root.html:37 -msgid "Expand Diff" +msgid "Failed to revoke permission" msgstr "" #: kallithea/templates/base/root.html:38 -msgid "Failed to revoke permission" +msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "" #: kallithea/templates/base/root.html:39 -msgid "Confirm to revoke permission for {0}: {1} ?" +msgid "enabled" msgstr "" #: kallithea/templates/base/root.html:40 -msgid "enabled" -msgstr "" - -#: kallithea/templates/base/root.html:41 msgid "disabled" msgstr "" -#: kallithea/templates/base/root.html:43 +#: kallithea/templates/base/root.html:42 msgid "Specify changeset" msgstr "" @@ -4611,7 +4630,6 @@ #: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 #: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" @@ -4651,7 +4669,7 @@ msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/templates/changelog/changelog.html:49 msgid "Clear selection" msgstr "" @@ -4723,7 +4741,7 @@ msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:291 +#: kallithea/templates/changelog/changelog.html:310 msgid "There are no changes yet" msgstr "" @@ -4845,7 +4863,7 @@ #: kallithea/templates/changeset/changeset.html:166 #: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:314 +#: kallithea/templates/pullrequests/pullrequest_show.html:318 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -4854,7 +4872,7 @@ #: kallithea/templates/changeset/changeset.html:168 #: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:320 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -4863,8 +4881,8 @@ #: kallithea/templates/changeset/changeset.html:182 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Show full diff anyway" msgstr "" @@ -4882,8 +4900,7 @@ msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:24 -#, fuzzy, python-format -#| msgid "%s changesets" +#, fuzzy msgid "on this changeset" msgstr "%s módosításcsomag" @@ -4892,8 +4909,7 @@ msgstr "Hozzászólás törlése?" #: kallithea/templates/changeset/changeset_file_comment.html:37 -#, fuzzy, python-format -#| msgid "%s changesets" +#, fuzzy msgid "Status change" msgstr "%s módosításcsomag" @@ -5040,7 +5056,7 @@ msgstr "" #: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:306 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 msgid "Common ancestor" msgstr "" @@ -5081,7 +5097,7 @@ msgstr "" #: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:301 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5145,15 +5161,23 @@ msgstr "" #: kallithea/templates/email_templates/password_reset.html:6 -msgid "We received a request to create a new password for your account." +msgid "We have received a request to reset the password for your account." msgstr "" #: kallithea/templates/email_templates/password_reset.html:7 -msgid "You can generate it by clicking following URL" +msgid "To set a new password, click the following link" msgstr "" #: kallithea/templates/email_templates/password_reset.html:10 -msgid "Please ignore this email if you did not request a new password ." +msgid "" +"Should you not be able to use the link above, please type the following " +"code into the password reset form" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:12 +msgid "" +"If it weren't you who requested the password reset, just disregard this " +"message." msgstr "" #: kallithea/templates/email_templates/pull_request.html:5 @@ -5553,8 +5577,6 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:70 #, fuzzy, python-format -#| msgid "Confirm to delete this group: %s with %s repository" -#| msgid_plural "Confirm to delete this group: %s with %s repositories" msgid "Confirm again to delete this pull request with %s comments" msgstr "" @@ -5612,98 +5634,104 @@ msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:131 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +msgid "" +"This is just a range of changesets and doesn't have a target or a real " +"merge ancestor." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:133 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:154 -msgid "Created by" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:169 +#: kallithea/templates/pullrequests/pullrequest_show.html:173 msgid "Update" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:187 +#: kallithea/templates/pullrequests/pullrequest_show.html:191 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:209 +#: kallithea/templates/pullrequests/pullrequest_show.html:213 msgid "Pull Request Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:234 +#: kallithea/templates/pullrequests/pullrequest_show.html:238 msgid "Remove reviewer" msgstr "Átnéző eltávolítása" -#: kallithea/templates/pullrequests/pullrequest_show.html:246 +#: kallithea/templates/pullrequests/pullrequest_show.html:250 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:254 +#: kallithea/templates/pullrequests/pullrequest_show.html:258 msgid "Potential Reviewers" msgstr "Lehetséges átnézők" -#: kallithea/templates/pullrequests/pullrequest_show.html:257 +#: kallithea/templates/pullrequests/pullrequest_show.html:261 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:280 +#: kallithea/templates/pullrequests/pullrequest_show.html:284 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/templates/pullrequests/pullrequest_show.html:285 msgid "Save as New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:282 +#: kallithea/templates/pullrequests/pullrequest_show.html:286 msgid "Cancel Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:292 +#: kallithea/templates/pullrequests/pullrequest_show.html:296 msgid "Pull Request Content" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 -#, python-format -msgid "Pull Requests from %s'" -msgstr "" - #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, python-format +msgid "Pull Requests from %s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:13 +#, python-format msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 -#, python-format -msgid "Show Pull Requests to %s" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +msgid "Open New Pull Request" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:37 #, python-format +msgid "Show Pull Requests to %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 -msgid "Hide closed pull requests (only show open pull requests)" -msgstr "" - #: kallithea/templates/pullrequests/pullrequest_show_all.html:49 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 msgid "Pull Requests I Participate In" msgstr "" @@ -5965,21 +5993,6 @@ #~ msgstr "" #~ msgid "" -#~ "Comment on %(repo_name)s changeset " -#~ "%(short_id)s on %(branch)s by " -#~ "%(comment_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Review request on %(repo_name)s pull " -#~ "request #%(pr_id)s from %(ref)s by " -#~ "%(pr_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Comment on %(repo_name)s pull request " -#~ "#%(pr_id)s from %(ref)s by " -#~ "%(comment_username)s" #~ msgstr "" #~ msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" @@ -5991,13 +6004,6 @@ #~ msgid "Username \"%(username)s\" is forbidden" #~ msgstr "" -#~ msgid "" -#~ "Username may only contain alphanumeric " -#~ "characters underscores, periods or dashes " -#~ "and must begin with alphanumeric " -#~ "character or underscore" -#~ msgstr "" - #~ msgid "invalid password" #~ msgstr "" @@ -6025,13 +6031,6 @@ #~ msgid "Revisions %(revs)s are already part of pull request or have set status" #~ msgstr "" -#~ msgid "" -#~ "Comma separated list of plugins. Order" -#~ " of plugins is also order in " -#~ "which Kallithea will try to authenticate" -#~ " user" -#~ msgstr "" - #~ msgid "Defaults" #~ msgstr "" @@ -6077,12 +6076,6 @@ #~ msgid "current IP" #~ msgstr "" -#~ msgid "" -#~ "Your user is in an external source" -#~ " of record; some details cannot be" -#~ " managed here" -#~ msgstr "" - #~ msgid "Permissions Administration" #~ msgstr "" @@ -6092,23 +6085,9 @@ #~ msgid "Overwrite existing settings" #~ msgstr "" -#~ msgid "" -#~ "All default permissions on each user " -#~ "group will be reset to chosen " -#~ "permission, note that all custom default" -#~ " permission on repository groups will " -#~ "be lost" -#~ msgstr "" - #~ msgid "Repository creation" #~ msgstr "" -#~ msgid "" -#~ "Write permission to a repository group" -#~ " allows creating repositories inside that" -#~ " group." -#~ msgstr "" - #~ msgid "Default IP Whitelist for All Users" #~ msgstr "" @@ -6169,20 +6148,6 @@ #~ msgid "Non-changeable id" #~ msgstr "" -#~ msgid "" -#~ "In case this repository is renamed " -#~ "or moved into another group the " -#~ "repository URL changes.\n" -#~ " Using the above " -#~ "URL guarantees that this repository will" -#~ " always be accessible under such URL." -#~ "\n" -#~ " Useful for CI " -#~ "systems, or any other cases that " -#~ "you need to hardcode the URL into" -#~ " 3rd party service." -#~ msgstr "" - #~ msgid "edit" #~ msgstr "" @@ -6228,12 +6193,6 @@ #~ msgid "Destroy old data" #~ msgstr "" -#~ msgid "" -#~ "Check this option to remove references" -#~ " to repositories that no longer exist" -#~ " in on the filesystem." -#~ msgstr "" - #~ msgid "check for updates" #~ msgstr "" @@ -6246,29 +6205,12 @@ #~ msgid "user groups" #~ msgstr "" -#~ msgid "" -#~ "This user is in an external source" -#~ " of record (%s); some details cannot" -#~ " be managed here." -#~ msgstr "" - #~ msgid "Inherit from defaults" #~ msgstr "" -#~ msgid "" -#~ "Select to inherit permissions from %s" -#~ " permissions settings, and default IP " -#~ "address whitelist." -#~ msgstr "" - #~ msgid "show" #~ msgstr "" -#~ msgid "" -#~ "Changeset status: %s\n" -#~ "Click to open associated pull request #%s" -#~ msgstr "" - #~ msgid "Push new repo" #~ msgstr "" @@ -6296,11 +6238,6 @@ #~ msgid "Comment on changeset" #~ msgstr "" -#~ msgid "" -#~ "Use @username inside this text to " -#~ "send notification to another local user." -#~ msgstr "" - #~ msgid "revision" #~ msgstr "" @@ -6331,3 +6268,60 @@ #~ msgid "with subrepos" #~ msgstr "" +#~ msgid "Your password reset link was sent" +#~ msgstr "" + +#~ msgid "" +#~ "Your password reset was successful, new" +#~ " password has been sent to your " +#~ "email" +#~ msgstr "" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Added by %(pr_username)s] %(repo_name)s pull" +#~ " request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "Your new password" +#~ msgstr "" + +#~ msgid "Your new Kallithea password:%s" +#~ msgstr "" + +#~ msgid "" +#~ "Password reset link will be sent " +#~ "to the email address matching your " +#~ "username." +#~ msgstr "" + +#~ msgid "Open New Pull Request for Selected Changesets" +#~ msgstr "" + +#~ msgid "Show Selected Changesets __S → __E" +#~ msgstr "" + +#~ msgid "Show Selected Changeset __S" +#~ msgstr "" + +#~ msgid "We received a request to create a new password for your account." +#~ msgstr "" + +#~ msgid "You can generate it by clicking following URL" +#~ msgstr "" + +#~ msgid "Please ignore this email if you did not request a new password ." +#~ msgstr "" + +#~ msgid "Created by" +#~ msgstr "" +
--- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Tue Sep 08 10:21:46 2015 +0000 +++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Tue Sep 08 10:37:51 2015 +0200 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2015-08-25 11:37+0200\n" +"POT-Creation-Date: 2015-09-08 10:34+0200\n" "PO-Revision-Date: 2015-01-31 02:07+0200\n" "Last-Translator: kobanari <kobanari@nifty.com>\n" "Language-Team: Japanese " @@ -24,7 +24,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" #: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:241 kallithea/lib/base.py:512 +#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 msgid "There are no changesets yet" msgstr "まだチェンジセットがありません" @@ -40,7 +40,7 @@ msgid "None" msgstr "なし" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(閉鎖済み)" @@ -55,12 +55,11 @@ #: kallithea/controllers/changeset.py:169 #, fuzzy, python-format -#| msgid "increase diff context to %(num)s lines" msgid "Increase diff context to %(num)s lines" msgstr "diff コンテキストを %(num)s 行増やす" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:743 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 msgid "Such revision does not exist for this repository" msgstr "お探しのリビジョンはこのリポジトリにはありません" @@ -70,17 +69,16 @@ "not allowed" msgstr "クローズしたプルリクエストに関連するチェンジセットのステータスを変更することは許可されていません" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:42 +#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 msgid "Select changeset" msgstr "リビジョンを選択" -#: kallithea/controllers/compare.py:258 +#: kallithea/controllers/compare.py:261 msgid "Cannot compare repositories without using common ancestor" msgstr "" #: kallithea/controllers/error.py:71 #, fuzzy -#| msgid "no revisions" msgid "No response" msgstr "リビジョンなし" @@ -125,8 +123,8 @@ #: kallithea/templates/changeset/changeset.html:195 #: kallithea/templates/compare/compare_diff.html:78 #: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Changeset was too big and was cut off..." msgstr "チェンジセットが大きすぎるため、省略しました" @@ -135,111 +133,111 @@ msgid "%s committed on %s" msgstr "%s が %s にコミット" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:91 msgid "Click here to add new file" msgstr "新しいファイルを追加" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:92 #, python-format msgid "There are no files yet. %s" msgstr "まだファイルがありません。 %s" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, fuzzy, python-format msgid "%s at %s" msgstr "%s と %s の間" -#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 -#: kallithea/controllers/files.py:433 +#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 +#: kallithea/controllers/files.py:432 #, python-format msgid "This repository has been locked by %s on %s" msgstr "このリポジトリは %s によって %s にロックされました" -#: kallithea/controllers/files.py:318 +#: kallithea/controllers/files.py:317 msgid "You can only delete files with revision being a valid branch " msgstr "有効なブランチ上のリビジョンからしかファイルを削除できません" -#: kallithea/controllers/files.py:329 +#: kallithea/controllers/files.py:328 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Kallithea経由で %s を削除" -#: kallithea/controllers/files.py:351 +#: kallithea/controllers/files.py:350 #, python-format msgid "Successfully deleted file %s" msgstr "%s ファイルの削除に成功しました" -#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 -#: kallithea/controllers/files.py:502 +#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 +#: kallithea/controllers/files.py:501 msgid "Error occurred during commit" msgstr "コミット中にエラーが発生しました" -#: kallithea/controllers/files.py:378 +#: kallithea/controllers/files.py:377 msgid "You can only edit files with revision being a valid branch " msgstr "有効なブランチを示すリビジョンでのみファイルを編集できます。" -#: kallithea/controllers/files.py:392 +#: kallithea/controllers/files.py:391 #, python-format msgid "Edited file %s via Kallithea" msgstr "Kallithea経由で %s を変更" -#: kallithea/controllers/files.py:408 +#: kallithea/controllers/files.py:407 msgid "No changes" msgstr "変更点なし" -#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 +#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 #, python-format msgid "Successfully committed to %s" msgstr "%s へのコミットが成功しました" -#: kallithea/controllers/files.py:444 +#: kallithea/controllers/files.py:443 msgid "Added file via Kallithea" msgstr "Kallithea経由でファイルを追加" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:464 msgid "No content" msgstr "内容がありません" -#: kallithea/controllers/files.py:469 +#: kallithea/controllers/files.py:468 msgid "No filename" msgstr "ファイル名がありません" -#: kallithea/controllers/files.py:494 +#: kallithea/controllers/files.py:493 msgid "Location must be relative path and must not contain .. in path" msgstr "場所には相対パスかつ .. を含まないパスを入力してください" -#: kallithea/controllers/files.py:527 +#: kallithea/controllers/files.py:526 msgid "Downloads disabled" msgstr "ダウンロードは無効化されています" -#: kallithea/controllers/files.py:538 +#: kallithea/controllers/files.py:537 #, python-format msgid "Unknown revision %s" msgstr "%s は未知のリビジョンです" -#: kallithea/controllers/files.py:540 +#: kallithea/controllers/files.py:539 msgid "Empty repository" msgstr "空のリポジトリ" -#: kallithea/controllers/files.py:542 +#: kallithea/controllers/files.py:541 msgid "Unknown archive type" msgstr "未知のアーカイブ種別です" -#: kallithea/controllers/files.py:772 +#: kallithea/controllers/files.py:771 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:15 #: kallithea/templates/pullrequests/pullrequest.html:97 msgid "Changesets" msgstr "チェンジセット" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:821 kallithea/templates/switch_to_list.html:3 +#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 +#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "ブランチ" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:832 kallithea/templates/switch_to_list.html:25 +#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 +#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "タグ" @@ -260,9 +258,9 @@ #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:131 -#: kallithea/templates/base/base.html:397 -#: kallithea/templates/base/base.html:569 +#: kallithea/templates/base/base.html:124 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "リポジトリ" @@ -288,31 +286,37 @@ msgstr "公開ジャーナル" #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:229 +#: kallithea/templates/base/base.html:222 #: kallithea/templates/journal/journal.html:4 #: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "ジャーナル" -#: kallithea/controllers/login.py:150 kallithea/controllers/login.py:196 -#, fuzzy -#| msgid "bad captcha" +#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 +#, fuzzy msgid "Bad captcha" msgstr "キャプチャが一致しません" -#: kallithea/controllers/login.py:156 +#: kallithea/controllers/login.py:157 msgid "You have successfully registered into Kallithea" msgstr "Kallitheaへの登録を受け付けました" -#: kallithea/controllers/login.py:201 -msgid "Your password reset link was sent" +#: kallithea/controllers/login.py:202 +#, fuzzy +#| msgid "Your password reset link was sent" +msgid "A password reset confirmation code has been sent" msgstr "パスワードリセットのリンクを送信しました" -#: kallithea/controllers/login.py:222 -msgid "" -"Your password reset was successful, new password has been sent to your " -"email" -msgstr "パスワードをリセットに成功しました。新しいパスワードをあなたのメールアドレスに送りました" +#: kallithea/controllers/login.py:251 +#, fuzzy +#| msgid "Password reset link" +msgid "Invalid password reset token" +msgstr "パスワードリセットのリンク" + +#: kallithea/controllers/login.py:256 +#: kallithea/controllers/admin/my_account.py:167 +msgid "Successfully updated password" +msgstr "パスワードを更新しました" #: kallithea/controllers/pullrequests.py:124 #, fuzzy, python-format @@ -333,118 +337,117 @@ msgid "Peer branches" msgstr "相手のブランチ" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:827 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "ブックマーク" -#: kallithea/controllers/pullrequests.py:306 +#: kallithea/controllers/pullrequests.py:310 #, python-format msgid "Error creating pull request: %s" msgstr "プルリクエスト作成中にエラーが発生しました: %s" -#: kallithea/controllers/pullrequests.py:352 -#: kallithea/controllers/pullrequests.py:499 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:503 #, fuzzy msgid "No description" msgstr "説明" -#: kallithea/controllers/pullrequests.py:359 +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "新しいプルリクエストの作成に成功しました" -#: kallithea/controllers/pullrequests.py:362 -#: kallithea/controllers/pullrequests.py:449 -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:453 +#: kallithea/controllers/pullrequests.py:509 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:365 -#: kallithea/controllers/pullrequests.py:452 +#: kallithea/controllers/pullrequests.py:369 +#: kallithea/controllers/pullrequests.py:456 #, fuzzy msgid "Error occurred while creating pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:401 msgid "Missing changesets since the previous pull request:" msgstr "" -#: kallithea/controllers/pullrequests.py:404 +#: kallithea/controllers/pullrequests.py:408 #, python-format msgid "New changesets on %s %s since the previous pull request:" msgstr "" -#: kallithea/controllers/pullrequests.py:411 +#: kallithea/controllers/pullrequests.py:415 msgid "Ancestor didn't change - show diff since previous version:" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:422 #, python-format msgid "" "This pull request is based on another %s revision and there is no simple " "diff." msgstr "" -#: kallithea/controllers/pullrequests.py:420 +#: kallithea/controllers/pullrequests.py:424 #, python-format msgid "No changes found on %s %s since previous version." msgstr "" -#: kallithea/controllers/pullrequests.py:458 +#: kallithea/controllers/pullrequests.py:462 #, python-format msgid "Closed, replaced by %s ." msgstr "" -#: kallithea/controllers/pullrequests.py:466 +#: kallithea/controllers/pullrequests.py:470 #, fuzzy msgid "Pull request update created" msgstr "プルリクエストレビュアー" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:513 #, fuzzy msgid "Pull request updated" msgstr "%s へのプルリクエスト" -#: kallithea/controllers/pullrequests.py:523 +#: kallithea/controllers/pullrequests.py:528 msgid "Successfully deleted pull request" msgstr "プルリクエストの削除に成功しました" -#: kallithea/controllers/pullrequests.py:582 +#: kallithea/controllers/pullrequests.py:594 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:584 +#: kallithea/controllers/pullrequests.py:596 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:602 +#: kallithea/controllers/pullrequests.py:614 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:605 +#: kallithea/controllers/pullrequests.py:617 msgid "No changesets found for updating this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:613 +#: kallithea/controllers/pullrequests.py:625 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:619 +#: kallithea/controllers/pullrequests.py:631 msgid "Git pull requests don't support updates yet." msgstr "" -#: kallithea/controllers/pullrequests.py:710 -#, fuzzy -#| msgid "Vote for pull request status" +#: kallithea/controllers/pullrequests.py:722 +#, fuzzy msgid "No permission to change pull request status" msgstr "プルリクエストステータスの投票" -#: kallithea/controllers/pullrequests.py:715 +#: kallithea/controllers/pullrequests.py:727 #, fuzzy msgid "Closing." msgstr "読み込み中..." @@ -491,39 +494,38 @@ #: kallithea/controllers/admin/gists.py:59 #: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:283 -#, fuzzy -#| msgid "forever" +#: kallithea/controllers/admin/users.py:285 +#, fuzzy msgid "Forever" msgstr "無期限" #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/users.py:286 msgid "5 minutes" msgstr "5 分" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/users.py:287 msgid "1 hour" msgstr "1 時間" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/users.py:288 msgid "1 day" msgstr "1 日" #: kallithea/controllers/admin/gists.py:63 #: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/users.py:289 msgid "1 month" msgstr "1 ヶ月" #: kallithea/controllers/admin/gists.py:67 #: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/users.py:291 msgid "Lifetime" msgstr "有効期間" @@ -538,7 +540,6 @@ #: kallithea/controllers/admin/gists.py:233 #, fuzzy -#| msgid "unmodified" msgid "Unmodified" msgstr "変更なし" @@ -555,8 +556,8 @@ msgid "Error occurred during update of gist %s" msgstr "Gist %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:208 -#: kallithea/model/user.py:230 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 +#: kallithea/model/user.py:237 msgid "You can't edit this user since it's crucial for entire application" msgstr "このユーザーを編集できません。このユーザーはアプリケーションにとって必要不可欠です。" @@ -565,47 +566,43 @@ msgstr "アカウントの更新に成功しました" #: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:204 +#: kallithea/controllers/admin/users.py:202 #, python-format msgid "Error occurred during update of user %s" msgstr "ユーザー %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/my_account.py:167 -msgid "Successfully updated password" -msgstr "パスワードを更新しました" - #: kallithea/controllers/admin/my_account.py:178 msgid "Error occurred during update of user password" msgstr "パスワードの更新中にエラーが発生しました" #: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:413 +#: kallithea/controllers/admin/users.py:415 #, python-format msgid "Added email %s to user" msgstr "ユーザーにメールアドレス %s を追加しました" #: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:419 +#: kallithea/controllers/admin/users.py:421 msgid "An error occurred during email saving" msgstr "メールの保存時にエラーが発生しました" #: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:431 +#: kallithea/controllers/admin/users.py:433 msgid "Removed email from user" msgstr "ユーザーからメールアドレスを削除しました" #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:306 +#: kallithea/controllers/admin/users.py:308 msgid "API key successfully created" msgstr "APIキーの作成に成功しました" #: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:319 +#: kallithea/controllers/admin/users.py:321 msgid "API key successfully reset" msgstr "APIキーのリセットに成功しました" #: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:323 +#: kallithea/controllers/admin/users.py:325 msgid "API key successfully deleted" msgstr "APIキーの削除に成功しました" @@ -655,10 +652,10 @@ #: kallithea/templates/admin/users/user_edit_profile.html:105 #: kallithea/templates/admin/users/users.html:10 #: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:252 +#: kallithea/templates/base/base.html:253 #: kallithea/templates/base/base.html:259 #: kallithea/templates/base/base.html:260 -#: kallithea/templates/base/base.html:266 -#: kallithea/templates/base/base.html:267 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "管理" @@ -825,7 +822,6 @@ #: kallithea/controllers/admin/repos.py:321 #, fuzzy, python-format -#| msgid "Cannot delete %s it still contains attached forks" msgid "Cannot delete repository %s which still has forks" msgstr "フォークしたリポジトリが存在するため、 %s は削除できません" @@ -874,14 +870,12 @@ #: kallithea/controllers/admin/repos.py:537 #: kallithea/controllers/admin/repos.py:564 #, fuzzy -#| msgid "Repository is not locked" msgid "Repository has been locked" msgstr "リポジトリはロックされていません" #: kallithea/controllers/admin/repos.py:540 #: kallithea/controllers/admin/repos.py:561 #, fuzzy -#| msgid "Repository is not locked" msgid "Repository has been unlocked" msgstr "リポジトリはロックされていません" @@ -921,48 +915,48 @@ msgstr "\"hgsubversion\"ライブラリが見つからないため、hgsubversionサポートを有効に出来ません。" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:274 +#: kallithea/controllers/admin/settings.py:277 msgid "Error occurred while updating application settings" msgstr "アプリケーション設定の更新中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:213 +#: kallithea/controllers/admin/settings.py:216 #, fuzzy, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "リポジトリの再スキャンに成功しました。 追加: %s 削除: %s" -#: kallithea/controllers/admin/settings.py:270 +#: kallithea/controllers/admin/settings.py:273 msgid "Updated application settings" msgstr "アプリケーション設定を更新しました" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "表示設定を更新しました" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:335 msgid "Error occurred during updating visualisation settings" msgstr "表示設定の更新中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:361 msgid "Please enter email address" msgstr "メールアドレスを入力してください" -#: kallithea/controllers/admin/settings.py:373 +#: kallithea/controllers/admin/settings.py:376 msgid "Send email task created" msgstr "メール送信タスクを作成しました" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Added new hook" msgstr "新しいフックを追加しました" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:421 msgid "Updated hooks" msgstr "フックを更新しました" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:425 msgid "Error occurred during hook creation" msgstr "フックの作成中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:448 +#: kallithea/controllers/admin/settings.py:451 msgid "Whoosh reindex task scheduled" msgstr "Whooshの再インデックスタスクを予定に入れました" @@ -1003,70 +997,69 @@ msgstr "ユーザーグループ権限を更新しました" #: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:382 +#: kallithea/controllers/admin/users.py:384 msgid "Updated permissions" msgstr "権限を更新しました" #: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:386 +#: kallithea/controllers/admin/users.py:388 msgid "An error occurred during permissions saving" msgstr "権限の保存時にエラーが発生しました" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:134 #, python-format msgid "Created user %s" msgstr "ユーザー %s を作成しました" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "ユーザー %s の作成中にエラーが発生しました" -#: kallithea/controllers/admin/users.py:184 +#: kallithea/controllers/admin/users.py:182 msgid "User updated successfully" msgstr "ユーザーの更新に成功しました" -#: kallithea/controllers/admin/users.py:220 +#: kallithea/controllers/admin/users.py:218 msgid "Successfully deleted user" msgstr "ユーザーの削除に成功しました" -#: kallithea/controllers/admin/users.py:225 +#: kallithea/controllers/admin/users.py:223 msgid "An error occurred during deletion of user" msgstr "ユーザーの削除中にエラーが発生しました" -#: kallithea/controllers/admin/users.py:238 +#: kallithea/controllers/admin/users.py:236 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:461 +#: kallithea/controllers/admin/users.py:463 #, python-format msgid "Added IP address %s to user whitelist" msgstr "ユーザーホワイトリストにIP %s を追加しました" -#: kallithea/controllers/admin/users.py:467 +#: kallithea/controllers/admin/users.py:469 msgid "An error occurred while adding IP address" msgstr "IPアドレスの保存中にエラーが発生しました" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 msgid "Removed IP address from user whitelist" msgstr "ユーザーホワイトリストからIPアドレスを削除しました" -#: kallithea/lib/auth.py:744 +#: kallithea/lib/auth.py:743 #, python-format msgid "IP %s not allowed" msgstr "IPアドレス %s は許可されません" -#: kallithea/lib/auth.py:757 -#, fuzzy -#| msgid "New api key" +#: kallithea/lib/auth.py:756 +#, fuzzy msgid "Invalid API key" msgstr "新しいAPIキー" -#: kallithea/lib/auth.py:795 +#: kallithea/lib/auth.py:812 msgid "You need to be a registered user to perform this action" msgstr "このアクションを実行するためには登録済みのユーザーである必要があります" -#: kallithea/lib/auth.py:827 +#: kallithea/lib/auth.py:844 msgid "You need to be signed in to view this page" msgstr "このページを閲覧するためにはサインインが必要です" @@ -1107,7 +1100,6 @@ #: kallithea/lib/helpers.py:677 #, fuzzy -#| msgid "compare view" msgid "Compare view" msgstr "比較ビュー" @@ -1126,13 +1118,11 @@ #: kallithea/lib/helpers.py:722 #, fuzzy, python-format -#| msgid "fork name %s" msgid "Fork name %s" msgstr "フォーク名 %s" #: kallithea/lib/helpers.py:742 #, fuzzy, python-format -#| msgid "Pull request #%s" msgid "Pull request %s" msgstr "プルリクエスト #%s" @@ -1223,7 +1213,7 @@ #: kallithea/lib/helpers.py:1128 #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "ファイルはありません" @@ -1763,13 +1753,11 @@ #: kallithea/model/db.py:1668 #, fuzzy -#| msgid "Unauthorized access to resource" msgid "Default user has read access to new repositories" msgstr "リソースにアクセスする権限がありません" #: kallithea/model/db.py:1669 #, fuzzy -#| msgid "Unauthorized access to resource" msgid "Default user has write access to new repositories" msgstr "リソースにアクセスする権限がありません" @@ -1810,74 +1798,62 @@ msgstr "" #: kallithea/model/db.py:1682 -#, fuzzy, python-format -#| msgid "Created repository group %s" +#, fuzzy msgid "Only admins can create repository groups" msgstr "リポジトリグループ %s を作成しました" #: kallithea/model/db.py:1683 -#, fuzzy, python-format -#| msgid "Created repository group %s" +#, fuzzy msgid "Non-admins can create repository groups" msgstr "リポジトリグループ %s を作成しました" #: kallithea/model/db.py:1685 #, fuzzy -#| msgid "Create user groups" msgid "Only admins can create user groups" msgstr "ユーザーグループを作成" #: kallithea/model/db.py:1686 #, fuzzy -#| msgid "Create user groups" msgid "Non-admins can create user groups" msgstr "ユーザーグループを作成" #: kallithea/model/db.py:1688 #, fuzzy -#| msgid "Top level repositories" msgid "Only admins can create top level repositories" msgstr "トップレベルリポジトリ数" #: kallithea/model/db.py:1689 #, fuzzy -#| msgid "Top level repositories" msgid "Non-admins can create top level repositories" msgstr "トップレベルリポジトリ数" #: kallithea/model/db.py:1694 #, fuzzy -#| msgid "Location of repositories" msgid "Only admins can fork repositories" msgstr "リポジトリ総数" #: kallithea/model/db.py:1695 #, fuzzy -#| msgid "Invalidate cache for all repositories" msgid "Non-admins can can fork repositories" msgstr "すべてのリポジトリのキャッシュを無効化する" #: kallithea/model/db.py:1698 #, fuzzy -#| msgid "User Registration with manual account activation" msgid "User registration with manual account activation" msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする" #: kallithea/model/db.py:1699 #, fuzzy -#| msgid "User Registration with automatic account activation" msgid "User registration with automatic account activation" msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする" #: kallithea/model/db.py:2228 #, fuzzy -#| msgid "Not Reviewed" msgid "Not reviewed" msgstr "未レビュー" #: kallithea/model/db.py:2231 #, fuzzy -#| msgid "Under Review" msgid "Under review" msgstr "レビュー中" @@ -1905,37 +1881,31 @@ #: kallithea/model/notification.py:254 #, fuzzy, python-format -#| msgid "%(user)s commented on changeset at %(when)s" msgid "%(user)s commented on changeset %(age)s" msgstr "%(user)s がチェンジセットにコメント %(when)s" #: kallithea/model/notification.py:255 #, fuzzy, python-format -#| msgid "%(user)s sent message at %(when)s" msgid "%(user)s sent message %(age)s" msgstr "%(user)s がメッセージを送信 %(when)s" #: kallithea/model/notification.py:256 #, fuzzy, python-format -#| msgid "%(user)s mentioned you at %(when)s" msgid "%(user)s mentioned you %(age)s" msgstr "%(user)s がにあなたにメンション %(when)s" #: kallithea/model/notification.py:257 #, fuzzy, python-format -#| msgid "%(user)s registered in Kallithea at %(when)s" msgid "%(user)s registered in Kallithea %(age)s" msgstr "%(user)s がKallitheaに登録 %(when)s" #: kallithea/model/notification.py:258 #, fuzzy, python-format -#| msgid "%(user)s opened new pull request at %(when)s" msgid "%(user)s opened new pull request %(age)s" msgstr "%(user)s が新しいプルリクエストを作成 %(when)s" #: kallithea/model/notification.py:259 #, fuzzy, python-format -#| msgid "%(user)s commented on pull request at %(when)s" msgid "%(user)s commented on pull request %(age)s" msgstr "%(user)s がプルリクエストにコメント %(when)s" @@ -1971,9 +1941,7 @@ #: kallithea/model/notification.py:302 #, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s changeset %(short_id)s " -"on %(branch)s" +msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" #: kallithea/model/notification.py:305 @@ -1982,18 +1950,17 @@ msgstr "ユーザー名 %(new_username)s は不正です" #: kallithea/model/notification.py:307 -#, python-format -msgid "" -"[Added by %(pr_username)s] %(repo_name)s pull request %(pr_nice_id)s from" -" %(ref)s" -msgstr "" +#, fuzzy, python-format +#| msgid "%(user)s wants you to review pull request %(pr_nice_id)s: +#| %(pr_title)s" +msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgstr "%(user)s がプリリクエスト #%(pr_id)s: %(pr_title)s のレビューを求めています" #: kallithea/model/notification.py:308 -#, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s pull request " -"%(pr_nice_id)s from %(ref)s" -msgstr "" +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgstr "プルリクエストに[コメント]" #: kallithea/model/notification.py:321 #, fuzzy @@ -2002,57 +1969,59 @@ #: kallithea/model/pull_request.py:137 #, fuzzy, python-format -#| msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "%(user)s がプリリクエスト #%(pr_id)s: %(pr_title)s のレビューを求めています" -#: kallithea/model/scm.py:813 +#: kallithea/model/scm.py:812 msgid "latest tip" msgstr "最新のtip" -#: kallithea/model/user.py:185 +#: kallithea/model/user.py:192 msgid "New user registration" msgstr "新規ユーザー登録" -#: kallithea/model/user.py:249 -#, fuzzy -#| msgid "You can't remove this user since it's crucial for entire application" +#: kallithea/model/user.py:256 +#, fuzzy msgid "You can't remove this user since it is crucial for the entire application" msgstr "このユーザーを削除できません。このユーザーはアプリケーションにとって必要不可欠です。" -#: kallithea/model/user.py:254 +#: kallithea/model/user.py:261 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "ユーザー \"%s\" はまだ %s 個のリポジトリの所有者のため削除することはできません。リポジトリの所有者を変更するか削除してください。 %s" -#: kallithea/model/user.py:259 +#: kallithea/model/user.py:266 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch" " owners or remove those repository groups: %s" msgstr "ユーザー \"%s\" はまだ %s 個のリポジトリの所有者のため削除することはできません。リポジトリの所有者を変更するか削除してください。 %s" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:273 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "ユーザー \"%s\" はまだ %s 個のリポジトリの所有者のため削除することはできません。リポジトリの所有者を変更するか削除してください。 %s" -#: kallithea/model/user.py:296 +#: kallithea/model/user.py:360 msgid "Password reset link" msgstr "パスワードリセットのリンク" -#: kallithea/model/user.py:319 -msgid "Your new password" -msgstr "新しいパスワード" - -#: kallithea/model/user.py:320 -#, python-format -msgid "Your new Kallithea password:%s" -msgstr "新しいKallitheaパスワード:%s" +#: kallithea/model/user.py:408 +#, fuzzy +#| msgid "Password reset link" +msgid "Password reset notification" +msgstr "パスワードリセットのリンク" + +#: kallithea/model/user.py:409 +#, python-format +msgid "" +"The password to your account %s has been changed using password reset " +"form." +msgstr "" #: kallithea/model/validators.py:77 kallithea/model/validators.py:78 msgid "Value cannot be an empty list" @@ -2065,15 +2034,11 @@ #: kallithea/model/validators.py:97 #, fuzzy, python-format -#| msgid "Username %(username)s is not valid" msgid "Username \"%(username)s\" cannot be used" msgstr "ユーザー名 %(username)s は不正です" #: kallithea/model/validators.py:99 #, fuzzy -#| msgid "" "Username may only contain alphanumeric characters underscores, -#| periods or" " dashes and must begin with alphanumeric character or -#| underscore" msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with an alphanumeric character or underscore" @@ -2133,7 +2098,6 @@ #: kallithea/model/validators.py:300 #, fuzzy -#| msgid "invalid password" msgid "Invalid username or password" msgstr "不正なパスワードです" @@ -2143,7 +2107,6 @@ #: kallithea/model/validators.py:345 #, fuzzy, python-format -#| msgid "Repository name %(repo)s is disallowed" msgid "Repository name %(repo)s is not allowed" msgstr "リポジトリ名 %(repo)s は許可されていません" @@ -2164,7 +2127,6 @@ #: kallithea/model/validators.py:465 #, fuzzy -#| msgid "private repository" msgid "Invalid repository URL" msgstr "非公開リポジトリ" @@ -2200,13 +2162,11 @@ #: kallithea/model/validators.py:705 #, fuzzy -#| msgid "This email address is already taken" msgid "This email address is already in use" msgstr "このメールアドレスはすでに取得されています" #: kallithea/model/validators.py:725 #, fuzzy, python-format -#| msgid "email \"%(email)s\" does not exist." msgid "Email address \"%(email)s\" not found" msgstr "メールアドレス \"%(email)s\" は存在しません" @@ -2358,7 +2318,9 @@ #: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:229 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/pullrequests/pullrequest_show.html:156 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 #: kallithea/templates/summary/summary.html:134 msgid "Owner" msgstr "所有者" @@ -2366,7 +2328,7 @@ #: kallithea/templates/index_base.html:140 #: kallithea/templates/admin/my_account/my_account_repos.html:57 #: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:44 +#: kallithea/templates/base/root.html:43 #: kallithea/templates/bookmarks/bookmarks.html:79 #: kallithea/templates/branches/branches.html:79 #: kallithea/templates/journal/journal.html:198 @@ -2378,7 +2340,7 @@ #: kallithea/templates/index_base.html:141 #: kallithea/templates/admin/my_account/my_account_repos.html:58 #: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:45 +#: kallithea/templates/base/root.html:44 #: kallithea/templates/bookmarks/bookmarks.html:80 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:199 @@ -2394,7 +2356,7 @@ #: kallithea/templates/index_base.html:143 #: kallithea/templates/admin/my_account/my_account_repos.html:60 #: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:46 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:201 @@ -2406,7 +2368,7 @@ #: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:147 kallithea/templates/base/root.html:48 +#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:202 @@ -2416,7 +2378,7 @@ msgstr "読み込み中..." #: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:333 +#: kallithea/templates/base/base.html:326 msgid "Log In" msgstr "ログイン" @@ -2431,14 +2393,15 @@ #: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:24 #: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/pullrequests/pullrequest_show.html:166 msgid "Username" msgstr "ユーザー名" #: kallithea/templates/login.html:33 kallithea/templates/register.html:33 #: kallithea/templates/admin/my_account/my_account.html:37 #: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:311 msgid "Password" msgstr "パスワード" @@ -2450,7 +2413,7 @@ msgid "Forgot your password ?" msgstr "パスワードを忘れた?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:329 +#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 msgid "Don't have an account ?" msgstr "アカウントを持っていない?" @@ -2463,11 +2426,14 @@ msgstr "パスワードリセット" #: kallithea/templates/password_reset.html:12 +#: kallithea/templates/password_reset_confirmation.html:12 #, fuzzy, python-format msgid "Reset Your Password to %s" msgstr "パスワードを %s にリセットします" #: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset_confirmation.html:5 +#: kallithea/templates/password_reset_confirmation.html:14 #, fuzzy msgid "Reset Your Password" msgstr "パスワードをリセット" @@ -2488,11 +2454,44 @@ #: kallithea/templates/password_reset.html:47 #, fuzzy +#| msgid "" "Password reset link will be sent to the email address matching +#| your " "username." msgid "" -"Password reset link will be sent to the email address matching your " -"username." +"A password reset link will be sent to the specified email address if it " +"is registered in the system." msgstr "該当するメールアドレスにパスワードリセットのリンクを送信します" +#: kallithea/templates/password_reset_confirmation.html:19 +#, python-format +msgid "You are about to set a new password for the email address %s." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:20 +msgid "" +"Note that you must use the same browser session for this as the one used " +"to request the password reset." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:30 +msgid "Code you received in the email" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:39 +#, fuzzy +#| msgid "New password" +msgid "New Password" +msgstr "新しいパスワード" + +#: kallithea/templates/password_reset_confirmation.html:48 +#, fuzzy +#| msgid "Confirm new password" +msgid "Confirm New Password" +msgstr "新しいパスワードの確認" + +#: kallithea/templates/password_reset_confirmation.html:56 +msgid "Confirm" +msgstr "" + #: kallithea/templates/register.html:5 kallithea/templates/register.html:14 #: kallithea/templates/register.html:90 msgid "Sign Up" @@ -2637,8 +2636,6 @@ #: kallithea/templates/admin/auth/auth_settings.html:33 #, fuzzy -#| msgid "" "Comma separated list of plugins. Order of plugins is also order in -#| which " "Kallithea will try to authenticate user" msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" @@ -2779,7 +2776,6 @@ #: kallithea/templates/admin/users/user_edit_api_keys.html:8 #: kallithea/templates/admin/users/user_edit_api_keys.html:27 #, fuzzy -#| msgid "never" msgid "Never" msgstr "無し" @@ -2811,7 +2807,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:244 +#: kallithea/templates/base/base.html:237 msgid "Create New Gist" msgstr "新しい Gist を作成" @@ -2953,7 +2949,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/base/base.html:343 msgid "My Account" msgstr "アカウント" @@ -2964,7 +2960,6 @@ #: kallithea/templates/admin/my_account/my_account.html:36 #, fuzzy -#| msgid "New email address" msgid "Email Addresses" msgstr "新しいメールアドレス" @@ -2976,14 +2971,12 @@ #: kallithea/templates/admin/my_account/my_account.html:39 #, fuzzy -#| msgid "repositories" msgid "Owned Repositories" msgstr "リポジトリ" #: kallithea/templates/admin/my_account/my_account.html:40 #: kallithea/templates/journal/journal.html:53 #, fuzzy -#| msgid "Create repositories" msgid "Watched Repositories" msgstr "リポジトリを作成する" @@ -2992,7 +2985,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 #, fuzzy -#| msgid "Copy permissions" msgid "Show Permissions" msgstr "権限のコピー" @@ -3004,42 +2996,36 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #, fuzzy, python-format -#| msgid "Confirm to reset this api key: %s" msgid "Confirm to reset this API key: %s" msgstr "このAPIキーをリセットしてもよろしいですか？: %s" #: kallithea/templates/admin/my_account/my_account_api_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:30 #, fuzzy -#| msgid "expired" msgid "Expired" msgstr "失効済み" #: kallithea/templates/admin/my_account/my_account_api_keys.html:40 #: kallithea/templates/admin/users/user_edit_api_keys.html:40 #, fuzzy, python-format -#| msgid "Confirm to remove this api key: %s" msgid "Confirm to remove this API key: %s" msgstr "このAPIキーを削除してもよろしいですか？: %s" #: kallithea/templates/admin/my_account/my_account_api_keys.html:42 #: kallithea/templates/admin/users/user_edit_api_keys.html:42 #, fuzzy -#| msgid "remove" msgid "Remove" msgstr "削除" #: kallithea/templates/admin/my_account/my_account_api_keys.html:49 #: kallithea/templates/admin/users/user_edit_api_keys.html:49 #, fuzzy -#| msgid "No additional api keys specified" msgid "No additional API keys specified" msgstr "API キーが指定されていません" #: kallithea/templates/admin/my_account/my_account_api_keys.html:61 #: kallithea/templates/admin/users/user_edit_api_keys.html:61 #, fuzzy -#| msgid "New api key" msgid "New API key" msgstr "新しいAPIキー" @@ -3120,7 +3106,6 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:16 #: kallithea/templates/admin/users/user_edit_profile.html:15 #, fuzzy -#| msgid "current IP" msgid "Current IP" msgstr "現在の IP" @@ -3131,7 +3116,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:45 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:200 @@ -3159,7 +3144,7 @@ msgstr "コメント" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 msgid "Pull Requests" msgstr "プルリクエスト" @@ -3179,7 +3164,7 @@ msgstr "通知を表示" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:342 msgid "Notifications" msgstr "通知" @@ -3221,7 +3206,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:26 #, fuzzy -#| msgid "Import existing repository ?" msgid "Apply to all existing repositories" msgstr "既存のリポジトリを import しますか？" @@ -3246,13 +3230,11 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:40 #, fuzzy -#| msgid "Import existing repository ?" msgid "Apply to all existing repository groups" msgstr "既存のリポジトリを import しますか？" #: kallithea/templates/admin/permissions/permissions_globals.html:41 #, fuzzy -#| msgid "Copy permission set from parent repository group." msgid "Permissions for the Default user on new repository groups." msgstr "親のリポジトリグループにセットされているパーミッションをコピーします。" @@ -3263,9 +3245,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:53 #, fuzzy -#| msgid "" "All default permissions on each user group will be reset to chosen -#| " "permission, note that all custom default permission on repository groups -#| " "will be lost" msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " @@ -3282,7 +3261,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:60 #, fuzzy -#| msgid "Repository creation" msgid "Top level repository creation" msgstr "リポジトリ作成" @@ -3302,8 +3280,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:74 #, fuzzy -#| msgid "" "Write permission to a repository group allows creating -#| repositories " "inside that group." msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " @@ -3337,7 +3313,6 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:13 #: kallithea/templates/admin/users/user_edit_ips.html:23 #, fuzzy, python-format -#| msgid "Confirm to delete this ip: %s" msgid "Confirm to delete this IP address: %s" msgstr "このIPアドレスを削除してもよろしいですか？ : %s" @@ -3396,7 +3371,7 @@ #: kallithea/templates/admin/repos/repo_edit.html:40 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:158 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 #: kallithea/templates/data_table/_dt_elements.html:45 #: kallithea/templates/data_table/_dt_elements.html:49 msgid "Settings" @@ -3435,7 +3410,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:146 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 msgid "Created on" msgstr "作成日" @@ -3454,7 +3429,6 @@ #: kallithea/templates/admin/repos/repo_edit_permissions.html:12 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 #, fuzzy -#| msgid "user/user group" msgid "User/User Group" msgstr "ユーザー/ユーザーグループ" @@ -3465,7 +3439,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 #, fuzzy -#| msgid "default" msgid "Default" msgstr "default" @@ -3476,7 +3449,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 #, fuzzy -#| msgid "revoke" msgid "Revoke" msgstr "取消" @@ -3488,7 +3460,6 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 #, fuzzy -#| msgid "apply to children" msgid "Apply to children" msgstr "子要素にも適用" @@ -3543,7 +3514,6 @@ #: kallithea/templates/admin/repos/repo_add_base.html:17 #, fuzzy -#| msgid "[created] repository" msgid "Clone remote repository" msgstr "リポジトリを[作成]" @@ -3811,37 +3781,31 @@ #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 #, fuzzy -#| msgid "private repository" msgid "Private Repository" msgstr "非公開リポジトリ" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 -#, fuzzy, python-format -#| msgid "Created repository %s" +#, fuzzy msgid "Remote repository URL" msgstr "リポジトリ %s を作成しました" #: kallithea/templates/admin/repos/repo_edit_remote.html:9 #, fuzzy -#| msgid "[pulled from remote] into repository" msgid "Pull Changes from Remote Repository" msgstr "リポジトリに[リモートからプル]" #: kallithea/templates/admin/repos/repo_edit_remote.html:11 #, fuzzy -#| msgid "Confirm to pull changes from remote side." msgid "Confirm to pull changes from remote repository." msgstr "リモートから変更を取り込んでもよろしいですか？" #: kallithea/templates/admin/repos/repo_edit_remote.html:17 #, fuzzy -#| msgid "This repository does not have a remote URL set." msgid "This repository does not have a remote repository URL." msgstr "このリポジトリにリモート URLは設定されていません" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 #, fuzzy -#| msgid "private repository" msgid "Permanent Repository ID" msgstr "非公開リポジトリ" @@ -3856,11 +3820,6 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:14 #, fuzzy -#| msgid "" "In case this repository is renamed or moved into another group the -#| " "repository URL changes.\n" " Using the -#| above URL guarantees that this " "repository will always be accessible under -#| such URL.\n" " Useful for CI systems, or any -#| other cases " "that you need to hardcode the URL into 3rd party service." msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3875,13 +3834,11 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:21 #, fuzzy -#| msgid "[created] repository" msgid "Remote repository" msgstr "リポジトリを[作成]" #: kallithea/templates/admin/repos/repo_edit_settings.html:25 #, fuzzy -#| msgid "Repository" msgid "Repository URL" msgstr "リポジトリ" @@ -4030,7 +3987,7 @@ msgid "Custom Hooks" msgstr "カスタムフック" -#: kallithea/templates/admin/settings/settings_hooks.html:68 +#: kallithea/templates/admin/settings/settings_hooks.html:67 msgid "Failed to remove hook" msgstr "フックの削除に失敗しました" @@ -4040,7 +3997,6 @@ #: kallithea/templates/admin/settings/settings_mapping.html:11 #, fuzzy -#| msgid "Search in repositories" msgid "Delete records of missing repositories" msgstr "リポジトリから検索" @@ -4071,7 +4027,18 @@ "Current hooks will be updated to the latest version." msgstr "各リポジトリに Kallitheas の GIT フックがインストールされているか確認してください。現在のフックは最新版に更新されます" +#: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "Overwrite existing Git hooks" +msgstr "" + #: kallithea/templates/admin/settings/settings_mapping.html:30 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any" +" custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:35 msgid "Rescan Repositories" msgstr "リポジトリを再スキャン" @@ -4100,7 +4067,6 @@ #: kallithea/templates/admin/settings/settings_system.html:4 #, fuzzy -#| msgid "check for updates" msgid "Check for updates" msgstr "更新を確認" @@ -4334,7 +4300,6 @@ #: kallithea/templates/admin/settings/settings_visual.html:92 #, fuzzy -#| msgid "Meta-Tagging" msgid "Meta Tagging" msgstr "メタタグ" @@ -4377,7 +4342,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit.html:33 #, fuzzy -#| msgid "members" msgid "Show Members" msgstr "メンバー" @@ -4525,49 +4489,49 @@ msgid "Git repository" msgstr "Gitリポジトリ" -#: kallithea/templates/base/base.html:126 +#: kallithea/templates/base/base.html:119 #, fuzzy msgid "Create Fork" msgstr "フォークを作成" -#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:130 #: kallithea/templates/data_table/_dt_elements.html:13 #: kallithea/templates/data_table/_dt_elements.html:17 #: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "要約" -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:141 +#: kallithea/templates/base/base.html:132 +#: kallithea/templates/base/base.html:134 #: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:21 #: kallithea/templates/data_table/_dt_elements.html:25 msgid "Changelog" msgstr "履歴" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:136 #: kallithea/templates/data_table/_dt_elements.html:29 #: kallithea/templates/data_table/_dt_elements.html:33 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "ファイル" -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:138 msgid "Switch To" msgstr "ブランチの切り替え" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/base/base.html:154 +#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:147 msgid "Options" msgstr "オプション" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:155 #: kallithea/templates/forks/forks_data.html:21 #, fuzzy msgid "Compare Fork" msgstr "フォークを比較" -#: kallithea/templates/base/base.html:164 +#: kallithea/templates/base/base.html:157 #: kallithea/templates/bookmarks/bookmarks.html:56 #: kallithea/templates/bookmarks/bookmarks_data.html:13 #: kallithea/templates/branches/branches.html:56 @@ -4577,123 +4541,122 @@ msgid "Compare" msgstr "比較" -#: kallithea/templates/base/base.html:166 -#: kallithea/templates/base/base.html:254 +#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:247 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:54 msgid "Search" msgstr "検索" -#: kallithea/templates/base/base.html:170 +#: kallithea/templates/base/base.html:163 msgid "Unlock" msgstr "アンロック" -#: kallithea/templates/base/base.html:172 +#: kallithea/templates/base/base.html:165 msgid "Lock" msgstr "ロック" -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:173 msgid "Follow" msgstr "フォロー" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:174 msgid "Unfollow" msgstr "アンフォロー" -#: kallithea/templates/base/base.html:184 +#: kallithea/templates/base/base.html:177 #: kallithea/templates/data_table/_dt_elements.html:37 #: kallithea/templates/data_table/_dt_elements.html:41 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "フォーク" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:178 #: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "プルリクエストを作成" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 #, python-format msgid "Show Pull Requests for %s" msgstr "%s のプルリクエストを表示" -#: kallithea/templates/base/base.html:228 +#: kallithea/templates/base/base.html:221 msgid "Show recent activity" msgstr "最近の活動を表示" -#: kallithea/templates/base/base.html:234 -#: kallithea/templates/base/base.html:235 +#: kallithea/templates/base/base.html:227 +#: kallithea/templates/base/base.html:228 msgid "Public journal" msgstr "公開ジャーナル" -#: kallithea/templates/base/base.html:240 +#: kallithea/templates/base/base.html:233 msgid "Show public gists" msgstr "公開 gists を表示" -#: kallithea/templates/base/base.html:241 +#: kallithea/templates/base/base.html:234 msgid "Gists" msgstr "Gists" -#: kallithea/templates/base/base.html:245 +#: kallithea/templates/base/base.html:238 #, fuzzy msgid "All Public Gists" msgstr "すべての公開 gists" -#: kallithea/templates/base/base.html:247 +#: kallithea/templates/base/base.html:240 #, fuzzy msgid "My Public Gists" msgstr "公開 gists" -#: kallithea/templates/base/base.html:248 +#: kallithea/templates/base/base.html:241 #, fuzzy msgid "My Private Gists" msgstr "非公開 gists" -#: kallithea/templates/base/base.html:253 +#: kallithea/templates/base/base.html:246 msgid "Search in repositories" msgstr "リポジトリから検索" -#: kallithea/templates/base/base.html:276 -#: kallithea/templates/base/base.html:277 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +#: kallithea/templates/base/base.html:269 +#: kallithea/templates/base/base.html:270 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 #, fuzzy msgid "My Pull Requests" msgstr "プルリクエスト" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:289 #, fuzzy msgid "Not Logged In" msgstr "ログインしていません" -#: kallithea/templates/base/base.html:303 +#: kallithea/templates/base/base.html:296 #, fuzzy msgid "Login to Your Account" msgstr "ログイン" -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:319 msgid "Forgot password ?" msgstr "パスワードを忘れた?" -#: kallithea/templates/base/base.html:353 +#: kallithea/templates/base/base.html:346 msgid "Log Out" msgstr "ログアウト" -#: kallithea/templates/base/base.html:402 +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "一致するものが見つかりません" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "キーボードショートカット" -#: kallithea/templates/base/base.html:540 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "サイト全体" #: kallithea/templates/base/default_perms_box.html:14 #, fuzzy -#| msgid "Inherit from defaults" msgid "Inherit defaults" msgstr "デフォルト権限を継承" @@ -4790,60 +4753,55 @@ msgstr "マッチするファイルはありません" #: kallithea/templates/base/root.html:31 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 -#, fuzzy -msgid "Open New Pull Request" -msgstr "新しいプルリクエストを作成" +#, fuzzy +#| msgid "on pull request" +msgid "Open New Pull Request from {0}" +msgstr "プルリクエスト #%s にコメント" #: kallithea/templates/base/root.html:32 -#, fuzzy -msgid "Open New Pull Request for Selected Changesets" -msgstr "選択したチェンジセットから新しいプルリクエストを作成" +msgid "Open New Pull Request for {0} → {1}" +msgstr "" #: kallithea/templates/base/root.html:33 #, fuzzy -msgid "Show Selected Changesets __S → __E" +#| msgid "Show Selected Changesets __S → __E" +msgid "Show Selected Changesets {0} → {1}" msgstr "選択した変更 __S -> __E を表示" #: kallithea/templates/base/root.html:34 #, fuzzy -msgid "Show Selected Changeset __S" -msgstr "選択した変更 __S を表示" +msgid "Selection Link" +msgstr "セレクション・リンク" #: kallithea/templates/base/root.html:35 -#, fuzzy -msgid "Selection Link" -msgstr "セレクション・リンク" - -#: kallithea/templates/base/root.html:36 #: kallithea/templates/changeset/diff_block.html:8 #, fuzzy msgid "Collapse Diff" msgstr "差分をたたむ" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:36 #, fuzzy msgid "Expand Diff" msgstr "差分を表示" -#: kallithea/templates/base/root.html:38 +#: kallithea/templates/base/root.html:37 msgid "Failed to revoke permission" msgstr "権限の取消に失敗しました" -#: kallithea/templates/base/root.html:39 +#: kallithea/templates/base/root.html:38 #, fuzzy msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "権限 {0}: {1} を取り消してもよろしいですか？" -#: kallithea/templates/base/root.html:40 +#: kallithea/templates/base/root.html:39 msgid "enabled" msgstr "有効" -#: kallithea/templates/base/root.html:41 +#: kallithea/templates/base/root.html:40 msgid "disabled" msgstr "無効" -#: kallithea/templates/base/root.html:43 +#: kallithea/templates/base/root.html:42 #, fuzzy msgid "Specify changeset" msgstr "チェンジセットを指定" @@ -4862,7 +4820,6 @@ #: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 #: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" @@ -4901,7 +4858,7 @@ msgid_plural "showing %d out of %d revisions" msgstr[0] "%d / %d リビジョンを表示" -#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/templates/changelog/changelog.html:49 msgid "Clear selection" msgstr "選択を解除" @@ -4930,8 +4887,6 @@ #: kallithea/templates/changelog/changelog.html:92 #: kallithea/templates/changelog/changelog_summary_data.html:20 #, fuzzy, python-format -#| msgid "" "Changeset status: %s\n" "Click to open associated pull request -#| #%s" msgid "" "Changeset status: %s\n" "Click to open associated pull request %s" @@ -4979,7 +4934,7 @@ msgid "Branch %s" msgstr "ブランチ %s" -#: kallithea/templates/changelog/changelog.html:291 +#: kallithea/templates/changelog/changelog.html:310 msgid "There are no changes yet" msgstr "まだ変更がありません" @@ -5037,7 +4992,6 @@ #: kallithea/templates/changelog/changelog_summary_data.html:90 #, fuzzy -#| msgid "Push new repo" msgid "Push new repository" msgstr "新しいリポジトリをプッシュ" @@ -5052,13 +5006,11 @@ #: kallithea/templates/changeset/changeset.html:36 #, fuzzy -#| msgid "parent rev." msgid "Parent rev." msgstr "親リビジョン" #: kallithea/templates/changeset/changeset.html:42 #, fuzzy -#| msgid "child rev." msgid "Child rev." msgstr "子リビジョン" @@ -5087,7 +5039,6 @@ #: kallithea/templates/changeset/changeset.html:89 #: kallithea/templates/changeset/changeset_range.html:88 #, fuzzy -#| msgid "merge" msgid "Merge" msgstr "マージ" @@ -5102,19 +5053,17 @@ #: kallithea/templates/changeset/changeset.html:135 #, fuzzy -#| msgid "Created by" msgid "Replaced by:" msgstr "作成日" #: kallithea/templates/changeset/changeset.html:149 #, fuzzy -#| msgid "Created by" msgid "Preceded by:" msgstr "作成日" #: kallithea/templates/changeset/changeset.html:166 #: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:314 +#: kallithea/templates/pullrequests/pullrequest_show.html:318 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -5122,7 +5071,7 @@ #: kallithea/templates/changeset/changeset.html:168 #: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:320 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -5130,8 +5079,8 @@ #: kallithea/templates/changeset/changeset.html:182 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 #, fuzzy msgid "Show full diff anyway" msgstr "すべての差分を表示" @@ -5139,13 +5088,11 @@ #: kallithea/templates/changeset/changeset.html:247 #: kallithea/templates/changeset/changeset.html:284 #, fuzzy -#| msgid "no revisions" msgid "No revisions" msgstr "リビジョンなし" #: kallithea/templates/changeset/changeset_file_comment.html:21 #, fuzzy -#| msgid "Comment from pull request" msgid "on pull request" msgstr "プルリクエスト #%s にコメント" @@ -5156,7 +5103,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:24 #, fuzzy -#| msgid "No changesets" msgid "on this changeset" msgstr "チェンジセットはありません" @@ -5167,7 +5113,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:37 #, fuzzy -#| msgid "Latest Changes" msgid "Status change" msgstr "最近の変更点" @@ -5238,7 +5183,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:150 #, fuzzy -#| msgid "Use @username inside this text to notify another user" msgid "Use @username inside this text to notify another user." msgstr "テキスト内で @username を使うと、その Kallithea のユーザーに通知を送信します" @@ -5321,7 +5265,7 @@ msgstr "すべての差分を表示" #: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:306 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 #, fuzzy msgid "Common ancestor" msgstr "チェンジセットにコメント" @@ -5366,7 +5310,7 @@ msgstr "リビジョン、ブランチ、ブックマークもしくはタグの比較を行います。" #: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:301 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5429,16 +5373,26 @@ msgstr "こんにちは %s" #: kallithea/templates/email_templates/password_reset.html:6 -msgid "We received a request to create a new password for your account." +#, fuzzy +#| msgid "We received a request to create a new password for your account." +msgid "We have received a request to reset the password for your account." msgstr "アカウントの新しいパスワードの生成リクエストを受け取りました。" #: kallithea/templates/email_templates/password_reset.html:7 -msgid "You can generate it by clicking following URL" -msgstr "下のURLをクリックすることで再生成が行えます。" +msgid "To set a new password, click the following link" +msgstr "" #: kallithea/templates/email_templates/password_reset.html:10 -msgid "Please ignore this email if you did not request a new password ." -msgstr "新しいパスワードを生成しない場合はこのメールを無視してください。" +msgid "" +"Should you not be able to use the link above, please type the following " +"code into the password reset form" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:12 +msgid "" +"If it weren't you who requested the password reset, just disregard this " +"message." +msgstr "" #: kallithea/templates/email_templates/pull_request.html:5 #, fuzzy, python-format @@ -5805,7 +5759,6 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:14 #, fuzzy -#| msgid "revoke" msgid "Vote" msgstr "取消" @@ -5847,19 +5800,16 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:70 #, fuzzy, python-format -#| msgid "Confirm to delete this pull request" msgid "Confirm again to delete this pull request with %s comments" msgstr "このプルリクエストを削除してもよろしいですか？" #: kallithea/templates/pullrequests/pullrequest_show.html:6 #, fuzzy, python-format -#| msgid "%s Pull Request #%s" msgid "%s Pull Request %s" msgstr "%s プルリクエスト #%s" #: kallithea/templates/pullrequests/pullrequest_show.html:10 #, fuzzy, python-format -#| msgid "Pull Requests from %s'" msgid "Pull request %s from %s#%s" msgstr "%s からのプルリクエスト" @@ -5909,108 +5859,114 @@ msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:131 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +msgid "" +"This is just a range of changesets and doesn't have a target or a real " +"merge ancestor." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:133 msgid "Pull changes" msgstr "変更を取得:" -#: kallithea/templates/pullrequests/pullrequest_show.html:154 -#, fuzzy -msgid "Created by" -msgstr "作成日" - -#: kallithea/templates/pullrequests/pullrequest_show.html:169 +#: kallithea/templates/pullrequests/pullrequest_show.html:173 #, fuzzy msgid "Update" msgstr "ユーザーを[更新]" -#: kallithea/templates/pullrequests/pullrequest_show.html:187 +#: kallithea/templates/pullrequests/pullrequest_show.html:191 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:209 +#: kallithea/templates/pullrequests/pullrequest_show.html:213 #, fuzzy msgid "Pull Request Reviewers" msgstr "プルリクエストレビュアー" -#: kallithea/templates/pullrequests/pullrequest_show.html:234 +#: kallithea/templates/pullrequests/pullrequest_show.html:238 #, fuzzy msgid "Remove reviewer" msgstr "レビュアー" -#: kallithea/templates/pullrequests/pullrequest_show.html:246 +#: kallithea/templates/pullrequests/pullrequest_show.html:250 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:254 +#: kallithea/templates/pullrequests/pullrequest_show.html:258 #, fuzzy msgid "Potential Reviewers" msgstr "コメントのプレビュー" -#: kallithea/templates/pullrequests/pullrequest_show.html:257 +#: kallithea/templates/pullrequests/pullrequest_show.html:261 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:280 +#: kallithea/templates/pullrequests/pullrequest_show.html:284 msgid "Save Changes" msgstr "変更を保存" -#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/templates/pullrequests/pullrequest_show.html:285 #, fuzzy msgid "Save as New Pull Request" msgstr "新しいプルリクエストを作成" -#: kallithea/templates/pullrequests/pullrequest_show.html:282 +#: kallithea/templates/pullrequests/pullrequest_show.html:286 #, fuzzy msgid "Cancel Changes" msgstr "最近の変更点" -#: kallithea/templates/pullrequests/pullrequest_show.html:292 +#: kallithea/templates/pullrequests/pullrequest_show.html:296 #, fuzzy msgid "Pull Request Content" msgstr "プルリクエストを以下のステータスに変更しました：" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" msgstr "%s プルリクエスト" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, fuzzy, python-format msgid "Pull Requests from %s'" msgstr "%s からのプルリクエスト" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:13 #, fuzzy, python-format msgid "Pull Requests to '%s'" msgstr "%s へのプルリクエスト" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#, fuzzy +msgid "Open New Pull Request" +msgstr "新しいプルリクエストを作成" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 #, fuzzy, python-format msgid "Show Pull Requests to %s" msgstr "%s へのプルリクエストを表示" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 #, fuzzy, python-format msgid "Show Pull Requests from '%s'" msgstr "%s からのプルリクエストを表示" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:30 #, fuzzy msgid "Show closed pull requests (in addition to open pull requests)" msgstr "クローズしたプルリクエストも表示" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 #, fuzzy msgid "Pull Requests Created by Me" msgstr "プルリクエストレビュアー" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 #, fuzzy msgid "Pull Requests I Participate In" msgstr "あなたがレビュアーとして参加しているプルリクエスト" @@ -6182,7 +6138,6 @@ #: kallithea/templates/summary/summary.html:125 #, fuzzy -#| msgid "with subrepos" msgid "With subrepos" msgstr "サブリポジトリを含める" @@ -6256,22 +6211,7 @@ #~ msgstr "ファイルなし" #~ msgid "" -#~ "Comment on %(repo_name)s changeset " -#~ "%(short_id)s on %(branch)s by " -#~ "%(comment_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Review request on %(repo_name)s pull " -#~ "request #%(pr_id)s from %(ref)s by " -#~ "%(pr_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Comment on %(repo_name)s pull request " -#~ "#%(pr_id)s from %(ref)s by " -#~ "%(comment_username)s" -#~ msgstr "" +#~ msgstr "テキスト内で @username を使うと、その Kallithea のユーザーに通知を送信します" #~ msgid "Username \"%(username)s\" is forbidden" #~ msgstr "ユーザー名 \"%(username)s\" は許可されていません" @@ -6312,12 +6252,6 @@ #~ msgid "delete" #~ msgstr "削除" -#~ msgid "" -#~ "Your user is in an external source" -#~ " of record; some details cannot be" -#~ " managed here" -#~ msgstr "ユーザーは外部の source of record に属しているため、ここでは詳細を管理できません" - #~ msgid "Permissions Administration" #~ msgstr "権限管理" @@ -6405,33 +6339,12 @@ #~ msgid "Destroy old data" #~ msgstr "古いデータを削除する" -#~ msgid "" -#~ "Check this option to remove references" -#~ " to repositories that no longer exist" -#~ " in on the filesystem." -#~ msgstr "" - #~ msgid "Default permissions" #~ msgstr "デフォルトの権限" #~ msgid "user groups" #~ msgstr "ユーザーグループ" -#~ msgid "" -#~ "This user is in an external source" -#~ " of record (%s); some details cannot" -#~ " be managed here." -#~ msgstr "このユーザーは外部の source of record (%s) に属しています。ここでは詳細を管理できません。" - -#~ msgid "" -#~ "Select to inherit permissions from %s" -#~ " permissions settings, and default IP " -#~ "address whitelist." -#~ msgstr "" -#~ "Select to inherit permissions from %s" -#~ " permissions settings, and default IP " -#~ "address whitelist." - #~ msgid "show" #~ msgstr "" @@ -6444,11 +6357,6 @@ #~ msgid "Comment on changeset" #~ msgstr "チェンジセットにコメント" -#~ msgid "" -#~ "Use @username inside this text to " -#~ "send notification to another local user." -#~ msgstr "テキスト内で @username を使うと、その Kallithea のユーザーに通知を送信します" - #~ msgid "revision" #~ msgstr "リビジョン" @@ -6473,3 +6381,45 @@ #~ msgid "reviewer" #~ msgstr "レビュアー" +#~ msgid "" +#~ "Your password reset was successful, new" +#~ " password has been sent to your " +#~ "email" +#~ msgstr "パスワードをリセットに成功しました。新しいパスワードをあなたのメールアドレスに送りました" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Added by %(pr_username)s] %(repo_name)s pull" +#~ " request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "Your new password" +#~ msgstr "新しいパスワード" + +#~ msgid "Your new Kallithea password:%s" +#~ msgstr "新しいKallitheaパスワード:%s" + +#~ msgid "Open New Pull Request for Selected Changesets" +#~ msgstr "選択したチェンジセットから新しいプルリクエストを作成" + +#~ msgid "Show Selected Changeset __S" +#~ msgstr "選択した変更 __S を表示" + +#~ msgid "You can generate it by clicking following URL" +#~ msgstr "下のURLをクリックすることで再生成が行えます。" + +#~ msgid "Please ignore this email if you did not request a new password ." +#~ msgstr "新しいパスワードを生成しない場合はこのメールを無視してください。" + +#~ msgid "Created by" +#~ msgstr "作成日" +
--- a/kallithea/i18n/kallithea.pot Tue Sep 08 10:21:46 2015 +0000 +++ b/kallithea/i18n/kallithea.pot Tue Sep 08 10:37:51 2015 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2015-08-25 11:37+0200\n" +"POT-Creation-Date: 2015-09-08 10:34+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,7 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" #: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:241 kallithea/lib/base.py:512 +#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 msgid "There are no changesets yet" msgstr "" @@ -33,7 +33,7 @@ msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "" @@ -51,8 +51,8 @@ msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:743 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 msgid "Such revision does not exist for this repository" msgstr "" @@ -60,11 +60,11 @@ msgid "Changing status on a changeset associated with a closed pull request is not allowed" msgstr "" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:42 +#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 msgid "Select changeset" msgstr "" -#: kallithea/controllers/compare.py:258 +#: kallithea/controllers/compare.py:261 msgid "Cannot compare repositories without using common ancestor" msgstr "" @@ -111,8 +111,8 @@ #: kallithea/templates/changeset/changeset.html:195 #: kallithea/templates/compare/compare_diff.html:78 #: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Changeset was too big and was cut off..." msgstr "" @@ -121,111 +121,111 @@ msgid "%s committed on %s" msgstr "" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:91 msgid "Click here to add new file" msgstr "" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:92 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 -#: kallithea/controllers/files.py:433 +#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 +#: kallithea/controllers/files.py:432 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:318 +#: kallithea/controllers/files.py:317 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:329 +#: kallithea/controllers/files.py:328 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:351 +#: kallithea/controllers/files.py:350 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 -#: kallithea/controllers/files.py:502 +#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 +#: kallithea/controllers/files.py:501 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:378 +#: kallithea/controllers/files.py:377 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:392 +#: kallithea/controllers/files.py:391 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:408 +#: kallithea/controllers/files.py:407 msgid "No changes" msgstr "" -#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 +#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:444 +#: kallithea/controllers/files.py:443 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:464 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:469 +#: kallithea/controllers/files.py:468 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:494 +#: kallithea/controllers/files.py:493 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:527 +#: kallithea/controllers/files.py:526 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:538 +#: kallithea/controllers/files.py:537 #, python-format msgid "Unknown revision %s" msgstr "" -#: kallithea/controllers/files.py:540 +#: kallithea/controllers/files.py:539 msgid "Empty repository" msgstr "" -#: kallithea/controllers/files.py:542 +#: kallithea/controllers/files.py:541 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:772 +#: kallithea/controllers/files.py:771 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:15 #: kallithea/templates/pullrequests/pullrequest.html:97 msgid "Changesets" msgstr "" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:821 kallithea/templates/switch_to_list.html:3 +#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 +#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:832 kallithea/templates/switch_to_list.html:25 +#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 +#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "" @@ -246,9 +246,9 @@ #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:131 -#: kallithea/templates/base/base.html:397 -#: kallithea/templates/base/base.html:569 +#: kallithea/templates/base/base.html:124 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "" @@ -274,26 +274,31 @@ msgstr "" #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:229 +#: kallithea/templates/base/base.html:222 #: kallithea/templates/journal/journal.html:4 #: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:150 kallithea/controllers/login.py:196 +#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:156 +#: kallithea/controllers/login.py:157 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:201 -msgid "Your password reset link was sent" -msgstr "" - -#: kallithea/controllers/login.py:222 -msgid "Your password reset was successful, new password has been sent to your email" +#: kallithea/controllers/login.py:202 +msgid "A password reset confirmation code has been sent" +msgstr "" + +#: kallithea/controllers/login.py:251 +msgid "Invalid password reset token" +msgstr "" + +#: kallithea/controllers/login.py:256 +#: kallithea/controllers/admin/my_account.py:167 +msgid "Successfully updated password" msgstr "" #: kallithea/controllers/pullrequests.py:124 @@ -315,110 +320,110 @@ msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:827 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:306 +#: kallithea/controllers/pullrequests.py:310 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:352 -#: kallithea/controllers/pullrequests.py:499 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:503 msgid "No description" msgstr "" -#: kallithea/controllers/pullrequests.py:359 +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:362 -#: kallithea/controllers/pullrequests.py:449 -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:453 +#: kallithea/controllers/pullrequests.py:509 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:365 -#: kallithea/controllers/pullrequests.py:452 +#: kallithea/controllers/pullrequests.py:369 +#: kallithea/controllers/pullrequests.py:456 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:401 msgid "Missing changesets since the previous pull request:" msgstr "" -#: kallithea/controllers/pullrequests.py:404 +#: kallithea/controllers/pullrequests.py:408 #, python-format msgid "New changesets on %s %s since the previous pull request:" msgstr "" -#: kallithea/controllers/pullrequests.py:411 +#: kallithea/controllers/pullrequests.py:415 msgid "Ancestor didn't change - show diff since previous version:" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:422 #, python-format msgid "This pull request is based on another %s revision and there is no simple diff." msgstr "" -#: kallithea/controllers/pullrequests.py:420 +#: kallithea/controllers/pullrequests.py:424 #, python-format msgid "No changes found on %s %s since previous version." msgstr "" -#: kallithea/controllers/pullrequests.py:458 +#: kallithea/controllers/pullrequests.py:462 #, python-format msgid "Closed, replaced by %s ." msgstr "" -#: kallithea/controllers/pullrequests.py:466 +#: kallithea/controllers/pullrequests.py:470 msgid "Pull request update created" msgstr "" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:513 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:523 +#: kallithea/controllers/pullrequests.py:528 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:582 +#: kallithea/controllers/pullrequests.py:594 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:584 +#: kallithea/controllers/pullrequests.py:596 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:602 +#: kallithea/controllers/pullrequests.py:614 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:605 +#: kallithea/controllers/pullrequests.py:617 msgid "No changesets found for updating this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:613 +#: kallithea/controllers/pullrequests.py:625 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:619 +#: kallithea/controllers/pullrequests.py:631 msgid "Git pull requests don't support updates yet." msgstr "" -#: kallithea/controllers/pullrequests.py:710 +#: kallithea/controllers/pullrequests.py:722 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:715 +#: kallithea/controllers/pullrequests.py:727 msgid "Closing." msgstr "" @@ -462,37 +467,37 @@ #: kallithea/controllers/admin/gists.py:59 #: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:283 +#: kallithea/controllers/admin/users.py:285 msgid "Forever" msgstr "" #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/users.py:286 msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/users.py:287 msgid "1 hour" msgstr "" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/users.py:288 msgid "1 day" msgstr "" #: kallithea/controllers/admin/gists.py:63 #: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/users.py:289 msgid "1 month" msgstr "" #: kallithea/controllers/admin/gists.py:67 #: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/users.py:291 msgid "Lifetime" msgstr "" @@ -522,8 +527,8 @@ msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:208 -#: kallithea/model/user.py:230 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 +#: kallithea/model/user.py:237 msgid "You can't edit this user since it's crucial for entire application" msgstr "" @@ -532,47 +537,43 @@ msgstr "" #: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:204 +#: kallithea/controllers/admin/users.py:202 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:167 -msgid "Successfully updated password" -msgstr "" - #: kallithea/controllers/admin/my_account.py:178 msgid "Error occurred during update of user password" msgstr "" #: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:413 +#: kallithea/controllers/admin/users.py:415 #, python-format msgid "Added email %s to user" msgstr "" #: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:419 +#: kallithea/controllers/admin/users.py:421 msgid "An error occurred during email saving" msgstr "" #: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:431 +#: kallithea/controllers/admin/users.py:433 msgid "Removed email from user" msgstr "" #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:306 +#: kallithea/controllers/admin/users.py:308 msgid "API key successfully created" msgstr "" #: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:319 +#: kallithea/controllers/admin/users.py:321 msgid "API key successfully reset" msgstr "" #: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:323 +#: kallithea/controllers/admin/users.py:325 msgid "API key successfully deleted" msgstr "" @@ -622,10 +623,10 @@ #: kallithea/templates/admin/users/user_edit_profile.html:105 #: kallithea/templates/admin/users/users.html:10 #: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:252 +#: kallithea/templates/base/base.html:253 #: kallithea/templates/base/base.html:259 #: kallithea/templates/base/base.html:260 -#: kallithea/templates/base/base.html:266 -#: kallithea/templates/base/base.html:267 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "" @@ -881,48 +882,48 @@ msgstr "" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:274 +#: kallithea/controllers/admin/settings.py:277 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:213 +#: kallithea/controllers/admin/settings.py:216 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:270 +#: kallithea/controllers/admin/settings.py:273 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:335 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:361 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:373 +#: kallithea/controllers/admin/settings.py:376 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:421 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:425 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:448 +#: kallithea/controllers/admin/settings.py:451 msgid "Whoosh reindex task scheduled" msgstr "" @@ -963,68 +964,68 @@ msgstr "" #: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:382 +#: kallithea/controllers/admin/users.py:384 msgid "Updated permissions" msgstr "" #: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:386 +#: kallithea/controllers/admin/users.py:388 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:134 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:184 +#: kallithea/controllers/admin/users.py:182 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:220 +#: kallithea/controllers/admin/users.py:218 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:225 +#: kallithea/controllers/admin/users.py:223 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:238 +#: kallithea/controllers/admin/users.py:236 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:461 +#: kallithea/controllers/admin/users.py:463 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:467 +#: kallithea/controllers/admin/users.py:469 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:744 +#: kallithea/lib/auth.py:743 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:757 +#: kallithea/lib/auth.py:756 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:795 +#: kallithea/lib/auth.py:812 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:827 +#: kallithea/lib/auth.py:844 msgid "You need to be signed in to view this page" msgstr "" @@ -1177,7 +1178,7 @@ #: kallithea/lib/helpers.py:1128 #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "" @@ -1892,7 +1893,7 @@ #: kallithea/model/notification.py:302 #, python-format -msgid "[Comment from %(comment_username)s] %(repo_name)s changeset %(short_id)s on %(branch)s" +msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" #: kallithea/model/notification.py:305 @@ -1902,12 +1903,12 @@ #: kallithea/model/notification.py:307 #, python-format -msgid "[Added by %(pr_username)s] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" #: kallithea/model/notification.py:308 #, python-format -msgid "[Comment from %(comment_username)s] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" #: kallithea/model/notification.py:321 @@ -1919,44 +1920,44 @@ msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:813 +#: kallithea/model/scm.py:812 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:185 +#: kallithea/model/user.py:192 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:249 +#: kallithea/model/user.py:256 msgid "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:254 +#: kallithea/model/user.py:261 #, python-format msgid "User \"%s\" still owns %s repositories and cannot be removed. Switch owners or remove those repositories: %s" msgstr "" -#: kallithea/model/user.py:259 -#, python-format -msgid "User \"%s\" still owns %s repository groups and cannot be removed. Switch owners or remove those repository groups: %s" -msgstr "" - #: kallithea/model/user.py:266 #, python-format +msgid "User \"%s\" still owns %s repository groups and cannot be removed. Switch owners or remove those repository groups: %s" +msgstr "" + +#: kallithea/model/user.py:273 +#, python-format msgid "User \"%s\" still owns %s user groups and cannot be removed. Switch owners or remove those user groups: %s" msgstr "" -#: kallithea/model/user.py:296 +#: kallithea/model/user.py:360 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:319 -msgid "Your new password" -msgstr "" - -#: kallithea/model/user.py:320 -#, python-format -msgid "Your new Kallithea password:%s" +#: kallithea/model/user.py:408 +msgid "Password reset notification" +msgstr "" + +#: kallithea/model/user.py:409 +#, python-format +msgid "The password to your account %s has been changed using password reset form." msgstr "" #: kallithea/model/validators.py:77 kallithea/model/validators.py:78 @@ -2240,7 +2241,9 @@ #: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:229 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/pullrequests/pullrequest_show.html:156 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 #: kallithea/templates/summary/summary.html:134 msgid "Owner" msgstr "" @@ -2248,7 +2251,7 @@ #: kallithea/templates/index_base.html:140 #: kallithea/templates/admin/my_account/my_account_repos.html:57 #: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:44 +#: kallithea/templates/base/root.html:43 #: kallithea/templates/bookmarks/bookmarks.html:79 #: kallithea/templates/branches/branches.html:79 #: kallithea/templates/journal/journal.html:198 @@ -2260,7 +2263,7 @@ #: kallithea/templates/index_base.html:141 #: kallithea/templates/admin/my_account/my_account_repos.html:58 #: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:45 +#: kallithea/templates/base/root.html:44 #: kallithea/templates/bookmarks/bookmarks.html:80 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:199 @@ -2276,7 +2279,7 @@ #: kallithea/templates/index_base.html:143 #: kallithea/templates/admin/my_account/my_account_repos.html:60 #: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:46 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:201 @@ -2288,7 +2291,7 @@ #: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:147 kallithea/templates/base/root.html:48 +#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:202 @@ -2298,7 +2301,7 @@ msgstr "" #: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:333 +#: kallithea/templates/base/base.html:326 msgid "Log In" msgstr "" @@ -2313,14 +2316,15 @@ #: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:24 #: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/pullrequests/pullrequest_show.html:166 msgid "Username" msgstr "" #: kallithea/templates/login.html:33 kallithea/templates/register.html:33 #: kallithea/templates/admin/my_account/my_account.html:37 #: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:311 msgid "Password" msgstr "" @@ -2332,7 +2336,7 @@ msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:329 +#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 msgid "Don't have an account ?" msgstr "" @@ -2345,11 +2349,14 @@ msgstr "" #: kallithea/templates/password_reset.html:12 +#: kallithea/templates/password_reset_confirmation.html:12 #, python-format msgid "Reset Your Password to %s" msgstr "" #: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset_confirmation.html:5 +#: kallithea/templates/password_reset_confirmation.html:14 msgid "Reset Your Password" msgstr "" @@ -2367,7 +2374,32 @@ msgstr "" #: kallithea/templates/password_reset.html:47 -msgid "Password reset link will be sent to the email address matching your username." +msgid "A password reset link will be sent to the specified email address if it is registered in the system." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:19 +#, python-format +msgid "You are about to set a new password for the email address %s." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:20 +msgid "Note that you must use the same browser session for this as the one used to request the password reset." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:30 +msgid "Code you received in the email" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:39 +msgid "New Password" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:48 +msgid "Confirm New Password" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:56 +msgid "Confirm" msgstr "" #: kallithea/templates/register.html:5 kallithea/templates/register.html:14 @@ -2673,7 +2705,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:244 +#: kallithea/templates/base/base.html:237 msgid "Create New Gist" msgstr "" @@ -2815,7 +2847,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/base/base.html:343 msgid "My Account" msgstr "" @@ -2969,7 +3001,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:45 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:200 @@ -2996,7 +3028,7 @@ msgstr "" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 msgid "Pull Requests" msgstr "" @@ -3014,7 +3046,7 @@ msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:342 msgid "Notifications" msgstr "" @@ -3196,7 +3228,7 @@ #: kallithea/templates/admin/repos/repo_edit.html:40 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:158 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 #: kallithea/templates/data_table/_dt_elements.html:45 #: kallithea/templates/data_table/_dt_elements.html:49 msgid "Settings" @@ -3235,7 +3267,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:146 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 msgid "Created on" msgstr "" @@ -3731,7 +3763,7 @@ msgid "Custom Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:68 +#: kallithea/templates/admin/settings/settings_hooks.html:67 msgid "Failed to remove hook" msgstr "" @@ -3763,7 +3795,15 @@ msgid "Verify if Kallithea's Git hooks are installed for each repository. Current hooks will be updated to the latest version." msgstr "" +#: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "Overwrite existing Git hooks" +msgstr "" + #: kallithea/templates/admin/settings/settings_mapping.html:30 +msgid "If installing Git hooks, overwrite any existing hooks, even if they do not seem to come from Kallithea. WARNING: This operation will destroy any custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:35 msgid "Rescan Repositories" msgstr "" @@ -4144,47 +4184,47 @@ msgid "Git repository" msgstr "" -#: kallithea/templates/base/base.html:126 +#: kallithea/templates/base/base.html:119 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:130 #: kallithea/templates/data_table/_dt_elements.html:13 #: kallithea/templates/data_table/_dt_elements.html:17 #: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:141 +#: kallithea/templates/base/base.html:132 +#: kallithea/templates/base/base.html:134 #: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:21 #: kallithea/templates/data_table/_dt_elements.html:25 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:136 #: kallithea/templates/data_table/_dt_elements.html:29 #: kallithea/templates/data_table/_dt_elements.html:33 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:138 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/base/base.html:154 +#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:147 msgid "Options" msgstr "" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:155 #: kallithea/templates/forks/forks_data.html:21 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:164 +#: kallithea/templates/base/base.html:157 #: kallithea/templates/bookmarks/bookmarks.html:56 #: kallithea/templates/bookmarks/bookmarks_data.html:13 #: kallithea/templates/branches/branches.html:56 @@ -4194,111 +4234,111 @@ msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:166 -#: kallithea/templates/base/base.html:254 +#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:247 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:54 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:170 +#: kallithea/templates/base/base.html:163 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:172 +#: kallithea/templates/base/base.html:165 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:173 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:174 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:184 +#: kallithea/templates/base/base.html:177 #: kallithea/templates/data_table/_dt_elements.html:37 #: kallithea/templates/data_table/_dt_elements.html:41 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:178 #: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 #, python-format msgid "Show Pull Requests for %s" msgstr "" +#: kallithea/templates/base/base.html:221 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:227 #: kallithea/templates/base/base.html:228 -msgid "Show recent activity" +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:233 +msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:234 -#: kallithea/templates/base/base.html:235 -msgid "Public journal" +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:238 +msgid "All Public Gists" msgstr "" #: kallithea/templates/base/base.html:240 -msgid "Show public gists" +msgid "My Public Gists" msgstr "" #: kallithea/templates/base/base.html:241 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:245 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:247 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:248 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:253 +#: kallithea/templates/base/base.html:246 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:276 -#: kallithea/templates/base/base.html:277 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +#: kallithea/templates/base/base.html:269 +#: kallithea/templates/base/base.html:270 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" +#: kallithea/templates/base/base.html:289 +msgid "Not Logged In" +msgstr "" + #: kallithea/templates/base/base.html:296 -msgid "Not Logged In" -msgstr "" - -#: kallithea/templates/base/base.html:303 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:319 msgid "Forgot password ?" msgstr "" -#: kallithea/templates/base/base.html:353 +#: kallithea/templates/base/base.html:346 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:402 +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:540 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" @@ -4396,52 +4436,47 @@ msgstr "" #: kallithea/templates/base/root.html:31 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 -msgid "Open New Pull Request" +msgid "Open New Pull Request from {0}" msgstr "" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for Selected Changesets" +msgid "Open New Pull Request for {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets __S → __E" +msgid "Show Selected Changesets {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:34 -msgid "Show Selected Changeset __S" +msgid "Selection Link" msgstr "" #: kallithea/templates/base/root.html:35 -msgid "Selection Link" +#: kallithea/templates/changeset/diff_block.html:8 +msgid "Collapse Diff" msgstr "" #: kallithea/templates/base/root.html:36 -#: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse Diff" +msgid "Expand Diff" msgstr "" #: kallithea/templates/base/root.html:37 -msgid "Expand Diff" +msgid "Failed to revoke permission" msgstr "" #: kallithea/templates/base/root.html:38 -msgid "Failed to revoke permission" +msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "" #: kallithea/templates/base/root.html:39 -msgid "Confirm to revoke permission for {0}: {1} ?" +msgid "enabled" msgstr "" #: kallithea/templates/base/root.html:40 -msgid "enabled" -msgstr "" - -#: kallithea/templates/base/root.html:41 msgid "disabled" msgstr "" -#: kallithea/templates/base/root.html:43 +#: kallithea/templates/base/root.html:42 msgid "Specify changeset" msgstr "" @@ -4459,7 +4494,6 @@ #: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 #: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" @@ -4499,7 +4533,7 @@ msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/templates/changelog/changelog.html:49 msgid "Clear selection" msgstr "" @@ -4571,7 +4605,7 @@ msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:291 +#: kallithea/templates/changelog/changelog.html:310 msgid "There are no changes yet" msgstr "" @@ -4693,7 +4727,7 @@ #: kallithea/templates/changeset/changeset.html:166 #: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:314 +#: kallithea/templates/pullrequests/pullrequest_show.html:318 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -4702,7 +4736,7 @@ #: kallithea/templates/changeset/changeset.html:168 #: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:320 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -4711,8 +4745,8 @@ #: kallithea/templates/changeset/changeset.html:182 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Show full diff anyway" msgstr "" @@ -4884,7 +4918,7 @@ msgstr "" #: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:306 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 msgid "Common ancestor" msgstr "" @@ -4925,7 +4959,7 @@ msgstr "" #: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:301 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -4989,15 +5023,19 @@ msgstr "" #: kallithea/templates/email_templates/password_reset.html:6 -msgid "We received a request to create a new password for your account." +msgid "We have received a request to reset the password for your account." msgstr "" #: kallithea/templates/email_templates/password_reset.html:7 -msgid "You can generate it by clicking following URL" +msgid "To set a new password, click the following link" msgstr "" #: kallithea/templates/email_templates/password_reset.html:10 -msgid "Please ignore this email if you did not request a new password ." +msgid "Should you not be able to use the link above, please type the following code into the password reset form" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:12 +msgid "If it weren't you who requested the password reset, just disregard this message." msgstr "" #: kallithea/templates/email_templates/pull_request.html:5 @@ -5454,98 +5492,102 @@ msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:131 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +msgid "This is just a range of changesets and doesn't have a target or a real merge ancestor." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:133 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:154 -msgid "Created by" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:169 +#: kallithea/templates/pullrequests/pullrequest_show.html:173 msgid "Update" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:187 +#: kallithea/templates/pullrequests/pullrequest_show.html:191 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:209 +#: kallithea/templates/pullrequests/pullrequest_show.html:213 msgid "Pull Request Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:234 +#: kallithea/templates/pullrequests/pullrequest_show.html:238 msgid "Remove reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:246 +#: kallithea/templates/pullrequests/pullrequest_show.html:250 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:254 +#: kallithea/templates/pullrequests/pullrequest_show.html:258 msgid "Potential Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:257 +#: kallithea/templates/pullrequests/pullrequest_show.html:261 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:280 +#: kallithea/templates/pullrequests/pullrequest_show.html:284 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/templates/pullrequests/pullrequest_show.html:285 msgid "Save as New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:282 +#: kallithea/templates/pullrequests/pullrequest_show.html:286 msgid "Cancel Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:292 +#: kallithea/templates/pullrequests/pullrequest_show.html:296 msgid "Pull Request Content" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 -#, python-format -msgid "Pull Requests from %s'" -msgstr "" - #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, python-format +msgid "Pull Requests from %s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:13 +#, python-format msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 -#, python-format -msgid "Show Pull Requests to %s" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +msgid "Open New Pull Request" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:37 #, python-format +msgid "Show Pull Requests to %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 -msgid "Hide closed pull requests (only show open pull requests)" -msgstr "" - #: kallithea/templates/pullrequests/pullrequest_show_all.html:49 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 msgid "Pull Requests I Participate In" msgstr ""
--- a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po Tue Sep 08 10:21:46 2015 +0000 +++ b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po Tue Sep 08 10:37:51 2015 +0200 @@ -5,9 +5,9 @@ # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Kallithea 0.3\n" +"Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2015-08-25 11:37+0200\n" +"POT-Creation-Date: 2015-09-08 10:34+0200\n" "PO-Revision-Date: 2015-05-28 22:41+0200\n" "Last-Translator: Sam Jaques <sam.jaques@me.com>\n" "Language-Team: Dutch (Belgium) " @@ -20,7 +20,7 @@ "X-Generator: Weblate 2.3-dev\n" #: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:241 kallithea/lib/base.py:512 +#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 msgid "There are no changesets yet" msgstr "Er zijn nog geen changesets" @@ -36,7 +36,7 @@ msgid "None" msgstr "Geen" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(gesloten)" @@ -52,12 +52,11 @@ #: kallithea/controllers/changeset.py:169 #, fuzzy, python-format -#| msgid "increase diff context to %(num)s lines" msgid "Increase diff context to %(num)s lines" msgstr "vergroot de diff context met %(num)s lijnen" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:743 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 msgid "Such revision does not exist for this repository" msgstr "Deze revisie bestaat niet in deze repository" @@ -69,11 +68,11 @@ "Het is niet toegestaan de status te wijzigen van een changeset " "geassocieerd met een gesloten pull request" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:42 +#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 msgid "Select changeset" msgstr "Selecteer de changeset" -#: kallithea/controllers/compare.py:258 +#: kallithea/controllers/compare.py:261 msgid "Cannot compare repositories without using common ancestor" msgstr "" @@ -122,8 +121,8 @@ #: kallithea/templates/changeset/changeset.html:195 #: kallithea/templates/compare/compare_diff.html:78 #: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Changeset was too big and was cut off..." msgstr "" @@ -132,111 +131,111 @@ msgid "%s committed on %s" msgstr "" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:91 msgid "Click here to add new file" msgstr "" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:92 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 -#: kallithea/controllers/files.py:433 +#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 +#: kallithea/controllers/files.py:432 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:318 +#: kallithea/controllers/files.py:317 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:329 +#: kallithea/controllers/files.py:328 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:351 +#: kallithea/controllers/files.py:350 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 -#: kallithea/controllers/files.py:502 +#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 +#: kallithea/controllers/files.py:501 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:378 +#: kallithea/controllers/files.py:377 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:392 +#: kallithea/controllers/files.py:391 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:408 +#: kallithea/controllers/files.py:407 msgid "No changes" msgstr "" -#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 +#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:444 +#: kallithea/controllers/files.py:443 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:464 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:469 +#: kallithea/controllers/files.py:468 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:494 +#: kallithea/controllers/files.py:493 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:527 +#: kallithea/controllers/files.py:526 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:538 +#: kallithea/controllers/files.py:537 #, python-format msgid "Unknown revision %s" msgstr "" -#: kallithea/controllers/files.py:540 +#: kallithea/controllers/files.py:539 msgid "Empty repository" msgstr "" -#: kallithea/controllers/files.py:542 +#: kallithea/controllers/files.py:541 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:772 +#: kallithea/controllers/files.py:771 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:15 #: kallithea/templates/pullrequests/pullrequest.html:97 msgid "Changesets" msgstr "" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:821 kallithea/templates/switch_to_list.html:3 +#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 +#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:832 kallithea/templates/switch_to_list.html:25 +#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 +#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "" @@ -257,9 +256,9 @@ #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:131 -#: kallithea/templates/base/base.html:397 -#: kallithea/templates/base/base.html:569 +#: kallithea/templates/base/base.html:124 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "" @@ -285,28 +284,31 @@ msgstr "" #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:229 +#: kallithea/templates/base/base.html:222 #: kallithea/templates/journal/journal.html:4 #: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:150 kallithea/controllers/login.py:196 +#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:156 +#: kallithea/controllers/login.py:157 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:201 -msgid "Your password reset link was sent" -msgstr "" - -#: kallithea/controllers/login.py:222 -msgid "" -"Your password reset was successful, new password has been sent to your " -"email" +#: kallithea/controllers/login.py:202 +msgid "A password reset confirmation code has been sent" +msgstr "" + +#: kallithea/controllers/login.py:251 +msgid "Invalid password reset token" +msgstr "" + +#: kallithea/controllers/login.py:256 +#: kallithea/controllers/admin/my_account.py:167 +msgid "Successfully updated password" msgstr "" #: kallithea/controllers/pullrequests.py:124 @@ -328,112 +330,112 @@ msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:827 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:306 +#: kallithea/controllers/pullrequests.py:310 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:352 -#: kallithea/controllers/pullrequests.py:499 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:503 msgid "No description" msgstr "" -#: kallithea/controllers/pullrequests.py:359 +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:362 -#: kallithea/controllers/pullrequests.py:449 -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:453 +#: kallithea/controllers/pullrequests.py:509 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:365 -#: kallithea/controllers/pullrequests.py:452 +#: kallithea/controllers/pullrequests.py:369 +#: kallithea/controllers/pullrequests.py:456 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:401 msgid "Missing changesets since the previous pull request:" msgstr "" -#: kallithea/controllers/pullrequests.py:404 +#: kallithea/controllers/pullrequests.py:408 #, python-format msgid "New changesets on %s %s since the previous pull request:" msgstr "" -#: kallithea/controllers/pullrequests.py:411 +#: kallithea/controllers/pullrequests.py:415 msgid "Ancestor didn't change - show diff since previous version:" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:422 #, python-format msgid "" "This pull request is based on another %s revision and there is no simple " "diff." msgstr "" -#: kallithea/controllers/pullrequests.py:420 +#: kallithea/controllers/pullrequests.py:424 #, python-format msgid "No changes found on %s %s since previous version." msgstr "" -#: kallithea/controllers/pullrequests.py:458 +#: kallithea/controllers/pullrequests.py:462 #, python-format msgid "Closed, replaced by %s ." msgstr "" -#: kallithea/controllers/pullrequests.py:466 +#: kallithea/controllers/pullrequests.py:470 msgid "Pull request update created" msgstr "" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:513 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:523 +#: kallithea/controllers/pullrequests.py:528 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:582 +#: kallithea/controllers/pullrequests.py:594 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:584 +#: kallithea/controllers/pullrequests.py:596 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:602 +#: kallithea/controllers/pullrequests.py:614 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:605 +#: kallithea/controllers/pullrequests.py:617 msgid "No changesets found for updating this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:613 +#: kallithea/controllers/pullrequests.py:625 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:619 +#: kallithea/controllers/pullrequests.py:631 msgid "Git pull requests don't support updates yet." msgstr "" -#: kallithea/controllers/pullrequests.py:710 +#: kallithea/controllers/pullrequests.py:722 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:715 +#: kallithea/controllers/pullrequests.py:727 msgid "Closing." msgstr "" @@ -477,37 +479,37 @@ #: kallithea/controllers/admin/gists.py:59 #: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:283 +#: kallithea/controllers/admin/users.py:285 msgid "Forever" msgstr "" #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/users.py:286 msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/users.py:287 msgid "1 hour" msgstr "" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/users.py:288 msgid "1 day" msgstr "" #: kallithea/controllers/admin/gists.py:63 #: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/users.py:289 msgid "1 month" msgstr "" #: kallithea/controllers/admin/gists.py:67 #: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/users.py:291 msgid "Lifetime" msgstr "" @@ -537,8 +539,8 @@ msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:208 -#: kallithea/model/user.py:230 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 +#: kallithea/model/user.py:237 msgid "You can't edit this user since it's crucial for entire application" msgstr "" @@ -547,47 +549,43 @@ msgstr "" #: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:204 +#: kallithea/controllers/admin/users.py:202 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:167 -msgid "Successfully updated password" -msgstr "" - #: kallithea/controllers/admin/my_account.py:178 msgid "Error occurred during update of user password" msgstr "" #: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:413 +#: kallithea/controllers/admin/users.py:415 #, python-format msgid "Added email %s to user" msgstr "" #: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:419 +#: kallithea/controllers/admin/users.py:421 msgid "An error occurred during email saving" msgstr "" #: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:431 +#: kallithea/controllers/admin/users.py:433 msgid "Removed email from user" msgstr "" #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:306 +#: kallithea/controllers/admin/users.py:308 msgid "API key successfully created" msgstr "" #: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:319 +#: kallithea/controllers/admin/users.py:321 msgid "API key successfully reset" msgstr "" #: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:323 +#: kallithea/controllers/admin/users.py:325 msgid "API key successfully deleted" msgstr "" @@ -637,10 +635,10 @@ #: kallithea/templates/admin/users/user_edit_profile.html:105 #: kallithea/templates/admin/users/users.html:10 #: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:252 +#: kallithea/templates/base/base.html:253 #: kallithea/templates/base/base.html:259 #: kallithea/templates/base/base.html:260 -#: kallithea/templates/base/base.html:266 -#: kallithea/templates/base/base.html:267 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "" @@ -854,17 +852,13 @@ #: kallithea/controllers/admin/repos.py:537 #: kallithea/controllers/admin/repos.py:564 -#, fuzzy, python-format -#| msgid "This repository has %s fork" -#| msgid_plural "This repository has %s forks" +#, fuzzy msgid "Repository has been locked" msgstr "" #: kallithea/controllers/admin/repos.py:540 #: kallithea/controllers/admin/repos.py:561 -#, fuzzy, python-format -#| msgid "This repository has %s fork" -#| msgid_plural "This repository has %s forks" +#, fuzzy msgid "Repository has been unlocked" msgstr "" @@ -904,48 +898,48 @@ msgstr "" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:274 +#: kallithea/controllers/admin/settings.py:277 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:213 +#: kallithea/controllers/admin/settings.py:216 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:270 +#: kallithea/controllers/admin/settings.py:273 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:335 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:361 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:373 +#: kallithea/controllers/admin/settings.py:376 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:421 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:425 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:448 +#: kallithea/controllers/admin/settings.py:451 msgid "Whoosh reindex task scheduled" msgstr "" @@ -986,68 +980,68 @@ msgstr "" #: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:382 +#: kallithea/controllers/admin/users.py:384 msgid "Updated permissions" msgstr "" #: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:386 +#: kallithea/controllers/admin/users.py:388 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:134 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:184 +#: kallithea/controllers/admin/users.py:182 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:220 +#: kallithea/controllers/admin/users.py:218 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:225 +#: kallithea/controllers/admin/users.py:223 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:238 +#: kallithea/controllers/admin/users.py:236 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:461 +#: kallithea/controllers/admin/users.py:463 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:467 +#: kallithea/controllers/admin/users.py:469 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:744 +#: kallithea/lib/auth.py:743 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:757 +#: kallithea/lib/auth.py:756 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:795 +#: kallithea/lib/auth.py:812 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:827 +#: kallithea/lib/auth.py:844 msgid "You need to be signed in to view this page" msgstr "" @@ -1200,7 +1194,7 @@ #: kallithea/lib/helpers.py:1128 #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "" @@ -1827,16 +1821,12 @@ msgstr "" #: kallithea/model/db.py:2228 -#, fuzzy, python-format -#| msgid "%d reviewer" -#| msgid_plural "%d reviewers" +#, fuzzy msgid "Not reviewed" msgstr "" #: kallithea/model/db.py:2231 -#, fuzzy, python-format -#| msgid "%d reviewer" -#| msgid_plural "%d reviewers" +#, fuzzy msgid "Under review" msgstr "" @@ -1924,9 +1914,7 @@ #: kallithea/model/notification.py:302 #, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s changeset %(short_id)s " -"on %(branch)s" +msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" #: kallithea/model/notification.py:305 @@ -1936,16 +1924,12 @@ #: kallithea/model/notification.py:307 #, python-format -msgid "" -"[Added by %(pr_username)s] %(repo_name)s pull request %(pr_nice_id)s from" -" %(ref)s" +msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" #: kallithea/model/notification.py:308 #, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s pull request " -"%(pr_nice_id)s from %(ref)s" +msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" #: kallithea/model/notification.py:321 @@ -1957,50 +1941,52 @@ msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:813 +#: kallithea/model/scm.py:812 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:185 +#: kallithea/model/user.py:192 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:249 +#: kallithea/model/user.py:256 msgid "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:254 +#: kallithea/model/user.py:261 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "" -#: kallithea/model/user.py:259 -#, python-format -msgid "" -"User \"%s\" still owns %s repository groups and cannot be removed. Switch" -" owners or remove those repository groups: %s" -msgstr "" - #: kallithea/model/user.py:266 #, python-format msgid "" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch" +" owners or remove those repository groups: %s" +msgstr "" + +#: kallithea/model/user.py:273 +#, python-format +msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "" -#: kallithea/model/user.py:296 +#: kallithea/model/user.py:360 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:319 -msgid "Your new password" -msgstr "" - -#: kallithea/model/user.py:320 -#, python-format -msgid "Your new Kallithea password:%s" +#: kallithea/model/user.py:408 +msgid "Password reset notification" +msgstr "" + +#: kallithea/model/user.py:409 +#, python-format +msgid "" +"The password to your account %s has been changed using password reset " +"form." msgstr "" #: kallithea/model/validators.py:77 kallithea/model/validators.py:78 @@ -2292,7 +2278,9 @@ #: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:229 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/pullrequests/pullrequest_show.html:156 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 #: kallithea/templates/summary/summary.html:134 msgid "Owner" msgstr "" @@ -2300,7 +2288,7 @@ #: kallithea/templates/index_base.html:140 #: kallithea/templates/admin/my_account/my_account_repos.html:57 #: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:44 +#: kallithea/templates/base/root.html:43 #: kallithea/templates/bookmarks/bookmarks.html:79 #: kallithea/templates/branches/branches.html:79 #: kallithea/templates/journal/journal.html:198 @@ -2312,7 +2300,7 @@ #: kallithea/templates/index_base.html:141 #: kallithea/templates/admin/my_account/my_account_repos.html:58 #: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:45 +#: kallithea/templates/base/root.html:44 #: kallithea/templates/bookmarks/bookmarks.html:80 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:199 @@ -2328,7 +2316,7 @@ #: kallithea/templates/index_base.html:143 #: kallithea/templates/admin/my_account/my_account_repos.html:60 #: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:46 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:201 @@ -2340,7 +2328,7 @@ #: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:147 kallithea/templates/base/root.html:48 +#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:202 @@ -2350,7 +2338,7 @@ msgstr "" #: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:333 +#: kallithea/templates/base/base.html:326 msgid "Log In" msgstr "" @@ -2365,14 +2353,15 @@ #: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:24 #: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/pullrequests/pullrequest_show.html:166 msgid "Username" msgstr "" #: kallithea/templates/login.html:33 kallithea/templates/register.html:33 #: kallithea/templates/admin/my_account/my_account.html:37 #: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:311 msgid "Password" msgstr "" @@ -2384,7 +2373,7 @@ msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:329 +#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 msgid "Don't have an account ?" msgstr "" @@ -2397,11 +2386,14 @@ msgstr "" #: kallithea/templates/password_reset.html:12 +#: kallithea/templates/password_reset_confirmation.html:12 #, python-format msgid "Reset Your Password to %s" msgstr "" #: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset_confirmation.html:5 +#: kallithea/templates/password_reset_confirmation.html:14 msgid "Reset Your Password" msgstr "" @@ -2420,8 +2412,35 @@ #: kallithea/templates/password_reset.html:47 msgid "" -"Password reset link will be sent to the email address matching your " -"username." +"A password reset link will be sent to the specified email address if it " +"is registered in the system." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:19 +#, python-format +msgid "You are about to set a new password for the email address %s." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:20 +msgid "" +"Note that you must use the same browser session for this as the one used " +"to request the password reset." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:30 +msgid "Code you received in the email" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:39 +msgid "New Password" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:48 +msgid "Confirm New Password" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:56 +msgid "Confirm" msgstr "" #: kallithea/templates/register.html:5 kallithea/templates/register.html:14 @@ -2733,7 +2752,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:244 +#: kallithea/templates/base/base.html:237 msgid "Create New Gist" msgstr "" @@ -2875,7 +2894,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/base/base.html:343 msgid "My Account" msgstr "" @@ -3029,7 +3048,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:45 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:200 @@ -3056,7 +3075,7 @@ msgstr "" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 msgid "Pull Requests" msgstr "" @@ -3074,7 +3093,7 @@ msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:342 msgid "Notifications" msgstr "" @@ -3215,8 +3234,6 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:13 #: kallithea/templates/admin/users/user_edit_ips.html:23 #, fuzzy, python-format -#| msgid "Confirm to delete this group: %s with %s repository" -#| msgid_plural "Confirm to delete this group: %s with %s repositories" msgid "Confirm to delete this IP address: %s" msgstr "" @@ -3274,7 +3291,7 @@ #: kallithea/templates/admin/repos/repo_edit.html:40 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:158 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 #: kallithea/templates/data_table/_dt_elements.html:45 #: kallithea/templates/data_table/_dt_elements.html:49 msgid "Settings" @@ -3313,7 +3330,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:146 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 msgid "Created on" msgstr "" @@ -3845,7 +3862,7 @@ msgid "Custom Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:68 +#: kallithea/templates/admin/settings/settings_hooks.html:67 msgid "Failed to remove hook" msgstr "" @@ -3881,7 +3898,18 @@ "Current hooks will be updated to the latest version." msgstr "" +#: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "Overwrite existing Git hooks" +msgstr "" + #: kallithea/templates/admin/settings/settings_mapping.html:30 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any" +" custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:35 msgid "Rescan Repositories" msgstr "" @@ -4291,47 +4319,47 @@ msgid "Git repository" msgstr "" -#: kallithea/templates/base/base.html:126 +#: kallithea/templates/base/base.html:119 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:130 #: kallithea/templates/data_table/_dt_elements.html:13 #: kallithea/templates/data_table/_dt_elements.html:17 #: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:141 +#: kallithea/templates/base/base.html:132 +#: kallithea/templates/base/base.html:134 #: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:21 #: kallithea/templates/data_table/_dt_elements.html:25 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:136 #: kallithea/templates/data_table/_dt_elements.html:29 #: kallithea/templates/data_table/_dt_elements.html:33 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:138 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/base/base.html:154 +#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:147 msgid "Options" msgstr "" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:155 #: kallithea/templates/forks/forks_data.html:21 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:164 +#: kallithea/templates/base/base.html:157 #: kallithea/templates/bookmarks/bookmarks.html:56 #: kallithea/templates/bookmarks/bookmarks_data.html:13 #: kallithea/templates/branches/branches.html:56 @@ -4341,111 +4369,111 @@ msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:166 -#: kallithea/templates/base/base.html:254 +#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:247 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:54 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:170 +#: kallithea/templates/base/base.html:163 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:172 +#: kallithea/templates/base/base.html:165 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:173 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:174 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:184 +#: kallithea/templates/base/base.html:177 #: kallithea/templates/data_table/_dt_elements.html:37 #: kallithea/templates/data_table/_dt_elements.html:41 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:178 #: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 #, python-format msgid "Show Pull Requests for %s" msgstr "" +#: kallithea/templates/base/base.html:221 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:227 #: kallithea/templates/base/base.html:228 -msgid "Show recent activity" +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:233 +msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:234 -#: kallithea/templates/base/base.html:235 -msgid "Public journal" +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:238 +msgid "All Public Gists" msgstr "" #: kallithea/templates/base/base.html:240 -msgid "Show public gists" +msgid "My Public Gists" msgstr "" #: kallithea/templates/base/base.html:241 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:245 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:247 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:248 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:253 +#: kallithea/templates/base/base.html:246 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:276 -#: kallithea/templates/base/base.html:277 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +#: kallithea/templates/base/base.html:269 +#: kallithea/templates/base/base.html:270 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" +#: kallithea/templates/base/base.html:289 +msgid "Not Logged In" +msgstr "" + #: kallithea/templates/base/base.html:296 -msgid "Not Logged In" -msgstr "" - -#: kallithea/templates/base/base.html:303 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:319 msgid "Forgot password ?" msgstr "" -#: kallithea/templates/base/base.html:353 +#: kallithea/templates/base/base.html:346 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:402 +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:540 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" @@ -4546,53 +4574,51 @@ msgstr "" #: kallithea/templates/base/root.html:31 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 -msgid "Open New Pull Request" -msgstr "" +#, fuzzy +#| msgid "on pull request" +msgid "Open New Pull Request from {0}" +msgstr "Statuswijziging -> %s" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for Selected Changesets" +msgid "Open New Pull Request for {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets __S → __E" -msgstr "" +#, fuzzy +#| msgid "Show Selected Changeset __S" +msgid "Show Selected Changesets {0} → {1}" +msgstr "Selecteer de changeset" #: kallithea/templates/base/root.html:34 -#, fuzzy -msgid "Show Selected Changeset __S" -msgstr "Selecteer de changeset" +msgid "Selection Link" +msgstr "" #: kallithea/templates/base/root.html:35 -msgid "Selection Link" +#: kallithea/templates/changeset/diff_block.html:8 +msgid "Collapse Diff" msgstr "" #: kallithea/templates/base/root.html:36 -#: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse Diff" +msgid "Expand Diff" msgstr "" #: kallithea/templates/base/root.html:37 -msgid "Expand Diff" +msgid "Failed to revoke permission" msgstr "" #: kallithea/templates/base/root.html:38 -msgid "Failed to revoke permission" +msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "" #: kallithea/templates/base/root.html:39 -msgid "Confirm to revoke permission for {0}: {1} ?" +msgid "enabled" msgstr "" #: kallithea/templates/base/root.html:40 -msgid "enabled" -msgstr "" - -#: kallithea/templates/base/root.html:41 msgid "disabled" msgstr "" -#: kallithea/templates/base/root.html:43 +#: kallithea/templates/base/root.html:42 #, fuzzy msgid "Specify changeset" msgstr "Selecteer de changeset" @@ -4611,7 +4637,6 @@ #: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 #: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" @@ -4651,7 +4676,7 @@ msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/templates/changelog/changelog.html:49 msgid "Clear selection" msgstr "" @@ -4723,7 +4748,7 @@ msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:291 +#: kallithea/templates/changelog/changelog.html:310 msgid "There are no changes yet" msgstr "" @@ -4845,7 +4870,7 @@ #: kallithea/templates/changeset/changeset.html:166 #: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:314 +#: kallithea/templates/pullrequests/pullrequest_show.html:318 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -4854,7 +4879,7 @@ #: kallithea/templates/changeset/changeset.html:168 #: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:320 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -4863,8 +4888,8 @@ #: kallithea/templates/changeset/changeset.html:182 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Show full diff anyway" msgstr "" @@ -4875,7 +4900,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:21 #, fuzzy -#| msgid "Status change from pull request" msgid "on pull request" msgstr "Statuswijziging -> %s" @@ -4885,7 +4909,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:24 #, fuzzy -#| msgid "Select changeset" msgid "on this changeset" msgstr "Selecteer de changeset" @@ -4896,7 +4919,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:37 #, fuzzy -#| msgid "Latest Changes" msgid "Status change" msgstr "Statuswijziging -> %s" @@ -5045,7 +5067,7 @@ msgstr "" #: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:306 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 msgid "Common ancestor" msgstr "" @@ -5086,7 +5108,7 @@ msgstr "" #: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:301 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5150,15 +5172,23 @@ msgstr "" #: kallithea/templates/email_templates/password_reset.html:6 -msgid "We received a request to create a new password for your account." +msgid "We have received a request to reset the password for your account." msgstr "" #: kallithea/templates/email_templates/password_reset.html:7 -msgid "You can generate it by clicking following URL" +msgid "To set a new password, click the following link" msgstr "" #: kallithea/templates/email_templates/password_reset.html:10 -msgid "Please ignore this email if you did not request a new password ." +msgid "" +"Should you not be able to use the link above, please type the following " +"code into the password reset form" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:12 +msgid "" +"If it weren't you who requested the password reset, just disregard this " +"message." msgstr "" #: kallithea/templates/email_templates/pull_request.html:5 @@ -5559,8 +5589,6 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:70 #, fuzzy, python-format -#| msgid "Confirm to delete this group: %s with %s repository" -#| msgid_plural "Confirm to delete this group: %s with %s repositories" msgid "Confirm again to delete this pull request with %s comments" msgstr "" @@ -5618,101 +5646,107 @@ msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:131 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +msgid "" +"This is just a range of changesets and doesn't have a target or a real " +"merge ancestor." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:133 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:154 -msgid "Created by" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:169 +#: kallithea/templates/pullrequests/pullrequest_show.html:173 msgid "Update" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:187 +#: kallithea/templates/pullrequests/pullrequest_show.html:191 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:209 +#: kallithea/templates/pullrequests/pullrequest_show.html:213 msgid "Pull Request Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:234 +#: kallithea/templates/pullrequests/pullrequest_show.html:238 #, fuzzy msgid "Remove reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:246 +#: kallithea/templates/pullrequests/pullrequest_show.html:250 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:254 +#: kallithea/templates/pullrequests/pullrequest_show.html:258 #, fuzzy msgid "Potential Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:257 +#: kallithea/templates/pullrequests/pullrequest_show.html:261 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:280 +#: kallithea/templates/pullrequests/pullrequest_show.html:284 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/templates/pullrequests/pullrequest_show.html:285 msgid "Save as New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:282 +#: kallithea/templates/pullrequests/pullrequest_show.html:286 #, fuzzy msgid "Cancel Changes" msgstr "Selecteer de changeset" -#: kallithea/templates/pullrequests/pullrequest_show.html:292 +#: kallithea/templates/pullrequests/pullrequest_show.html:296 msgid "Pull Request Content" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 -#, python-format -msgid "Pull Requests from %s'" -msgstr "" - #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, python-format +msgid "Pull Requests from %s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:13 +#, python-format msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 -#, python-format -msgid "Show Pull Requests to %s" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +msgid "Open New Pull Request" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:37 #, python-format +msgid "Show Pull Requests to %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 -msgid "Hide closed pull requests (only show open pull requests)" -msgstr "" - #: kallithea/templates/pullrequests/pullrequest_show_all.html:49 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 msgid "Pull Requests I Participate In" msgstr "" @@ -5972,21 +6006,6 @@ #~ msgstr "" #~ msgid "" -#~ "Comment on %(repo_name)s changeset " -#~ "%(short_id)s on %(branch)s by " -#~ "%(comment_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Review request on %(repo_name)s pull " -#~ "request #%(pr_id)s from %(ref)s by " -#~ "%(pr_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Comment on %(repo_name)s pull request " -#~ "#%(pr_id)s from %(ref)s by " -#~ "%(comment_username)s" #~ msgstr "" #~ msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" @@ -5998,13 +6017,6 @@ #~ msgid "Username \"%(username)s\" is forbidden" #~ msgstr "" -#~ msgid "" -#~ "Username may only contain alphanumeric " -#~ "characters underscores, periods or dashes " -#~ "and must begin with alphanumeric " -#~ "character or underscore" -#~ msgstr "" - #~ msgid "invalid password" #~ msgstr "" @@ -6032,13 +6044,6 @@ #~ msgid "Revisions %(revs)s are already part of pull request or have set status" #~ msgstr "" -#~ msgid "" -#~ "Comma separated list of plugins. Order" -#~ " of plugins is also order in " -#~ "which Kallithea will try to authenticate" -#~ " user" -#~ msgstr "" - #~ msgid "Defaults" #~ msgstr "" @@ -6084,12 +6089,6 @@ #~ msgid "current IP" #~ msgstr "" -#~ msgid "" -#~ "Your user is in an external source" -#~ " of record; some details cannot be" -#~ " managed here" -#~ msgstr "" - #~ msgid "Permissions Administration" #~ msgstr "" @@ -6099,23 +6098,9 @@ #~ msgid "Overwrite existing settings" #~ msgstr "" -#~ msgid "" -#~ "All default permissions on each user " -#~ "group will be reset to chosen " -#~ "permission, note that all custom default" -#~ " permission on repository groups will " -#~ "be lost" -#~ msgstr "" - #~ msgid "Repository creation" #~ msgstr "" -#~ msgid "" -#~ "Write permission to a repository group" -#~ " allows creating repositories inside that" -#~ " group." -#~ msgstr "" - #~ msgid "Default IP Whitelist for All Users" #~ msgstr "" @@ -6176,20 +6161,6 @@ #~ msgid "Non-changeable id" #~ msgstr "" -#~ msgid "" -#~ "In case this repository is renamed " -#~ "or moved into another group the " -#~ "repository URL changes.\n" -#~ " Using the above " -#~ "URL guarantees that this repository will" -#~ " always be accessible under such URL." -#~ "\n" -#~ " Useful for CI " -#~ "systems, or any other cases that " -#~ "you need to hardcode the URL into" -#~ " 3rd party service." -#~ msgstr "" - #~ msgid "edit" #~ msgstr "" @@ -6235,12 +6206,6 @@ #~ msgid "Destroy old data" #~ msgstr "" -#~ msgid "" -#~ "Check this option to remove references" -#~ " to repositories that no longer exist" -#~ " in on the filesystem." -#~ msgstr "" - #~ msgid "check for updates" #~ msgstr "" @@ -6253,29 +6218,12 @@ #~ msgid "user groups" #~ msgstr "" -#~ msgid "" -#~ "This user is in an external source" -#~ " of record (%s); some details cannot" -#~ " be managed here." -#~ msgstr "" - #~ msgid "Inherit from defaults" #~ msgstr "" -#~ msgid "" -#~ "Select to inherit permissions from %s" -#~ " permissions settings, and default IP " -#~ "address whitelist." -#~ msgstr "" - #~ msgid "show" #~ msgstr "" -#~ msgid "" -#~ "Changeset status: %s\n" -#~ "Click to open associated pull request #%s" -#~ msgstr "" - #~ msgid "Push new repo" #~ msgstr "" @@ -6300,11 +6248,6 @@ #~ msgid "Comment on changeset" #~ msgstr "" -#~ msgid "" -#~ "Use @username inside this text to " -#~ "send notification to another local user." -#~ msgstr "" - #~ msgid "revision" #~ msgstr "" @@ -6335,3 +6278,57 @@ #~ msgid "with subrepos" #~ msgstr "" +#~ msgid "Your password reset link was sent" +#~ msgstr "" + +#~ msgid "" +#~ "Your password reset was successful, new" +#~ " password has been sent to your " +#~ "email" +#~ msgstr "" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Added by %(pr_username)s] %(repo_name)s pull" +#~ " request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "Your new password" +#~ msgstr "" + +#~ msgid "Your new Kallithea password:%s" +#~ msgstr "" + +#~ msgid "" +#~ "Password reset link will be sent " +#~ "to the email address matching your " +#~ "username." +#~ msgstr "" + +#~ msgid "Open New Pull Request for Selected Changesets" +#~ msgstr "" + +#~ msgid "Show Selected Changesets __S → __E" +#~ msgstr "" + +#~ msgid "We received a request to create a new password for your account." +#~ msgstr "" + +#~ msgid "You can generate it by clicking following URL" +#~ msgstr "" + +#~ msgid "Please ignore this email if you did not request a new password ." +#~ msgstr "" + +#~ msgid "Created by" +#~ msgstr "" +
--- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Tue Sep 08 10:21:46 2015 +0000 +++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Tue Sep 08 10:37:51 2015 +0200 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2015-08-25 11:37+0200\n" +"POT-Creation-Date: 2015-09-08 10:34+0200\n" "PO-Revision-Date: 2015-04-04 09:08+0200\n" "Last-Translator: Andrew Shadura <andrew@shadura.me>\n" "Language-Team: Polish " @@ -25,7 +25,7 @@ "X-Generator: Weblate 2.3-dev\n" #: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:241 kallithea/lib/base.py:512 +#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 msgid "There are no changesets yet" msgstr "Brak zestawienia zmian" @@ -41,7 +41,7 @@ msgid "None" msgstr "Brak" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(zamknięty)" @@ -59,8 +59,8 @@ msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:743 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 msgid "Such revision does not exist for this repository" msgstr "" @@ -72,17 +72,16 @@ "Zmiana statusu na grupy zmian powiązania łączy zamkniętego wniosku jest " "niedozwolona" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:42 +#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 msgid "Select changeset" msgstr "Wybrane zmiany" -#: kallithea/controllers/compare.py:258 +#: kallithea/controllers/compare.py:261 msgid "Cannot compare repositories without using common ancestor" msgstr "" #: kallithea/controllers/error.py:71 #, fuzzy -#| msgid "revisions" msgid "No response" msgstr "rewizja" @@ -131,8 +130,8 @@ #: kallithea/templates/changeset/changeset.html:195 #: kallithea/templates/compare/compare_diff.html:78 #: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Changeset was too big and was cut off..." msgstr "Lista zmian była zbyt duża i została ucięta..." @@ -141,111 +140,111 @@ msgid "%s committed on %s" msgstr "%s zakomitowal w %s" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:91 msgid "Click here to add new file" msgstr "Kliknij tutaj, by dodać nowy plik" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:92 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, fuzzy, python-format msgid "%s at %s" msgstr "w %s i %s" -#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 -#: kallithea/controllers/files.py:433 +#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 +#: kallithea/controllers/files.py:432 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Repozytorium zostało zablokowane przez %s na %s" -#: kallithea/controllers/files.py:318 +#: kallithea/controllers/files.py:317 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:329 +#: kallithea/controllers/files.py:328 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:351 +#: kallithea/controllers/files.py:350 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 -#: kallithea/controllers/files.py:502 +#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 +#: kallithea/controllers/files.py:501 msgid "Error occurred during commit" msgstr "Wystąpił błąd w trakcie zatwierdzania" -#: kallithea/controllers/files.py:378 +#: kallithea/controllers/files.py:377 msgid "You can only edit files with revision being a valid branch " msgstr "Można tylko edytować pliki z rewizji obecnej gałęzi " -#: kallithea/controllers/files.py:392 +#: kallithea/controllers/files.py:391 #, python-format msgid "Edited file %s via Kallithea" msgstr "Edytowanie %s w Kallithea" -#: kallithea/controllers/files.py:408 +#: kallithea/controllers/files.py:407 msgid "No changes" msgstr "Bez zmian" -#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 +#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 #, python-format msgid "Successfully committed to %s" msgstr "Committ wykonany do %s" -#: kallithea/controllers/files.py:444 +#: kallithea/controllers/files.py:443 msgid "Added file via Kallithea" msgstr "Dodano %s poprzez Kallithea" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:464 msgid "No content" msgstr "Brak treści" -#: kallithea/controllers/files.py:469 +#: kallithea/controllers/files.py:468 msgid "No filename" msgstr "Brak nazwy pliku" -#: kallithea/controllers/files.py:494 +#: kallithea/controllers/files.py:493 msgid "Location must be relative path and must not contain .. in path" msgstr "Lokalizacja musi być ścieżką względną i nie może zawierać .. ścieżki" -#: kallithea/controllers/files.py:527 +#: kallithea/controllers/files.py:526 msgid "Downloads disabled" msgstr "Pobieranie wyłączone" -#: kallithea/controllers/files.py:538 +#: kallithea/controllers/files.py:537 #, python-format msgid "Unknown revision %s" msgstr "Nieznana wersja %s" -#: kallithea/controllers/files.py:540 +#: kallithea/controllers/files.py:539 msgid "Empty repository" msgstr "Puste repozytorium" -#: kallithea/controllers/files.py:542 +#: kallithea/controllers/files.py:541 msgid "Unknown archive type" msgstr "Nieznany typ archiwum" -#: kallithea/controllers/files.py:772 +#: kallithea/controllers/files.py:771 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:15 #: kallithea/templates/pullrequests/pullrequest.html:97 msgid "Changesets" msgstr "Różnice" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:821 kallithea/templates/switch_to_list.html:3 +#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 +#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "Gałęzie" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:832 kallithea/templates/switch_to_list.html:25 +#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 +#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "Etykiety" @@ -266,9 +265,9 @@ #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:131 -#: kallithea/templates/base/base.html:397 -#: kallithea/templates/base/base.html:569 +#: kallithea/templates/base/base.html:124 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "Repozytoria" @@ -294,29 +293,36 @@ msgstr "Dziennik Publiczny" #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:229 +#: kallithea/templates/base/base.html:222 #: kallithea/templates/journal/journal.html:4 #: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "Dziennik" -#: kallithea/controllers/login.py:150 kallithea/controllers/login.py:196 +#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:156 +#: kallithea/controllers/login.py:157 msgid "You have successfully registered into Kallithea" msgstr "Udało Ci się zarejestrować na stronie" -#: kallithea/controllers/login.py:201 -msgid "Your password reset link was sent" +#: kallithea/controllers/login.py:202 +#, fuzzy +#| msgid "Your password reset link was sent" +msgid "A password reset confirmation code has been sent" msgstr "Twój link zresetowania hasła został wysłany" -#: kallithea/controllers/login.py:222 -msgid "" -"Your password reset was successful, new password has been sent to your " -"email" -msgstr "Twoje hasło zostało zresetowane, nowe hasło zostanie wysłane na e-mail" +#: kallithea/controllers/login.py:251 +#, fuzzy +#| msgid "Password reset link" +msgid "Invalid password reset token" +msgstr "łącze resetowania hasła" + +#: kallithea/controllers/login.py:256 +#: kallithea/controllers/admin/my_account.py:167 +msgid "Successfully updated password" +msgstr "" #: kallithea/controllers/pullrequests.py:124 #, python-format @@ -337,115 +343,114 @@ msgid "Peer branches" msgstr "gałęzie" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:827 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Zakładki" -#: kallithea/controllers/pullrequests.py:306 +#: kallithea/controllers/pullrequests.py:310 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:352 -#: kallithea/controllers/pullrequests.py:499 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:503 msgid "No description" msgstr "Brak opisu" -#: kallithea/controllers/pullrequests.py:359 +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "Prośba o wykonanie połączenia gałęzi została wykonana prawidłowo" -#: kallithea/controllers/pullrequests.py:362 -#: kallithea/controllers/pullrequests.py:449 -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:453 +#: kallithea/controllers/pullrequests.py:509 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:365 -#: kallithea/controllers/pullrequests.py:452 +#: kallithea/controllers/pullrequests.py:369 +#: kallithea/controllers/pullrequests.py:456 msgid "Error occurred while creating pull request" msgstr "Wystąpił błąd podczas prośby o połączenie gałęzi" -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:401 msgid "Missing changesets since the previous pull request:" msgstr "" -#: kallithea/controllers/pullrequests.py:404 +#: kallithea/controllers/pullrequests.py:408 #, python-format msgid "New changesets on %s %s since the previous pull request:" msgstr "" -#: kallithea/controllers/pullrequests.py:411 +#: kallithea/controllers/pullrequests.py:415 msgid "Ancestor didn't change - show diff since previous version:" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:422 #, python-format msgid "" "This pull request is based on another %s revision and there is no simple " "diff." msgstr "" -#: kallithea/controllers/pullrequests.py:420 +#: kallithea/controllers/pullrequests.py:424 #, python-format msgid "No changes found on %s %s since previous version." msgstr "" -#: kallithea/controllers/pullrequests.py:458 +#: kallithea/controllers/pullrequests.py:462 #, python-format msgid "Closed, replaced by %s ." msgstr "" -#: kallithea/controllers/pullrequests.py:466 +#: kallithea/controllers/pullrequests.py:470 msgid "Pull request update created" msgstr "Recenzje wniosków połączenia gałęzi" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:513 #, fuzzy msgid "Pull request updated" msgstr "Połączone gałęzie" -#: kallithea/controllers/pullrequests.py:523 +#: kallithea/controllers/pullrequests.py:528 msgid "Successfully deleted pull request" msgstr "Prośba o skasowanie połączenia gałęzi została wykonana prawidłowo" -#: kallithea/controllers/pullrequests.py:582 +#: kallithea/controllers/pullrequests.py:594 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:584 +#: kallithea/controllers/pullrequests.py:596 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:602 +#: kallithea/controllers/pullrequests.py:614 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:605 +#: kallithea/controllers/pullrequests.py:617 msgid "No changesets found for updating this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:613 +#: kallithea/controllers/pullrequests.py:625 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:619 +#: kallithea/controllers/pullrequests.py:631 msgid "Git pull requests don't support updates yet." msgstr "" -#: kallithea/controllers/pullrequests.py:710 -#, fuzzy -#| msgid "Vote for pull request status" +#: kallithea/controllers/pullrequests.py:722 +#, fuzzy msgid "No permission to change pull request status" msgstr "Zagłosuj na żądanie na grupę zmian" -#: kallithea/controllers/pullrequests.py:715 +#: kallithea/controllers/pullrequests.py:727 msgid "Closing." msgstr "Zamknięcie." @@ -490,39 +495,38 @@ #: kallithea/controllers/admin/gists.py:59 #: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:283 -#, fuzzy -#| msgid "forever" +#: kallithea/controllers/admin/users.py:285 +#, fuzzy msgid "Forever" msgstr "na zawsze" #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/users.py:286 msgid "5 minutes" msgstr "5 minut" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/users.py:287 msgid "1 hour" msgstr "1 godzina" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/users.py:288 msgid "1 day" msgstr "1 dzień" #: kallithea/controllers/admin/gists.py:63 #: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/users.py:289 msgid "1 month" msgstr "1 miesiąc" #: kallithea/controllers/admin/gists.py:67 #: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/users.py:291 msgid "Lifetime" msgstr "Czas życia" @@ -537,7 +541,6 @@ #: kallithea/controllers/admin/gists.py:233 #, fuzzy -#| msgid "Last Modified" msgid "Unmodified" msgstr "Ostatnio modyfikowany" @@ -554,8 +557,8 @@ msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:208 -#: kallithea/model/user.py:230 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 +#: kallithea/model/user.py:237 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej " @@ -566,47 +569,43 @@ msgstr "Twoje konto zostało pomyślnie zaktualizowane" #: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:204 +#: kallithea/controllers/admin/users.py:202 #, python-format msgid "Error occurred during update of user %s" msgstr "wystąpił błąd podczas aktualizacji użytkownika %s" -#: kallithea/controllers/admin/my_account.py:167 -msgid "Successfully updated password" -msgstr "" - #: kallithea/controllers/admin/my_account.py:178 msgid "Error occurred during update of user password" msgstr "" #: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:413 +#: kallithea/controllers/admin/users.py:415 #, python-format msgid "Added email %s to user" msgstr "Dodano e-mail %s do użytkownika" #: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:419 +#: kallithea/controllers/admin/users.py:421 msgid "An error occurred during email saving" msgstr "Wystąpił błąd podczas zapisywania e-maila" #: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:431 +#: kallithea/controllers/admin/users.py:433 msgid "Removed email from user" msgstr "Usunięto e-mail użytkownikowi" #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:306 +#: kallithea/controllers/admin/users.py:308 msgid "API key successfully created" msgstr "" #: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:319 +#: kallithea/controllers/admin/users.py:321 msgid "API key successfully reset" msgstr "" #: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:323 +#: kallithea/controllers/admin/users.py:325 msgid "API key successfully deleted" msgstr "" @@ -656,10 +655,10 @@ #: kallithea/templates/admin/users/user_edit_profile.html:105 #: kallithea/templates/admin/users/users.html:10 #: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:252 +#: kallithea/templates/base/base.html:253 #: kallithea/templates/base/base.html:259 #: kallithea/templates/base/base.html:260 -#: kallithea/templates/base/base.html:266 -#: kallithea/templates/base/base.html:267 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Administracja" @@ -826,7 +825,6 @@ #: kallithea/controllers/admin/repos.py:321 #, fuzzy, python-format -#| msgid "Cannot delete %s it still contains attached forks" msgid "Cannot delete repository %s which still has forks" msgstr "Nie można usunąć %s nadal zawiera załączniki rozgałęzienia" @@ -875,14 +873,12 @@ #: kallithea/controllers/admin/repos.py:537 #: kallithea/controllers/admin/repos.py:564 #, fuzzy -#| msgid "Repository is not locked" msgid "Repository has been locked" msgstr "Repozytorium nie jest zablokowane" #: kallithea/controllers/admin/repos.py:540 #: kallithea/controllers/admin/repos.py:561 #, fuzzy -#| msgid "Repository is not locked" msgid "Repository has been unlocked" msgstr "Repozytorium nie jest zablokowane" @@ -922,50 +918,50 @@ msgstr "" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:274 +#: kallithea/controllers/admin/settings.py:277 msgid "Error occurred while updating application settings" msgstr "Wystąpił błąd podczas aktualizacji ustawień aplikacji" -#: kallithea/controllers/admin/settings.py:213 +#: kallithea/controllers/admin/settings.py:216 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" "Repozytoria z powodzeniem zostały ponownie zeskanowane dodano: %s, " "usunięto: %s." -#: kallithea/controllers/admin/settings.py:270 +#: kallithea/controllers/admin/settings.py:273 msgid "Updated application settings" msgstr "Aktualizacja ustawień aplikacji" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "Aktualizacja ustawień wizualizacji" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:335 msgid "Error occurred during updating visualisation settings" msgstr "Wystąpił błąd podczas aktualizacji ustawień wizualizacji" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:361 msgid "Please enter email address" msgstr "Proszę podać adres email" -#: kallithea/controllers/admin/settings.py:373 +#: kallithea/controllers/admin/settings.py:376 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Added new hook" msgstr "Dodano nowy hook" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:421 msgid "Updated hooks" msgstr "Aktualizacja hooku" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:425 msgid "Error occurred during hook creation" msgstr "Wystąpił błąd podczas tworzenia hooku" -#: kallithea/controllers/admin/settings.py:448 +#: kallithea/controllers/admin/settings.py:451 msgid "Whoosh reindex task scheduled" msgstr "Zadanie ponownej indeksacji whoosh zostało zaplanowane" @@ -1006,68 +1002,68 @@ msgstr "Aktualizacja uprawnień grupy użytkowników" #: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:382 +#: kallithea/controllers/admin/users.py:384 msgid "Updated permissions" msgstr "Aktualizacja uprawnień" #: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:386 +#: kallithea/controllers/admin/users.py:388 msgid "An error occurred during permissions saving" msgstr "Wystąpił błąd podczas zapisywania uprawnień" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:134 #, python-format msgid "Created user %s" msgstr "Utworzono użytkownika %s" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "Wystąpił błąd podczas tworzenia użytkownika %s" -#: kallithea/controllers/admin/users.py:184 +#: kallithea/controllers/admin/users.py:182 msgid "User updated successfully" msgstr "Użytkownik został zaktualizowany" -#: kallithea/controllers/admin/users.py:220 +#: kallithea/controllers/admin/users.py:218 msgid "Successfully deleted user" msgstr "Użytkownik został usunięty" -#: kallithea/controllers/admin/users.py:225 +#: kallithea/controllers/admin/users.py:223 msgid "An error occurred during deletion of user" msgstr "Wystąpił błąd podczas usuwania użytkownika" -#: kallithea/controllers/admin/users.py:238 +#: kallithea/controllers/admin/users.py:236 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:461 +#: kallithea/controllers/admin/users.py:463 #, python-format msgid "Added IP address %s to user whitelist" msgstr "Dodano ip %s do listy dozwolonych adresów użytkownia" -#: kallithea/controllers/admin/users.py:467 +#: kallithea/controllers/admin/users.py:469 msgid "An error occurred while adding IP address" msgstr "Wystąpił błąd podczas zapisywania e-maila" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 msgid "Removed IP address from user whitelist" msgstr "Usunięto adres ip z listy dozwolonych adresów dla użytkownika" -#: kallithea/lib/auth.py:744 +#: kallithea/lib/auth.py:743 #, python-format msgid "IP %s not allowed" msgstr "Obserwatorzy %s" -#: kallithea/lib/auth.py:757 +#: kallithea/lib/auth.py:756 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:795 +#: kallithea/lib/auth.py:812 msgid "You need to be a registered user to perform this action" msgstr "Musisz być zarejestrowanym użytkownikiem, żeby wykonać to działanie" -#: kallithea/lib/auth.py:827 +#: kallithea/lib/auth.py:844 msgid "You need to be signed in to view this page" msgstr "Musisz być zalogowany, żeby oglądać stronę" @@ -1110,7 +1106,6 @@ #: kallithea/lib/helpers.py:677 #, fuzzy -#| msgid "compare view" msgid "Compare view" msgstr "Wyświetl porównanie" @@ -1129,13 +1124,11 @@ #: kallithea/lib/helpers.py:722 #, fuzzy, python-format -#| msgid "fork name %s" msgid "Fork name %s" msgstr "nazwa rozgałęzienia %s" #: kallithea/lib/helpers.py:742 #, fuzzy, python-format -#| msgid "Pull request #%s" msgid "Pull request %s" msgstr "Połączonych gałęzi #%s" @@ -1226,7 +1219,7 @@ #: kallithea/lib/helpers.py:1128 #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "Brak plików" @@ -1779,13 +1772,11 @@ #: kallithea/model/db.py:1668 #, fuzzy -#| msgid "Unauthorized access to resource" msgid "Default user has read access to new repositories" msgstr "Nieautoryzowany dostęp do zasobów" #: kallithea/model/db.py:1669 #, fuzzy -#| msgid "Unauthorized access to resource" msgid "Default user has write access to new repositories" msgstr "Nieautoryzowany dostęp do zasobów" @@ -1826,26 +1817,22 @@ msgstr "" #: kallithea/model/db.py:1682 -#, fuzzy, python-format -#| msgid "Created repository group %s" +#, fuzzy msgid "Only admins can create repository groups" msgstr "Utworzono grupę repo %s" #: kallithea/model/db.py:1683 -#, fuzzy, python-format -#| msgid "Created repository group %s" +#, fuzzy msgid "Non-admins can create repository groups" msgstr "Utworzono grupę repo %s" #: kallithea/model/db.py:1685 #, fuzzy -#| msgid "Create user groups" msgid "Only admins can create user groups" msgstr "Tworzenie grup użytkowników" #: kallithea/model/db.py:1686 #, fuzzy -#| msgid "Create user groups" msgid "Non-admins can create user groups" msgstr "Tworzenie grup użytkowników" @@ -1859,37 +1846,31 @@ #: kallithea/model/db.py:1694 #, fuzzy -#| msgid "Location of repositories" msgid "Only admins can fork repositories" msgstr "Ogólna liczba repozytoriów" #: kallithea/model/db.py:1695 #, fuzzy -#| msgid "Invalidate cache for all repositories" msgid "Non-admins can can fork repositories" msgstr "Unieważnia cache dla wszystkich repozytoriów" #: kallithea/model/db.py:1698 #, fuzzy -#| msgid "User Registration with manual account activation" msgid "User registration with manual account activation" msgstr "Rejestracja użytkownika z ręczną aktywacją konta" #: kallithea/model/db.py:1699 #, fuzzy -#| msgid "User Registration with automatic account activation" msgid "User registration with automatic account activation" msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" #: kallithea/model/db.py:2228 #, fuzzy -#| msgid "Not Reviewed" msgid "Not reviewed" msgstr "Brak Korekty" #: kallithea/model/db.py:2231 #, fuzzy -#| msgid "Under Review" msgid "Under review" msgstr "Objęty Przeglądem" @@ -1917,37 +1898,31 @@ #: kallithea/model/notification.py:254 #, fuzzy, python-format -#| msgid "%(user)s commented on changeset at %(when)s" msgid "%(user)s commented on changeset %(age)s" msgstr "%(user)s skomentował zatwierdzenie %(when)s" #: kallithea/model/notification.py:255 #, fuzzy, python-format -#| msgid "%(user)s sent message at %(when)s" msgid "%(user)s sent message %(age)s" msgstr "%(user)s wysłał wiadomość do %(when)s" #: kallithea/model/notification.py:256 #, fuzzy, python-format -#| msgid "%(user)s mentioned you at %(when)s" msgid "%(user)s mentioned you %(age)s" msgstr "%(user)s wspomniał o Tobie w %(when)s" #: kallithea/model/notification.py:257 #, fuzzy, python-format -#| msgid "%(user)s registered in Kallithea at %(when)s" msgid "%(user)s registered in Kallithea %(age)s" msgstr "%(user)s zarejestrował na stronie w %(when)s" #: kallithea/model/notification.py:258 #, fuzzy, python-format -#| msgid "%(user)s opened new pull request at %(when)s" msgid "%(user)s opened new pull request %(age)s" msgstr "%(user)s otworzył nowe połączenie gałęzi w %(when)s" #: kallithea/model/notification.py:259 #, fuzzy, python-format -#| msgid "%(user)s commented on pull request at %(when)s" msgid "%(user)s commented on pull request %(age)s" msgstr "%(user)s skomentował nowe połączenie gałęzi w %(when)s" @@ -1983,9 +1958,7 @@ #: kallithea/model/notification.py:302 #, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s changeset %(short_id)s " -"on %(branch)s" +msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" #: kallithea/model/notification.py:305 @@ -1994,18 +1967,17 @@ msgstr "Użytkownik %(new_username)s zarejestrował" #: kallithea/model/notification.py:307 -#, python-format -msgid "" -"[Added by %(pr_username)s] %(repo_name)s pull request %(pr_nice_id)s from" -" %(ref)s" -msgstr "" +#, fuzzy, python-format +#| msgid "%(user)s wants you to review pull request %(pr_nice_id)s: +#| %(pr_title)s" +msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgstr "%(user)s chce żeby przejrzeć nowe gałęzie #%(pr_id)s: %(pr_title)s" #: kallithea/model/notification.py:308 -#, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s pull request " -"%(pr_nice_id)s from %(ref)s" -msgstr "" +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgstr "[komentarz] wniosek o połączenie gałęzi" #: kallithea/model/notification.py:321 #, fuzzy @@ -2014,27 +1986,25 @@ #: kallithea/model/pull_request.py:137 #, fuzzy, python-format -#| msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "%(user)s chce żeby przejrzeć nowe gałęzie #%(pr_id)s: %(pr_title)s" -#: kallithea/model/scm.py:813 +#: kallithea/model/scm.py:812 msgid "latest tip" msgstr "ostatni tip" -#: kallithea/model/user.py:185 +#: kallithea/model/user.py:192 msgid "New user registration" msgstr "nowy użytkownik się zarejestrował" -#: kallithea/model/user.py:249 -#, fuzzy -#| msgid "You can't remove this user since it's crucial for entire application" +#: kallithea/model/user.py:256 +#, fuzzy msgid "You can't remove this user since it is crucial for the entire application" msgstr "" "Nie możesz usunąć tego użytkownika ponieważ jest kluczowy dla całej " "aplikacji" -#: kallithea/model/user.py:254 +#: kallithea/model/user.py:261 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -2043,7 +2013,7 @@ "użytkownik \"%s\" wciąż posiada repozytoria następujące %s i nie może " "zostać usunięty. Zmień właściciela lub usuń te repozytoria. %s" -#: kallithea/model/user.py:259 +#: kallithea/model/user.py:266 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch" @@ -2052,7 +2022,7 @@ "użytkownik \"%s\" wciąż posiada repozytoria następujące %s i nie może " "zostać usunięty. Zmień właściciela lub usuń te repozytoria. %s" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:273 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -2061,18 +2031,22 @@ "użytkownik \"%s\" wciąż posiada repozytoria następujące %s i nie może " "zostać usunięty. Zmień właściciela lub usuń te repozytoria. %s" -#: kallithea/model/user.py:296 +#: kallithea/model/user.py:360 msgid "Password reset link" msgstr "łącze resetowania hasła" -#: kallithea/model/user.py:319 -msgid "Your new password" -msgstr "Nowe hasło" - -#: kallithea/model/user.py:320 -#, python-format -msgid "Your new Kallithea password:%s" -msgstr "Nowe hasło do strony: %s" +#: kallithea/model/user.py:408 +#, fuzzy +#| msgid "Password reset link" +msgid "Password reset notification" +msgstr "łącze resetowania hasła" + +#: kallithea/model/user.py:409 +#, python-format +msgid "" +"The password to your account %s has been changed using password reset " +"form." +msgstr "" #: kallithea/model/validators.py:77 kallithea/model/validators.py:78 msgid "Value cannot be an empty list" @@ -2085,15 +2059,11 @@ #: kallithea/model/validators.py:97 #, fuzzy, python-format -#| msgid "Username %(username)s is not valid" msgid "Username \"%(username)s\" cannot be used" msgstr "Nazwa użytkownika %(username)s jest nieprawidłowa" #: kallithea/model/validators.py:99 #, fuzzy -#| msgid "" "Username may only contain alphanumeric characters underscores, -#| periods or" " dashes and must begin with alphanumeric character or -#| underscore" msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with an alphanumeric character or underscore" @@ -2156,7 +2126,6 @@ #: kallithea/model/validators.py:300 #, fuzzy -#| msgid "invalid password" msgid "Invalid username or password" msgstr "nieprawidłowe hasło" @@ -2166,7 +2135,6 @@ #: kallithea/model/validators.py:345 #, fuzzy, python-format -#| msgid "Repository name %(repo)s is disallowed" msgid "Repository name %(repo)s is not allowed" msgstr "Nazwa repozytorium %(repo)s jest zabroniona" @@ -2187,7 +2155,6 @@ #: kallithea/model/validators.py:465 #, fuzzy -#| msgid "private repository" msgid "Invalid repository URL" msgstr "prywatne repozytorium" @@ -2223,13 +2190,11 @@ #: kallithea/model/validators.py:705 #, fuzzy -#| msgid "This email address is already taken" msgid "This email address is already in use" msgstr "Ten adres e-mail jest już zajęty" #: kallithea/model/validators.py:725 #, fuzzy, python-format -#| msgid "email \"%(email)s\" does not exist." msgid "Email address \"%(email)s\" not found" msgstr "e-mail \"%(email)s\" nie istnieje." @@ -2385,7 +2350,9 @@ #: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:229 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/pullrequests/pullrequest_show.html:156 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 #: kallithea/templates/summary/summary.html:134 msgid "Owner" msgstr "Właściciel" @@ -2393,7 +2360,7 @@ #: kallithea/templates/index_base.html:140 #: kallithea/templates/admin/my_account/my_account_repos.html:57 #: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:44 +#: kallithea/templates/base/root.html:43 #: kallithea/templates/bookmarks/bookmarks.html:79 #: kallithea/templates/branches/branches.html:79 #: kallithea/templates/journal/journal.html:198 @@ -2405,7 +2372,7 @@ #: kallithea/templates/index_base.html:141 #: kallithea/templates/admin/my_account/my_account_repos.html:58 #: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:45 +#: kallithea/templates/base/root.html:44 #: kallithea/templates/bookmarks/bookmarks.html:80 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:199 @@ -2421,7 +2388,7 @@ #: kallithea/templates/index_base.html:143 #: kallithea/templates/admin/my_account/my_account_repos.html:60 #: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:46 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:201 @@ -2433,7 +2400,7 @@ #: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:147 kallithea/templates/base/root.html:48 +#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:202 @@ -2443,7 +2410,7 @@ msgstr "Wczytywanie..." #: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:333 +#: kallithea/templates/base/base.html:326 msgid "Log In" msgstr "Zaloguj się" @@ -2458,14 +2425,15 @@ #: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:24 #: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/pullrequests/pullrequest_show.html:166 msgid "Username" msgstr "Nazwa użytkownika" #: kallithea/templates/login.html:33 kallithea/templates/register.html:33 #: kallithea/templates/admin/my_account/my_account.html:37 #: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:311 msgid "Password" msgstr "Hasło" @@ -2477,7 +2445,7 @@ msgid "Forgot your password ?" msgstr "Zapomniałeś hasła?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:329 +#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 msgid "Don't have an account ?" msgstr "Nie masz konta?" @@ -2490,11 +2458,14 @@ msgstr "Łącze resetowania hasła" #: kallithea/templates/password_reset.html:12 +#: kallithea/templates/password_reset_confirmation.html:12 #, fuzzy, python-format msgid "Reset Your Password to %s" msgstr "Zapomniałeś hasła do %s?" #: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset_confirmation.html:5 +#: kallithea/templates/password_reset_confirmation.html:14 #, fuzzy msgid "Reset Your Password" msgstr "Zapomniałeś hasła?" @@ -2515,11 +2486,44 @@ #: kallithea/templates/password_reset.html:47 #, fuzzy +#| msgid "" "Password reset link will be sent to the email address matching +#| your " "username." msgid "" -"Password reset link will be sent to the email address matching your " -"username." +"A password reset link will be sent to the specified email address if it " +"is registered in the system." msgstr "Link do zresetowania hasła zostanie wysłany na adres e-mail" +#: kallithea/templates/password_reset_confirmation.html:19 +#, python-format +msgid "You are about to set a new password for the email address %s." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:20 +msgid "" +"Note that you must use the same browser session for this as the one used " +"to request the password reset." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:30 +msgid "Code you received in the email" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:39 +#, fuzzy +#| msgid "New password" +msgid "New Password" +msgstr "Nowe hasło" + +#: kallithea/templates/password_reset_confirmation.html:48 +#, fuzzy +#| msgid "Your new password" +msgid "Confirm New Password" +msgstr "Nowe hasło" + +#: kallithea/templates/password_reset_confirmation.html:56 +msgid "Confirm" +msgstr "" + #: kallithea/templates/register.html:5 kallithea/templates/register.html:14 #: kallithea/templates/register.html:90 msgid "Sign Up" @@ -2805,7 +2809,6 @@ #: kallithea/templates/admin/users/user_edit_api_keys.html:8 #: kallithea/templates/admin/users/user_edit_api_keys.html:27 #, fuzzy -#| msgid "never" msgid "Never" msgstr "nigdy" @@ -2837,7 +2840,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:244 +#: kallithea/templates/base/base.html:237 msgid "Create New Gist" msgstr "Utwórz Nowy Gist" @@ -2979,7 +2982,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/base/base.html:343 msgid "My Account" msgstr "Moje konto" @@ -2990,7 +2993,6 @@ #: kallithea/templates/admin/my_account/my_account.html:36 #, fuzzy -#| msgid "New email address" msgid "Email Addresses" msgstr "Nowy adres e-mail" @@ -3001,14 +3003,12 @@ #: kallithea/templates/admin/my_account/my_account.html:39 #, fuzzy -#| msgid "repositories" msgid "Owned Repositories" msgstr "repozytoria" #: kallithea/templates/admin/my_account/my_account.html:40 #: kallithea/templates/journal/journal.html:53 #, fuzzy -#| msgid "Create repositories" msgid "Watched Repositories" msgstr "Utwórz repozytorium" @@ -3017,7 +3017,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 #, fuzzy -#| msgid "Copy permissions" msgid "Show Permissions" msgstr "Skopiuj uprawnienia" @@ -3029,42 +3028,36 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #, fuzzy, python-format -#| msgid "Confirm to delete this ip: %s" msgid "Confirm to reset this API key: %s" msgstr "Potwierdź, aby usunąć to ip: %s" #: kallithea/templates/admin/my_account/my_account_api_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:30 #, fuzzy -#| msgid "Expires" msgid "Expired" msgstr "Wygasa" #: kallithea/templates/admin/my_account/my_account_api_keys.html:40 #: kallithea/templates/admin/users/user_edit_api_keys.html:40 #, fuzzy, python-format -#| msgid "Confirm to delete this ip: %s" msgid "Confirm to remove this API key: %s" msgstr "Potwierdź, aby usunąć to ip: %s" #: kallithea/templates/admin/my_account/my_account_api_keys.html:42 #: kallithea/templates/admin/users/user_edit_api_keys.html:42 #, fuzzy -#| msgid "Removed" msgid "Remove" msgstr "Usunięto" #: kallithea/templates/admin/my_account/my_account_api_keys.html:49 #: kallithea/templates/admin/users/user_edit_api_keys.html:49 #, fuzzy -#| msgid "No additional emails specified." msgid "No additional API keys specified" msgstr "Brak dodatkowych emaili" #: kallithea/templates/admin/my_account/my_account_api_keys.html:61 #: kallithea/templates/admin/users/user_edit_api_keys.html:61 #, fuzzy -#| msgid "New field key" msgid "New API key" msgstr "Nowe pole klucza" @@ -3154,7 +3147,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:45 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:200 @@ -3182,7 +3175,7 @@ msgstr "Komentarze" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 msgid "Pull Requests" msgstr "Połączone gałęzie" @@ -3202,7 +3195,7 @@ msgstr "Pokaż powiadomienia" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:342 msgid "Notifications" msgstr "Powiadomienia" @@ -3247,7 +3240,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:26 #, fuzzy -#| msgid "Existing repository?" msgid "Apply to all existing repositories" msgstr "Istniejące repozytorium?" @@ -3275,7 +3267,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:40 #, fuzzy -#| msgid "Delete this repository group" msgid "Apply to all existing repository groups" msgstr "Usuń ta grupę repozytoriów" @@ -3290,9 +3281,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:53 #, fuzzy -#| msgid "" "All default permissions on each user group will be reset to chosen -#| " "permission, note that all custom default permission on repository groups -#| " "will be lost" msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " @@ -3313,7 +3301,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:60 #, fuzzy -#| msgid "Repository creation" msgid "Top level repository creation" msgstr "Tworzenie repozytorium" @@ -3365,7 +3352,6 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:13 #: kallithea/templates/admin/users/user_edit_ips.html:23 #, fuzzy, python-format -#| msgid "Confirm to delete this ip: %s" msgid "Confirm to delete this IP address: %s" msgstr "Potwierdź, aby usunąć to ip: %s" @@ -3424,7 +3410,7 @@ #: kallithea/templates/admin/repos/repo_edit.html:40 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:158 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 #: kallithea/templates/data_table/_dt_elements.html:45 #: kallithea/templates/data_table/_dt_elements.html:49 msgid "Settings" @@ -3463,7 +3449,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:146 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 msgid "Created on" msgstr "Utworzono" @@ -3484,7 +3470,6 @@ #: kallithea/templates/admin/repos/repo_edit_permissions.html:12 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 #, fuzzy -#| msgid "user/user group" msgid "User/User Group" msgstr "użytkownik/grupa użytkowników" @@ -3495,7 +3480,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 #, fuzzy -#| msgid "default" msgid "Default" msgstr "domyślny" @@ -3506,7 +3490,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 #, fuzzy -#| msgid "revoke" msgid "Revoke" msgstr "odwołane" @@ -3518,7 +3501,6 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 #, fuzzy -#| msgid "apply to children" msgid "Apply to children" msgstr "dotyczy dzieci" @@ -3575,7 +3557,6 @@ #: kallithea/templates/admin/repos/repo_add_base.html:17 #, fuzzy -#| msgid "[created] repository" msgid "Clone remote repository" msgstr "[utworzone] repozytorium" @@ -3849,25 +3830,21 @@ #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 #, fuzzy -#| msgid "private repository" msgid "Private Repository" msgstr "prywatne repozytorium" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 -#, fuzzy, python-format -#| msgid "Created repository %s" +#, fuzzy msgid "Remote repository URL" msgstr "Utworzone repozytorium %s" #: kallithea/templates/admin/repos/repo_edit_remote.html:9 #, fuzzy -#| msgid "[pulled from remote] into repository" msgid "Pull Changes from Remote Repository" msgstr "[pobieranie z zdalnego] do repozytorium" #: kallithea/templates/admin/repos/repo_edit_remote.html:11 #, fuzzy -#| msgid "Confirm to pull changes from remote side." msgid "Confirm to pull changes from remote repository." msgstr "Potwierdź pull z zdalnej strony" @@ -3877,7 +3854,6 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:11 #, fuzzy -#| msgid "private repository" msgid "Permanent Repository ID" msgstr "prywatne repozytorium" @@ -3901,13 +3877,11 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:21 #, fuzzy -#| msgid "[created] repository" msgid "Remote repository" msgstr "[utworzone] repozytorium" #: kallithea/templates/admin/repos/repo_edit_settings.html:25 #, fuzzy -#| msgid "Repository" msgid "Repository URL" msgstr "Repozytorium" @@ -4052,7 +4026,7 @@ msgid "Custom Hooks" msgstr "Niestandardowa aktualizacja" -#: kallithea/templates/admin/settings/settings_hooks.html:68 +#: kallithea/templates/admin/settings/settings_hooks.html:67 msgid "Failed to remove hook" msgstr "Nie udało się usunąć hooka" @@ -4062,7 +4036,6 @@ #: kallithea/templates/admin/settings/settings_mapping.html:11 #, fuzzy -#| msgid "Search in repositories" msgid "Delete records of missing repositories" msgstr "Szukaj we wszystkich repozytoriach" @@ -4091,7 +4064,18 @@ "Current hooks will be updated to the latest version." msgstr "" +#: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "Overwrite existing Git hooks" +msgstr "" + #: kallithea/templates/admin/settings/settings_mapping.html:30 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any" +" custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:35 msgid "Rescan Repositories" msgstr "" @@ -4324,7 +4308,6 @@ #: kallithea/templates/admin/settings/settings_visual.html:92 #, fuzzy -#| msgid "Meta-Tagging" msgid "Meta Tagging" msgstr "Tagowanie meta" @@ -4366,7 +4349,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit.html:33 #, fuzzy -#| msgid "members" msgid "Show Members" msgstr "użytkownik" @@ -4513,49 +4495,49 @@ msgid "Git repository" msgstr "Repozytorium git" -#: kallithea/templates/base/base.html:126 +#: kallithea/templates/base/base.html:119 #, fuzzy msgid "Create Fork" msgstr "Usuń rozwidlenie" -#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:130 #: kallithea/templates/data_table/_dt_elements.html:13 #: kallithea/templates/data_table/_dt_elements.html:17 #: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "Podsumowanie" -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:141 +#: kallithea/templates/base/base.html:132 +#: kallithea/templates/base/base.html:134 #: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:21 #: kallithea/templates/data_table/_dt_elements.html:25 msgid "Changelog" msgstr "Dziennik zmian" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:136 #: kallithea/templates/data_table/_dt_elements.html:29 #: kallithea/templates/data_table/_dt_elements.html:33 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "Pliki" -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:138 msgid "Switch To" msgstr "Przełącz do" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/base/base.html:154 +#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:147 msgid "Options" msgstr "Opcje" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:155 #: kallithea/templates/forks/forks_data.html:21 #, fuzzy msgid "Compare Fork" msgstr "Porównaj rozwidlenie" -#: kallithea/templates/base/base.html:164 +#: kallithea/templates/base/base.html:157 #: kallithea/templates/bookmarks/bookmarks.html:56 #: kallithea/templates/bookmarks/bookmarks_data.html:13 #: kallithea/templates/branches/branches.html:56 @@ -4565,123 +4547,122 @@ msgid "Compare" msgstr "Porównaj" -#: kallithea/templates/base/base.html:166 -#: kallithea/templates/base/base.html:254 +#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:247 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:54 msgid "Search" msgstr "Szukaj" -#: kallithea/templates/base/base.html:170 +#: kallithea/templates/base/base.html:163 msgid "Unlock" msgstr "Odblokowany" -#: kallithea/templates/base/base.html:172 +#: kallithea/templates/base/base.html:165 msgid "Lock" msgstr "zablokowane" -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:173 msgid "Follow" msgstr "Obserwuj" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:174 msgid "Unfollow" msgstr "Nie obserwuj" -#: kallithea/templates/base/base.html:184 +#: kallithea/templates/base/base.html:177 #: kallithea/templates/data_table/_dt_elements.html:37 #: kallithea/templates/data_table/_dt_elements.html:41 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "Gałąź" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:178 #: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "Stwórz nowe żądanie połączenia gałęzi" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 #, python-format msgid "Show Pull Requests for %s" msgstr "Pokaż Prośby Pobrania %s" -#: kallithea/templates/base/base.html:228 +#: kallithea/templates/base/base.html:221 msgid "Show recent activity" msgstr "Pokaż ostatnią aktywność" -#: kallithea/templates/base/base.html:234 -#: kallithea/templates/base/base.html:235 +#: kallithea/templates/base/base.html:227 +#: kallithea/templates/base/base.html:228 msgid "Public journal" msgstr "Dziennik publiczny" -#: kallithea/templates/base/base.html:240 +#: kallithea/templates/base/base.html:233 msgid "Show public gists" msgstr "Wyświetl publiczne gists" -#: kallithea/templates/base/base.html:241 +#: kallithea/templates/base/base.html:234 msgid "Gists" msgstr "Gists" -#: kallithea/templates/base/base.html:245 +#: kallithea/templates/base/base.html:238 #, fuzzy msgid "All Public Gists" msgstr "Wszystkie publiczne gists" -#: kallithea/templates/base/base.html:247 +#: kallithea/templates/base/base.html:240 #, fuzzy msgid "My Public Gists" msgstr "Moje publiczne gists" -#: kallithea/templates/base/base.html:248 +#: kallithea/templates/base/base.html:241 #, fuzzy msgid "My Private Gists" msgstr "Moje prywatne gists" -#: kallithea/templates/base/base.html:253 +#: kallithea/templates/base/base.html:246 msgid "Search in repositories" msgstr "Szukaj we wszystkich repozytoriach" -#: kallithea/templates/base/base.html:276 -#: kallithea/templates/base/base.html:277 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +#: kallithea/templates/base/base.html:269 +#: kallithea/templates/base/base.html:270 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 #, fuzzy msgid "My Pull Requests" msgstr "Połączone gałęzie" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:289 #, fuzzy msgid "Not Logged In" msgstr "Zaloguj się" -#: kallithea/templates/base/base.html:303 +#: kallithea/templates/base/base.html:296 #, fuzzy msgid "Login to Your Account" msgstr "Zaloguj się do swojego konta" -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:319 msgid "Forgot password ?" msgstr "Nie pamiętasz hasła?" -#: kallithea/templates/base/base.html:353 +#: kallithea/templates/base/base.html:346 msgid "Log Out" msgstr "Wyloguj się" -#: kallithea/templates/base/base.html:402 +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:540 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" #: kallithea/templates/base/default_perms_box.html:14 #, fuzzy -#| msgid "Repository Defaults" msgid "Inherit defaults" msgstr "Repozytoria domyślne" @@ -4784,60 +4765,55 @@ msgstr "Nie ma plików pasujących" #: kallithea/templates/base/root.html:31 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 -#, fuzzy -msgid "Open New Pull Request" -msgstr "Otwórz nową prośbę o połączenie gałęzi" +#, fuzzy +#| msgid "on pull request" +msgid "Open New Pull Request from {0}" +msgstr "Komentarz połączenia gałęzi %s" #: kallithea/templates/base/root.html:32 -#, fuzzy -msgid "Open New Pull Request for Selected Changesets" -msgstr "Otwórz nową prośbę o połączenie gałęzi w zestawieniu zmian" +msgid "Open New Pull Request for {0} → {1}" +msgstr "" #: kallithea/templates/base/root.html:33 #, fuzzy -msgid "Show Selected Changesets __S → __E" +#| msgid "Show Selected Changesets __S → __E" +msgid "Show Selected Changesets {0} → {1}" msgstr "Pokaż wybrane zmiany __S -> __E" #: kallithea/templates/base/root.html:34 #, fuzzy -msgid "Show Selected Changeset __S" -msgstr "Pokaż wybrane zmiany __S -> __E" +msgid "Selection Link" +msgstr "Wybór linku" #: kallithea/templates/base/root.html:35 -#, fuzzy -msgid "Selection Link" -msgstr "Wybór linku" - -#: kallithea/templates/base/root.html:36 #: kallithea/templates/changeset/diff_block.html:8 #, fuzzy msgid "Collapse Diff" msgstr "Pliki różnic" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:36 #, fuzzy msgid "Expand Diff" msgstr "poprawka różnic" -#: kallithea/templates/base/root.html:38 +#: kallithea/templates/base/root.html:37 msgid "Failed to revoke permission" msgstr "Nie udało się cofnąć uprawnienia" -#: kallithea/templates/base/root.html:39 +#: kallithea/templates/base/root.html:38 #, fuzzy msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "potwierdzić odwołanie pozwolenie na {0}: {1} ?" -#: kallithea/templates/base/root.html:40 +#: kallithea/templates/base/root.html:39 msgid "enabled" msgstr "" -#: kallithea/templates/base/root.html:41 +#: kallithea/templates/base/root.html:40 msgid "disabled" msgstr "" -#: kallithea/templates/base/root.html:43 +#: kallithea/templates/base/root.html:42 #, fuzzy msgid "Specify changeset" msgstr "Wybrane zmiany" @@ -4856,7 +4832,6 @@ #: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 #: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" @@ -4897,7 +4872,7 @@ msgstr[1] "pokazano %d z %d rewizji" msgstr[2] "pokazano %d z %d rewizji" -#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/templates/changelog/changelog.html:49 msgid "Clear selection" msgstr "Wyczyść zaznaczenie" @@ -4926,8 +4901,6 @@ #: kallithea/templates/changelog/changelog.html:92 #: kallithea/templates/changelog/changelog_summary_data.html:20 #, fuzzy, python-format -#| msgid "" "Changeset status: %s\n" "Click to open associated pull request -#| #%s" msgid "" "Changeset status: %s\n" "Click to open associated pull request %s" @@ -4973,7 +4946,7 @@ msgid "Branch %s" msgstr "Gałęzie %s" -#: kallithea/templates/changelog/changelog.html:291 +#: kallithea/templates/changelog/changelog.html:310 msgid "There are no changes yet" msgstr "Nie ma jeszcze zmian" @@ -5031,7 +5004,6 @@ #: kallithea/templates/changelog/changelog_summary_data.html:90 #, fuzzy -#| msgid "Push new repo" msgid "Push new repository" msgstr "Wyślij zmiany do nowego repo" @@ -5077,7 +5049,6 @@ #: kallithea/templates/changeset/changeset.html:89 #: kallithea/templates/changeset/changeset_range.html:88 #, fuzzy -#| msgid "merge" msgid "Merge" msgstr "połącz" @@ -5092,19 +5063,17 @@ #: kallithea/templates/changeset/changeset.html:135 #, fuzzy -#| msgid "Created by" msgid "Replaced by:" msgstr "utworzono" #: kallithea/templates/changeset/changeset.html:149 #, fuzzy -#| msgid "Created by" msgid "Preceded by:" msgstr "utworzono" #: kallithea/templates/changeset/changeset.html:166 #: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:314 +#: kallithea/templates/pullrequests/pullrequest_show.html:318 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -5114,7 +5083,7 @@ #: kallithea/templates/changeset/changeset.html:168 #: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:320 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -5124,8 +5093,8 @@ #: kallithea/templates/changeset/changeset.html:182 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 #, fuzzy msgid "Show full diff anyway" msgstr "Pokaż pełną historię" @@ -5133,13 +5102,11 @@ #: kallithea/templates/changeset/changeset.html:247 #: kallithea/templates/changeset/changeset.html:284 #, fuzzy -#| msgid "revisions" msgid "No revisions" msgstr "rewizja" #: kallithea/templates/changeset/changeset_file_comment.html:21 #, fuzzy -#| msgid "Comment from pull request" msgid "on pull request" msgstr "Komentarz połączenia gałęzi %s" @@ -5150,7 +5117,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:24 #, fuzzy -#| msgid "No changesets" msgid "on this changeset" msgstr "Brak zestawienia zmian" @@ -5161,7 +5127,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:37 #, fuzzy -#| msgid "Latest Changes" msgid "Status change" msgstr "Ostatnia aktywność" @@ -5240,7 +5205,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:150 #, fuzzy -#| msgid "Use @username inside this text to notify another user" msgid "Use @username inside this text to notify another user." msgstr "" "Użyj @username wewnątrz tego tekstu, aby wysłać powiadomienie do " @@ -5325,7 +5289,7 @@ msgstr "Pokaż pełną historię" #: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:306 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 #, fuzzy msgid "Common ancestor" msgstr "Skomentuj grupę zmian" @@ -5369,7 +5333,7 @@ msgstr "" #: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:301 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5434,16 +5398,26 @@ msgstr "Witaj %s" #: kallithea/templates/email_templates/password_reset.html:6 -msgid "We received a request to create a new password for your account." +#, fuzzy +#| msgid "We received a request to create a new password for your account." +msgid "We have received a request to reset the password for your account." msgstr "Otrzymaliśmy prośbę o utworzenie nowego hasła do twojego konta." #: kallithea/templates/email_templates/password_reset.html:7 -msgid "You can generate it by clicking following URL" -msgstr "Możesz wygenerować nowe hasło klikając w link URL poniżej" +msgid "To set a new password, click the following link" +msgstr "" #: kallithea/templates/email_templates/password_reset.html:10 -msgid "Please ignore this email if you did not request a new password ." -msgstr "Proszę zignorować tą wiadomość, jeśli nie poproś o nowe hasło." +msgid "" +"Should you not be able to use the link above, please type the following " +"code into the password reset form" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:12 +msgid "" +"If it weren't you who requested the password reset, just disregard this " +"message." +msgstr "" #: kallithea/templates/email_templates/pull_request.html:5 #, fuzzy, python-format @@ -5814,7 +5788,6 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:14 #, fuzzy -#| msgid "revoke" msgid "Vote" msgstr "odwołane" @@ -5856,19 +5829,16 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:70 #, fuzzy, python-format -#| msgid "Confirm to delete this pull request" msgid "Confirm again to delete this pull request with %s comments" msgstr "Potwierdź usunięcie połączenia gałęzi" #: kallithea/templates/pullrequests/pullrequest_show.html:6 #, fuzzy, python-format -#| msgid "%s Pull Request #%s" msgid "%s Pull Request %s" msgstr "%s Połączonych gałęzi #%s" #: kallithea/templates/pullrequests/pullrequest_show.html:10 #, fuzzy, python-format -#| msgid "Pull Requests from %s'" msgid "Pull request %s from %s#%s" msgstr "Połączonych gałęzi #%s" @@ -5920,107 +5890,113 @@ msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:131 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +msgid "" +"This is just a range of changesets and doesn't have a target or a real " +"merge ancestor." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:133 msgid "Pull changes" msgstr "Pobierz zmiany" -#: kallithea/templates/pullrequests/pullrequest_show.html:154 -#, fuzzy -msgid "Created by" -msgstr "utworzono" - -#: kallithea/templates/pullrequests/pullrequest_show.html:169 +#: kallithea/templates/pullrequests/pullrequest_show.html:173 #, fuzzy msgid "Update" msgstr "[zaktualizowany] użytkownik" -#: kallithea/templates/pullrequests/pullrequest_show.html:187 +#: kallithea/templates/pullrequests/pullrequest_show.html:191 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:209 +#: kallithea/templates/pullrequests/pullrequest_show.html:213 #, fuzzy msgid "Pull Request Reviewers" msgstr "Recenzje wniosków połączenia gałęzi" -#: kallithea/templates/pullrequests/pullrequest_show.html:234 +#: kallithea/templates/pullrequests/pullrequest_show.html:238 #, fuzzy msgid "Remove reviewer" msgstr "recenzent" -#: kallithea/templates/pullrequests/pullrequest_show.html:246 +#: kallithea/templates/pullrequests/pullrequest_show.html:250 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:254 +#: kallithea/templates/pullrequests/pullrequest_show.html:258 #, fuzzy msgid "Potential Reviewers" msgstr "Podgląd komentarza" -#: kallithea/templates/pullrequests/pullrequest_show.html:257 +#: kallithea/templates/pullrequests/pullrequest_show.html:261 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:280 +#: kallithea/templates/pullrequests/pullrequest_show.html:284 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/templates/pullrequests/pullrequest_show.html:285 #, fuzzy msgid "Save as New Pull Request" msgstr "Otwórz nową prośbę o połączenie gałęzi" -#: kallithea/templates/pullrequests/pullrequest_show.html:282 +#: kallithea/templates/pullrequests/pullrequest_show.html:286 #, fuzzy msgid "Cancel Changes" msgstr "Ostatnia aktywność" -#: kallithea/templates/pullrequests/pullrequest_show.html:292 +#: kallithea/templates/pullrequests/pullrequest_show.html:296 #, fuzzy msgid "Pull Request Content" msgstr "Wniosek połączenia zmienił status" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" msgstr "%s Moje prośby połączenia gałęzi" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, fuzzy, python-format msgid "Pull Requests from %s'" msgstr "Połączonych gałęzi #%s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:13 #, fuzzy, python-format msgid "Pull Requests to '%s'" msgstr "Połączonych gałęzi #%s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#, fuzzy +msgid "Open New Pull Request" +msgstr "Otwórz nową prośbę o połączenie gałęzi" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 #, fuzzy, python-format msgid "Show Pull Requests to %s" msgstr "Pokaż Prośby Pobrania %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 #, fuzzy, python-format msgid "Show Pull Requests from '%s'" msgstr "Pokaż Prośby Pobrania %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 -msgid "Hide closed pull requests (only show open pull requests)" -msgstr "" - #: kallithea/templates/pullrequests/pullrequest_show_all.html:49 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 #, fuzzy msgid "Pull Requests Created by Me" msgstr "Recenzje wniosków połączenia gałęzi" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 #, fuzzy msgid "Pull Requests I Participate In" msgstr "Biorę udział w" @@ -6192,7 +6168,6 @@ #: kallithea/templates/summary/summary.html:125 #, fuzzy -#| msgid "with subrepos" msgid "With subrepos" msgstr "z subrepozytorium" @@ -6275,21 +6250,6 @@ #~ msgstr "Brak Plików" #~ msgid "" -#~ "Comment on %(repo_name)s changeset " -#~ "%(short_id)s on %(branch)s by " -#~ "%(comment_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Review request on %(repo_name)s pull " -#~ "request #%(pr_id)s from %(ref)s by " -#~ "%(pr_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Comment on %(repo_name)s pull request " -#~ "#%(pr_id)s from %(ref)s by " -#~ "%(comment_username)s" #~ msgstr "" #~ msgid "Username \"%(username)s\" is forbidden" @@ -6309,15 +6269,6 @@ #~ msgid "Revisions %(revs)s are already part of pull request or have set status" #~ msgstr "" -#~ "Rewizja %(revs)s jest już częścią " -#~ "nowej gałęzi więc określ jego status" - -#~ msgid "" -#~ "Comma separated list of plugins. Order" -#~ " of plugins is also order in " -#~ "which Kallithea will try to authenticate" -#~ " user" -#~ msgstr "" #~ msgid "Defaults" #~ msgstr "Domyślne" @@ -6361,12 +6312,6 @@ #~ msgid "current IP" #~ msgstr "" -#~ msgid "" -#~ "Your user is in an external source" -#~ " of record; some details cannot be" -#~ " managed here" -#~ msgstr "" - #~ msgid "Permissions Administration" #~ msgstr "Uprawnienia administracji" @@ -6376,12 +6321,6 @@ #~ msgid "Overwrite existing settings" #~ msgstr "Nadpisz ustawienia" -#~ msgid "" -#~ "Write permission to a repository group" -#~ " allows creating repositories inside that" -#~ " group." -#~ msgstr "" - #~ msgid "Default IP Whitelist for All Users" #~ msgstr "" @@ -6421,20 +6360,6 @@ #~ msgid "Non-changeable id" #~ msgstr "Brak zmiennej id" -#~ msgid "" -#~ "In case this repository is renamed " -#~ "or moved into another group the " -#~ "repository URL changes.\n" -#~ " Using the above " -#~ "URL guarantees that this repository will" -#~ " always be accessible under such URL." -#~ "\n" -#~ " Useful for CI " -#~ "systems, or any other cases that " -#~ "you need to hardcode the URL into" -#~ " 3rd party service." -#~ msgstr "" - #~ msgid "edit" #~ msgstr "edycja" @@ -6480,12 +6405,6 @@ #~ msgid "Destroy old data" #~ msgstr "Zniszcz stare dane" -#~ msgid "" -#~ "Check this option to remove references" -#~ " to repositories that no longer exist" -#~ " in on the filesystem." -#~ msgstr "" - #~ msgid "check for updates" #~ msgstr "" @@ -6495,21 +6414,9 @@ #~ msgid "user groups" #~ msgstr "" -#~ msgid "" -#~ "This user is in an external source" -#~ " of record (%s); some details cannot" -#~ " be managed here." -#~ msgstr "" - #~ msgid "Inherit from defaults" #~ msgstr "" -#~ msgid "" -#~ "Select to inherit permissions from %s" -#~ " permissions settings, and default IP " -#~ "address whitelist." -#~ msgstr "" - #~ msgid "show" #~ msgstr "" @@ -6531,13 +6438,6 @@ #~ msgid "Comment on changeset" #~ msgstr "Skomentuj grupę zmian" -#~ msgid "" -#~ "Use @username inside this text to " -#~ "send notification to another local user." -#~ msgstr "" -#~ "Użyj @username wewnątrz tego tekstu, aby" -#~ " wysłać powiadomienie do użytkownika strony" - #~ msgid "revision" #~ msgstr "rewizja" @@ -6562,3 +6462,42 @@ #~ msgid "reviewer" #~ msgstr "recenzent" +#~ msgid "" +#~ "Your password reset was successful, new" +#~ " password has been sent to your " +#~ "email" +#~ msgstr "Twoje hasło zostało zresetowane, nowe hasło zostanie wysłane na e-mail" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Added by %(pr_username)s] %(repo_name)s pull" +#~ " request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "Your new Kallithea password:%s" +#~ msgstr "Nowe hasło do strony: %s" + +#~ msgid "Open New Pull Request for Selected Changesets" +#~ msgstr "Otwórz nową prośbę o połączenie gałęzi w zestawieniu zmian" + +#~ msgid "Show Selected Changeset __S" +#~ msgstr "Pokaż wybrane zmiany __S -> __E" + +#~ msgid "You can generate it by clicking following URL" +#~ msgstr "Możesz wygenerować nowe hasło klikając w link URL poniżej" + +#~ msgid "Please ignore this email if you did not request a new password ." +#~ msgstr "Proszę zignorować tą wiadomość, jeśli nie poproś o nowe hasło." + +#~ msgid "Created by" +#~ msgstr "utworzono" +
--- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Tue Sep 08 10:21:46 2015 +0000 +++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Tue Sep 08 10:37:51 2015 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2015-04-01 03:17+0200\n" +"POT-Creation-Date: 2015-09-08 10:34+0200\n" "PO-Revision-Date: 2014-02-13 14:34+0000\n" "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n" "Language-Team: Portuguese (Brazil) " @@ -19,7 +19,7 @@ "Content-Transfer-Encoding: 8bit\n" #: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:241 kallithea/lib/base.py:512 +#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 msgid "There are no changesets yet" msgstr "Não há nenhum changeset ainda" @@ -35,7 +35,7 @@ msgid "None" msgstr "Nenhum" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(fechado)" @@ -53,8 +53,8 @@ msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:743 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 msgid "Such revision does not exist for this repository" msgstr "" @@ -64,17 +64,16 @@ "not allowed" msgstr "Mudar o estado de um changeset associado a um pull request não é permitido" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:42 +#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 msgid "Select changeset" msgstr "" -#: kallithea/controllers/compare.py:258 +#: kallithea/controllers/compare.py:261 msgid "Cannot compare repositories without using common ancestor" msgstr "" #: kallithea/controllers/error.py:71 #, fuzzy -#| msgid "revisions" msgid "No response" msgstr "revisões" @@ -123,8 +122,8 @@ #: kallithea/templates/changeset/changeset.html:195 #: kallithea/templates/compare/compare_diff.html:78 #: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Changeset was too big and was cut off..." msgstr "Conjunto de mudanças era grande demais e foi cortado..." @@ -133,111 +132,111 @@ msgid "%s committed on %s" msgstr "%s commitados em %s" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:91 msgid "Click here to add new file" msgstr "Clique aqui para adicionar um novo arquivo" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:92 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, fuzzy, python-format msgid "%s at %s" msgstr "em %s e %s" -#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 -#: kallithea/controllers/files.py:433 +#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 +#: kallithea/controllers/files.py:432 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Este repositório foi travado por %s em %s" -#: kallithea/controllers/files.py:318 +#: kallithea/controllers/files.py:317 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:329 +#: kallithea/controllers/files.py:328 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:351 +#: kallithea/controllers/files.py:350 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 -#: kallithea/controllers/files.py:502 +#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 +#: kallithea/controllers/files.py:501 msgid "Error occurred during commit" msgstr "Ocorreu um erro ao realizar commit" -#: kallithea/controllers/files.py:378 +#: kallithea/controllers/files.py:377 msgid "You can only edit files with revision being a valid branch " msgstr "Só é possível editar arquivos quando a revisão é um ramo válido" -#: kallithea/controllers/files.py:392 +#: kallithea/controllers/files.py:391 #, python-format msgid "Edited file %s via Kallithea" msgstr "Arquivo %s editado via Kallithea" -#: kallithea/controllers/files.py:408 +#: kallithea/controllers/files.py:407 msgid "No changes" msgstr "Sem modificações" -#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 +#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 #, python-format msgid "Successfully committed to %s" msgstr "Commit realizado com sucesso para %s" -#: kallithea/controllers/files.py:444 +#: kallithea/controllers/files.py:443 msgid "Added file via Kallithea" msgstr "Arquivo adicionado via Kallithea" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:464 msgid "No content" msgstr "Nenhum conteúdo" -#: kallithea/controllers/files.py:469 +#: kallithea/controllers/files.py:468 msgid "No filename" msgstr "Nenhum nome de arquivo" -#: kallithea/controllers/files.py:494 +#: kallithea/controllers/files.py:493 msgid "Location must be relative path and must not contain .. in path" msgstr "O caminho deve ser relativo e não pode conter .." -#: kallithea/controllers/files.py:527 +#: kallithea/controllers/files.py:526 msgid "Downloads disabled" msgstr "Downloads desabilitados" -#: kallithea/controllers/files.py:538 +#: kallithea/controllers/files.py:537 #, python-format msgid "Unknown revision %s" msgstr "Revisão desconhecida %s" -#: kallithea/controllers/files.py:540 +#: kallithea/controllers/files.py:539 msgid "Empty repository" msgstr "Repositório vazio" -#: kallithea/controllers/files.py:542 +#: kallithea/controllers/files.py:541 msgid "Unknown archive type" msgstr "Tipo de arquivo desconhecido" -#: kallithea/controllers/files.py:772 +#: kallithea/controllers/files.py:771 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:15 #: kallithea/templates/pullrequests/pullrequest.html:97 msgid "Changesets" msgstr "Conjuntos de mudanças" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:821 kallithea/templates/switch_to_list.html:3 +#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 +#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "Ramos" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:832 kallithea/templates/switch_to_list.html:25 +#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 +#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "Etiquetas" @@ -258,9 +257,9 @@ #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:131 -#: kallithea/templates/base/base.html:397 -#: kallithea/templates/base/base.html:569 +#: kallithea/templates/base/base.html:124 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "Repositórios" @@ -286,31 +285,36 @@ msgstr "Diário Público" #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:229 +#: kallithea/templates/base/base.html:222 #: kallithea/templates/journal/journal.html:4 #: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "Diário" -#: kallithea/controllers/login.py:150 kallithea/controllers/login.py:196 +#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:156 +#: kallithea/controllers/login.py:157 msgid "You have successfully registered into Kallithea" msgstr "Você foi registrado no Kallithea com sucesso" -#: kallithea/controllers/login.py:201 -msgid "Your password reset link was sent" +#: kallithea/controllers/login.py:202 +#, fuzzy +#| msgid "Your password reset link was sent" +msgid "A password reset confirmation code has been sent" msgstr "Seu link de reinicialização de senha foi enviado" -#: kallithea/controllers/login.py:222 -msgid "" -"Your password reset was successful, new password has been sent to your " -"email" -msgstr "" -"Sua reinicialização de senha foi bem sucedida, sua senha foi enviada ao " -"seu e-mail" +#: kallithea/controllers/login.py:251 +#, fuzzy +#| msgid "Password reset link" +msgid "Invalid password reset token" +msgstr "Link para trocar senha" + +#: kallithea/controllers/login.py:256 +#: kallithea/controllers/admin/my_account.py:167 +msgid "Successfully updated password" +msgstr "" #: kallithea/controllers/pullrequests.py:124 #, fuzzy, python-format @@ -331,118 +335,117 @@ msgid "Peer branches" msgstr "Ramos pares" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:827 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Marcadores" -#: kallithea/controllers/pullrequests.py:306 +#: kallithea/controllers/pullrequests.py:310 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:352 -#: kallithea/controllers/pullrequests.py:499 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:503 #, fuzzy msgid "No description" msgstr "Descrição" -#: kallithea/controllers/pullrequests.py:359 +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "Novo pull request criado com sucesso" -#: kallithea/controllers/pullrequests.py:362 -#: kallithea/controllers/pullrequests.py:449 -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:453 +#: kallithea/controllers/pullrequests.py:509 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:365 -#: kallithea/controllers/pullrequests.py:452 +#: kallithea/controllers/pullrequests.py:369 +#: kallithea/controllers/pullrequests.py:456 #, fuzzy msgid "Error occurred while creating pull request" msgstr "Ocorreu um erro durante o envio do pull request" -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:401 msgid "Missing changesets since the previous pull request:" msgstr "" -#: kallithea/controllers/pullrequests.py:404 +#: kallithea/controllers/pullrequests.py:408 #, python-format msgid "New changesets on %s %s since the previous pull request:" msgstr "" -#: kallithea/controllers/pullrequests.py:411 +#: kallithea/controllers/pullrequests.py:415 msgid "Ancestor didn't change - show diff since previous version:" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:422 #, python-format msgid "" "This pull request is based on another %s revision and there is no simple " "diff." msgstr "" -#: kallithea/controllers/pullrequests.py:420 +#: kallithea/controllers/pullrequests.py:424 #, python-format msgid "No changes found on %s %s since previous version." msgstr "" -#: kallithea/controllers/pullrequests.py:458 +#: kallithea/controllers/pullrequests.py:462 #, python-format msgid "Closed, replaced by %s ." msgstr "" -#: kallithea/controllers/pullrequests.py:466 +#: kallithea/controllers/pullrequests.py:470 #, fuzzy msgid "Pull request update created" msgstr "Revisores do pull request" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:513 #, fuzzy msgid "Pull request updated" msgstr "Pull requests para %s" -#: kallithea/controllers/pullrequests.py:523 +#: kallithea/controllers/pullrequests.py:528 msgid "Successfully deleted pull request" msgstr "Pull request excluído com sucesso" -#: kallithea/controllers/pullrequests.py:582 +#: kallithea/controllers/pullrequests.py:594 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:584 +#: kallithea/controllers/pullrequests.py:596 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:602 +#: kallithea/controllers/pullrequests.py:614 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:605 +#: kallithea/controllers/pullrequests.py:617 msgid "No changesets found for updating this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:613 +#: kallithea/controllers/pullrequests.py:625 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:619 +#: kallithea/controllers/pullrequests.py:631 msgid "Git pull requests don't support updates yet." msgstr "" -#: kallithea/controllers/pullrequests.py:710 -#, fuzzy -#| msgid "Vote for pull request status" +#: kallithea/controllers/pullrequests.py:722 +#, fuzzy msgid "No permission to change pull request status" msgstr "Vote para estado do pull request" -#: kallithea/controllers/pullrequests.py:715 +#: kallithea/controllers/pullrequests.py:727 #, fuzzy msgid "Closing." msgstr "carregando ..." @@ -489,39 +492,38 @@ #: kallithea/controllers/admin/gists.py:59 #: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:283 -#, fuzzy -#| msgid "forever" +#: kallithea/controllers/admin/users.py:285 +#, fuzzy msgid "Forever" msgstr "para sempre" #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/users.py:286 msgid "5 minutes" msgstr "cinco minutos" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/users.py:287 msgid "1 hour" msgstr "uma hora" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/users.py:288 msgid "1 day" msgstr "um dia" #: kallithea/controllers/admin/gists.py:63 #: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/users.py:289 msgid "1 month" msgstr "um mês" #: kallithea/controllers/admin/gists.py:67 #: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/users.py:291 msgid "Lifetime" msgstr "" @@ -536,7 +538,6 @@ #: kallithea/controllers/admin/gists.py:233 #, fuzzy -#| msgid "Last Modified" msgid "Unmodified" msgstr "Última alteração" @@ -553,8 +554,8 @@ msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:208 -#: kallithea/model/user.py:230 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 +#: kallithea/model/user.py:237 msgid "You can't edit this user since it's crucial for entire application" msgstr "Você não pode editar esse usuário pois ele é crucial para toda a aplicação" @@ -563,47 +564,43 @@ msgstr "Sua conta foi atualizada com sucesso" #: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:204 +#: kallithea/controllers/admin/users.py:202 #, python-format msgid "Error occurred during update of user %s" msgstr "Ocorreu um erro durante a atualização do usuário %s" -#: kallithea/controllers/admin/my_account.py:167 -msgid "Successfully updated password" -msgstr "" - #: kallithea/controllers/admin/my_account.py:178 msgid "Error occurred during update of user password" msgstr "" #: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:413 +#: kallithea/controllers/admin/users.py:415 #, python-format msgid "Added email %s to user" msgstr "Email %s adicionado ao usuário" #: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:419 +#: kallithea/controllers/admin/users.py:421 msgid "An error occurred during email saving" msgstr "Ocorreu um erro durante o salvamento do email" #: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:431 +#: kallithea/controllers/admin/users.py:433 msgid "Removed email from user" msgstr "Email removido do usuário" #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:306 +#: kallithea/controllers/admin/users.py:308 msgid "API key successfully created" msgstr "" #: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:319 +#: kallithea/controllers/admin/users.py:321 msgid "API key successfully reset" msgstr "" #: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:323 +#: kallithea/controllers/admin/users.py:325 msgid "API key successfully deleted" msgstr "" @@ -653,10 +650,10 @@ #: kallithea/templates/admin/users/user_edit_profile.html:105 #: kallithea/templates/admin/users/users.html:10 #: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:252 +#: kallithea/templates/base/base.html:253 #: kallithea/templates/base/base.html:259 #: kallithea/templates/base/base.html:260 -#: kallithea/templates/base/base.html:266 -#: kallithea/templates/base/base.html:267 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Administrador" @@ -823,7 +820,6 @@ #: kallithea/controllers/admin/repos.py:321 #, fuzzy, python-format -#| msgid "Cannot delete %s it still contains attached forks" msgid "Cannot delete repository %s which still has forks" msgstr "Nao é possível excluir %s pois ele ainda contém bifurcações vinculadas" @@ -872,14 +868,12 @@ #: kallithea/controllers/admin/repos.py:537 #: kallithea/controllers/admin/repos.py:564 #, fuzzy -#| msgid "Repository is not locked" msgid "Repository has been locked" msgstr "Repositório não está travado" #: kallithea/controllers/admin/repos.py:540 #: kallithea/controllers/admin/repos.py:561 #, fuzzy -#| msgid "Repository is not locked" msgid "Repository has been unlocked" msgstr "Repositório não está travado" @@ -919,48 +913,48 @@ msgstr "" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:274 +#: kallithea/controllers/admin/settings.py:277 msgid "Error occurred while updating application settings" msgstr "Ocorreu um erro durante a atualização das configurações da aplicação" -#: kallithea/controllers/admin/settings.py:213 +#: kallithea/controllers/admin/settings.py:216 #, fuzzy, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "Repositórios varridos com sucesso adicionados: %s ; removidos: %s" -#: kallithea/controllers/admin/settings.py:270 +#: kallithea/controllers/admin/settings.py:273 msgid "Updated application settings" msgstr "Configurações da aplicação atualizadas" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "Configurações de visualização atualizadas" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:335 msgid "Error occurred during updating visualisation settings" msgstr "Ocorreu um erro durante a atualização das configurações de visualização" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:361 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:373 +#: kallithea/controllers/admin/settings.py:376 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Added new hook" msgstr "Adicionado novo gancho" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:421 msgid "Updated hooks" msgstr "Atualizados os ganchos" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:425 msgid "Error occurred during hook creation" msgstr "Ocorreu um erro durante a criação do hook" -#: kallithea/controllers/admin/settings.py:448 +#: kallithea/controllers/admin/settings.py:451 msgid "Whoosh reindex task scheduled" msgstr "Tarefa de reindexação do whoosh agendada" @@ -1001,68 +995,68 @@ msgstr "Permissões do Grupo de Usuários atualizadas" #: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:382 +#: kallithea/controllers/admin/users.py:384 msgid "Updated permissions" msgstr "Permissões atualizadas" #: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:386 +#: kallithea/controllers/admin/users.py:388 msgid "An error occurred during permissions saving" msgstr "Ocorreu um erro durante o salvamento das permissões" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:134 #, python-format msgid "Created user %s" msgstr "Usuário %s criado" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "Ocorreu um erro durante a criação do usuário %s" -#: kallithea/controllers/admin/users.py:184 +#: kallithea/controllers/admin/users.py:182 msgid "User updated successfully" msgstr "Usuário atualizado com sucesso" -#: kallithea/controllers/admin/users.py:220 +#: kallithea/controllers/admin/users.py:218 msgid "Successfully deleted user" msgstr "Usuário excluído com sucesso" -#: kallithea/controllers/admin/users.py:225 +#: kallithea/controllers/admin/users.py:223 msgid "An error occurred during deletion of user" msgstr "Ocorreu um erro ao excluir o usuário" -#: kallithea/controllers/admin/users.py:238 +#: kallithea/controllers/admin/users.py:236 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:461 +#: kallithea/controllers/admin/users.py:463 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:467 +#: kallithea/controllers/admin/users.py:469 msgid "An error occurred while adding IP address" msgstr "Ocorreu um erro durante o salvamento do IP" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:744 +#: kallithea/lib/auth.py:743 #, python-format msgid "IP %s not allowed" msgstr "IP %s não permitido" -#: kallithea/lib/auth.py:757 +#: kallithea/lib/auth.py:756 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:795 +#: kallithea/lib/auth.py:812 msgid "You need to be a registered user to perform this action" msgstr "Você precisa ser um usuário registrado para realizar essa ação" -#: kallithea/lib/auth.py:827 +#: kallithea/lib/auth.py:844 msgid "You need to be signed in to view this page" msgstr "Você precisa estar logado para ver essa página" @@ -1105,7 +1099,6 @@ #: kallithea/lib/helpers.py:677 #, fuzzy -#| msgid "compare view" msgid "Compare view" msgstr "comparar exibir" @@ -1124,13 +1117,11 @@ #: kallithea/lib/helpers.py:722 #, fuzzy, python-format -#| msgid "fork name %s" msgid "Fork name %s" msgstr "nome da bifurcação %s" #: kallithea/lib/helpers.py:742 #, fuzzy, python-format -#| msgid "Pull request #%s" msgid "Pull request %s" msgstr "Pull request #%s" @@ -1221,7 +1212,7 @@ #: kallithea/lib/helpers.py:1128 #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "Nenhum arquivo" @@ -1768,13 +1759,11 @@ #: kallithea/model/db.py:1668 #, fuzzy -#| msgid "Unauthorized access to resource" msgid "Default user has read access to new repositories" msgstr "Acesso não autorizado ao recurso" #: kallithea/model/db.py:1669 #, fuzzy -#| msgid "Unauthorized access to resource" msgid "Default user has write access to new repositories" msgstr "Acesso não autorizado ao recurso" @@ -1815,26 +1804,22 @@ msgstr "" #: kallithea/model/db.py:1682 -#, fuzzy, python-format -#| msgid "Created repository group %s" +#, fuzzy msgid "Only admins can create repository groups" msgstr "Grupo de repositórios %s criado" #: kallithea/model/db.py:1683 -#, fuzzy, python-format -#| msgid "Created repository group %s" +#, fuzzy msgid "Non-admins can create repository groups" msgstr "Grupo de repositórios %s criado" #: kallithea/model/db.py:1685 #, fuzzy -#| msgid "Create user groups" msgid "Only admins can create user groups" msgstr "Criar grupos de usuários" #: kallithea/model/db.py:1686 #, fuzzy -#| msgid "Create user groups" msgid "Non-admins can create user groups" msgstr "Criar grupos de usuários" @@ -1848,37 +1833,31 @@ #: kallithea/model/db.py:1694 #, fuzzy -#| msgid "Location of repositories" msgid "Only admins can fork repositories" msgstr "Criar repositórios" #: kallithea/model/db.py:1695 #, fuzzy -#| msgid "Invalidate cache for all repositories" msgid "Non-admins can can fork repositories" msgstr "Invalidar o cache para todos os repositórios" #: kallithea/model/db.py:1698 #, fuzzy -#| msgid "User Registration with manual account activation" msgid "User registration with manual account activation" msgstr "Registro de Usuário com ativação manual de conta" #: kallithea/model/db.py:1699 #, fuzzy -#| msgid "User Registration with automatic account activation" msgid "User registration with automatic account activation" msgstr "Registro de Usuário com ativação automática de conta" #: kallithea/model/db.py:2228 #, fuzzy -#| msgid "Not Reviewed" msgid "Not reviewed" msgstr "Não Revisado" #: kallithea/model/db.py:2231 #, fuzzy -#| msgid "Under Review" msgid "Under review" msgstr "Sob Revisão" @@ -1906,37 +1885,31 @@ #: kallithea/model/notification.py:254 #, fuzzy, python-format -#| msgid "%(user)s commented on changeset at %(when)s" msgid "%(user)s commented on changeset %(age)s" msgstr "%(user)s comentou no changeset em %(when)s" #: kallithea/model/notification.py:255 #, fuzzy, python-format -#| msgid "%(user)s sent message at %(when)s" msgid "%(user)s sent message %(age)s" msgstr "%(user)s enviou mensagem em %(when)s" #: kallithea/model/notification.py:256 #, fuzzy, python-format -#| msgid "%(user)s mentioned you at %(when)s" msgid "%(user)s mentioned you %(age)s" msgstr "%(user)s mencionou-o em %(when)s" #: kallithea/model/notification.py:257 #, fuzzy, python-format -#| msgid "%(user)s registered in Kallithea at %(when)s" msgid "%(user)s registered in Kallithea %(age)s" msgstr "%(user)s registrou-se no Kallithea em %(when)s" #: kallithea/model/notification.py:258 #, fuzzy, python-format -#| msgid "%(user)s opened new pull request at %(when)s" msgid "%(user)s opened new pull request %(age)s" msgstr "%(user)s abriu um novo pull request em %(when)s" #: kallithea/model/notification.py:259 #, fuzzy, python-format -#| msgid "%(user)s commented on pull request at %(when)s" msgid "%(user)s commented on pull request %(age)s" msgstr "%(user)s comentou no pull request em %(when)s" @@ -1972,9 +1945,7 @@ #: kallithea/model/notification.py:302 #, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s changeset %(short_id)s " -"on %(branch)s" +msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" #: kallithea/model/notification.py:305 @@ -1983,18 +1954,17 @@ msgstr "O username \"%(new_username)s\" não é válido" #: kallithea/model/notification.py:307 -#, python-format -msgid "" -"[Added by %(pr_username)s] %(repo_name)s pull request %(pr_nice_id)s from" -" %(ref)s" -msgstr "" +#, fuzzy, python-format +#| msgid "%(user)s wants you to review pull request %(pr_nice_id)s: +#| %(pr_title)s" +msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgstr "%(user)s solicita sua revisão no pull request $%(pr_id)s: %(pr_title)s" #: kallithea/model/notification.py:308 -#, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s pull request " -"%(pr_nice_id)s from %(ref)s" -msgstr "" +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgstr "[comentado] no pull request para" #: kallithea/model/notification.py:321 #, fuzzy @@ -2003,27 +1973,25 @@ #: kallithea/model/pull_request.py:137 #, fuzzy, python-format -#| msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "%(user)s solicita sua revisão no pull request $%(pr_id)s: %(pr_title)s" -#: kallithea/model/scm.py:813 +#: kallithea/model/scm.py:812 msgid "latest tip" msgstr "tip mais recente" -#: kallithea/model/user.py:185 +#: kallithea/model/user.py:192 msgid "New user registration" msgstr "Novo registro de usuário" -#: kallithea/model/user.py:249 -#, fuzzy -#| msgid "You can't remove this user since it's crucial for entire application" +#: kallithea/model/user.py:256 +#, fuzzy msgid "You can't remove this user since it is crucial for the entire application" msgstr "" "Você não pode remover esse usuário, pois ele é crucial para toda a " "aplicação" -#: kallithea/model/user.py:254 +#: kallithea/model/user.py:261 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -2032,7 +2000,7 @@ "usuário \"%s\" ainda é dono de %s repositórios e não pode ser removido. " "Troque os donos ou remova esses repositórios. %s" -#: kallithea/model/user.py:259 +#: kallithea/model/user.py:266 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch" @@ -2041,7 +2009,7 @@ "usuário \"%s\" ainda é dono de %s repositórios e não pode ser removido. " "Troque os donos ou remova esses repositórios. %s" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:273 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -2050,18 +2018,22 @@ "usuário \"%s\" ainda é dono de %s repositórios e não pode ser removido. " "Troque os donos ou remova esses repositórios. %s" -#: kallithea/model/user.py:296 +#: kallithea/model/user.py:360 msgid "Password reset link" msgstr "Link para trocar senha" -#: kallithea/model/user.py:319 -msgid "Your new password" -msgstr "Sua nova senha" - -#: kallithea/model/user.py:320 -#, python-format -msgid "Your new Kallithea password:%s" -msgstr "Sua nova senha no Kallithea: %s" +#: kallithea/model/user.py:408 +#, fuzzy +#| msgid "Password reset link" +msgid "Password reset notification" +msgstr "Link para trocar senha" + +#: kallithea/model/user.py:409 +#, python-format +msgid "" +"The password to your account %s has been changed using password reset " +"form." +msgstr "" #: kallithea/model/validators.py:77 kallithea/model/validators.py:78 msgid "Value cannot be an empty list" @@ -2074,15 +2046,11 @@ #: kallithea/model/validators.py:97 #, fuzzy, python-format -#| msgid "Username %(username)s is not valid" msgid "Username \"%(username)s\" cannot be used" msgstr "O username \"%(username)s\" não é válido" #: kallithea/model/validators.py:99 #, fuzzy -#| msgid "" "Username may only contain alphanumeric characters underscores, -#| periods or" " dashes and must begin with alphanumeric character or -#| underscore" msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with an alphanumeric character or underscore" @@ -2145,7 +2113,6 @@ #: kallithea/model/validators.py:300 #, fuzzy -#| msgid "invalid password" msgid "Invalid username or password" msgstr "senha inválida" @@ -2155,7 +2122,6 @@ #: kallithea/model/validators.py:345 #, fuzzy, python-format -#| msgid "Repository name %(repo)s is disallowed" msgid "Repository name %(repo)s is not allowed" msgstr "O nome de repositório %(repo)s não é permitido" @@ -2176,7 +2142,6 @@ #: kallithea/model/validators.py:465 #, fuzzy -#| msgid "private repository" msgid "Invalid repository URL" msgstr "repositório privado" @@ -2212,13 +2177,11 @@ #: kallithea/model/validators.py:705 #, fuzzy -#| msgid "This email address is already taken" msgid "This email address is already in use" msgstr "Esse endereço de e-mail já está tomado" #: kallithea/model/validators.py:725 #, fuzzy, python-format -#| msgid "email \"%(email)s\" does not exist." msgid "Email address \"%(email)s\" not found" msgstr "o e-mail \"%(email)s\" não existe." @@ -2372,7 +2335,9 @@ #: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:229 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/pullrequests/pullrequest_show.html:156 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 #: kallithea/templates/summary/summary.html:134 msgid "Owner" msgstr "Dono" @@ -2380,7 +2345,7 @@ #: kallithea/templates/index_base.html:140 #: kallithea/templates/admin/my_account/my_account_repos.html:57 #: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:44 +#: kallithea/templates/base/root.html:43 #: kallithea/templates/bookmarks/bookmarks.html:79 #: kallithea/templates/branches/branches.html:79 #: kallithea/templates/journal/journal.html:198 @@ -2392,7 +2357,7 @@ #: kallithea/templates/index_base.html:141 #: kallithea/templates/admin/my_account/my_account_repos.html:58 #: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:45 +#: kallithea/templates/base/root.html:44 #: kallithea/templates/bookmarks/bookmarks.html:80 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:199 @@ -2408,7 +2373,7 @@ #: kallithea/templates/index_base.html:143 #: kallithea/templates/admin/my_account/my_account_repos.html:60 #: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:46 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:201 @@ -2420,7 +2385,7 @@ #: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:147 kallithea/templates/base/root.html:48 +#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:202 @@ -2430,7 +2395,7 @@ msgstr "Carregando..." #: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:333 +#: kallithea/templates/base/base.html:326 msgid "Log In" msgstr "Entrar" @@ -2445,14 +2410,15 @@ #: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:24 #: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/pullrequests/pullrequest_show.html:166 msgid "Username" msgstr "Nome de usuário" #: kallithea/templates/login.html:33 kallithea/templates/register.html:33 #: kallithea/templates/admin/my_account/my_account.html:37 #: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:311 msgid "Password" msgstr "Senha" @@ -2464,7 +2430,7 @@ msgid "Forgot your password ?" msgstr "Esqueceu sua senha ?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:329 +#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 msgid "Don't have an account ?" msgstr "Não possui uma conta ?" @@ -2477,11 +2443,14 @@ msgstr "Senha Trocada" #: kallithea/templates/password_reset.html:12 +#: kallithea/templates/password_reset_confirmation.html:12 #, fuzzy, python-format msgid "Reset Your Password to %s" msgstr "" #: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset_confirmation.html:5 +#: kallithea/templates/password_reset_confirmation.html:14 #, fuzzy msgid "Reset Your Password" msgstr "Esqueceu sua senha ?" @@ -2502,13 +2471,46 @@ #: kallithea/templates/password_reset.html:47 #, fuzzy +#| msgid "" "Password reset link will be sent to the email address matching +#| your " "username." msgid "" -"Password reset link will be sent to the email address matching your " -"username." +"A password reset link will be sent to the specified email address if it " +"is registered in the system." msgstr "" "Link de reinicialização de senha será enviado ao endereço de e-mail " "correspondente" +#: kallithea/templates/password_reset_confirmation.html:19 +#, python-format +msgid "You are about to set a new password for the email address %s." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:20 +msgid "" +"Note that you must use the same browser session for this as the one used " +"to request the password reset." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:30 +msgid "Code you received in the email" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:39 +#, fuzzy +#| msgid "New password" +msgid "New Password" +msgstr "Nova senha" + +#: kallithea/templates/password_reset_confirmation.html:48 +#, fuzzy +#| msgid "Your new password" +msgid "Confirm New Password" +msgstr "Sua nova senha" + +#: kallithea/templates/password_reset_confirmation.html:56 +msgid "Confirm" +msgstr "" + #: kallithea/templates/register.html:5 kallithea/templates/register.html:14 #: kallithea/templates/register.html:90 msgid "Sign Up" @@ -2793,7 +2795,6 @@ #: kallithea/templates/admin/users/user_edit_api_keys.html:8 #: kallithea/templates/admin/users/user_edit_api_keys.html:27 #, fuzzy -#| msgid "never" msgid "Never" msgstr "nunca" @@ -2825,7 +2826,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:244 +#: kallithea/templates/base/base.html:237 msgid "Create New Gist" msgstr "" @@ -2967,7 +2968,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/base/base.html:343 msgid "My Account" msgstr "Minha Conta" @@ -2978,7 +2979,6 @@ #: kallithea/templates/admin/my_account/my_account.html:36 #, fuzzy -#| msgid "New email address" msgid "Email Addresses" msgstr "Novo endereço de email" @@ -2989,14 +2989,12 @@ #: kallithea/templates/admin/my_account/my_account.html:39 #, fuzzy -#| msgid "repositories" msgid "Owned Repositories" msgstr "repositórios" #: kallithea/templates/admin/my_account/my_account.html:40 #: kallithea/templates/journal/journal.html:53 #, fuzzy -#| msgid "Create repositories" msgid "Watched Repositories" msgstr "Criar repositórios" @@ -3005,7 +3003,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 #, fuzzy -#| msgid "Copy permissions" msgid "Show Permissions" msgstr "Copiar permissões" @@ -3017,28 +3014,24 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #, fuzzy, python-format -#| msgid "Confirm to delete this ip: %s" msgid "Confirm to reset this API key: %s" msgstr "Confirme para excluir este IP: %s" #: kallithea/templates/admin/my_account/my_account_api_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:30 #, fuzzy -#| msgid "Expires" msgid "Expired" msgstr "Expira" #: kallithea/templates/admin/my_account/my_account_api_keys.html:40 #: kallithea/templates/admin/users/user_edit_api_keys.html:40 #, fuzzy, python-format -#| msgid "Confirm to delete this ip: %s" msgid "Confirm to remove this API key: %s" msgstr "Confirme para excluir este IP: %s" #: kallithea/templates/admin/my_account/my_account_api_keys.html:42 #: kallithea/templates/admin/users/user_edit_api_keys.html:42 #, fuzzy -#| msgid "Removed" msgid "Remove" msgstr "Removido" @@ -3050,7 +3043,6 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:61 #: kallithea/templates/admin/users/user_edit_api_keys.html:61 #, fuzzy -#| msgid "New field key" msgid "New API key" msgstr "Próxima chave de campo" @@ -3139,7 +3131,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:45 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:200 @@ -3167,7 +3159,7 @@ msgstr "Comentários" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 msgid "Pull Requests" msgstr "Pull Requests" @@ -3187,7 +3179,7 @@ msgstr "Mostrar notificação" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:342 msgid "Notifications" msgstr "Notificações" @@ -3231,7 +3223,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:26 #, fuzzy -#| msgid "Existing repository?" msgid "Apply to all existing repositories" msgstr "Repositório existente?" @@ -3258,8 +3249,7 @@ "padrão customizadas em grupos de repositórios serão perdidas" #: kallithea/templates/admin/permissions/permissions_globals.html:40 -#, fuzzy, python-format -#| msgid "Updated repository group %s" +#, fuzzy msgid "Apply to all existing repository groups" msgstr "Grupo de repositórios %s atualizado" @@ -3274,9 +3264,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:53 #, fuzzy -#| msgid "" "All default permissions on each user group will be reset to chosen -#| " "permission, note that all custom default permission on repository groups -#| " "will be lost" msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " @@ -3296,7 +3283,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:60 #, fuzzy -#| msgid "Repository creation" msgid "Top level repository creation" msgstr "Criação de repositório" @@ -3348,7 +3334,6 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:13 #: kallithea/templates/admin/users/user_edit_ips.html:23 #, fuzzy, python-format -#| msgid "Confirm to delete this ip: %s" msgid "Confirm to delete this IP address: %s" msgstr "Confirme para excluir este IP: %s" @@ -3407,7 +3392,7 @@ #: kallithea/templates/admin/repos/repo_edit.html:40 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:158 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 #: kallithea/templates/data_table/_dt_elements.html:45 #: kallithea/templates/data_table/_dt_elements.html:49 msgid "Settings" @@ -3446,7 +3431,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:146 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 msgid "Created on" msgstr "Criado em" @@ -3466,7 +3451,6 @@ #: kallithea/templates/admin/repos/repo_edit_permissions.html:12 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 #, fuzzy -#| msgid "User group" msgid "User/User Group" msgstr "Grupo de usuários" @@ -3477,7 +3461,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 #, fuzzy -#| msgid "default" msgid "Default" msgstr "padrão" @@ -3488,7 +3471,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 #, fuzzy -#| msgid "revoke" msgid "Revoke" msgstr "revogar" @@ -3500,7 +3482,6 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 #, fuzzy -#| msgid "apply to children" msgid "Apply to children" msgstr "aplicar aos filhos" @@ -3557,7 +3538,6 @@ #: kallithea/templates/admin/repos/repo_add_base.html:17 #, fuzzy -#| msgid "[created] repository" msgid "Clone remote repository" msgstr "repositório [criado]" @@ -3834,25 +3814,21 @@ #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 #, fuzzy -#| msgid "private repository" msgid "Private Repository" msgstr "repositório privado" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 -#, fuzzy, python-format -#| msgid "Created repository %s" +#, fuzzy msgid "Remote repository URL" msgstr "Repositório %s criado" #: kallithea/templates/admin/repos/repo_edit_remote.html:9 #, fuzzy -#| msgid "[pulled from remote] into repository" msgid "Pull Changes from Remote Repository" msgstr "[pulled do remote] no repositório" #: kallithea/templates/admin/repos/repo_edit_remote.html:11 #, fuzzy -#| msgid "Confirm to pull changes from remote side." msgid "Confirm to pull changes from remote repository." msgstr "Confirma realizar pull de alterações a partir de lado remoto" @@ -3862,7 +3838,6 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:11 #, fuzzy -#| msgid "private repository" msgid "Permanent Repository ID" msgstr "repositório privado" @@ -3886,13 +3861,11 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:21 #, fuzzy -#| msgid "[created] repository" msgid "Remote repository" msgstr "repositório [criado]" #: kallithea/templates/admin/repos/repo_edit_settings.html:25 #, fuzzy -#| msgid "Repository" msgid "Repository URL" msgstr "Repositório" @@ -4037,7 +4010,7 @@ msgid "Custom Hooks" msgstr "Ganchos customizados" -#: kallithea/templates/admin/settings/settings_hooks.html:68 +#: kallithea/templates/admin/settings/settings_hooks.html:67 msgid "Failed to remove hook" msgstr "Falha ao remover gancho" @@ -4047,7 +4020,6 @@ #: kallithea/templates/admin/settings/settings_mapping.html:11 #, fuzzy -#| msgid "Search in repositories" msgid "Delete records of missing repositories" msgstr "Buscar nos repositórios" @@ -4076,7 +4048,18 @@ "Current hooks will be updated to the latest version." msgstr "" +#: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "Overwrite existing Git hooks" +msgstr "" + #: kallithea/templates/admin/settings/settings_mapping.html:30 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any" +" custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:35 msgid "Rescan Repositories" msgstr "" @@ -4309,7 +4292,6 @@ #: kallithea/templates/admin/settings/settings_visual.html:92 #, fuzzy -#| msgid "Meta-Tagging" msgid "Meta Tagging" msgstr "Meta-Tagging" @@ -4351,7 +4333,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit.html:33 #, fuzzy -#| msgid "members" msgid "Show Members" msgstr "membros" @@ -4498,49 +4479,49 @@ msgid "Git repository" msgstr "Repositório Git" -#: kallithea/templates/base/base.html:126 +#: kallithea/templates/base/base.html:119 #, fuzzy msgid "Create Fork" msgstr "Excluir bifurcações" -#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:130 #: kallithea/templates/data_table/_dt_elements.html:13 #: kallithea/templates/data_table/_dt_elements.html:17 #: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "Sumário" -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:141 +#: kallithea/templates/base/base.html:132 +#: kallithea/templates/base/base.html:134 #: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:21 #: kallithea/templates/data_table/_dt_elements.html:25 msgid "Changelog" msgstr "Registro de alterações" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:136 #: kallithea/templates/data_table/_dt_elements.html:29 #: kallithea/templates/data_table/_dt_elements.html:33 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "Arquivos" -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:138 msgid "Switch To" msgstr "Trocar Para" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/base/base.html:154 +#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:147 msgid "Options" msgstr "Opções" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:155 #: kallithea/templates/forks/forks_data.html:21 #, fuzzy msgid "Compare Fork" msgstr "Compare bifurcação" -#: kallithea/templates/base/base.html:164 +#: kallithea/templates/base/base.html:157 #: kallithea/templates/bookmarks/bookmarks.html:56 #: kallithea/templates/bookmarks/bookmarks_data.html:13 #: kallithea/templates/branches/branches.html:56 @@ -4550,123 +4531,122 @@ msgid "Compare" msgstr "Compare" -#: kallithea/templates/base/base.html:166 -#: kallithea/templates/base/base.html:254 +#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:247 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:54 msgid "Search" msgstr "Pesquisar" -#: kallithea/templates/base/base.html:170 +#: kallithea/templates/base/base.html:163 msgid "Unlock" msgstr "Destravar" -#: kallithea/templates/base/base.html:172 +#: kallithea/templates/base/base.html:165 msgid "Lock" msgstr "Travar" -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:173 msgid "Follow" msgstr "Seguir" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:174 msgid "Unfollow" msgstr "Parar de seguir" -#: kallithea/templates/base/base.html:184 +#: kallithea/templates/base/base.html:177 #: kallithea/templates/data_table/_dt_elements.html:37 #: kallithea/templates/data_table/_dt_elements.html:41 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "Bifurcação" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:178 #: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "Criar Pull Request" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 #, python-format msgid "Show Pull Requests for %s" msgstr "Mostrar Pull Requests para %s" -#: kallithea/templates/base/base.html:228 +#: kallithea/templates/base/base.html:221 msgid "Show recent activity" msgstr "Mostrar atividade recente" -#: kallithea/templates/base/base.html:234 -#: kallithea/templates/base/base.html:235 +#: kallithea/templates/base/base.html:227 +#: kallithea/templates/base/base.html:228 msgid "Public journal" msgstr "Diário público" -#: kallithea/templates/base/base.html:240 +#: kallithea/templates/base/base.html:233 msgid "Show public gists" msgstr "Mostrar gists públicos" -#: kallithea/templates/base/base.html:241 +#: kallithea/templates/base/base.html:234 msgid "Gists" msgstr "Gists" -#: kallithea/templates/base/base.html:245 +#: kallithea/templates/base/base.html:238 #, fuzzy msgid "All Public Gists" msgstr "Todos os gists públicos" -#: kallithea/templates/base/base.html:247 +#: kallithea/templates/base/base.html:240 #, fuzzy msgid "My Public Gists" msgstr "Meus gists públicos" -#: kallithea/templates/base/base.html:248 +#: kallithea/templates/base/base.html:241 #, fuzzy msgid "My Private Gists" msgstr "Meus gists privados" -#: kallithea/templates/base/base.html:253 +#: kallithea/templates/base/base.html:246 msgid "Search in repositories" msgstr "Buscar nos repositórios" -#: kallithea/templates/base/base.html:276 -#: kallithea/templates/base/base.html:277 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +#: kallithea/templates/base/base.html:269 +#: kallithea/templates/base/base.html:270 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 #, fuzzy msgid "My Pull Requests" msgstr "Pull requests" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:289 #, fuzzy msgid "Not Logged In" msgstr "Não logado" -#: kallithea/templates/base/base.html:303 +#: kallithea/templates/base/base.html:296 #, fuzzy msgid "Login to Your Account" msgstr "Entrar com sua conta" -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:319 msgid "Forgot password ?" msgstr "Esqueceu a senha ?" -#: kallithea/templates/base/base.html:353 +#: kallithea/templates/base/base.html:346 msgid "Log Out" msgstr "Sair" -#: kallithea/templates/base/base.html:402 +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:540 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" #: kallithea/templates/base/default_perms_box.html:14 #, fuzzy -#| msgid "Repository Defaults" msgid "Inherit defaults" msgstr "Padrões de repositórios" @@ -4769,60 +4749,55 @@ msgstr "Nenhum arquivo encontrado" #: kallithea/templates/base/root.html:31 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 -#, fuzzy -msgid "Open New Pull Request" -msgstr "Crie novo pull request" +#, fuzzy +#| msgid "on pull request" +msgid "Open New Pull Request from {0}" +msgstr "Comentar no pull request #%s" #: kallithea/templates/base/root.html:32 -#, fuzzy -msgid "Open New Pull Request for Selected Changesets" -msgstr "Abrir novo pull request para os changesets selecionados" +msgid "Open New Pull Request for {0} → {1}" +msgstr "" #: kallithea/templates/base/root.html:33 #, fuzzy -msgid "Show Selected Changesets __S → __E" +#| msgid "Show Selected Changesets __S → __E" +msgid "Show Selected Changesets {0} → {1}" msgstr "Mostrar changesets selecionados __S -> __E" #: kallithea/templates/base/root.html:34 #, fuzzy -msgid "Show Selected Changeset __S" -msgstr "Mostrar changesets selecionados __S" +msgid "Selection Link" +msgstr "Link da seleção" #: kallithea/templates/base/root.html:35 -#, fuzzy -msgid "Selection Link" -msgstr "Link da seleção" - -#: kallithea/templates/base/root.html:36 #: kallithea/templates/changeset/diff_block.html:8 #, fuzzy msgid "Collapse Diff" msgstr "Colapsar diff" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:36 #, fuzzy msgid "Expand Diff" msgstr "Expandir diff" -#: kallithea/templates/base/root.html:38 +#: kallithea/templates/base/root.html:37 msgid "Failed to revoke permission" msgstr "Falhou ao revocar a permissão" -#: kallithea/templates/base/root.html:39 +#: kallithea/templates/base/root.html:38 #, fuzzy msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "confirme para revogar permissão para {0}: {1} ?" -#: kallithea/templates/base/root.html:40 +#: kallithea/templates/base/root.html:39 msgid "enabled" msgstr "" -#: kallithea/templates/base/root.html:41 +#: kallithea/templates/base/root.html:40 msgid "disabled" msgstr "" -#: kallithea/templates/base/root.html:43 +#: kallithea/templates/base/root.html:42 #, fuzzy msgid "Specify changeset" msgstr "%s Changeset" @@ -4841,7 +4816,6 @@ #: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 #: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" @@ -4881,7 +4855,7 @@ msgstr[0] "mostrando %d de %d revisão" msgstr[1] "mostrando %d de %d revisões" -#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/templates/changelog/changelog.html:49 msgid "Clear selection" msgstr "Deselecionar seleção" @@ -4910,8 +4884,6 @@ #: kallithea/templates/changelog/changelog.html:92 #: kallithea/templates/changelog/changelog_summary_data.html:20 #, fuzzy, python-format -#| msgid "" "Changeset status: %s\n" "Click to open associated pull request -#| #%s" msgid "" "Changeset status: %s\n" "Click to open associated pull request %s" @@ -4959,7 +4931,7 @@ msgid "Branch %s" msgstr "Ramo %s" -#: kallithea/templates/changelog/changelog.html:291 +#: kallithea/templates/changelog/changelog.html:310 msgid "There are no changes yet" msgstr "Ainda não há alteações" @@ -5017,7 +4989,6 @@ #: kallithea/templates/changelog/changelog_summary_data.html:90 #, fuzzy -#| msgid "Push new repo" msgid "Push new repository" msgstr "Fazer push de novo repositório" @@ -5063,7 +5034,6 @@ #: kallithea/templates/changeset/changeset.html:89 #: kallithea/templates/changeset/changeset_range.html:88 #, fuzzy -#| msgid "merge" msgid "Merge" msgstr "mesclar" @@ -5078,19 +5048,17 @@ #: kallithea/templates/changeset/changeset.html:135 #, fuzzy -#| msgid "Created by" msgid "Replaced by:" msgstr "criado" #: kallithea/templates/changeset/changeset.html:149 #, fuzzy -#| msgid "Created by" msgid "Preceded by:" msgstr "criado" #: kallithea/templates/changeset/changeset.html:166 #: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:314 +#: kallithea/templates/pullrequests/pullrequest_show.html:318 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -5099,7 +5067,7 @@ #: kallithea/templates/changeset/changeset.html:168 #: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:320 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -5108,8 +5076,8 @@ #: kallithea/templates/changeset/changeset.html:182 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 #, fuzzy msgid "Show full diff anyway" msgstr "Mostrar diff completo" @@ -5117,13 +5085,11 @@ #: kallithea/templates/changeset/changeset.html:247 #: kallithea/templates/changeset/changeset.html:284 #, fuzzy -#| msgid "revisions" msgid "No revisions" msgstr "revisões" #: kallithea/templates/changeset/changeset_file_comment.html:21 #, fuzzy -#| msgid "Comment from pull request" msgid "on pull request" msgstr "Comentar no pull request #%s" @@ -5134,7 +5100,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:24 #, fuzzy -#| msgid "No changesets" msgid "on this changeset" msgstr "Nenhum changeset" @@ -5145,7 +5110,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:37 #, fuzzy -#| msgid "Latest Changes" msgid "Status change" msgstr "Mudanças mais recentes" @@ -5221,7 +5185,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:150 #, fuzzy -#| msgid "Use @username inside this text to notify another user" msgid "Use @username inside this text to notify another user." msgstr "" "Use @nomedeusuário dentro desse texto para enviar notificação a este " @@ -5306,7 +5269,7 @@ msgstr "Mostrar diff completo" #: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:306 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 #, fuzzy msgid "Common ancestor" msgstr "Comentário no changeset" @@ -5350,7 +5313,7 @@ msgstr "" #: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:301 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5414,16 +5377,26 @@ msgstr "Olá %s" #: kallithea/templates/email_templates/password_reset.html:6 -msgid "We received a request to create a new password for your account." +#, fuzzy +#| msgid "We received a request to create a new password for your account." +msgid "We have received a request to reset the password for your account." msgstr "Recebemos uma requisição para criar uma nova senha para sua conta." #: kallithea/templates/email_templates/password_reset.html:7 -msgid "You can generate it by clicking following URL" -msgstr "Você pode gerá-la clicando na seguinte URL" +msgid "To set a new password, click the following link" +msgstr "" #: kallithea/templates/email_templates/password_reset.html:10 -msgid "Please ignore this email if you did not request a new password ." -msgstr "Por favor, ignore este email se você não requisitou uma nova senha." +msgid "" +"Should you not be able to use the link above, please type the following " +"code into the password reset form" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:12 +msgid "" +"If it weren't you who requested the password reset, just disregard this " +"message." +msgstr "" #: kallithea/templates/email_templates/pull_request.html:5 #, fuzzy, python-format @@ -5793,7 +5766,6 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:14 #, fuzzy -#| msgid "revoke" msgid "Vote" msgstr "revogar" @@ -5835,19 +5807,16 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:70 #, fuzzy, python-format -#| msgid "Confirm to delete this pull request" msgid "Confirm again to delete this pull request with %s comments" msgstr "Confirme para excluir este pull request" #: kallithea/templates/pullrequests/pullrequest_show.html:6 #, fuzzy, python-format -#| msgid "%s Pull Request #%s" msgid "%s Pull Request %s" msgstr "%s Pull Request #%s" #: kallithea/templates/pullrequests/pullrequest_show.html:10 #, fuzzy, python-format -#| msgid "Pull Requests from %s'" msgid "Pull request %s from %s#%s" msgstr "Pull requests de %s" @@ -5898,108 +5867,114 @@ msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:131 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +msgid "" +"This is just a range of changesets and doesn't have a target or a real " +"merge ancestor." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:133 msgid "Pull changes" msgstr "Puxar mudanças" -#: kallithea/templates/pullrequests/pullrequest_show.html:154 -#, fuzzy -msgid "Created by" -msgstr "criado" - -#: kallithea/templates/pullrequests/pullrequest_show.html:169 +#: kallithea/templates/pullrequests/pullrequest_show.html:173 #, fuzzy msgid "Update" msgstr "usuário [atualizado]" -#: kallithea/templates/pullrequests/pullrequest_show.html:187 +#: kallithea/templates/pullrequests/pullrequest_show.html:191 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:209 +#: kallithea/templates/pullrequests/pullrequest_show.html:213 #, fuzzy msgid "Pull Request Reviewers" msgstr "Revisores do pull request" -#: kallithea/templates/pullrequests/pullrequest_show.html:234 +#: kallithea/templates/pullrequests/pullrequest_show.html:238 #, fuzzy msgid "Remove reviewer" msgstr "revisor" -#: kallithea/templates/pullrequests/pullrequest_show.html:246 +#: kallithea/templates/pullrequests/pullrequest_show.html:250 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:254 +#: kallithea/templates/pullrequests/pullrequest_show.html:258 #, fuzzy msgid "Potential Reviewers" msgstr "Visualizar comentário" -#: kallithea/templates/pullrequests/pullrequest_show.html:257 +#: kallithea/templates/pullrequests/pullrequest_show.html:261 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:280 +#: kallithea/templates/pullrequests/pullrequest_show.html:284 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/templates/pullrequests/pullrequest_show.html:285 #, fuzzy msgid "Save as New Pull Request" msgstr "Crie novo pull request" -#: kallithea/templates/pullrequests/pullrequest_show.html:282 +#: kallithea/templates/pullrequests/pullrequest_show.html:286 #, fuzzy msgid "Cancel Changes" msgstr "Mudanças mais recentes" -#: kallithea/templates/pullrequests/pullrequest_show.html:292 +#: kallithea/templates/pullrequests/pullrequest_show.html:296 #, fuzzy msgid "Pull Request Content" msgstr "O pull request mudou de estado" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" msgstr "%s Pull Requests" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, fuzzy, python-format msgid "Pull Requests from %s'" msgstr "Pull requests de %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:13 #, fuzzy, python-format msgid "Pull Requests to '%s'" msgstr "Pull requests para %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#, fuzzy +msgid "Open New Pull Request" +msgstr "Crie novo pull request" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 #, fuzzy, python-format msgid "Show Pull Requests to %s" msgstr "Pull requests para %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 #, fuzzy, python-format msgid "Show Pull Requests from '%s'" msgstr "Pull requests de %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 -msgid "Hide closed pull requests (only show open pull requests)" -msgstr "" - #: kallithea/templates/pullrequests/pullrequest_show_all.html:49 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:30 #, fuzzy msgid "Show closed pull requests (in addition to open pull requests)" msgstr "Mostrar pull requests fechados também" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 #, fuzzy msgid "Pull Requests Created by Me" msgstr "Revisores do pull request" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 #, fuzzy msgid "Pull Requests I Participate In" msgstr "Eu participo em" @@ -6171,7 +6146,6 @@ #: kallithea/templates/summary/summary.html:125 #, fuzzy -#| msgid "with subrepos" msgid "With subrepos" msgstr "com subrepositórios" @@ -6254,21 +6228,6 @@ #~ msgstr "Nenhum Arquivo" #~ msgid "" -#~ "Comment on %(repo_name)s changeset " -#~ "%(short_id)s on %(branch)s by " -#~ "%(comment_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Review request on %(repo_name)s pull " -#~ "request #%(pr_id)s from %(ref)s by " -#~ "%(pr_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Comment on %(repo_name)s pull request " -#~ "#%(pr_id)s from %(ref)s by " -#~ "%(comment_username)s" #~ msgstr "" #~ msgid "Username \"%(username)s\" is forbidden" @@ -6288,16 +6247,6 @@ #~ msgid "Revisions %(revs)s are already part of pull request or have set status" #~ msgstr "" -#~ "As revisões %(revs)s já fazem parte " -#~ "de um pull request ou já setaram" -#~ " o estado" - -#~ msgid "" -#~ "Comma separated list of plugins. Order" -#~ " of plugins is also order in " -#~ "which Kallithea will try to authenticate" -#~ " user" -#~ msgstr "" #~ msgid "Defaults" #~ msgstr "Padrões" @@ -6341,12 +6290,6 @@ #~ msgid "current IP" #~ msgstr "" -#~ msgid "" -#~ "Your user is in an external source" -#~ " of record; some details cannot be" -#~ " managed here" -#~ msgstr "" - #~ msgid "Permissions Administration" #~ msgstr "Administração de permissões" @@ -6356,12 +6299,6 @@ #~ msgid "Overwrite existing settings" #~ msgstr "Sobrescrever as configurações existentes" -#~ msgid "" -#~ "Write permission to a repository group" -#~ " allows creating repositories inside that" -#~ " group." -#~ msgstr "" - #~ msgid "Default IP Whitelist for All Users" #~ msgstr "" @@ -6404,20 +6341,6 @@ #~ msgid "Non-changeable id" #~ msgstr "ID inalterável" -#~ msgid "" -#~ "In case this repository is renamed " -#~ "or moved into another group the " -#~ "repository URL changes.\n" -#~ " Using the above " -#~ "URL guarantees that this repository will" -#~ " always be accessible under such URL." -#~ "\n" -#~ " Useful for CI " -#~ "systems, or any other cases that " -#~ "you need to hardcode the URL into" -#~ " 3rd party service." -#~ msgstr "" - #~ msgid "edit" #~ msgstr "editar" @@ -6463,12 +6386,6 @@ #~ msgid "Destroy old data" #~ msgstr "Destruir dados antigos" -#~ msgid "" -#~ "Check this option to remove references" -#~ " to repositories that no longer exist" -#~ " in on the filesystem." -#~ msgstr "" - #~ msgid "check for updates" #~ msgstr "" @@ -6478,21 +6395,9 @@ #~ msgid "user groups" #~ msgstr "" -#~ msgid "" -#~ "This user is in an external source" -#~ " of record (%s); some details cannot" -#~ " be managed here." -#~ msgstr "" - #~ msgid "Inherit from defaults" #~ msgstr "" -#~ msgid "" -#~ "Select to inherit permissions from %s" -#~ " permissions settings, and default IP " -#~ "address whitelist." -#~ msgstr "" - #~ msgid "show" #~ msgstr "" @@ -6514,14 +6419,6 @@ #~ msgid "Comment on changeset" #~ msgstr "Comentário no changeset" -#~ msgid "" -#~ "Use @username inside this text to " -#~ "send notification to another local user." -#~ msgstr "" -#~ "Use @nomedeusuário dentro desse texto " -#~ "para enviar notificação a este usuário" -#~ " do Kallithea" - #~ msgid "revision" #~ msgstr "" @@ -6546,3 +6443,45 @@ #~ msgid "reviewer" #~ msgstr "revisor" +#~ msgid "" +#~ "Your password reset was successful, new" +#~ " password has been sent to your " +#~ "email" +#~ msgstr "" +#~ "Sua reinicialização de senha foi bem " +#~ "sucedida, sua senha foi enviada ao " +#~ "seu e-mail" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Added by %(pr_username)s] %(repo_name)s pull" +#~ " request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "Your new Kallithea password:%s" +#~ msgstr "Sua nova senha no Kallithea: %s" + +#~ msgid "Open New Pull Request for Selected Changesets" +#~ msgstr "Abrir novo pull request para os changesets selecionados" + +#~ msgid "Show Selected Changeset __S" +#~ msgstr "Mostrar changesets selecionados __S" + +#~ msgid "You can generate it by clicking following URL" +#~ msgstr "Você pode gerá-la clicando na seguinte URL" + +#~ msgid "Please ignore this email if you did not request a new password ." +#~ msgstr "Por favor, ignore este email se você não requisitou uma nova senha." + +#~ msgid "Created by" +#~ msgstr "criado" +
--- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Tue Sep 08 10:21:46 2015 +0000 +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Tue Sep 08 10:37:51 2015 +0200 @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2015-08-25 11:37+0200\n" +"POT-Creation-Date: 2015-09-08 10:34+0200\n" "PO-Revision-Date: 2015-04-13 20:18+0200\n" "Last-Translator: Andrew Shadura <andrew@shadura.me>\n" "Language-Team: Russian " @@ -32,7 +32,7 @@ "X-Generator: Weblate 2.3-dev\n" #: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:241 kallithea/lib/base.py:512 +#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 msgid "There are no changesets yet" msgstr "Ещё не было изменений" @@ -48,7 +48,7 @@ msgid "None" msgstr "Ничего" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(закрыто)" @@ -63,12 +63,11 @@ #: kallithea/controllers/changeset.py:169 #, fuzzy, python-format -#| msgid "increase diff context to %(num)s lines" msgid "Increase diff context to %(num)s lines" msgstr "увеличить контекст до %(num)s строк" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:743 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 msgid "Such revision does not exist for this repository" msgstr "Нет такой ревизии в этом репозитории" @@ -80,17 +79,16 @@ "Нельзя редактировать статус изменений, связанных с закрытыми pull-" "request'ами" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:42 +#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 msgid "Select changeset" msgstr "Выбрать набор изменений" -#: kallithea/controllers/compare.py:258 +#: kallithea/controllers/compare.py:261 msgid "Cannot compare repositories without using common ancestor" msgstr "Невозможно сравнивать репозитории без общего предка" #: kallithea/controllers/error.py:71 #, fuzzy -#| msgid "revisions" msgid "No response" msgstr "версии" @@ -135,8 +133,8 @@ #: kallithea/templates/changeset/changeset.html:195 #: kallithea/templates/compare/compare_diff.html:78 #: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Changeset was too big and was cut off..." msgstr "Изменения оказались слишком большими и были вырезаны..." @@ -145,115 +143,115 @@ msgid "%s committed on %s" msgstr "%s выполнил коммит в %s" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:91 msgid "Click here to add new file" msgstr "Нажмите чтобы добавить новый файл" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:92 #, python-format msgid "There are no files yet. %s" msgstr "Нет файлов. %s" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "%s (%s)" -#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 -#: kallithea/controllers/files.py:433 +#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 +#: kallithea/controllers/files.py:432 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Репозиторий заблокировал %s в %s" -#: kallithea/controllers/files.py:318 +#: kallithea/controllers/files.py:317 msgid "You can only delete files with revision being a valid branch " msgstr "Вы можете удалять файлы только в ревизии, связанной с существующей веткой " -#: kallithea/controllers/files.py:329 +#: kallithea/controllers/files.py:328 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Файл %s удалён с помощью Kallithea" -#: kallithea/controllers/files.py:351 +#: kallithea/controllers/files.py:350 #, python-format msgid "Successfully deleted file %s" msgstr "Файл %s удалён" -#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 -#: kallithea/controllers/files.py:502 +#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 +#: kallithea/controllers/files.py:501 msgid "Error occurred during commit" msgstr "Во время коммита произошла ошибка" -#: kallithea/controllers/files.py:378 +#: kallithea/controllers/files.py:377 msgid "You can only edit files with revision being a valid branch " msgstr "" "Вы можете редактировать файлы только в ревизии, связанной с существующей " "веткой " -#: kallithea/controllers/files.py:392 +#: kallithea/controllers/files.py:391 #, python-format msgid "Edited file %s via Kallithea" msgstr "Файл %s отредактирован с помощью Kallithea" -#: kallithea/controllers/files.py:408 +#: kallithea/controllers/files.py:407 msgid "No changes" msgstr "Без изменений" -#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 +#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 #, python-format msgid "Successfully committed to %s" msgstr "Изменения применены в %s" -#: kallithea/controllers/files.py:444 +#: kallithea/controllers/files.py:443 msgid "Added file via Kallithea" msgstr "Файл добавлен с помощью Kallithea" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:464 msgid "No content" msgstr "Пусто" -#: kallithea/controllers/files.py:469 +#: kallithea/controllers/files.py:468 msgid "No filename" msgstr "Безымянный" -#: kallithea/controllers/files.py:494 +#: kallithea/controllers/files.py:493 msgid "Location must be relative path and must not contain .. in path" msgstr "" "Расположение должно быть относительным путем, и не должно содержать " "\"..\" в пути" -#: kallithea/controllers/files.py:527 +#: kallithea/controllers/files.py:526 msgid "Downloads disabled" msgstr "Возможность скачивать отключена" -#: kallithea/controllers/files.py:538 +#: kallithea/controllers/files.py:537 #, python-format msgid "Unknown revision %s" msgstr "Неизвестная ревизия %s" -#: kallithea/controllers/files.py:540 +#: kallithea/controllers/files.py:539 msgid "Empty repository" msgstr "Пустой репозиторий" -#: kallithea/controllers/files.py:542 +#: kallithea/controllers/files.py:541 msgid "Unknown archive type" msgstr "Неизвестный тип архива" -#: kallithea/controllers/files.py:772 +#: kallithea/controllers/files.py:771 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:15 #: kallithea/templates/pullrequests/pullrequest.html:97 msgid "Changesets" msgstr "Набор изменений" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:821 kallithea/templates/switch_to_list.html:3 +#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 +#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "Ветки" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:832 kallithea/templates/switch_to_list.html:25 +#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 +#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "Метки" @@ -274,9 +272,9 @@ #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:131 -#: kallithea/templates/base/base.html:397 -#: kallithea/templates/base/base.html:569 +#: kallithea/templates/base/base.html:124 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "Репозитории" @@ -302,31 +300,37 @@ msgstr "Публичный журнал" #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:229 +#: kallithea/templates/base/base.html:222 #: kallithea/templates/journal/journal.html:4 #: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "Журнал" -#: kallithea/controllers/login.py:150 kallithea/controllers/login.py:196 +#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 #, fuzzy -#| msgid "bad captcha" msgid "Bad captcha" msgstr "неверная капча" -#: kallithea/controllers/login.py:156 +#: kallithea/controllers/login.py:157 msgid "You have successfully registered into Kallithea" msgstr "Регистрация в Kallithea прошла успешно" -#: kallithea/controllers/login.py:201 -msgid "Your password reset link was sent" +#: kallithea/controllers/login.py:202 +#, fuzzy +#| msgid "Your password reset link was sent" +msgid "A password reset confirmation code has been sent" msgstr "Ссылка для сброса пароля отправлена" -#: kallithea/controllers/login.py:222 -msgid "" -"Your password reset was successful, new password has been sent to your " -"email" -msgstr "Сброс пароля произведён, новый пароль был отправлен на ваш email" +#: kallithea/controllers/login.py:251 +#, fuzzy +#| msgid "Password reset link" +msgid "Invalid password reset token" +msgstr "Ссылка сброса пароля" + +#: kallithea/controllers/login.py:256 +#: kallithea/controllers/admin/my_account.py:167 +msgid "Successfully updated password" +msgstr "Пароль обновлён" #: kallithea/controllers/pullrequests.py:124 #, python-format @@ -347,112 +351,112 @@ msgid "Peer branches" msgstr "Ветки участника" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:827 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Закладки" -#: kallithea/controllers/pullrequests.py:306 +#: kallithea/controllers/pullrequests.py:310 #, python-format msgid "Error creating pull request: %s" msgstr "Ошибка при создании pull-запроса: %s" -#: kallithea/controllers/pullrequests.py:352 -#: kallithea/controllers/pullrequests.py:499 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:503 msgid "No description" msgstr "Нет описания" -#: kallithea/controllers/pullrequests.py:359 +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "Pull-запрос создан успешно" -#: kallithea/controllers/pullrequests.py:362 -#: kallithea/controllers/pullrequests.py:449 -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:453 +#: kallithea/controllers/pullrequests.py:509 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:365 -#: kallithea/controllers/pullrequests.py:452 +#: kallithea/controllers/pullrequests.py:369 +#: kallithea/controllers/pullrequests.py:456 msgid "Error occurred while creating pull request" msgstr "Произошла ошибка при создании pull-запроса" -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:401 msgid "Missing changesets since the previous pull request:" msgstr "Отсутствующие ревизии относительно предыдущего pull-запроса:" -#: kallithea/controllers/pullrequests.py:404 +#: kallithea/controllers/pullrequests.py:408 #, python-format msgid "New changesets on %s %s since the previous pull request:" msgstr "Новые ревизии на %s %s относительно предыдущего pull-запроса" -#: kallithea/controllers/pullrequests.py:411 +#: kallithea/controllers/pullrequests.py:415 msgid "Ancestor didn't change - show diff since previous version:" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:422 #, python-format msgid "" "This pull request is based on another %s revision and there is no simple " "diff." msgstr "Этот pull-запрос основан на другой ревизии %s, простой diff невозможен" -#: kallithea/controllers/pullrequests.py:420 +#: kallithea/controllers/pullrequests.py:424 #, python-format msgid "No changes found on %s %s since previous version." msgstr "Нет изменений на %s %s относительно предыдущей версии." -#: kallithea/controllers/pullrequests.py:458 +#: kallithea/controllers/pullrequests.py:462 #, python-format msgid "Closed, replaced by %s ." msgstr "Закрыт, замещён %s ." -#: kallithea/controllers/pullrequests.py:466 +#: kallithea/controllers/pullrequests.py:470 msgid "Pull request update created" msgstr "Обновление для pull-запроса создано" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:513 msgid "Pull request updated" msgstr "Pull-запрос обновлён" -#: kallithea/controllers/pullrequests.py:523 +#: kallithea/controllers/pullrequests.py:528 msgid "Successfully deleted pull request" msgstr "Pull-запрос успешно удалён" -#: kallithea/controllers/pullrequests.py:582 +#: kallithea/controllers/pullrequests.py:594 #, python-format msgid "This pull request has already been merged to %s." msgstr "Этот pull-запрос уже принят на ветку %s." -#: kallithea/controllers/pullrequests.py:584 +#: kallithea/controllers/pullrequests.py:596 msgid "This pull request has been closed and can not be updated." msgstr "Этот pull-запрос был закрыт и не может быть обновлён." -#: kallithea/controllers/pullrequests.py:602 +#: kallithea/controllers/pullrequests.py:614 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "Этот pull-запрос может быть обновлён из %s:" -#: kallithea/controllers/pullrequests.py:605 +#: kallithea/controllers/pullrequests.py:617 msgid "No changesets found for updating this pull request." msgstr "Нет изменений для обновления этого pull-запроса." -#: kallithea/controllers/pullrequests.py:613 +#: kallithea/controllers/pullrequests.py:625 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Внимание: Ветка %s имеет ещё одну верхушку: %s." -#: kallithea/controllers/pullrequests.py:619 +#: kallithea/controllers/pullrequests.py:631 msgid "Git pull requests don't support updates yet." msgstr "Обновление pull-запросы git не поддерживается." -#: kallithea/controllers/pullrequests.py:710 +#: kallithea/controllers/pullrequests.py:722 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:715 +#: kallithea/controllers/pullrequests.py:727 msgid "Closing." msgstr "Закрыт." @@ -496,39 +500,38 @@ #: kallithea/controllers/admin/gists.py:59 #: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:283 +#: kallithea/controllers/admin/users.py:285 #, fuzzy -#| msgid "forever" msgid "Forever" msgstr "навсегда" #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/users.py:286 msgid "5 minutes" msgstr "5 минут" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/users.py:287 msgid "1 hour" msgstr "1 час" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/users.py:288 msgid "1 day" msgstr "1 день" #: kallithea/controllers/admin/gists.py:63 #: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/users.py:289 msgid "1 month" msgstr "1 месяц" #: kallithea/controllers/admin/gists.py:67 #: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/users.py:291 msgid "Lifetime" msgstr "Срок" @@ -543,7 +546,6 @@ #: kallithea/controllers/admin/gists.py:233 #, fuzzy -#| msgid "Last Modified" msgid "Unmodified" msgstr "Последнее изменение" @@ -560,8 +562,8 @@ msgid "Error occurred during update of gist %s" msgstr "Произошла ошибка при обновлении gist-записи %s" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:208 -#: kallithea/model/user.py:230 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 +#: kallithea/model/user.py:237 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Вы не можете изменить данные этого пользователя, поскольку он важен для " @@ -572,47 +574,43 @@ msgstr "Ваша учетная запись успешно обновлена" #: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:204 +#: kallithea/controllers/admin/users.py:202 #, python-format msgid "Error occurred during update of user %s" msgstr "Произошла ошибка при обновлении пользователя %s" -#: kallithea/controllers/admin/my_account.py:167 -msgid "Successfully updated password" -msgstr "Пароль обновлён" - #: kallithea/controllers/admin/my_account.py:178 msgid "Error occurred during update of user password" msgstr "Ошибка при обновлении пароля" #: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:413 +#: kallithea/controllers/admin/users.py:415 #, python-format msgid "Added email %s to user" msgstr "Пользователю добавлен e-mail %s" #: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:419 +#: kallithea/controllers/admin/users.py:421 msgid "An error occurred during email saving" msgstr "Произошла ошибка при сохранении e-mail" #: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:431 +#: kallithea/controllers/admin/users.py:433 msgid "Removed email from user" msgstr "E-mail пользователя удалён" #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:306 +#: kallithea/controllers/admin/users.py:308 msgid "API key successfully created" msgstr "API-ключ успешно создан" #: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:319 +#: kallithea/controllers/admin/users.py:321 msgid "API key successfully reset" msgstr "API-ключ успешно сброшен" #: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:323 +#: kallithea/controllers/admin/users.py:325 msgid "API key successfully deleted" msgstr "API-ключ успешно удалён" @@ -662,10 +660,10 @@ #: kallithea/templates/admin/users/user_edit_profile.html:105 #: kallithea/templates/admin/users/users.html:10 #: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:252 +#: kallithea/templates/base/base.html:253 #: kallithea/templates/base/base.html:259 #: kallithea/templates/base/base.html:260 -#: kallithea/templates/base/base.html:266 -#: kallithea/templates/base/base.html:267 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Администратор" @@ -832,7 +830,6 @@ #: kallithea/controllers/admin/repos.py:321 #, fuzzy, python-format -#| msgid "Cannot delete %s it still contains attached forks" msgid "Cannot delete repository %s which still has forks" msgstr "Невозможно удалить %s, он всё-ещё содержит форки" @@ -881,14 +878,12 @@ #: kallithea/controllers/admin/repos.py:537 #: kallithea/controllers/admin/repos.py:564 #, fuzzy -#| msgid "Repository is not locked" msgid "Repository has been locked" msgstr "Репозиторий не заблокирован" #: kallithea/controllers/admin/repos.py:540 #: kallithea/controllers/admin/repos.py:561 #, fuzzy -#| msgid "Repository is not locked" msgid "Repository has been unlocked" msgstr "Репозиторий не заблокирован" @@ -930,48 +925,48 @@ "отсутствует" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:274 +#: kallithea/controllers/admin/settings.py:277 msgid "Error occurred while updating application settings" msgstr "Произошла ошибка при обновлении настроек приложения" -#: kallithea/controllers/admin/settings.py:213 +#: kallithea/controllers/admin/settings.py:216 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "Репозитории успешно пересканированы, добавлено: %s, удалено: %s." -#: kallithea/controllers/admin/settings.py:270 +#: kallithea/controllers/admin/settings.py:273 msgid "Updated application settings" msgstr "Обновленные параметры настройки приложения" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "Настройки визуализации обновлены" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:335 msgid "Error occurred during updating visualisation settings" msgstr "Произошла ошибка при обновлении настроек визуализации" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:361 msgid "Please enter email address" msgstr "Пожалуйста, введите адрес электронной почты" -#: kallithea/controllers/admin/settings.py:373 +#: kallithea/controllers/admin/settings.py:376 msgid "Send email task created" msgstr "Задача отправки Email создана" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Added new hook" msgstr "Добавлена новая ловушка" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:421 msgid "Updated hooks" msgstr "Обновлённые ловушки" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:425 msgid "Error occurred during hook creation" msgstr "произошла ошибка при создании хука" -#: kallithea/controllers/admin/settings.py:448 +#: kallithea/controllers/admin/settings.py:451 msgid "Whoosh reindex task scheduled" msgstr "Запланирована переиндексация базы Whoosh" @@ -1012,70 +1007,70 @@ msgstr "Привилегии группы пользователей обновлены" #: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:382 +#: kallithea/controllers/admin/users.py:384 msgid "Updated permissions" msgstr "Обновлены привилегии" #: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:386 +#: kallithea/controllers/admin/users.py:388 msgid "An error occurred during permissions saving" msgstr "Произошла ошибка при сохранении привилегий" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:134 #, python-format msgid "Created user %s" msgstr "Пользователь %s создан" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "Произошла ошибка при создании пользователя %s" -#: kallithea/controllers/admin/users.py:184 +#: kallithea/controllers/admin/users.py:182 msgid "User updated successfully" msgstr "Пользователь успешно обновлён" -#: kallithea/controllers/admin/users.py:220 +#: kallithea/controllers/admin/users.py:218 msgid "Successfully deleted user" msgstr "Пользователь успешно удалён" -#: kallithea/controllers/admin/users.py:225 +#: kallithea/controllers/admin/users.py:223 msgid "An error occurred during deletion of user" msgstr "Произошла ошибка при удалении пользователя" -#: kallithea/controllers/admin/users.py:238 +#: kallithea/controllers/admin/users.py:236 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:461 +#: kallithea/controllers/admin/users.py:463 #, python-format msgid "Added IP address %s to user whitelist" msgstr "Добавлен IP %s в белый список пользователя" -#: kallithea/controllers/admin/users.py:467 +#: kallithea/controllers/admin/users.py:469 msgid "An error occurred while adding IP address" msgstr "Произошла ошибка при сохранении IP" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 msgid "Removed IP address from user whitelist" msgstr "Удален IP %s из белого списка пользователя" -#: kallithea/lib/auth.py:744 +#: kallithea/lib/auth.py:743 #, python-format msgid "IP %s not allowed" msgstr "IP %s заблокирован" -#: kallithea/lib/auth.py:757 +#: kallithea/lib/auth.py:756 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:795 +#: kallithea/lib/auth.py:812 msgid "You need to be a registered user to perform this action" msgstr "" "Вы должны быть зарегистрированным пользователем, чтобы выполнить это " "действие" -#: kallithea/lib/auth.py:827 +#: kallithea/lib/auth.py:844 msgid "You need to be signed in to view this page" msgstr "Страница доступна только авторизованным пользователям" @@ -1118,7 +1113,6 @@ #: kallithea/lib/helpers.py:677 #, fuzzy -#| msgid "compare view" msgid "Compare view" msgstr "сравнение" @@ -1137,13 +1131,11 @@ #: kallithea/lib/helpers.py:722 #, fuzzy, python-format -#| msgid "fork name %s" msgid "Fork name %s" msgstr "имя форка %s" #: kallithea/lib/helpers.py:742 #, fuzzy, python-format -#| msgid "Pull request #%s" msgid "Pull request %s" msgstr "Pull-запрос #%s" @@ -1234,7 +1226,7 @@ #: kallithea/lib/helpers.py:1128 #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "Нет файлов" @@ -1787,13 +1779,11 @@ #: kallithea/model/db.py:1668 #, fuzzy -#| msgid "Unauthorized access to resource" msgid "Default user has read access to new repositories" msgstr "Несанкционированный доступ к ресурсу" #: kallithea/model/db.py:1669 #, fuzzy -#| msgid "Unauthorized access to resource" msgid "Default user has write access to new repositories" msgstr "Несанкционированный доступ к ресурсу" @@ -1834,26 +1824,22 @@ msgstr "" #: kallithea/model/db.py:1682 -#, fuzzy, python-format -#| msgid "Created repository group %s" +#, fuzzy msgid "Only admins can create repository groups" msgstr "Создана новая группа репозиториев %s" #: kallithea/model/db.py:1683 -#, fuzzy, python-format -#| msgid "Created repository group %s" +#, fuzzy msgid "Non-admins can create repository groups" msgstr "Создана новая группа репозиториев %s" #: kallithea/model/db.py:1685 #, fuzzy -#| msgid "Create user groups" msgid "Only admins can create user groups" msgstr "Создавать группы пользователей" #: kallithea/model/db.py:1686 #, fuzzy -#| msgid "Create user groups" msgid "Non-admins can create user groups" msgstr "Создавать группы пользователей" @@ -1867,37 +1853,31 @@ #: kallithea/model/db.py:1694 #, fuzzy -#| msgid "Location of repositories" msgid "Only admins can fork repositories" msgstr "Местонахождение репозиториев" #: kallithea/model/db.py:1695 #, fuzzy -#| msgid "Invalidate cache for all repositories" msgid "Non-admins can can fork repositories" msgstr "Сбросить кэш для всех репозиториев" #: kallithea/model/db.py:1698 #, fuzzy -#| msgid "User Registration with manual account activation" msgid "User registration with manual account activation" msgstr "Регистрация пользователя с ручной активацией учётной записи" #: kallithea/model/db.py:1699 #, fuzzy -#| msgid "User Registration with automatic account activation" msgid "User registration with automatic account activation" msgstr "Регистрация пользователя с автоматической активацией" #: kallithea/model/db.py:2228 #, fuzzy -#| msgid "Not Reviewed" msgid "Not reviewed" msgstr "Не просмотрено" #: kallithea/model/db.py:2231 #, fuzzy -#| msgid "Under Review" msgid "Under review" msgstr "На рассмотрении" @@ -1925,37 +1905,31 @@ #: kallithea/model/notification.py:254 #, fuzzy, python-format -#| msgid "%(user)s commented on changeset at %(when)s" msgid "%(user)s commented on changeset %(age)s" msgstr "%(user)s оставил комментарий к набору изменений %(when)s" #: kallithea/model/notification.py:255 #, fuzzy, python-format -#| msgid "%(user)s sent message at %(when)s" msgid "%(user)s sent message %(age)s" msgstr "%(user)s отправил сообщение %(when)s" #: kallithea/model/notification.py:256 #, fuzzy, python-format -#| msgid "%(user)s mentioned you at %(when)s" msgid "%(user)s mentioned you %(age)s" msgstr "%(user)s упомянул вас %(when)s" #: kallithea/model/notification.py:257 #, fuzzy, python-format -#| msgid "%(user)s registered in Kallithea at %(when)s" msgid "%(user)s registered in Kallithea %(age)s" msgstr "%(user)s зарегистрировался в Kallithea %(when)s" #: kallithea/model/notification.py:258 #, fuzzy, python-format -#| msgid "%(user)s opened new pull request at %(when)s" msgid "%(user)s opened new pull request %(age)s" msgstr "%(user)s открыл новый pull-запрос %(when)s" #: kallithea/model/notification.py:259 #, fuzzy, python-format -#| msgid "%(user)s commented on pull request at %(when)s" msgid "%(user)s commented on pull request %(age)s" msgstr "%(user)s оставил комментарий к pull-запросу %(when)s" @@ -1991,9 +1965,7 @@ #: kallithea/model/notification.py:302 #, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s changeset %(short_id)s " -"on %(branch)s" +msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" #: kallithea/model/notification.py:305 @@ -2002,18 +1974,17 @@ msgstr "Новый пользователь \"%(new_username)s\" зарегистрирован" #: kallithea/model/notification.py:307 -#, python-format -msgid "" -"[Added by %(pr_username)s] %(repo_name)s pull request %(pr_nice_id)s from" -" %(ref)s" -msgstr "" +#, fuzzy, python-format +#| msgid "%(user)s wants you to review pull request %(pr_nice_id)s: +#| %(pr_title)s" +msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgstr "%(user)s просит вас рассмотреть pull request #%(pr_id)s: %(pr_title)s" #: kallithea/model/notification.py:308 -#, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s pull request " -"%(pr_nice_id)s from %(ref)s" -msgstr "" +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgstr "[прокомментировано] в запросе на внесение изменений для" #: kallithea/model/notification.py:321 msgid "Closing" @@ -2021,27 +1992,25 @@ #: kallithea/model/pull_request.py:137 #, fuzzy, python-format -#| msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "%(user)s просит вас рассмотреть pull request #%(pr_id)s: %(pr_title)s" -#: kallithea/model/scm.py:813 +#: kallithea/model/scm.py:812 msgid "latest tip" msgstr "последняя версия" -#: kallithea/model/user.py:185 +#: kallithea/model/user.py:192 msgid "New user registration" msgstr "Регистрация нового пользователя" -#: kallithea/model/user.py:249 +#: kallithea/model/user.py:256 #, fuzzy -#| msgid "You can't remove this user since it's crucial for entire application" msgid "You can't remove this user since it is crucial for the entire application" msgstr "" "Вы не можете удалить пользователя, поскольку это критично для работы " "всего приложения" -#: kallithea/model/user.py:254 +#: kallithea/model/user.py:261 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -2050,7 +2019,7 @@ "Пользователь \"%s\" всё ещё является владельцем %s репозиториев и поэтому" " не может быть удалён. Смените владельца или удалите эти репозитории: %s" -#: kallithea/model/user.py:259 +#: kallithea/model/user.py:266 #, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch" @@ -2060,7 +2029,7 @@ "поэтому не может быть удалён. Смените владельца или удалите данные " "группы: %s" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:273 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -2070,18 +2039,22 @@ "поэтому не может быть удалён. Смените владельца или удалите данные " "группы: %s" -#: kallithea/model/user.py:296 +#: kallithea/model/user.py:360 msgid "Password reset link" msgstr "Ссылка сброса пароля" -#: kallithea/model/user.py:319 -msgid "Your new password" -msgstr "Ваш новый пароль" - -#: kallithea/model/user.py:320 -#, python-format -msgid "Your new Kallithea password:%s" -msgstr "Ваш новый пароль от Kallithea: %s" +#: kallithea/model/user.py:408 +#, fuzzy +#| msgid "Password reset link" +msgid "Password reset notification" +msgstr "Ссылка сброса пароля" + +#: kallithea/model/user.py:409 +#, python-format +msgid "" +"The password to your account %s has been changed using password reset " +"form." +msgstr "" #: kallithea/model/validators.py:77 kallithea/model/validators.py:78 msgid "Value cannot be an empty list" @@ -2094,15 +2067,11 @@ #: kallithea/model/validators.py:97 #, fuzzy, python-format -#| msgid "Username %(username)s is not valid" msgid "Username \"%(username)s\" cannot be used" msgstr "Имя \"%(username)s\" недопустимо" #: kallithea/model/validators.py:99 #, fuzzy -#| msgid "" "Username may only contain alphanumeric characters underscores, -#| periods or" " dashes and must begin with alphanumeric character or -#| underscore" msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with an alphanumeric character or underscore" @@ -2165,7 +2134,6 @@ #: kallithea/model/validators.py:300 #, fuzzy -#| msgid "invalid password" msgid "Invalid username or password" msgstr "неверный пароль" @@ -2175,7 +2143,6 @@ #: kallithea/model/validators.py:345 #, fuzzy, python-format -#| msgid "Repository name %(repo)s is disallowed" msgid "Repository name %(repo)s is not allowed" msgstr "Имя репозитория %(repo)s запрещено" @@ -2196,7 +2163,6 @@ #: kallithea/model/validators.py:465 #, fuzzy -#| msgid "private repository" msgid "Invalid repository URL" msgstr "приватный репозиторий" @@ -2232,13 +2198,11 @@ #: kallithea/model/validators.py:705 #, fuzzy -#| msgid "This email address is already taken" msgid "This email address is already in use" msgstr "Этот E-mail уже занят" #: kallithea/model/validators.py:725 #, fuzzy, python-format -#| msgid "email \"%(email)s\" does not exist." msgid "Email address \"%(email)s\" not found" msgstr "\"%(email)s\" не существует." @@ -2396,7 +2360,9 @@ #: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:229 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/pullrequests/pullrequest_show.html:156 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 #: kallithea/templates/summary/summary.html:134 msgid "Owner" msgstr "Владелец" @@ -2404,7 +2370,7 @@ #: kallithea/templates/index_base.html:140 #: kallithea/templates/admin/my_account/my_account_repos.html:57 #: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:44 +#: kallithea/templates/base/root.html:43 #: kallithea/templates/bookmarks/bookmarks.html:79 #: kallithea/templates/branches/branches.html:79 #: kallithea/templates/journal/journal.html:198 @@ -2416,7 +2382,7 @@ #: kallithea/templates/index_base.html:141 #: kallithea/templates/admin/my_account/my_account_repos.html:58 #: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:45 +#: kallithea/templates/base/root.html:44 #: kallithea/templates/bookmarks/bookmarks.html:80 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:199 @@ -2432,7 +2398,7 @@ #: kallithea/templates/index_base.html:143 #: kallithea/templates/admin/my_account/my_account_repos.html:60 #: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:46 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:201 @@ -2444,7 +2410,7 @@ #: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:147 kallithea/templates/base/root.html:48 +#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:202 @@ -2454,7 +2420,7 @@ msgstr "Загрузка..." #: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:333 +#: kallithea/templates/base/base.html:326 msgid "Log In" msgstr "Войти" @@ -2469,14 +2435,15 @@ #: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:24 #: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/pullrequests/pullrequest_show.html:166 msgid "Username" msgstr "Имя пользователя" #: kallithea/templates/login.html:33 kallithea/templates/register.html:33 #: kallithea/templates/admin/my_account/my_account.html:37 #: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:311 msgid "Password" msgstr "Пароль" @@ -2488,7 +2455,7 @@ msgid "Forgot your password ?" msgstr "Забыли пароль?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:329 +#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 msgid "Don't have an account ?" msgstr "Нет аккаунта?" @@ -2501,11 +2468,14 @@ msgstr "Сброс пароля" #: kallithea/templates/password_reset.html:12 +#: kallithea/templates/password_reset_confirmation.html:12 #, python-format msgid "Reset Your Password to %s" msgstr "Забыли пароль для %s?" #: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset_confirmation.html:5 +#: kallithea/templates/password_reset_confirmation.html:14 msgid "Reset Your Password" msgstr "Забыли пароль?" @@ -2523,11 +2493,45 @@ msgstr "Послать ссылку сброса пароля" #: kallithea/templates/password_reset.html:47 +#, fuzzy +#| msgid "" "Password reset link will be sent to the email address matching +#| your " "username." msgid "" -"Password reset link will be sent to the email address matching your " -"username." +"A password reset link will be sent to the specified email address if it " +"is registered in the system." msgstr "Ссылка для сброса пароля была отправлена на соответствующий e-mail." +#: kallithea/templates/password_reset_confirmation.html:19 +#, python-format +msgid "You are about to set a new password for the email address %s." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:20 +msgid "" +"Note that you must use the same browser session for this as the one used " +"to request the password reset." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:30 +msgid "Code you received in the email" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:39 +#, fuzzy +#| msgid "New password" +msgid "New Password" +msgstr "Новый пароль" + +#: kallithea/templates/password_reset_confirmation.html:48 +#, fuzzy +#| msgid "Confirm new password" +msgid "Confirm New Password" +msgstr "Подтвердите новый пароль" + +#: kallithea/templates/password_reset_confirmation.html:56 +msgid "Confirm" +msgstr "" + #: kallithea/templates/register.html:5 kallithea/templates/register.html:14 #: kallithea/templates/register.html:90 msgid "Sign Up" @@ -2672,8 +2676,6 @@ #: kallithea/templates/admin/auth/auth_settings.html:33 #, fuzzy -#| msgid "" "Comma separated list of plugins. Order of plugins is also order in -#| which " "Kallithea will try to authenticate user" msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" @@ -2813,7 +2815,6 @@ #: kallithea/templates/admin/users/user_edit_api_keys.html:8 #: kallithea/templates/admin/users/user_edit_api_keys.html:27 #, fuzzy -#| msgid "never" msgid "Never" msgstr "никогда" @@ -2845,7 +2846,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:244 +#: kallithea/templates/base/base.html:237 msgid "Create New Gist" msgstr "Создать новую gist-запись" @@ -2987,7 +2988,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/base/base.html:343 msgid "My Account" msgstr "Мой Аккаунт" @@ -2998,7 +2999,6 @@ #: kallithea/templates/admin/my_account/my_account.html:36 #, fuzzy -#| msgid "New email address" msgid "Email Addresses" msgstr "Новый E-mail" @@ -3009,14 +3009,12 @@ #: kallithea/templates/admin/my_account/my_account.html:39 #, fuzzy -#| msgid "repositories" msgid "Owned Repositories" msgstr "репозитории" #: kallithea/templates/admin/my_account/my_account.html:40 #: kallithea/templates/journal/journal.html:53 #, fuzzy -#| msgid "Create repositories" msgid "Watched Repositories" msgstr "Создать репозитории" @@ -3025,7 +3023,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 #, fuzzy -#| msgid "Copy permissions" msgid "Show Permissions" msgstr "Скопировать привилегии" @@ -3037,42 +3034,36 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #, fuzzy, python-format -#| msgid "Confirm to reset this api key: %s" msgid "Confirm to reset this API key: %s" msgstr "Подтвердите сброс этого API-ключа: %s" #: kallithea/templates/admin/my_account/my_account_api_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:30 #, fuzzy -#| msgid "Expires" msgid "Expired" msgstr "Истекает" #: kallithea/templates/admin/my_account/my_account_api_keys.html:40 #: kallithea/templates/admin/users/user_edit_api_keys.html:40 #, fuzzy, python-format -#| msgid "Confirm to remove this api key: %s" msgid "Confirm to remove this API key: %s" msgstr "Подтвердите удаление этого API-ключа: %s" #: kallithea/templates/admin/my_account/my_account_api_keys.html:42 #: kallithea/templates/admin/users/user_edit_api_keys.html:42 #, fuzzy -#| msgid "Removed" msgid "Remove" msgstr "Удалено" #: kallithea/templates/admin/my_account/my_account_api_keys.html:49 #: kallithea/templates/admin/users/user_edit_api_keys.html:49 #, fuzzy -#| msgid "No additional emails specified." msgid "No additional API keys specified" msgstr "Дополнительные адреса e-mail не указаны" #: kallithea/templates/admin/my_account/my_account_api_keys.html:61 #: kallithea/templates/admin/users/user_edit_api_keys.html:61 #, fuzzy -#| msgid "New field key" msgid "New API key" msgstr "Ключ" @@ -3151,7 +3142,6 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:16 #: kallithea/templates/admin/users/user_edit_profile.html:15 #, fuzzy -#| msgid "current IP" msgid "Current IP" msgstr "текущий IP-адрес" @@ -3161,7 +3151,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:45 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:200 @@ -3188,7 +3178,7 @@ msgstr "Комментарии" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 msgid "Pull Requests" msgstr "Pull-запросы" @@ -3206,7 +3196,7 @@ msgstr "Показать уведомление" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:342 msgid "Notifications" msgstr "Уведомления" @@ -3249,7 +3239,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:26 #, fuzzy -#| msgid "Existing repository?" msgid "Apply to all existing repositories" msgstr "Существующий репозиторий?" @@ -3277,7 +3266,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:40 #, fuzzy -#| msgid "Delete this repository group" msgid "Apply to all existing repository groups" msgstr "Удалить эту группу репозиториев" @@ -3292,9 +3280,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:53 #, fuzzy -#| msgid "" "All default permissions on each user group will be reset to chosen -#| " "permission, note that all custom default permission on repository groups -#| " "will be lost" msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " @@ -3314,7 +3299,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:60 #, fuzzy -#| msgid "Repository creation" msgid "Top level repository creation" msgstr "Создание репозитория" @@ -3366,7 +3350,6 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:13 #: kallithea/templates/admin/users/user_edit_ips.html:23 #, fuzzy, python-format -#| msgid "Confirm to delete this ip: %s" msgid "Confirm to delete this IP address: %s" msgstr "Подтвердите удаление IP %s" @@ -3424,7 +3407,7 @@ #: kallithea/templates/admin/repos/repo_edit.html:40 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:158 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 #: kallithea/templates/data_table/_dt_elements.html:45 #: kallithea/templates/data_table/_dt_elements.html:49 msgid "Settings" @@ -3463,7 +3446,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:146 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 msgid "Created on" msgstr "Создано" @@ -3484,7 +3467,6 @@ #: kallithea/templates/admin/repos/repo_edit_permissions.html:12 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 #, fuzzy -#| msgid "User group" msgid "User/User Group" msgstr "Группа пользователей" @@ -3495,7 +3477,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 #, fuzzy -#| msgid "default" msgid "Default" msgstr "по умолчанию" @@ -3506,7 +3487,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 #, fuzzy -#| msgid "revoke" msgid "Revoke" msgstr "отозвать" @@ -3518,7 +3498,6 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 #, fuzzy -#| msgid "apply to children" msgid "Apply to children" msgstr "применить к дочерним" @@ -3571,7 +3550,6 @@ #: kallithea/templates/admin/repos/repo_add_base.html:17 #, fuzzy -#| msgid "[created] repository" msgid "Clone remote repository" msgstr "[создан] репозиторий" @@ -3826,25 +3804,21 @@ #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 #, fuzzy -#| msgid "private repository" msgid "Private Repository" msgstr "приватный репозиторий" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 -#, fuzzy, python-format -#| msgid "Created repository %s" +#, fuzzy msgid "Remote repository URL" msgstr "Репозиторий %s создан" #: kallithea/templates/admin/repos/repo_edit_remote.html:9 #, fuzzy -#| msgid "[pulled from remote] into repository" msgid "Pull Changes from Remote Repository" msgstr "[внесены изменения из удалённого репозитория] в репозиторий" #: kallithea/templates/admin/repos/repo_edit_remote.html:11 #, fuzzy -#| msgid "Confirm to pull changes from remote side." msgid "Confirm to pull changes from remote repository." msgstr "Подтвердите скачивание изменений." @@ -3854,7 +3828,6 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:11 #, fuzzy -#| msgid "private repository" msgid "Permanent Repository ID" msgstr "приватный репозиторий" @@ -3878,13 +3851,11 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:21 #, fuzzy -#| msgid "[created] repository" msgid "Remote repository" msgstr "[создан] репозиторий" #: kallithea/templates/admin/repos/repo_edit_settings.html:25 #, fuzzy -#| msgid "Repository" msgid "Repository URL" msgstr "Репозиторий" @@ -4025,7 +3996,7 @@ msgid "Custom Hooks" msgstr "Пользовательские хуки" -#: kallithea/templates/admin/settings/settings_hooks.html:68 +#: kallithea/templates/admin/settings/settings_hooks.html:67 msgid "Failed to remove hook" msgstr "Не удалось удалить хук" @@ -4035,7 +4006,6 @@ #: kallithea/templates/admin/settings/settings_mapping.html:11 #, fuzzy -#| msgid "Search in repositories" msgid "Delete records of missing repositories" msgstr "Поиск по репозиториям" @@ -4063,7 +4033,18 @@ "Current hooks will be updated to the latest version." msgstr "" +#: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "Overwrite existing Git hooks" +msgstr "" + #: kallithea/templates/admin/settings/settings_mapping.html:30 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any" +" custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:35 msgid "Rescan Repositories" msgstr "" @@ -4292,7 +4273,6 @@ #: kallithea/templates/admin/settings/settings_visual.html:92 #, fuzzy -#| msgid "Meta-Tagging" msgid "Meta Tagging" msgstr "Метатегирование" @@ -4334,7 +4314,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit.html:33 #, fuzzy -#| msgid "members" msgid "Show Members" msgstr "участники" @@ -4479,47 +4458,47 @@ msgid "Git repository" msgstr "Git репозиторий" -#: kallithea/templates/base/base.html:126 +#: kallithea/templates/base/base.html:119 msgid "Create Fork" msgstr "Создать форк" -#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:130 #: kallithea/templates/data_table/_dt_elements.html:13 #: kallithea/templates/data_table/_dt_elements.html:17 #: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "Общие сведения" -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:141 +#: kallithea/templates/base/base.html:132 +#: kallithea/templates/base/base.html:134 #: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:21 #: kallithea/templates/data_table/_dt_elements.html:25 msgid "Changelog" msgstr "История изменений" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:136 #: kallithea/templates/data_table/_dt_elements.html:29 #: kallithea/templates/data_table/_dt_elements.html:33 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "Файлы" -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:138 msgid "Switch To" msgstr "Переключиться на" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/base/base.html:154 +#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:147 msgid "Options" msgstr "Опции" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:155 #: kallithea/templates/forks/forks_data.html:21 msgid "Compare Fork" msgstr "Сравнить форк" -#: kallithea/templates/base/base.html:164 +#: kallithea/templates/base/base.html:157 #: kallithea/templates/bookmarks/bookmarks.html:56 #: kallithea/templates/bookmarks/bookmarks_data.html:13 #: kallithea/templates/branches/branches.html:56 @@ -4529,117 +4508,116 @@ msgid "Compare" msgstr "Сравнить" -#: kallithea/templates/base/base.html:166 -#: kallithea/templates/base/base.html:254 +#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:247 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:54 msgid "Search" msgstr "Поиск" -#: kallithea/templates/base/base.html:170 +#: kallithea/templates/base/base.html:163 msgid "Unlock" msgstr "Разблокировать" -#: kallithea/templates/base/base.html:172 +#: kallithea/templates/base/base.html:165 msgid "Lock" msgstr "Заблокировать" -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:173 msgid "Follow" msgstr "Наблюдать" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:174 msgid "Unfollow" msgstr "Не наблюдать" -#: kallithea/templates/base/base.html:184 +#: kallithea/templates/base/base.html:177 #: kallithea/templates/data_table/_dt_elements.html:37 #: kallithea/templates/data_table/_dt_elements.html:41 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "Форк" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:178 #: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "Создать Pull запрос" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 #, python-format msgid "Show Pull Requests for %s" msgstr "Показать pull-запросы для %s" -#: kallithea/templates/base/base.html:228 +#: kallithea/templates/base/base.html:221 msgid "Show recent activity" msgstr "Показать последнюю активность" +#: kallithea/templates/base/base.html:227 +#: kallithea/templates/base/base.html:228 +msgid "Public journal" +msgstr "Общедоступный журнал" + +#: kallithea/templates/base/base.html:233 +msgid "Show public gists" +msgstr "Показать публичные записи" + #: kallithea/templates/base/base.html:234 -#: kallithea/templates/base/base.html:235 -msgid "Public journal" -msgstr "Общедоступный журнал" +msgid "Gists" +msgstr "Gist" + +#: kallithea/templates/base/base.html:238 +msgid "All Public Gists" +msgstr "Все публичные Gist-записи" #: kallithea/templates/base/base.html:240 -msgid "Show public gists" -msgstr "Показать публичные записи" +msgid "My Public Gists" +msgstr "Мои публичные Gist-записи" #: kallithea/templates/base/base.html:241 -msgid "Gists" -msgstr "Gist" - -#: kallithea/templates/base/base.html:245 -msgid "All Public Gists" -msgstr "Все публичные Gist-записи" - -#: kallithea/templates/base/base.html:247 -msgid "My Public Gists" -msgstr "Мои публичные Gist-записи" - -#: kallithea/templates/base/base.html:248 msgid "My Private Gists" msgstr "Мои приватные Gist-записи" -#: kallithea/templates/base/base.html:253 +#: kallithea/templates/base/base.html:246 msgid "Search in repositories" msgstr "Поиск по репозиториям" -#: kallithea/templates/base/base.html:276 -#: kallithea/templates/base/base.html:277 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +#: kallithea/templates/base/base.html:269 +#: kallithea/templates/base/base.html:270 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "Мои Pull-запросы" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:289 msgid "Not Logged In" msgstr "Не авторизован" -#: kallithea/templates/base/base.html:303 +#: kallithea/templates/base/base.html:296 msgid "Login to Your Account" msgstr "Авторизоваться" -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:319 msgid "Forgot password ?" msgstr "Забыли пароль?" -#: kallithea/templates/base/base.html:353 +#: kallithea/templates/base/base.html:346 msgid "Log Out" msgstr "Выход" -#: kallithea/templates/base/base.html:402 +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:540 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" #: kallithea/templates/base/default_perms_box.html:14 #, fuzzy -#| msgid "Repository Defaults" msgid "Inherit defaults" msgstr "Значения по умолчанию" @@ -4737,52 +4715,51 @@ msgstr "Нет совпадений" #: kallithea/templates/base/root.html:31 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 -msgid "Open New Pull Request" -msgstr "Создать новый pull-запрос" +#, fuzzy +#| msgid "on pull request" +msgid "Open New Pull Request from {0}" +msgstr "Комментарий в pull-запросе" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for Selected Changesets" -msgstr "Открыть новый pull-request для выбранных наборов изменений" +msgid "Open New Pull Request for {0} → {1}" +msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets __S → __E" +#, fuzzy +#| msgid "Show Selected Changesets __S → __E" +msgid "Show Selected Changesets {0} → {1}" msgstr "Показать выбранные наборы изменений: __S → __E" #: kallithea/templates/base/root.html:34 -msgid "Show Selected Changeset __S" -msgstr "Показать выбранный набор изменений: __S" +msgid "Selection Link" +msgstr "Ссылка выбора" #: kallithea/templates/base/root.html:35 -msgid "Selection Link" -msgstr "Ссылка выбора" - -#: kallithea/templates/base/root.html:36 #: kallithea/templates/changeset/diff_block.html:8 msgid "Collapse Diff" msgstr "Свернуть сравнение" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:36 msgid "Expand Diff" msgstr "Раскрыть сравнение" +#: kallithea/templates/base/root.html:37 +msgid "Failed to revoke permission" +msgstr "Не удалось отозвать привилегии" + #: kallithea/templates/base/root.html:38 -msgid "Failed to revoke permission" -msgstr "Не удалось отозвать привилегии" - -#: kallithea/templates/base/root.html:39 msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "Подтвердите удаление привилегии для {0}: {1} ?" -#: kallithea/templates/base/root.html:40 +#: kallithea/templates/base/root.html:39 msgid "enabled" msgstr "включено" -#: kallithea/templates/base/root.html:41 +#: kallithea/templates/base/root.html:40 msgid "disabled" msgstr "отключено" -#: kallithea/templates/base/root.html:43 +#: kallithea/templates/base/root.html:42 msgid "Specify changeset" msgstr "Выбрать набор изменений" @@ -4800,7 +4777,6 @@ #: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 #: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" @@ -4841,7 +4817,7 @@ msgstr[1] "Показаны %d из %d ревизий" msgstr[2] "Показаны %d из %d ревизий" -#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/templates/changelog/changelog.html:49 msgid "Clear selection" msgstr "Очистить выбор" @@ -4868,8 +4844,6 @@ #: kallithea/templates/changelog/changelog.html:92 #: kallithea/templates/changelog/changelog_summary_data.html:20 #, fuzzy, python-format -#| msgid "" "Changeset status: %s\n" "Click to open associated pull request -#| #%s" msgid "" "Changeset status: %s\n" "Click to open associated pull request %s" @@ -4917,7 +4891,7 @@ msgid "Branch %s" msgstr "Ветка %s" -#: kallithea/templates/changelog/changelog.html:291 +#: kallithea/templates/changelog/changelog.html:310 msgid "There are no changes yet" msgstr "Изменений ещё нет" @@ -4975,7 +4949,6 @@ #: kallithea/templates/changelog/changelog_summary_data.html:90 #, fuzzy -#| msgid "Push new repo" msgid "Push new repository" msgstr "Отправить новый репозиторий" @@ -5021,7 +4994,6 @@ #: kallithea/templates/changeset/changeset.html:89 #: kallithea/templates/changeset/changeset_range.html:88 #, fuzzy -#| msgid "merge" msgid "Merge" msgstr "свести" @@ -5035,19 +5007,17 @@ #: kallithea/templates/changeset/changeset.html:135 #, fuzzy -#| msgid "Created by" msgid "Replaced by:" msgstr "Создано" #: kallithea/templates/changeset/changeset.html:149 #, fuzzy -#| msgid "Created by" msgid "Preceded by:" msgstr "Создано" #: kallithea/templates/changeset/changeset.html:166 #: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:314 +#: kallithea/templates/pullrequests/pullrequest_show.html:318 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -5057,7 +5027,7 @@ #: kallithea/templates/changeset/changeset.html:168 #: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:320 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -5067,21 +5037,19 @@ #: kallithea/templates/changeset/changeset.html:182 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Show full diff anyway" msgstr "Показать полный diff" #: kallithea/templates/changeset/changeset.html:247 #: kallithea/templates/changeset/changeset.html:284 #, fuzzy -#| msgid "revisions" msgid "No revisions" msgstr "версии" #: kallithea/templates/changeset/changeset_file_comment.html:21 #, fuzzy -#| msgid "Comment from pull request" msgid "on pull request" msgstr "Комментарий в pull-запросе" @@ -5091,7 +5059,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:24 #, fuzzy -#| msgid "No changesets" msgid "on this changeset" msgstr "Нет изменений" @@ -5101,7 +5068,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:37 #, fuzzy -#| msgid "Latest Changes" msgid "Status change" msgstr "Последние изменения" @@ -5180,7 +5146,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:150 #, fuzzy -#| msgid "Use @username inside this text to notify another user" msgid "Use @username inside this text to notify another user." msgstr "" "Используйте @имя_пользователя в тексте, чтобы отправить оповещение " @@ -5259,7 +5224,7 @@ msgstr "Показать merge diff" #: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:306 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 msgid "Common ancestor" msgstr "Общий предок" @@ -5300,7 +5265,7 @@ msgstr "" #: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:301 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5365,18 +5330,26 @@ msgstr "Здравствуйте, %s" #: kallithea/templates/email_templates/password_reset.html:6 -msgid "We received a request to create a new password for your account." +#, fuzzy +#| msgid "We received a request to create a new password for your account." +msgid "We have received a request to reset the password for your account." msgstr "Мы отправили запрос на создание нового пароля для вашего аккаунта." #: kallithea/templates/email_templates/password_reset.html:7 -msgid "You can generate it by clicking following URL" -msgstr "Вы можете заново сгенерировать его, перейдя по следующей ссылке" +msgid "To set a new password, click the following link" +msgstr "" #: kallithea/templates/email_templates/password_reset.html:10 -msgid "Please ignore this email if you did not request a new password ." -msgstr "" -"Пожалуйста, проигнорируйте данное сообщение, если вы не запрашивали новый" -" пароль." +msgid "" +"Should you not be able to use the link above, please type the following " +"code into the password reset form" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:12 +msgid "" +"If it weren't you who requested the password reset, just disregard this " +"message." +msgstr "" #: kallithea/templates/email_templates/pull_request.html:5 #, python-format @@ -5739,7 +5712,6 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:14 #, fuzzy -#| msgid "revoke" msgid "Vote" msgstr "отозвать" @@ -5780,19 +5752,16 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:70 #, fuzzy, python-format -#| msgid "Confirm to delete this pull request" msgid "Confirm again to delete this pull request with %s comments" msgstr "Подтвердите удаление этого pull-request'а" #: kallithea/templates/pullrequests/pullrequest_show.html:6 #, fuzzy, python-format -#| msgid "%s Pull Request #%s" msgid "%s Pull Request %s" msgstr "%s Pull-запрос #%s" #: kallithea/templates/pullrequests/pullrequest_show.html:10 #, fuzzy, python-format -#| msgid "Pull request #%s from %s#%s" msgid "Pull request %s from %s#%s" msgstr "Pull-запросы №%s от %s#%s" @@ -5843,103 +5812,109 @@ msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:131 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +msgid "" +"This is just a range of changesets and doesn't have a target or a real " +"merge ancestor." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:133 msgid "Pull changes" msgstr "Принять изменения" -#: kallithea/templates/pullrequests/pullrequest_show.html:154 -msgid "Created by" -msgstr "Создано" - -#: kallithea/templates/pullrequests/pullrequest_show.html:169 +#: kallithea/templates/pullrequests/pullrequest_show.html:173 #, fuzzy msgid "Update" msgstr "[обновлён] пользователь" -#: kallithea/templates/pullrequests/pullrequest_show.html:187 +#: kallithea/templates/pullrequests/pullrequest_show.html:191 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:209 +#: kallithea/templates/pullrequests/pullrequest_show.html:213 msgid "Pull Request Reviewers" msgstr "Рецензенты pull-запросов" -#: kallithea/templates/pullrequests/pullrequest_show.html:234 +#: kallithea/templates/pullrequests/pullrequest_show.html:238 msgid "Remove reviewer" msgstr "Удалить рецензента" -#: kallithea/templates/pullrequests/pullrequest_show.html:246 +#: kallithea/templates/pullrequests/pullrequest_show.html:250 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:254 +#: kallithea/templates/pullrequests/pullrequest_show.html:258 msgid "Potential Reviewers" msgstr "Потенциальные рецензенты" -#: kallithea/templates/pullrequests/pullrequest_show.html:257 +#: kallithea/templates/pullrequests/pullrequest_show.html:261 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:280 +#: kallithea/templates/pullrequests/pullrequest_show.html:284 msgid "Save Changes" msgstr "Сохранить изменения" -#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/templates/pullrequests/pullrequest_show.html:285 #, fuzzy msgid "Save as New Pull Request" msgstr "Создать новый pull запрос" -#: kallithea/templates/pullrequests/pullrequest_show.html:282 +#: kallithea/templates/pullrequests/pullrequest_show.html:286 msgid "Cancel Changes" msgstr "Отменить изменения" -#: kallithea/templates/pullrequests/pullrequest_show.html:292 +#: kallithea/templates/pullrequests/pullrequest_show.html:296 #, fuzzy msgid "Pull Request Content" msgstr "Статус pull-request'а был изменен" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" msgstr "%s Запросы на внесение изменений" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, python-format msgid "Pull Requests from %s'" msgstr "Pull-запросы от %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:13 #, python-format msgid "Pull Requests to '%s'" msgstr "Pull-запросы для %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +msgid "Open New Pull Request" +msgstr "Создать новый pull-запрос" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 #, fuzzy, python-format msgid "Show Pull Requests to %s" msgstr "Pull-запросы для %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 #, fuzzy, python-format msgid "Show Pull Requests from '%s'" msgstr "Pull запросы от %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 -msgid "Hide closed pull requests (only show open pull requests)" -msgstr "" - #: kallithea/templates/pullrequests/pullrequest_show_all.html:49 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:30 #, fuzzy msgid "Show closed pull requests (in addition to open pull requests)" msgstr "Показать закрытые pull-запросы" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 #, fuzzy msgid "Pull Requests Created by Me" msgstr "Рецензенты запросов на внесение изменений Pull request" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 #, fuzzy msgid "Pull Requests I Participate In" msgstr "Моё участие" @@ -6109,7 +6084,6 @@ #: kallithea/templates/summary/summary.html:125 #, fuzzy -#| msgid "with subrepos" msgid "With subrepos" msgstr "с дочерними репозиториями" @@ -6183,21 +6157,6 @@ #~ msgstr "Файлов нет" #~ msgid "" -#~ "Comment on %(repo_name)s changeset " -#~ "%(short_id)s on %(branch)s by " -#~ "%(comment_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Review request on %(repo_name)s pull " -#~ "request #%(pr_id)s from %(ref)s by " -#~ "%(pr_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Comment on %(repo_name)s pull request " -#~ "#%(pr_id)s from %(ref)s by " -#~ "%(comment_username)s" #~ msgstr "" #~ msgid "Username \"%(username)s\" is forbidden" @@ -6214,14 +6173,9 @@ #~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" #~ msgstr "" -#~ "Неверный URL клонирования, предоставьте " -#~ "корректный URL для клонирования в " -#~ "формате http(s)/svn+http(s)/ssh" #~ msgid "Revisions %(revs)s are already part of pull request or have set status" #~ msgstr "" -#~ "Ревизии %(revs)s уже включены в pull-" -#~ "request или имеют установленный статус" #~ msgid "Defaults" #~ msgstr "Значения по умолчанию" @@ -6256,12 +6210,6 @@ #~ msgid "delete" #~ msgstr "удалить" -#~ msgid "" -#~ "Your user is in an external source" -#~ " of record; some details cannot be" -#~ " managed here" -#~ msgstr "" - #~ msgid "Permissions Administration" #~ msgstr "Управление привилегиями" @@ -6271,12 +6219,6 @@ #~ msgid "Overwrite existing settings" #~ msgstr "Перезаписать существующие настройки" -#~ msgid "" -#~ "Write permission to a repository group" -#~ " allows creating repositories inside that" -#~ " group." -#~ msgstr "" - #~ msgid "Default IP Whitelist for All Users" #~ msgstr "Белый список IP для всех пользователей" @@ -6319,20 +6261,6 @@ #~ msgid "Non-changeable id" #~ msgstr "Неизменяемый id" -#~ msgid "" -#~ "In case this repository is renamed " -#~ "or moved into another group the " -#~ "repository URL changes.\n" -#~ " Using the above " -#~ "URL guarantees that this repository will" -#~ " always be accessible under such URL." -#~ "\n" -#~ " Useful for CI " -#~ "systems, or any other cases that " -#~ "you need to hardcode the URL into" -#~ " 3rd party service." -#~ msgstr "" - #~ msgid "edit" #~ msgstr "редактировать" @@ -6378,12 +6306,6 @@ #~ msgid "Destroy old data" #~ msgstr "Уничтожить все данные" -#~ msgid "" -#~ "Check this option to remove references" -#~ " to repositories that no longer exist" -#~ " in on the filesystem." -#~ msgstr "" - #~ msgid "check for updates" #~ msgstr "" @@ -6393,21 +6315,9 @@ #~ msgid "user groups" #~ msgstr "" -#~ msgid "" -#~ "This user is in an external source" -#~ " of record (%s); some details cannot" -#~ " be managed here." -#~ msgstr "" - #~ msgid "Inherit from defaults" #~ msgstr "" -#~ msgid "" -#~ "Select to inherit permissions from %s" -#~ " permissions settings, and default IP " -#~ "address whitelist." -#~ msgstr "" - #~ msgid "show" #~ msgstr "" @@ -6429,13 +6339,6 @@ #~ msgid "Comment on changeset" #~ msgstr "" -#~ msgid "" -#~ "Use @username inside this text to " -#~ "send notification to another local user." -#~ msgstr "" -#~ "Используйте @имя_пользователя в тексте, чтобы" -#~ " отправить оповещение указанному пользователю." - #~ msgid "revision" #~ msgstr "" @@ -6457,3 +6360,47 @@ #~ msgid "reviewer" #~ msgstr "рецензент" +#~ msgid "" +#~ "Your password reset was successful, new" +#~ " password has been sent to your " +#~ "email" +#~ msgstr "Сброс пароля произведён, новый пароль был отправлен на ваш email" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Added by %(pr_username)s] %(repo_name)s pull" +#~ " request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "Your new password" +#~ msgstr "Ваш новый пароль" + +#~ msgid "Your new Kallithea password:%s" +#~ msgstr "Ваш новый пароль от Kallithea: %s" + +#~ msgid "Open New Pull Request for Selected Changesets" +#~ msgstr "Открыть новый pull-request для выбранных наборов изменений" + +#~ msgid "Show Selected Changeset __S" +#~ msgstr "Показать выбранный набор изменений: __S" + +#~ msgid "You can generate it by clicking following URL" +#~ msgstr "Вы можете заново сгенерировать его, перейдя по следующей ссылке" + +#~ msgid "Please ignore this email if you did not request a new password ." +#~ msgstr "" +#~ "Пожалуйста, проигнорируйте данное сообщение, " +#~ "если вы не запрашивали новый пароль." + +#~ msgid "Created by" +#~ msgstr "Создано" +
--- a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po Tue Sep 08 10:21:46 2015 +0000 +++ b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po Tue Sep 08 10:37:51 2015 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2015-08-25 11:37+0200\n" +"POT-Creation-Date: 2015-09-08 10:34+0200\n" "PO-Revision-Date: 2015-04-01 12:59+0200\n" "Last-Translator: Andrew Shadura <andrew@shadura.me>\n" "Language-Team: Slovak " @@ -20,7 +20,7 @@ "X-Generator: Weblate 2.3-dev\n" #: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:241 kallithea/lib/base.py:512 +#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 msgid "There are no changesets yet" msgstr "Zatiaľ nie sú žiadne zmeny" @@ -36,7 +36,7 @@ msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(zatvorené)" @@ -54,8 +54,8 @@ msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:743 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 msgid "Such revision does not exist for this repository" msgstr "Taká revízia neexistuje" @@ -65,17 +65,16 @@ "not allowed" msgstr "" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:42 +#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 msgid "Select changeset" msgstr "" -#: kallithea/controllers/compare.py:258 +#: kallithea/controllers/compare.py:261 msgid "Cannot compare repositories without using common ancestor" msgstr "" #: kallithea/controllers/error.py:71 -#, fuzzy, python-format -#| msgid "Unknown revision %s" +#, fuzzy msgid "No response" msgstr "Neznáma revízia %s" @@ -120,8 +119,8 @@ #: kallithea/templates/changeset/changeset.html:195 #: kallithea/templates/compare/compare_diff.html:78 #: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Changeset was too big and was cut off..." msgstr "" @@ -130,111 +129,111 @@ msgid "%s committed on %s" msgstr "" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:91 msgid "Click here to add new file" msgstr "Kliknite pre pridanie nového súboru" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:92 #, python-format msgid "There are no files yet. %s" msgstr "Zatiaľ nie sú žiadne súbory. %s" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 -#: kallithea/controllers/files.py:433 +#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 +#: kallithea/controllers/files.py:432 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Tento repozitár bol uzamknutý používateľom %s dňa %s" -#: kallithea/controllers/files.py:318 +#: kallithea/controllers/files.py:317 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:329 +#: kallithea/controllers/files.py:328 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Zmazaný súbor %s cez Kallithea" -#: kallithea/controllers/files.py:351 +#: kallithea/controllers/files.py:350 #, python-format msgid "Successfully deleted file %s" msgstr "Úspešne zmazaný súbor %s" -#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 -#: kallithea/controllers/files.py:502 +#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 +#: kallithea/controllers/files.py:501 msgid "Error occurred during commit" msgstr "Došlo k chybe pri ukladaní" -#: kallithea/controllers/files.py:378 +#: kallithea/controllers/files.py:377 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:392 +#: kallithea/controllers/files.py:391 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:408 +#: kallithea/controllers/files.py:407 msgid "No changes" msgstr "Žiadne zmeny" -#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 +#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:444 +#: kallithea/controllers/files.py:443 msgid "Added file via Kallithea" msgstr "Pridaný súbor cez Kallithea" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:464 msgid "No content" msgstr "Žiadny obsah" -#: kallithea/controllers/files.py:469 +#: kallithea/controllers/files.py:468 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:494 +#: kallithea/controllers/files.py:493 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:527 +#: kallithea/controllers/files.py:526 msgid "Downloads disabled" msgstr "Sťahovanie vypnuté" -#: kallithea/controllers/files.py:538 +#: kallithea/controllers/files.py:537 #, python-format msgid "Unknown revision %s" msgstr "Neznáma revízia %s" -#: kallithea/controllers/files.py:540 +#: kallithea/controllers/files.py:539 msgid "Empty repository" msgstr "Prázdny repozitár" -#: kallithea/controllers/files.py:542 +#: kallithea/controllers/files.py:541 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:772 +#: kallithea/controllers/files.py:771 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:15 #: kallithea/templates/pullrequests/pullrequest.html:97 msgid "Changesets" msgstr "Zmeny" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:821 kallithea/templates/switch_to_list.html:3 +#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 +#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "Vetvy" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:832 kallithea/templates/switch_to_list.html:25 +#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 +#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "Tagy" @@ -255,9 +254,9 @@ #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:131 -#: kallithea/templates/base/base.html:397 -#: kallithea/templates/base/base.html:569 +#: kallithea/templates/base/base.html:124 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "Repozitáre" @@ -283,31 +282,33 @@ msgstr "" #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:229 +#: kallithea/templates/base/base.html:222 #: kallithea/templates/journal/journal.html:4 #: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:150 kallithea/controllers/login.py:196 +#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 #, fuzzy -#| msgid "bad captcha" msgid "Bad captcha" msgstr "zlá captcha" -#: kallithea/controllers/login.py:156 +#: kallithea/controllers/login.py:157 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:201 -msgid "Your password reset link was sent" -msgstr "" - -#: kallithea/controllers/login.py:222 -msgid "" -"Your password reset was successful, new password has been sent to your " -"email" -msgstr "" +#: kallithea/controllers/login.py:202 +msgid "A password reset confirmation code has been sent" +msgstr "" + +#: kallithea/controllers/login.py:251 +msgid "Invalid password reset token" +msgstr "" + +#: kallithea/controllers/login.py:256 +#: kallithea/controllers/admin/my_account.py:167 +msgid "Successfully updated password" +msgstr "Úspešne aktualizované heslo" #: kallithea/controllers/pullrequests.py:124 #, python-format @@ -328,112 +329,112 @@ msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:827 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Záložky" -#: kallithea/controllers/pullrequests.py:306 +#: kallithea/controllers/pullrequests.py:310 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:352 -#: kallithea/controllers/pullrequests.py:499 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:503 msgid "No description" msgstr "" -#: kallithea/controllers/pullrequests.py:359 +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:362 -#: kallithea/controllers/pullrequests.py:449 -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:453 +#: kallithea/controllers/pullrequests.py:509 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:365 -#: kallithea/controllers/pullrequests.py:452 +#: kallithea/controllers/pullrequests.py:369 +#: kallithea/controllers/pullrequests.py:456 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:401 msgid "Missing changesets since the previous pull request:" msgstr "" -#: kallithea/controllers/pullrequests.py:404 +#: kallithea/controllers/pullrequests.py:408 #, python-format msgid "New changesets on %s %s since the previous pull request:" msgstr "" -#: kallithea/controllers/pullrequests.py:411 +#: kallithea/controllers/pullrequests.py:415 msgid "Ancestor didn't change - show diff since previous version:" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:422 #, python-format msgid "" "This pull request is based on another %s revision and there is no simple " "diff." msgstr "" -#: kallithea/controllers/pullrequests.py:420 +#: kallithea/controllers/pullrequests.py:424 #, python-format msgid "No changes found on %s %s since previous version." msgstr "" -#: kallithea/controllers/pullrequests.py:458 +#: kallithea/controllers/pullrequests.py:462 #, python-format msgid "Closed, replaced by %s ." msgstr "" -#: kallithea/controllers/pullrequests.py:466 +#: kallithea/controllers/pullrequests.py:470 msgid "Pull request update created" msgstr "" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:513 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:523 +#: kallithea/controllers/pullrequests.py:528 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:582 +#: kallithea/controllers/pullrequests.py:594 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:584 +#: kallithea/controllers/pullrequests.py:596 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:602 +#: kallithea/controllers/pullrequests.py:614 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:605 +#: kallithea/controllers/pullrequests.py:617 msgid "No changesets found for updating this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:613 +#: kallithea/controllers/pullrequests.py:625 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:619 +#: kallithea/controllers/pullrequests.py:631 msgid "Git pull requests don't support updates yet." msgstr "" -#: kallithea/controllers/pullrequests.py:710 +#: kallithea/controllers/pullrequests.py:722 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:715 +#: kallithea/controllers/pullrequests.py:727 msgid "Closing." msgstr "" @@ -477,37 +478,37 @@ #: kallithea/controllers/admin/gists.py:59 #: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:283 +#: kallithea/controllers/admin/users.py:285 msgid "Forever" msgstr "" #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/users.py:286 msgid "5 minutes" msgstr "5 minút" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/users.py:287 msgid "1 hour" msgstr "1 hodina" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/users.py:288 msgid "1 day" msgstr "1 deň" #: kallithea/controllers/admin/gists.py:63 #: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/users.py:289 msgid "1 month" msgstr "1 mesiac" #: kallithea/controllers/admin/gists.py:67 #: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/users.py:291 msgid "Lifetime" msgstr "" @@ -537,8 +538,8 @@ msgid "Error occurred during update of gist %s" msgstr "Došlo k chybe pri aktualizácii gist %s" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:208 -#: kallithea/model/user.py:230 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 +#: kallithea/model/user.py:237 msgid "You can't edit this user since it's crucial for entire application" msgstr "" @@ -547,47 +548,43 @@ msgstr "" #: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:204 +#: kallithea/controllers/admin/users.py:202 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:167 -msgid "Successfully updated password" -msgstr "Úspešne aktualizované heslo" - #: kallithea/controllers/admin/my_account.py:178 msgid "Error occurred during update of user password" msgstr "Došlo k chybe pri aktualizácii hesla užívateľa" #: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:413 +#: kallithea/controllers/admin/users.py:415 #, python-format msgid "Added email %s to user" msgstr "" #: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:419 +#: kallithea/controllers/admin/users.py:421 msgid "An error occurred during email saving" msgstr "Došlo k chybe pri ukladaní e-mailovej adresy" #: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:431 +#: kallithea/controllers/admin/users.py:433 msgid "Removed email from user" msgstr "" #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:306 +#: kallithea/controllers/admin/users.py:308 msgid "API key successfully created" msgstr "" #: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:319 +#: kallithea/controllers/admin/users.py:321 msgid "API key successfully reset" msgstr "" #: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:323 +#: kallithea/controllers/admin/users.py:325 msgid "API key successfully deleted" msgstr "" @@ -637,10 +634,10 @@ #: kallithea/templates/admin/users/user_edit_profile.html:105 #: kallithea/templates/admin/users/users.html:10 #: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:252 +#: kallithea/templates/base/base.html:253 #: kallithea/templates/base/base.html:259 #: kallithea/templates/base/base.html:260 -#: kallithea/templates/base/base.html:266 -#: kallithea/templates/base/base.html:267 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "" @@ -854,15 +851,13 @@ #: kallithea/controllers/admin/repos.py:537 #: kallithea/controllers/admin/repos.py:564 -#, fuzzy, python-format -#| msgid "This repository has been locked by %s on %s" +#, fuzzy msgid "Repository has been locked" msgstr "Tento repozitár bol uzamknutý používateľom %s dňa %s" #: kallithea/controllers/admin/repos.py:540 #: kallithea/controllers/admin/repos.py:561 -#, fuzzy, python-format -#| msgid "This repository has been locked by %s on %s" +#, fuzzy msgid "Repository has been unlocked" msgstr "Tento repozitár bol uzamknutý používateľom %s dňa %s" @@ -902,48 +897,48 @@ msgstr "" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:274 +#: kallithea/controllers/admin/settings.py:277 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:213 +#: kallithea/controllers/admin/settings.py:216 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:270 +#: kallithea/controllers/admin/settings.py:273 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:335 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:361 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:373 +#: kallithea/controllers/admin/settings.py:376 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:421 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:425 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:448 +#: kallithea/controllers/admin/settings.py:451 msgid "Whoosh reindex task scheduled" msgstr "" @@ -984,68 +979,68 @@ msgstr "" #: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:382 +#: kallithea/controllers/admin/users.py:384 msgid "Updated permissions" msgstr "" #: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:386 +#: kallithea/controllers/admin/users.py:388 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:134 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:184 +#: kallithea/controllers/admin/users.py:182 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:220 +#: kallithea/controllers/admin/users.py:218 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:225 +#: kallithea/controllers/admin/users.py:223 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:238 +#: kallithea/controllers/admin/users.py:236 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:461 +#: kallithea/controllers/admin/users.py:463 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:467 +#: kallithea/controllers/admin/users.py:469 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:744 +#: kallithea/lib/auth.py:743 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:757 +#: kallithea/lib/auth.py:756 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:795 +#: kallithea/lib/auth.py:812 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:827 +#: kallithea/lib/auth.py:844 msgid "You need to be signed in to view this page" msgstr "" @@ -1198,7 +1193,7 @@ #: kallithea/lib/helpers.py:1128 #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "" @@ -1816,13 +1811,11 @@ #: kallithea/model/db.py:1694 #, fuzzy -#| msgid "Location of repositories" msgid "Only admins can fork repositories" msgstr "Repozitáre" #: kallithea/model/db.py:1695 #, fuzzy -#| msgid "Location of repositories" msgid "Non-admins can can fork repositories" msgstr "Repozitáre" @@ -1835,16 +1828,12 @@ msgstr "" #: kallithea/model/db.py:2228 -#, fuzzy, python-format -#| msgid "%d reviewer" -#| msgid_plural "%d reviewers" +#, fuzzy msgid "Not reviewed" msgstr "" #: kallithea/model/db.py:2231 -#, fuzzy, python-format -#| msgid "%d reviewer" -#| msgid_plural "%d reviewers" +#, fuzzy msgid "Under review" msgstr "" @@ -1932,9 +1921,7 @@ #: kallithea/model/notification.py:302 #, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s changeset %(short_id)s " -"on %(branch)s" +msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" #: kallithea/model/notification.py:305 @@ -1944,16 +1931,12 @@ #: kallithea/model/notification.py:307 #, python-format -msgid "" -"[Added by %(pr_username)s] %(repo_name)s pull request %(pr_nice_id)s from" -" %(ref)s" +msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" #: kallithea/model/notification.py:308 #, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s pull request " -"%(pr_nice_id)s from %(ref)s" +msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" #: kallithea/model/notification.py:321 @@ -1965,50 +1948,52 @@ msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:813 +#: kallithea/model/scm.py:812 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:185 +#: kallithea/model/user.py:192 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:249 +#: kallithea/model/user.py:256 msgid "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:254 +#: kallithea/model/user.py:261 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "" -#: kallithea/model/user.py:259 -#, python-format -msgid "" -"User \"%s\" still owns %s repository groups and cannot be removed. Switch" -" owners or remove those repository groups: %s" -msgstr "" - #: kallithea/model/user.py:266 #, python-format msgid "" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch" +" owners or remove those repository groups: %s" +msgstr "" + +#: kallithea/model/user.py:273 +#, python-format +msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "" -#: kallithea/model/user.py:296 +#: kallithea/model/user.py:360 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:319 -msgid "Your new password" -msgstr "" - -#: kallithea/model/user.py:320 -#, python-format -msgid "Your new Kallithea password:%s" +#: kallithea/model/user.py:408 +msgid "Password reset notification" +msgstr "" + +#: kallithea/model/user.py:409 +#, python-format +msgid "" +"The password to your account %s has been changed using password reset " +"form." msgstr "" #: kallithea/model/validators.py:77 kallithea/model/validators.py:78 @@ -2111,7 +2096,6 @@ #: kallithea/model/validators.py:465 #, fuzzy -#| msgid "Unlock Repository" msgid "Invalid repository URL" msgstr "Odblokovať repozitár" @@ -2302,7 +2286,9 @@ #: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:229 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/pullrequests/pullrequest_show.html:156 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 #: kallithea/templates/summary/summary.html:134 msgid "Owner" msgstr "" @@ -2310,7 +2296,7 @@ #: kallithea/templates/index_base.html:140 #: kallithea/templates/admin/my_account/my_account_repos.html:57 #: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:44 +#: kallithea/templates/base/root.html:43 #: kallithea/templates/bookmarks/bookmarks.html:79 #: kallithea/templates/branches/branches.html:79 #: kallithea/templates/journal/journal.html:198 @@ -2322,7 +2308,7 @@ #: kallithea/templates/index_base.html:141 #: kallithea/templates/admin/my_account/my_account_repos.html:58 #: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:45 +#: kallithea/templates/base/root.html:44 #: kallithea/templates/bookmarks/bookmarks.html:80 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:199 @@ -2338,7 +2324,7 @@ #: kallithea/templates/index_base.html:143 #: kallithea/templates/admin/my_account/my_account_repos.html:60 #: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:46 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:201 @@ -2350,7 +2336,7 @@ #: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:147 kallithea/templates/base/root.html:48 +#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:202 @@ -2360,7 +2346,7 @@ msgstr "" #: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:333 +#: kallithea/templates/base/base.html:326 msgid "Log In" msgstr "" @@ -2375,14 +2361,15 @@ #: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:24 #: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/pullrequests/pullrequest_show.html:166 msgid "Username" msgstr "" #: kallithea/templates/login.html:33 kallithea/templates/register.html:33 #: kallithea/templates/admin/my_account/my_account.html:37 #: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:311 msgid "Password" msgstr "" @@ -2394,7 +2381,7 @@ msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:329 +#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 msgid "Don't have an account ?" msgstr "" @@ -2407,11 +2394,14 @@ msgstr "" #: kallithea/templates/password_reset.html:12 +#: kallithea/templates/password_reset_confirmation.html:12 #, python-format msgid "Reset Your Password to %s" msgstr "" #: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset_confirmation.html:5 +#: kallithea/templates/password_reset_confirmation.html:14 msgid "Reset Your Password" msgstr "" @@ -2430,8 +2420,35 @@ #: kallithea/templates/password_reset.html:47 msgid "" -"Password reset link will be sent to the email address matching your " -"username." +"A password reset link will be sent to the specified email address if it " +"is registered in the system." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:19 +#, python-format +msgid "You are about to set a new password for the email address %s." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:20 +msgid "" +"Note that you must use the same browser session for this as the one used " +"to request the password reset." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:30 +msgid "Code you received in the email" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:39 +msgid "New Password" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:48 +msgid "Confirm New Password" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:56 +msgid "Confirm" msgstr "" #: kallithea/templates/register.html:5 kallithea/templates/register.html:14 @@ -2745,7 +2762,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:244 +#: kallithea/templates/base/base.html:237 msgid "Create New Gist" msgstr "" @@ -2887,7 +2904,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/base/base.html:343 msgid "My Account" msgstr "" @@ -2907,14 +2924,12 @@ #: kallithea/templates/admin/my_account/my_account.html:39 #, fuzzy -#| msgid "Repositories" msgid "Owned Repositories" msgstr "Repozitáre" #: kallithea/templates/admin/my_account/my_account.html:40 #: kallithea/templates/journal/journal.html:53 #, fuzzy -#| msgid "Repositories" msgid "Watched Repositories" msgstr "Repozitáre" @@ -3045,7 +3060,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:45 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:200 @@ -3072,7 +3087,7 @@ msgstr "" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 msgid "Pull Requests" msgstr "" @@ -3090,7 +3105,7 @@ msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:342 msgid "Notifications" msgstr "" @@ -3130,7 +3145,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:26 #, fuzzy -#| msgid "Location of repositories" msgid "Apply to all existing repositories" msgstr "Repozitáre" @@ -3233,8 +3247,6 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:13 #: kallithea/templates/admin/users/user_edit_ips.html:23 #, fuzzy, python-format -#| msgid "Confirm to delete this group: %s with %s repository" -#| msgid_plural "Confirm to delete this group: %s with %s repositories" msgid "Confirm to delete this IP address: %s" msgstr "" @@ -3292,7 +3304,7 @@ #: kallithea/templates/admin/repos/repo_edit.html:40 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:158 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 #: kallithea/templates/data_table/_dt_elements.html:45 #: kallithea/templates/data_table/_dt_elements.html:49 msgid "Settings" @@ -3331,7 +3343,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:146 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 msgid "Created on" msgstr "" @@ -3430,7 +3442,6 @@ #: kallithea/templates/admin/repos/repo_add_base.html:17 #, fuzzy -#| msgid "Empty repository" msgid "Clone remote repository" msgstr "Prázdny repozitár" @@ -3683,25 +3694,21 @@ #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 #, fuzzy -#| msgid "Empty repository" msgid "Private Repository" msgstr "Prázdny repozitár" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 #, fuzzy -#| msgid "Empty repository" msgid "Remote repository URL" msgstr "Prázdny repozitár" #: kallithea/templates/admin/repos/repo_edit_remote.html:9 -#, fuzzy, python-format -#| msgid "Changes on %s repository" +#, fuzzy msgid "Pull Changes from Remote Repository" msgstr "Zmeny na repozitáre %s" #: kallithea/templates/admin/repos/repo_edit_remote.html:11 #, fuzzy -#| msgid "Confirm to lock repository." msgid "Confirm to pull changes from remote repository." msgstr "Potvrdenie blokovania repozitára." @@ -3711,7 +3718,6 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:11 #, fuzzy -#| msgid "Empty repository" msgid "Permanent Repository ID" msgstr "Prázdny repozitár" @@ -3735,13 +3741,11 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:21 #, fuzzy -#| msgid "Empty repository" msgid "Remote repository" msgstr "Prázdny repozitár" #: kallithea/templates/admin/repos/repo_edit_settings.html:25 #, fuzzy -#| msgid "Repository Defaults" msgid "Repository URL" msgstr "Repozitáre" @@ -3880,7 +3884,7 @@ msgid "Custom Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:68 +#: kallithea/templates/admin/settings/settings_hooks.html:67 msgid "Failed to remove hook" msgstr "" @@ -3916,7 +3920,18 @@ "Current hooks will be updated to the latest version." msgstr "" +#: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "Overwrite existing Git hooks" +msgstr "" + #: kallithea/templates/admin/settings/settings_mapping.html:30 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any" +" custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:35 msgid "Rescan Repositories" msgstr "" @@ -4327,47 +4342,47 @@ msgid "Git repository" msgstr "" -#: kallithea/templates/base/base.html:126 +#: kallithea/templates/base/base.html:119 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:130 #: kallithea/templates/data_table/_dt_elements.html:13 #: kallithea/templates/data_table/_dt_elements.html:17 #: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:141 +#: kallithea/templates/base/base.html:132 +#: kallithea/templates/base/base.html:134 #: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:21 #: kallithea/templates/data_table/_dt_elements.html:25 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:136 #: kallithea/templates/data_table/_dt_elements.html:29 #: kallithea/templates/data_table/_dt_elements.html:33 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:138 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/base/base.html:154 +#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:147 msgid "Options" msgstr "" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:155 #: kallithea/templates/forks/forks_data.html:21 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:164 +#: kallithea/templates/base/base.html:157 #: kallithea/templates/bookmarks/bookmarks.html:56 #: kallithea/templates/bookmarks/bookmarks_data.html:13 #: kallithea/templates/branches/branches.html:56 @@ -4377,117 +4392,116 @@ msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:166 -#: kallithea/templates/base/base.html:254 +#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:247 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:54 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:170 +#: kallithea/templates/base/base.html:163 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:172 +#: kallithea/templates/base/base.html:165 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:173 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:174 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:184 +#: kallithea/templates/base/base.html:177 #: kallithea/templates/data_table/_dt_elements.html:37 #: kallithea/templates/data_table/_dt_elements.html:41 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:178 #: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 #, python-format msgid "Show Pull Requests for %s" msgstr "" +#: kallithea/templates/base/base.html:221 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:227 #: kallithea/templates/base/base.html:228 -msgid "Show recent activity" +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:233 +msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:234 -#: kallithea/templates/base/base.html:235 -msgid "Public journal" +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:238 +msgid "All Public Gists" msgstr "" #: kallithea/templates/base/base.html:240 -msgid "Show public gists" +msgid "My Public Gists" msgstr "" #: kallithea/templates/base/base.html:241 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:245 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:247 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:248 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:253 +#: kallithea/templates/base/base.html:246 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:276 -#: kallithea/templates/base/base.html:277 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +#: kallithea/templates/base/base.html:269 +#: kallithea/templates/base/base.html:270 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" +#: kallithea/templates/base/base.html:289 +msgid "Not Logged In" +msgstr "" + #: kallithea/templates/base/base.html:296 -msgid "Not Logged In" -msgstr "" - -#: kallithea/templates/base/base.html:303 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:319 msgid "Forgot password ?" msgstr "" -#: kallithea/templates/base/base.html:353 +#: kallithea/templates/base/base.html:346 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:402 +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:540 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" #: kallithea/templates/base/default_perms_box.html:14 #, fuzzy -#| msgid "Repository Defaults" msgid "Inherit defaults" msgstr "Repozitáre" @@ -4584,52 +4598,49 @@ msgstr "" #: kallithea/templates/base/root.html:31 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 -msgid "Open New Pull Request" -msgstr "" +#, fuzzy +#| msgid "on pull request" +msgid "Open New Pull Request from {0}" +msgstr "Zmena stavu" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for Selected Changesets" +msgid "Open New Pull Request for {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets __S → __E" +msgid "Show Selected Changesets {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:34 -msgid "Show Selected Changeset __S" +msgid "Selection Link" msgstr "" #: kallithea/templates/base/root.html:35 -msgid "Selection Link" +#: kallithea/templates/changeset/diff_block.html:8 +msgid "Collapse Diff" msgstr "" #: kallithea/templates/base/root.html:36 -#: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse Diff" +msgid "Expand Diff" msgstr "" #: kallithea/templates/base/root.html:37 -msgid "Expand Diff" +msgid "Failed to revoke permission" msgstr "" #: kallithea/templates/base/root.html:38 -msgid "Failed to revoke permission" +msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "" #: kallithea/templates/base/root.html:39 -msgid "Confirm to revoke permission for {0}: {1} ?" +msgid "enabled" msgstr "" #: kallithea/templates/base/root.html:40 -msgid "enabled" -msgstr "" - -#: kallithea/templates/base/root.html:41 msgid "disabled" msgstr "" -#: kallithea/templates/base/root.html:43 +#: kallithea/templates/base/root.html:42 msgid "Specify changeset" msgstr "" @@ -4647,7 +4658,6 @@ #: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 #: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" @@ -4688,7 +4698,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/templates/changelog/changelog.html:49 msgid "Clear selection" msgstr "" @@ -4761,7 +4771,7 @@ msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:291 +#: kallithea/templates/changelog/changelog.html:310 msgid "There are no changes yet" msgstr "" @@ -4819,7 +4829,6 @@ #: kallithea/templates/changelog/changelog_summary_data.html:90 #, fuzzy -#| msgid "Empty repository" msgid "Push new repository" msgstr "Prázdny repozitár" @@ -4885,7 +4894,7 @@ #: kallithea/templates/changeset/changeset.html:166 #: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:314 +#: kallithea/templates/pullrequests/pullrequest_show.html:318 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -4895,7 +4904,7 @@ #: kallithea/templates/changeset/changeset.html:168 #: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:320 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -4905,21 +4914,19 @@ #: kallithea/templates/changeset/changeset.html:182 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Show full diff anyway" msgstr "" #: kallithea/templates/changeset/changeset.html:247 #: kallithea/templates/changeset/changeset.html:284 -#, fuzzy, python-format -#| msgid "Unknown revision %s" +#, fuzzy msgid "No revisions" msgstr "Neznáma revízia %s" #: kallithea/templates/changeset/changeset_file_comment.html:21 #, fuzzy -#| msgid "Status change from pull request" msgid "on pull request" msgstr "Zmena stavu" @@ -4928,8 +4935,7 @@ msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:24 -#, fuzzy, python-format -#| msgid "%s changesets" +#, fuzzy msgid "on this changeset" msgstr "%s zmien" @@ -4940,7 +4946,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:37 #, fuzzy -#| msgid "Latest Changes" msgid "Status change" msgstr "Posledné zmeny" @@ -5093,7 +5098,7 @@ msgstr "" #: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:306 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 msgid "Common ancestor" msgstr "" @@ -5134,7 +5139,7 @@ msgstr "" #: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:301 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5199,15 +5204,23 @@ msgstr "" #: kallithea/templates/email_templates/password_reset.html:6 -msgid "We received a request to create a new password for your account." +msgid "We have received a request to reset the password for your account." msgstr "" #: kallithea/templates/email_templates/password_reset.html:7 -msgid "You can generate it by clicking following URL" +msgid "To set a new password, click the following link" msgstr "" #: kallithea/templates/email_templates/password_reset.html:10 -msgid "Please ignore this email if you did not request a new password ." +msgid "" +"Should you not be able to use the link above, please type the following " +"code into the password reset form" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:12 +msgid "" +"If it weren't you who requested the password reset, just disregard this " +"message." msgstr "" #: kallithea/templates/email_templates/pull_request.html:5 @@ -5609,8 +5622,6 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:70 #, fuzzy, python-format -#| msgid "Confirm to delete this group: %s with %s repository" -#| msgid_plural "Confirm to delete this group: %s with %s repositories" msgid "Confirm again to delete this pull request with %s comments" msgstr "" @@ -5670,100 +5681,106 @@ msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:131 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +msgid "" +"This is just a range of changesets and doesn't have a target or a real " +"merge ancestor." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:133 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:154 -msgid "Created by" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:169 +#: kallithea/templates/pullrequests/pullrequest_show.html:173 msgid "Update" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:187 +#: kallithea/templates/pullrequests/pullrequest_show.html:191 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:209 +#: kallithea/templates/pullrequests/pullrequest_show.html:213 msgid "Pull Request Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:234 +#: kallithea/templates/pullrequests/pullrequest_show.html:238 #, fuzzy msgid "Remove reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:246 +#: kallithea/templates/pullrequests/pullrequest_show.html:250 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:254 +#: kallithea/templates/pullrequests/pullrequest_show.html:258 #, fuzzy msgid "Potential Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:257 +#: kallithea/templates/pullrequests/pullrequest_show.html:261 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:280 +#: kallithea/templates/pullrequests/pullrequest_show.html:284 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/templates/pullrequests/pullrequest_show.html:285 msgid "Save as New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:282 +#: kallithea/templates/pullrequests/pullrequest_show.html:286 msgid "Cancel Changes" msgstr "Zrušiť zmeny" -#: kallithea/templates/pullrequests/pullrequest_show.html:292 +#: kallithea/templates/pullrequests/pullrequest_show.html:296 msgid "Pull Request Content" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 -#, python-format -msgid "Pull Requests from %s'" -msgstr "" - #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, python-format +msgid "Pull Requests from %s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:13 +#, python-format msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 -#, python-format -msgid "Show Pull Requests to %s" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +msgid "Open New Pull Request" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:37 #, python-format +msgid "Show Pull Requests to %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 -msgid "Hide closed pull requests (only show open pull requests)" -msgstr "" - #: kallithea/templates/pullrequests/pullrequest_show_all.html:49 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 msgid "Pull Requests I Participate In" msgstr "" @@ -6022,21 +6039,6 @@ #~ msgstr "" #~ msgid "" -#~ "Comment on %(repo_name)s changeset " -#~ "%(short_id)s on %(branch)s by " -#~ "%(comment_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Review request on %(repo_name)s pull " -#~ "request #%(pr_id)s from %(ref)s by " -#~ "%(pr_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Comment on %(repo_name)s pull request " -#~ "#%(pr_id)s from %(ref)s by " -#~ "%(comment_username)s" #~ msgstr "" #~ msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" @@ -6048,13 +6050,6 @@ #~ msgid "Username \"%(username)s\" is forbidden" #~ msgstr "" -#~ msgid "" -#~ "Username may only contain alphanumeric " -#~ "characters underscores, periods or dashes " -#~ "and must begin with alphanumeric " -#~ "character or underscore" -#~ msgstr "" - #~ msgid "invalid password" #~ msgstr "" @@ -6082,13 +6077,6 @@ #~ msgid "Revisions %(revs)s are already part of pull request or have set status" #~ msgstr "" -#~ msgid "" -#~ "Comma separated list of plugins. Order" -#~ " of plugins is also order in " -#~ "which Kallithea will try to authenticate" -#~ " user" -#~ msgstr "" - #~ msgid "Defaults" #~ msgstr "" @@ -6134,12 +6122,6 @@ #~ msgid "current IP" #~ msgstr "" -#~ msgid "" -#~ "Your user is in an external source" -#~ " of record; some details cannot be" -#~ " managed here" -#~ msgstr "" - #~ msgid "Permissions Administration" #~ msgstr "" @@ -6149,23 +6131,9 @@ #~ msgid "Overwrite existing settings" #~ msgstr "" -#~ msgid "" -#~ "All default permissions on each user " -#~ "group will be reset to chosen " -#~ "permission, note that all custom default" -#~ " permission on repository groups will " -#~ "be lost" -#~ msgstr "" - #~ msgid "Repository creation" #~ msgstr "" -#~ msgid "" -#~ "Write permission to a repository group" -#~ " allows creating repositories inside that" -#~ " group." -#~ msgstr "" - #~ msgid "Default IP Whitelist for All Users" #~ msgstr "" @@ -6226,20 +6194,6 @@ #~ msgid "Non-changeable id" #~ msgstr "" -#~ msgid "" -#~ "In case this repository is renamed " -#~ "or moved into another group the " -#~ "repository URL changes.\n" -#~ " Using the above " -#~ "URL guarantees that this repository will" -#~ " always be accessible under such URL." -#~ "\n" -#~ " Useful for CI " -#~ "systems, or any other cases that " -#~ "you need to hardcode the URL into" -#~ " 3rd party service." -#~ msgstr "" - #~ msgid "edit" #~ msgstr "" @@ -6285,12 +6239,6 @@ #~ msgid "Destroy old data" #~ msgstr "" -#~ msgid "" -#~ "Check this option to remove references" -#~ " to repositories that no longer exist" -#~ " in on the filesystem." -#~ msgstr "" - #~ msgid "check for updates" #~ msgstr "" @@ -6303,29 +6251,12 @@ #~ msgid "user groups" #~ msgstr "" -#~ msgid "" -#~ "This user is in an external source" -#~ " of record (%s); some details cannot" -#~ " be managed here." -#~ msgstr "" - #~ msgid "Inherit from defaults" #~ msgstr "" -#~ msgid "" -#~ "Select to inherit permissions from %s" -#~ " permissions settings, and default IP " -#~ "address whitelist." -#~ msgstr "" - #~ msgid "show" #~ msgstr "" -#~ msgid "" -#~ "Changeset status: %s\n" -#~ "Click to open associated pull request #%s" -#~ msgstr "" - #~ msgid "Push new repo" #~ msgstr "" @@ -6350,11 +6281,6 @@ #~ msgid "Comment on changeset" #~ msgstr "" -#~ msgid "" -#~ "Use @username inside this text to " -#~ "send notification to another local user." -#~ msgstr "" - #~ msgid "revision" #~ msgstr "" @@ -6385,3 +6311,60 @@ #~ msgid "with subrepos" #~ msgstr "" +#~ msgid "Your password reset link was sent" +#~ msgstr "" + +#~ msgid "" +#~ "Your password reset was successful, new" +#~ " password has been sent to your " +#~ "email" +#~ msgstr "" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Added by %(pr_username)s] %(repo_name)s pull" +#~ " request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "Your new password" +#~ msgstr "" + +#~ msgid "Your new Kallithea password:%s" +#~ msgstr "" + +#~ msgid "" +#~ "Password reset link will be sent " +#~ "to the email address matching your " +#~ "username." +#~ msgstr "" + +#~ msgid "Open New Pull Request for Selected Changesets" +#~ msgstr "" + +#~ msgid "Show Selected Changesets __S → __E" +#~ msgstr "" + +#~ msgid "Show Selected Changeset __S" +#~ msgstr "" + +#~ msgid "We received a request to create a new password for your account." +#~ msgstr "" + +#~ msgid "You can generate it by clicking following URL" +#~ msgstr "" + +#~ msgid "Please ignore this email if you did not request a new password ." +#~ msgstr "" + +#~ msgid "Created by" +#~ msgstr "" +
--- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Tue Sep 08 10:21:46 2015 +0000 +++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Tue Sep 08 10:37:51 2015 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2015-08-25 11:37+0200\n" +"POT-Creation-Date: 2015-09-08 10:34+0200\n" "PO-Revision-Date: 2014-12-12 14:19+0200\n" "Last-Translator: Michal Čihař <michal@cihar.com>\n" "Language-Team: Simplified Chinese " @@ -21,7 +21,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" #: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:241 kallithea/lib/base.py:512 +#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 msgid "There are no changesets yet" msgstr "还没有修订集" @@ -37,7 +37,7 @@ msgid "None" msgstr "无" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "" @@ -55,8 +55,8 @@ msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:743 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 msgid "Such revision does not exist for this repository" msgstr "" @@ -66,17 +66,16 @@ "not allowed" msgstr "" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:42 +#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 msgid "Select changeset" msgstr "" -#: kallithea/controllers/compare.py:258 +#: kallithea/controllers/compare.py:261 msgid "Cannot compare repositories without using common ancestor" msgstr "" #: kallithea/controllers/error.py:71 #, fuzzy -#| msgid "revisions" msgid "No response" msgstr "修订" @@ -121,8 +120,8 @@ #: kallithea/templates/changeset/changeset.html:195 #: kallithea/templates/compare/compare_diff.html:78 #: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Changeset was too big and was cut off..." msgstr "修订集太大已被截断......" @@ -131,111 +130,111 @@ msgid "%s committed on %s" msgstr "" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:91 msgid "Click here to add new file" msgstr "" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:92 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, fuzzy, python-format msgid "%s at %s" msgstr "%s零%s" -#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 -#: kallithea/controllers/files.py:433 +#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 +#: kallithea/controllers/files.py:432 #, python-format msgid "This repository has been locked by %s on %s" msgstr "版本库由%s于%s锁定" -#: kallithea/controllers/files.py:318 +#: kallithea/controllers/files.py:317 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:329 +#: kallithea/controllers/files.py:328 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:351 +#: kallithea/controllers/files.py:350 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 -#: kallithea/controllers/files.py:502 +#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 +#: kallithea/controllers/files.py:501 msgid "Error occurred during commit" msgstr "提交时发生错误" -#: kallithea/controllers/files.py:378 +#: kallithea/controllers/files.py:377 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:392 +#: kallithea/controllers/files.py:391 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:408 +#: kallithea/controllers/files.py:407 msgid "No changes" msgstr "无变更" -#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 +#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 #, python-format msgid "Successfully committed to %s" msgstr "成功提交到%s" -#: kallithea/controllers/files.py:444 +#: kallithea/controllers/files.py:443 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:464 msgid "No content" msgstr "无内容" -#: kallithea/controllers/files.py:469 +#: kallithea/controllers/files.py:468 msgid "No filename" msgstr "无文件名" -#: kallithea/controllers/files.py:494 +#: kallithea/controllers/files.py:493 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:527 +#: kallithea/controllers/files.py:526 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:538 +#: kallithea/controllers/files.py:537 #, python-format msgid "Unknown revision %s" msgstr "未知版本%s" -#: kallithea/controllers/files.py:540 +#: kallithea/controllers/files.py:539 msgid "Empty repository" msgstr "空版本库" -#: kallithea/controllers/files.py:542 +#: kallithea/controllers/files.py:541 msgid "Unknown archive type" msgstr "未知包类型" -#: kallithea/controllers/files.py:772 +#: kallithea/controllers/files.py:771 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:15 #: kallithea/templates/pullrequests/pullrequest.html:97 msgid "Changesets" msgstr "修订集" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:821 kallithea/templates/switch_to_list.html:3 +#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 +#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "分支" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:832 kallithea/templates/switch_to_list.html:25 +#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 +#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "标签" @@ -256,9 +255,9 @@ #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:131 -#: kallithea/templates/base/base.html:397 -#: kallithea/templates/base/base.html:569 +#: kallithea/templates/base/base.html:124 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "版本库" @@ -284,29 +283,36 @@ msgstr "公共日志" #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:229 +#: kallithea/templates/base/base.html:222 #: kallithea/templates/journal/journal.html:4 #: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "日志" -#: kallithea/controllers/login.py:150 kallithea/controllers/login.py:196 +#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:156 +#: kallithea/controllers/login.py:157 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:201 -msgid "Your password reset link was sent" +#: kallithea/controllers/login.py:202 +#, fuzzy +#| msgid "Your password reset link was sent" +msgid "A password reset confirmation code has been sent" msgstr "密码重置链接已经发送" -#: kallithea/controllers/login.py:222 -msgid "" -"Your password reset was successful, new password has been sent to your " -"email" -msgstr "密码已经成功重置，新密码已经发送到你的邮箱" +#: kallithea/controllers/login.py:251 +#, fuzzy +#| msgid "Your password reset link was sent" +msgid "Invalid password reset token" +msgstr "密码重置链接已经发送" + +#: kallithea/controllers/login.py:256 +#: kallithea/controllers/admin/my_account.py:167 +msgid "Successfully updated password" +msgstr "" #: kallithea/controllers/pullrequests.py:124 #, python-format @@ -327,116 +333,116 @@ msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:827 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "书签" -#: kallithea/controllers/pullrequests.py:306 +#: kallithea/controllers/pullrequests.py:310 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:352 -#: kallithea/controllers/pullrequests.py:499 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:503 #, fuzzy msgid "No description" msgstr "描述" -#: kallithea/controllers/pullrequests.py:359 +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "成功提交拉取请求" -#: kallithea/controllers/pullrequests.py:362 -#: kallithea/controllers/pullrequests.py:449 -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:453 +#: kallithea/controllers/pullrequests.py:509 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:365 -#: kallithea/controllers/pullrequests.py:452 +#: kallithea/controllers/pullrequests.py:369 +#: kallithea/controllers/pullrequests.py:456 #, fuzzy msgid "Error occurred while creating pull request" msgstr "提交拉取请求时发生错误" -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:401 msgid "Missing changesets since the previous pull request:" msgstr "" -#: kallithea/controllers/pullrequests.py:404 +#: kallithea/controllers/pullrequests.py:408 #, python-format msgid "New changesets on %s %s since the previous pull request:" msgstr "" -#: kallithea/controllers/pullrequests.py:411 +#: kallithea/controllers/pullrequests.py:415 msgid "Ancestor didn't change - show diff since previous version:" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:422 #, python-format msgid "" "This pull request is based on another %s revision and there is no simple " "diff." msgstr "" -#: kallithea/controllers/pullrequests.py:420 +#: kallithea/controllers/pullrequests.py:424 #, python-format msgid "No changes found on %s %s since previous version." msgstr "" -#: kallithea/controllers/pullrequests.py:458 +#: kallithea/controllers/pullrequests.py:462 #, python-format msgid "Closed, replaced by %s ." msgstr "" -#: kallithea/controllers/pullrequests.py:466 +#: kallithea/controllers/pullrequests.py:470 #, fuzzy msgid "Pull request update created" msgstr "拉取请求检视人员" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:513 #, fuzzy msgid "Pull request updated" msgstr "拉取请求" -#: kallithea/controllers/pullrequests.py:523 +#: kallithea/controllers/pullrequests.py:528 msgid "Successfully deleted pull request" msgstr "成功删除拉取请求" -#: kallithea/controllers/pullrequests.py:582 +#: kallithea/controllers/pullrequests.py:594 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:584 +#: kallithea/controllers/pullrequests.py:596 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:602 +#: kallithea/controllers/pullrequests.py:614 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:605 +#: kallithea/controllers/pullrequests.py:617 msgid "No changesets found for updating this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:613 +#: kallithea/controllers/pullrequests.py:625 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:619 +#: kallithea/controllers/pullrequests.py:631 msgid "Git pull requests don't support updates yet." msgstr "" -#: kallithea/controllers/pullrequests.py:710 +#: kallithea/controllers/pullrequests.py:722 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:715 +#: kallithea/controllers/pullrequests.py:727 #, fuzzy msgid "Closing." msgstr "使用中" @@ -483,39 +489,38 @@ #: kallithea/controllers/admin/gists.py:59 #: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:283 -#, fuzzy -#| msgid "reviewer" +#: kallithea/controllers/admin/users.py:285 +#, fuzzy msgid "Forever" msgstr "检视者" #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/users.py:286 msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/users.py:287 msgid "1 hour" msgstr "" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/users.py:288 msgid "1 day" msgstr "" #: kallithea/controllers/admin/gists.py:63 #: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/users.py:289 msgid "1 month" msgstr "" #: kallithea/controllers/admin/gists.py:67 #: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/users.py:291 msgid "Lifetime" msgstr "" @@ -530,7 +535,6 @@ #: kallithea/controllers/admin/gists.py:233 #, fuzzy -#| msgid "Last Modified" msgid "Unmodified" msgstr "最后修改于" @@ -547,8 +551,8 @@ msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:208 -#: kallithea/model/user.py:230 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 +#: kallithea/model/user.py:237 msgid "You can't edit this user since it's crucial for entire application" msgstr "由于是系统帐号，无法编辑该用户" @@ -557,47 +561,43 @@ msgstr "你的帐号已经更新完成" #: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:204 +#: kallithea/controllers/admin/users.py:202 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:167 -msgid "Successfully updated password" -msgstr "" - #: kallithea/controllers/admin/my_account.py:178 msgid "Error occurred during update of user password" msgstr "" #: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:413 +#: kallithea/controllers/admin/users.py:415 #, python-format msgid "Added email %s to user" msgstr "已为用户添加电子邮件 %s" #: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:419 +#: kallithea/controllers/admin/users.py:421 msgid "An error occurred during email saving" msgstr "保存电子邮件时发生错误" #: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:431 +#: kallithea/controllers/admin/users.py:433 msgid "Removed email from user" msgstr "成功删除用户电子邮件" #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:306 +#: kallithea/controllers/admin/users.py:308 msgid "API key successfully created" msgstr "" #: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:319 +#: kallithea/controllers/admin/users.py:321 msgid "API key successfully reset" msgstr "" #: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:323 +#: kallithea/controllers/admin/users.py:325 msgid "API key successfully deleted" msgstr "" @@ -647,10 +647,10 @@ #: kallithea/templates/admin/users/user_edit_profile.html:105 #: kallithea/templates/admin/users/users.html:10 #: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:252 +#: kallithea/templates/base/base.html:253 #: kallithea/templates/base/base.html:259 #: kallithea/templates/base/base.html:260 -#: kallithea/templates/base/base.html:266 -#: kallithea/templates/base/base.html:267 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "管理" @@ -817,7 +817,6 @@ #: kallithea/controllers/admin/repos.py:321 #, fuzzy, python-format -#| msgid "Cannot delete %s it still contains attached forks" msgid "Cannot delete repository %s which still has forks" msgstr "无法删除%s因为它还有其他分复刻本库" @@ -866,14 +865,12 @@ #: kallithea/controllers/admin/repos.py:537 #: kallithea/controllers/admin/repos.py:564 #, fuzzy -#| msgid "Repository is not locked" msgid "Repository has been locked" msgstr "版本库未锁定" #: kallithea/controllers/admin/repos.py:540 #: kallithea/controllers/admin/repos.py:561 #, fuzzy -#| msgid "Repository is not locked" msgid "Repository has been unlocked" msgstr "版本库未锁定" @@ -913,48 +910,48 @@ msgstr "" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:274 +#: kallithea/controllers/admin/settings.py:277 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:213 +#: kallithea/controllers/admin/settings.py:216 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:270 +#: kallithea/controllers/admin/settings.py:273 msgid "Updated application settings" msgstr "更新应用设置" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "成功更新可视化设置" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:335 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:361 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:373 +#: kallithea/controllers/admin/settings.py:376 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Added new hook" msgstr "新建钩子" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:421 msgid "Updated hooks" msgstr "更新钩子" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:425 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:448 +#: kallithea/controllers/admin/settings.py:451 msgid "Whoosh reindex task scheduled" msgstr "Whoosh重新索引任务调度" @@ -995,68 +992,68 @@ msgstr "" #: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:382 +#: kallithea/controllers/admin/users.py:384 msgid "Updated permissions" msgstr "" #: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:386 +#: kallithea/controllers/admin/users.py:388 msgid "An error occurred during permissions saving" msgstr "保存权限时发生错误" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:134 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:184 +#: kallithea/controllers/admin/users.py:182 msgid "User updated successfully" msgstr "用户更新成功" -#: kallithea/controllers/admin/users.py:220 +#: kallithea/controllers/admin/users.py:218 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:225 +#: kallithea/controllers/admin/users.py:223 msgid "An error occurred during deletion of user" msgstr "删除用户时发生错误" -#: kallithea/controllers/admin/users.py:238 +#: kallithea/controllers/admin/users.py:236 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:461 +#: kallithea/controllers/admin/users.py:463 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:467 +#: kallithea/controllers/admin/users.py:469 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:744 +#: kallithea/lib/auth.py:743 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:757 +#: kallithea/lib/auth.py:756 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:795 +#: kallithea/lib/auth.py:812 msgid "You need to be a registered user to perform this action" msgstr "必须是注册用户才能进行此操作" -#: kallithea/lib/auth.py:827 +#: kallithea/lib/auth.py:844 msgid "You need to be signed in to view this page" msgstr "必须登录才能访问该页面" @@ -1097,7 +1094,6 @@ #: kallithea/lib/helpers.py:677 #, fuzzy -#| msgid "compare view" msgid "Compare view" msgstr "比较显示" @@ -1116,13 +1112,11 @@ #: kallithea/lib/helpers.py:722 #, fuzzy, python-format -#| msgid "fork name %s" msgid "Fork name %s" msgstr "复刻名称%s" #: kallithea/lib/helpers.py:742 #, fuzzy, python-format -#| msgid "Pull request #%s" msgid "Pull request %s" msgstr "拉取请求#%s" @@ -1213,7 +1207,7 @@ #: kallithea/lib/helpers.py:1128 #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "无文件" @@ -1751,13 +1745,11 @@ #: kallithea/model/db.py:1668 #, fuzzy -#| msgid "Unauthorized access to resource" msgid "Default user has read access to new repositories" msgstr "未授权的资源访问" #: kallithea/model/db.py:1669 #, fuzzy -#| msgid "Unauthorized access to resource" msgid "Default user has write access to new repositories" msgstr "未授权的资源访问" @@ -1799,13 +1791,11 @@ #: kallithea/model/db.py:1682 #, fuzzy -#| msgid "You don't have permissions to create repository in this group" msgid "Only admins can create repository groups" msgstr "没有在该版本库组中创建版本库的权限" #: kallithea/model/db.py:1683 #, fuzzy -#| msgid "You don't have permissions to create repository in this group" msgid "Non-admins can create repository groups" msgstr "没有在该版本库组中创建版本库的权限" @@ -1827,13 +1817,11 @@ #: kallithea/model/db.py:1694 #, fuzzy -#| msgid "Location of repositories" msgid "Only admins can fork repositories" msgstr "创建版本库" #: kallithea/model/db.py:1695 #, fuzzy -#| msgid "Location of repositories" msgid "Non-admins can can fork repositories" msgstr "创建版本库" @@ -1847,13 +1835,11 @@ #: kallithea/model/db.py:2228 #, fuzzy -#| msgid "Not Reviewed" msgid "Not reviewed" msgstr "未检视" #: kallithea/model/db.py:2231 #, fuzzy -#| msgid "Under Review" msgid "Under review" msgstr "检视中" @@ -1901,13 +1887,11 @@ #: kallithea/model/notification.py:258 #, fuzzy, python-format -#| msgid "Successfully opened new pull request" msgid "%(user)s opened new pull request %(age)s" msgstr "成功提交拉取请求" #: kallithea/model/notification.py:259 #, fuzzy, python-format -#| msgid "[commented] on pull request for" msgid "%(user)s commented on pull request %(age)s" msgstr "[评论]拉取请求" @@ -1943,9 +1927,7 @@ #: kallithea/model/notification.py:302 #, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s changeset %(short_id)s " -"on %(branch)s" +msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" #: kallithea/model/notification.py:305 @@ -1955,17 +1937,14 @@ #: kallithea/model/notification.py:307 #, python-format -msgid "" -"[Added by %(pr_username)s] %(repo_name)s pull request %(pr_nice_id)s from" -" %(ref)s" +msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" #: kallithea/model/notification.py:308 -#, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s pull request " -"%(pr_nice_id)s from %(ref)s" -msgstr "" +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgstr "[评论]拉取请求" #: kallithea/model/notification.py:321 #, fuzzy @@ -1977,52 +1956,55 @@ msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:813 +#: kallithea/model/scm.py:812 msgid "latest tip" msgstr "最新tip版本" -#: kallithea/model/user.py:185 +#: kallithea/model/user.py:192 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:249 -#, fuzzy -#| msgid "You can't remove this user since it's crucial for entire application" +#: kallithea/model/user.py:256 +#, fuzzy msgid "You can't remove this user since it is crucial for the entire application" msgstr "由于是系统帐号，无法删除该用户" -#: kallithea/model/user.py:254 +#: kallithea/model/user.py:261 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本库。%s" -#: kallithea/model/user.py:259 +#: kallithea/model/user.py:266 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch" " owners or remove those repository groups: %s" msgstr "由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本库。%s" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:273 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本库。%s" -#: kallithea/model/user.py:296 +#: kallithea/model/user.py:360 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:319 -msgid "Your new password" -msgstr "" - -#: kallithea/model/user.py:320 -#, python-format -msgid "Your new Kallithea password:%s" +#: kallithea/model/user.py:408 +#, fuzzy +#| msgid "Password confirmation" +msgid "Password reset notification" +msgstr "确认密码" + +#: kallithea/model/user.py:409 +#, python-format +msgid "" +"The password to your account %s has been changed using password reset " +"form." msgstr "" #: kallithea/model/validators.py:77 kallithea/model/validators.py:78 @@ -2036,7 +2018,6 @@ #: kallithea/model/validators.py:97 #, fuzzy, python-format -#| msgid "Username %(username)s is not valid" msgid "Username \"%(username)s\" cannot be used" msgstr "用户名称 %(username)s 无效" @@ -2098,7 +2079,6 @@ #: kallithea/model/validators.py:300 #, fuzzy -#| msgid "invalid password" msgid "Invalid username or password" msgstr "无效密码" @@ -2108,7 +2088,6 @@ #: kallithea/model/validators.py:345 #, fuzzy, python-format -#| msgid "Repository name %(repo)s is disallowed" msgid "Repository name %(repo)s is not allowed" msgstr "版本库名称不能为%(repo)s" @@ -2129,7 +2108,6 @@ #: kallithea/model/validators.py:465 #, fuzzy -#| msgid "private repository" msgid "Invalid repository URL" msgstr "私有版本库" @@ -2165,13 +2143,11 @@ #: kallithea/model/validators.py:705 #, fuzzy -#| msgid "This email address is already taken" msgid "This email address is already in use" msgstr "该邮件地址已被使用" #: kallithea/model/validators.py:725 #, fuzzy, python-format -#| msgid "email \"%(email)s\" does not exist." msgid "Email address \"%(email)s\" not found" msgstr "邮件地址\"%(email)s\"不存在" @@ -2323,7 +2299,9 @@ #: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:229 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/pullrequests/pullrequest_show.html:156 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 #: kallithea/templates/summary/summary.html:134 msgid "Owner" msgstr "所有者" @@ -2331,7 +2309,7 @@ #: kallithea/templates/index_base.html:140 #: kallithea/templates/admin/my_account/my_account_repos.html:57 #: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:44 +#: kallithea/templates/base/root.html:43 #: kallithea/templates/bookmarks/bookmarks.html:79 #: kallithea/templates/branches/branches.html:79 #: kallithea/templates/journal/journal.html:198 @@ -2343,7 +2321,7 @@ #: kallithea/templates/index_base.html:141 #: kallithea/templates/admin/my_account/my_account_repos.html:58 #: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:45 +#: kallithea/templates/base/root.html:44 #: kallithea/templates/bookmarks/bookmarks.html:80 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:199 @@ -2359,7 +2337,7 @@ #: kallithea/templates/index_base.html:143 #: kallithea/templates/admin/my_account/my_account_repos.html:60 #: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:46 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:201 @@ -2371,7 +2349,7 @@ #: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:147 kallithea/templates/base/root.html:48 +#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:202 @@ -2381,7 +2359,7 @@ msgstr "载入中..." #: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:333 +#: kallithea/templates/base/base.html:326 msgid "Log In" msgstr "登录" @@ -2396,14 +2374,15 @@ #: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:24 #: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/pullrequests/pullrequest_show.html:166 msgid "Username" msgstr "帐号" #: kallithea/templates/login.html:33 kallithea/templates/register.html:33 #: kallithea/templates/admin/my_account/my_account.html:37 #: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:311 msgid "Password" msgstr "密码" @@ -2415,7 +2394,7 @@ msgid "Forgot your password ?" msgstr "忘记了密码？" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:329 +#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 msgid "Don't have an account ?" msgstr "还没有帐号？" @@ -2428,11 +2407,14 @@ msgstr "" #: kallithea/templates/password_reset.html:12 +#: kallithea/templates/password_reset_confirmation.html:12 #, fuzzy, python-format msgid "Reset Your Password to %s" msgstr "" #: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset_confirmation.html:5 +#: kallithea/templates/password_reset_confirmation.html:14 #, fuzzy msgid "Reset Your Password" msgstr "忘记了密码？" @@ -2453,11 +2435,44 @@ #: kallithea/templates/password_reset.html:47 #, fuzzy +#| msgid "" "Password reset link will be sent to the email address matching +#| your " "username." msgid "" -"Password reset link will be sent to the email address matching your " -"username." +"A password reset link will be sent to the specified email address if it " +"is registered in the system." msgstr "密码重置地址已经发送到邮件" +#: kallithea/templates/password_reset_confirmation.html:19 +#, python-format +msgid "You are about to set a new password for the email address %s." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:20 +msgid "" +"Note that you must use the same browser session for this as the one used " +"to request the password reset." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:30 +msgid "Code you received in the email" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:39 +#, fuzzy +#| msgid "New password" +msgid "New Password" +msgstr "新密码" + +#: kallithea/templates/password_reset_confirmation.html:48 +#, fuzzy +#| msgid "New password" +msgid "Confirm New Password" +msgstr "新密码" + +#: kallithea/templates/password_reset_confirmation.html:56 +msgid "Confirm" +msgstr "" + #: kallithea/templates/register.html:5 kallithea/templates/register.html:14 #: kallithea/templates/register.html:90 msgid "Sign Up" @@ -2739,7 +2754,6 @@ #: kallithea/templates/admin/users/user_edit_api_keys.html:8 #: kallithea/templates/admin/users/user_edit_api_keys.html:27 #, fuzzy -#| msgid "reviewer" msgid "Never" msgstr "检视者" @@ -2771,7 +2785,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:244 +#: kallithea/templates/base/base.html:237 msgid "Create New Gist" msgstr "" @@ -2913,7 +2927,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/base/base.html:343 msgid "My Account" msgstr "我的账户" @@ -2924,7 +2938,6 @@ #: kallithea/templates/admin/my_account/my_account.html:36 #, fuzzy -#| msgid "New email address" msgid "Email Addresses" msgstr "增加邮箱" @@ -2935,14 +2948,12 @@ #: kallithea/templates/admin/my_account/my_account.html:39 #, fuzzy -#| msgid "repositories" msgid "Owned Repositories" msgstr "版本库" #: kallithea/templates/admin/my_account/my_account.html:40 #: kallithea/templates/journal/journal.html:53 #, fuzzy -#| msgid "Create repositories" msgid "Watched Repositories" msgstr "创建版本库" @@ -2951,7 +2962,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 #, fuzzy -#| msgid "Copy permissions" msgid "Show Permissions" msgstr "拷贝权限" @@ -2963,7 +2973,6 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #, fuzzy, python-format -#| msgid "Confirm to delete this user: %s" msgid "Confirm to reset this API key: %s" msgstr "确认删除用户：%s" @@ -2975,14 +2984,12 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:40 #: kallithea/templates/admin/users/user_edit_api_keys.html:40 #, fuzzy, python-format -#| msgid "Confirm to delete this user: %s" msgid "Confirm to remove this API key: %s" msgstr "确认删除用户：%s" #: kallithea/templates/admin/my_account/my_account_api_keys.html:42 #: kallithea/templates/admin/users/user_edit_api_keys.html:42 #, fuzzy -#| msgid "revoke" msgid "Remove" msgstr "移除" @@ -3081,7 +3088,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:45 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:200 @@ -3109,7 +3116,7 @@ msgstr "评论" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 msgid "Pull Requests" msgstr "" @@ -3129,7 +3136,7 @@ msgstr "显示通知" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:342 msgid "Notifications" msgstr "通知" @@ -3170,7 +3177,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:26 #, fuzzy -#| msgid "Existing repository?" msgid "Apply to all existing repositories" msgstr "已有版本库？" @@ -3195,7 +3201,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:40 #, fuzzy -#| msgid "Existing repository?" msgid "Apply to all existing repository groups" msgstr "已有版本库？" @@ -3225,7 +3230,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:60 #, fuzzy -#| msgid "Repository creation" msgid "Top level repository creation" msgstr "建立版本库" @@ -3277,7 +3281,6 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:13 #: kallithea/templates/admin/users/user_edit_ips.html:23 #, fuzzy, python-format -#| msgid "Confirm to delete this user: %s" msgid "Confirm to delete this IP address: %s" msgstr "确认删除用户：%s" @@ -3335,7 +3338,7 @@ #: kallithea/templates/admin/repos/repo_edit.html:40 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:158 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 #: kallithea/templates/data_table/_dt_elements.html:45 #: kallithea/templates/data_table/_dt_elements.html:49 msgid "Settings" @@ -3374,7 +3377,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:146 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 msgid "Created on" msgstr "创建于" @@ -3402,7 +3405,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 #, fuzzy -#| msgid "default" msgid "Default" msgstr "默认" @@ -3413,7 +3415,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 #, fuzzy -#| msgid "revoke" msgid "Revoke" msgstr "移除" @@ -3425,7 +3426,6 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 #, fuzzy -#| msgid "apply to children" msgid "Apply to children" msgstr "应用到成员" @@ -3479,7 +3479,6 @@ #: kallithea/templates/admin/repos/repo_add_base.html:17 #, fuzzy -#| msgid "[created] repository" msgid "Clone remote repository" msgstr "[创建]版本库" @@ -3746,25 +3745,21 @@ #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 #, fuzzy -#| msgid "private repository" msgid "Private Repository" msgstr "私有版本库" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 #, fuzzy -#| msgid "[created] repository" msgid "Remote repository URL" msgstr "[创建]版本库" #: kallithea/templates/admin/repos/repo_edit_remote.html:9 #, fuzzy -#| msgid "[pulled from remote] into repository" msgid "Pull Changes from Remote Repository" msgstr "[远程拉取]到版本库" #: kallithea/templates/admin/repos/repo_edit_remote.html:11 #, fuzzy -#| msgid "Confirm to pull changes from remote side." msgid "Confirm to pull changes from remote repository." msgstr "确认从远程拉取修订集" @@ -3774,7 +3769,6 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:11 #, fuzzy -#| msgid "private repository" msgid "Permanent Repository ID" msgstr "私有版本库" @@ -3798,13 +3792,11 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:21 #, fuzzy -#| msgid "[created] repository" msgid "Remote repository" msgstr "[创建]版本库" #: kallithea/templates/admin/repos/repo_edit_settings.html:25 #, fuzzy -#| msgid "Repository" msgid "Repository URL" msgstr "版本库" @@ -3949,7 +3941,7 @@ msgid "Custom Hooks" msgstr "自定义钩子" -#: kallithea/templates/admin/settings/settings_hooks.html:68 +#: kallithea/templates/admin/settings/settings_hooks.html:67 msgid "Failed to remove hook" msgstr "移除钩子失败" @@ -3985,7 +3977,18 @@ "Current hooks will be updated to the latest version." msgstr "" +#: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "Overwrite existing Git hooks" +msgstr "" + #: kallithea/templates/admin/settings/settings_mapping.html:30 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any" +" custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:35 msgid "Rescan Repositories" msgstr "" @@ -4216,7 +4219,6 @@ #: kallithea/templates/admin/settings/settings_visual.html:92 #, fuzzy -#| msgid "Meta-Tagging" msgid "Meta Tagging" msgstr "元标记" @@ -4258,7 +4260,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit.html:33 #, fuzzy -#| msgid "members" msgid "Show Members" msgstr "成员" @@ -4405,49 +4406,49 @@ msgid "Git repository" msgstr "Git版本库" -#: kallithea/templates/base/base.html:126 +#: kallithea/templates/base/base.html:119 #, fuzzy msgid "Create Fork" msgstr "创建于" -#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:130 #: kallithea/templates/data_table/_dt_elements.html:13 #: kallithea/templates/data_table/_dt_elements.html:17 #: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "概况" -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:141 +#: kallithea/templates/base/base.html:132 +#: kallithea/templates/base/base.html:134 #: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:21 #: kallithea/templates/data_table/_dt_elements.html:25 msgid "Changelog" msgstr "修订记录" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:136 #: kallithea/templates/data_table/_dt_elements.html:29 #: kallithea/templates/data_table/_dt_elements.html:33 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "浏览" -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:138 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/base/base.html:154 +#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:147 msgid "Options" msgstr "选项" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:155 #: kallithea/templates/forks/forks_data.html:21 #, fuzzy msgid "Compare Fork" msgstr "比较复刻" -#: kallithea/templates/base/base.html:164 +#: kallithea/templates/base/base.html:157 #: kallithea/templates/bookmarks/bookmarks.html:56 #: kallithea/templates/bookmarks/bookmarks_data.html:13 #: kallithea/templates/branches/branches.html:56 @@ -4457,119 +4458,118 @@ msgid "Compare" msgstr "比较显示" -#: kallithea/templates/base/base.html:166 -#: kallithea/templates/base/base.html:254 +#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:247 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:54 msgid "Search" msgstr "搜索" -#: kallithea/templates/base/base.html:170 +#: kallithea/templates/base/base.html:163 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:172 +#: kallithea/templates/base/base.html:165 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:173 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:174 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:184 +#: kallithea/templates/base/base.html:177 #: kallithea/templates/data_table/_dt_elements.html:37 #: kallithea/templates/data_table/_dt_elements.html:41 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "复刻" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:178 #: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 #, python-format msgid "Show Pull Requests for %s" msgstr "" +#: kallithea/templates/base/base.html:221 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:227 #: kallithea/templates/base/base.html:228 -msgid "Show recent activity" +msgid "Public journal" +msgstr "公共日志" + +#: kallithea/templates/base/base.html:233 +msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:234 -#: kallithea/templates/base/base.html:235 -msgid "Public journal" -msgstr "公共日志" +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:238 +msgid "All Public Gists" +msgstr "" #: kallithea/templates/base/base.html:240 -msgid "Show public gists" +msgid "My Public Gists" msgstr "" #: kallithea/templates/base/base.html:241 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:245 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:247 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:248 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:253 +#: kallithea/templates/base/base.html:246 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:276 -#: kallithea/templates/base/base.html:277 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +#: kallithea/templates/base/base.html:269 +#: kallithea/templates/base/base.html:270 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 #, fuzzy msgid "My Pull Requests" msgstr "拉取请求" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:289 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:303 +#: kallithea/templates/base/base.html:296 #, fuzzy msgid "Login to Your Account" msgstr "登录" -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:319 msgid "Forgot password ?" msgstr "忘记密码？" -#: kallithea/templates/base/base.html:353 +#: kallithea/templates/base/base.html:346 msgid "Log Out" msgstr "退出" -#: kallithea/templates/base/base.html:402 +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:540 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" #: kallithea/templates/base/default_perms_box.html:14 #, fuzzy -#| msgid "Repository Defaults" msgid "Inherit defaults" msgstr "版本库默认设置" @@ -4666,58 +4666,54 @@ msgstr "" #: kallithea/templates/base/root.html:31 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 -#, fuzzy -msgid "Open New Pull Request" -msgstr "新建拉取请求" +#, fuzzy +#| msgid "on pull request" +msgid "Open New Pull Request from {0}" +msgstr "[评论]拉取请求" #: kallithea/templates/base/root.html:32 -#, fuzzy -msgid "Open New Pull Request for Selected Changesets" -msgstr "为选择的变更集创建新的拉取请求" +msgid "Open New Pull Request for {0} → {1}" +msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets __S → __E" -msgstr "" +#, fuzzy +#| msgid "Show Selected Changeset __S" +msgid "Show Selected Changesets {0} → {1}" +msgstr "显示合并的修订集%s->%s" #: kallithea/templates/base/root.html:34 #, fuzzy -msgid "Show Selected Changeset __S" -msgstr "显示合并的修订集%s->%s" - -#: kallithea/templates/base/root.html:35 -#, fuzzy msgid "Selection Link" msgstr "选择链接" -#: kallithea/templates/base/root.html:36 +#: kallithea/templates/base/root.html:35 #: kallithea/templates/changeset/diff_block.html:8 #, fuzzy msgid "Collapse Diff" msgstr "文件差异" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:36 #, fuzzy msgid "Expand Diff" msgstr "文件差异" +#: kallithea/templates/base/root.html:37 +msgid "Failed to revoke permission" +msgstr "" + #: kallithea/templates/base/root.html:38 -msgid "Failed to revoke permission" +msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "" #: kallithea/templates/base/root.html:39 -msgid "Confirm to revoke permission for {0}: {1} ?" +msgid "enabled" msgstr "" #: kallithea/templates/base/root.html:40 -msgid "enabled" -msgstr "" - -#: kallithea/templates/base/root.html:41 msgid "disabled" msgstr "" -#: kallithea/templates/base/root.html:43 +#: kallithea/templates/base/root.html:42 #, fuzzy msgid "Specify changeset" msgstr "%s修订集" @@ -4736,7 +4732,6 @@ #: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 #: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" @@ -4775,7 +4770,7 @@ msgid_plural "showing %d out of %d revisions" msgstr[0] "显示%d/%d个版本" -#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/templates/changelog/changelog.html:49 msgid "Clear selection" msgstr "清除选择" @@ -4849,7 +4844,7 @@ msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:291 +#: kallithea/templates/changelog/changelog.html:310 msgid "There are no changes yet" msgstr "没有任何变更" @@ -4907,7 +4902,6 @@ #: kallithea/templates/changelog/changelog_summary_data.html:90 #, fuzzy -#| msgid "Push new repo" msgid "Push new repository" msgstr "推送新版本库" @@ -4953,7 +4947,6 @@ #: kallithea/templates/changeset/changeset.html:89 #: kallithea/templates/changeset/changeset_range.html:88 #, fuzzy -#| msgid "merge" msgid "Merge" msgstr "合并" @@ -4968,19 +4961,17 @@ #: kallithea/templates/changeset/changeset.html:135 #, fuzzy -#| msgid "Created by" msgid "Replaced by:" msgstr "创建于" #: kallithea/templates/changeset/changeset.html:149 #, fuzzy -#| msgid "Created by" msgid "Preceded by:" msgstr "创建于" #: kallithea/templates/changeset/changeset.html:166 #: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:314 +#: kallithea/templates/pullrequests/pullrequest_show.html:318 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -4988,7 +4979,7 @@ #: kallithea/templates/changeset/changeset.html:168 #: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:320 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -4996,21 +4987,19 @@ #: kallithea/templates/changeset/changeset.html:182 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Show full diff anyway" msgstr "" #: kallithea/templates/changeset/changeset.html:247 #: kallithea/templates/changeset/changeset.html:284 #, fuzzy -#| msgid "revisions" msgid "No revisions" msgstr "修订" #: kallithea/templates/changeset/changeset_file_comment.html:21 #, fuzzy -#| msgid "Comment from pull request" msgid "on pull request" msgstr "[评论]拉取请求" @@ -5021,7 +5010,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:24 #, fuzzy -#| msgid "No changesets" msgid "on this changeset" msgstr "无修订" @@ -5032,7 +5020,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:37 #, fuzzy -#| msgid "Latest Changes" msgid "Status change" msgstr "文件已更改" @@ -5103,7 +5090,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:150 #, fuzzy -#| msgid "Use @username inside this text to notify another user" msgid "Use @username inside this text to notify another user." msgstr "在文本中使用 @用户名 以发送通知到该Kallithea用户" @@ -5185,7 +5171,7 @@ msgstr "" #: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:306 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 msgid "Common ancestor" msgstr "" @@ -5227,7 +5213,7 @@ msgstr "" #: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:301 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5290,15 +5276,25 @@ msgstr "" #: kallithea/templates/email_templates/password_reset.html:6 -msgid "We received a request to create a new password for your account." +#, fuzzy +#| msgid "We received a request to create a new password for your account." +msgid "We have received a request to reset the password for your account." msgstr "我们收到重置你用户密码的请求。" #: kallithea/templates/email_templates/password_reset.html:7 -msgid "You can generate it by clicking following URL" -msgstr "点击下面的链接以重新生成密码：" +msgid "To set a new password, click the following link" +msgstr "" #: kallithea/templates/email_templates/password_reset.html:10 -msgid "Please ignore this email if you did not request a new password ." +msgid "" +"Should you not be able to use the link above, please type the following " +"code into the password reset form" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:12 +msgid "" +"If it weren't you who requested the password reset, just disregard this " +"message." msgstr "" #: kallithea/templates/email_templates/pull_request.html:5 @@ -5665,7 +5661,6 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:14 #, fuzzy -#| msgid "revoke" msgid "Vote" msgstr "移除" @@ -5707,19 +5702,16 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:70 #, fuzzy, python-format -#| msgid "Confirm to delete this pull request" msgid "Confirm again to delete this pull request with %s comments" msgstr "确认删除拉取请求" #: kallithea/templates/pullrequests/pullrequest_show.html:6 #, fuzzy, python-format -#| msgid "Pull request #%s" msgid "%s Pull Request %s" msgstr "拉取请求#%s" #: kallithea/templates/pullrequests/pullrequest_show.html:10 #, fuzzy, python-format -#| msgid "Pull Requests from %s'" msgid "Pull request %s from %s#%s" msgstr "拉取请求#%s" @@ -5769,107 +5761,113 @@ msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:131 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +msgid "" +"This is just a range of changesets and doesn't have a target or a real " +"merge ancestor." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:133 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:154 -#, fuzzy -msgid "Created by" -msgstr "创建于" - -#: kallithea/templates/pullrequests/pullrequest_show.html:169 +#: kallithea/templates/pullrequests/pullrequest_show.html:173 #, fuzzy msgid "Update" msgstr "[更新]用户" -#: kallithea/templates/pullrequests/pullrequest_show.html:187 +#: kallithea/templates/pullrequests/pullrequest_show.html:191 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:209 +#: kallithea/templates/pullrequests/pullrequest_show.html:213 #, fuzzy msgid "Pull Request Reviewers" msgstr "拉取请求检视人员" -#: kallithea/templates/pullrequests/pullrequest_show.html:234 +#: kallithea/templates/pullrequests/pullrequest_show.html:238 #, fuzzy msgid "Remove reviewer" msgstr "检视者" -#: kallithea/templates/pullrequests/pullrequest_show.html:246 +#: kallithea/templates/pullrequests/pullrequest_show.html:250 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:254 +#: kallithea/templates/pullrequests/pullrequest_show.html:258 #, fuzzy msgid "Potential Reviewers" msgstr "%d个检视者" -#: kallithea/templates/pullrequests/pullrequest_show.html:257 +#: kallithea/templates/pullrequests/pullrequest_show.html:261 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:280 +#: kallithea/templates/pullrequests/pullrequest_show.html:284 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/templates/pullrequests/pullrequest_show.html:285 #, fuzzy msgid "Save as New Pull Request" msgstr "新建拉取请求" -#: kallithea/templates/pullrequests/pullrequest_show.html:282 +#: kallithea/templates/pullrequests/pullrequest_show.html:286 #, fuzzy msgid "Cancel Changes" msgstr "无变更" -#: kallithea/templates/pullrequests/pullrequest_show.html:292 +#: kallithea/templates/pullrequests/pullrequest_show.html:296 #, fuzzy msgid "Pull Request Content" msgstr "拉取请求" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, fuzzy, python-format msgid "Pull Requests from %s'" msgstr "拉取请求#%s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:13 #, fuzzy, python-format msgid "Pull Requests to '%s'" msgstr "拉取请求#%s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 -#, fuzzy, python-format -msgid "Show Pull Requests to %s" -msgstr "拉取请求#%s" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#, fuzzy +msgid "Open New Pull Request" +msgstr "新建拉取请求" #: kallithea/templates/pullrequests/pullrequest_show_all.html:37 #, fuzzy, python-format +msgid "Show Pull Requests to %s" +msgstr "拉取请求#%s" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#, fuzzy, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 -msgid "Hide closed pull requests (only show open pull requests)" -msgstr "" - #: kallithea/templates/pullrequests/pullrequest_show_all.html:49 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 #, fuzzy msgid "Pull Requests Created by Me" msgstr "拉取请求检视人员" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 #, fuzzy msgid "Pull Requests I Participate In" msgstr "我参与的" @@ -6041,7 +6039,6 @@ #: kallithea/templates/summary/summary.html:125 #, fuzzy -#| msgid "with subrepos" msgid "With subrepos" msgstr "包括子版本库" @@ -6127,22 +6124,7 @@ #~ msgstr "没有文件" #~ msgid "" -#~ "Comment on %(repo_name)s changeset " -#~ "%(short_id)s on %(branch)s by " -#~ "%(comment_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Review request on %(repo_name)s pull " -#~ "request #%(pr_id)s from %(ref)s by " -#~ "%(pr_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Comment on %(repo_name)s pull request " -#~ "#%(pr_id)s from %(ref)s by " -#~ "%(comment_username)s" -#~ msgstr "" +#~ msgstr "在文本中使用 @用户名 以发送通知到该Kallithea用户" #~ msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" #~ msgstr "" @@ -6150,13 +6132,6 @@ #~ msgid "Username \"%(username)s\" is forbidden" #~ msgstr "不允许用户名 \"%(username)s\"" -#~ msgid "" -#~ "Username may only contain alphanumeric " -#~ "characters underscores, periods or dashes " -#~ "and must begin with alphanumeric " -#~ "character or underscore" -#~ msgstr "" - #~ msgid "invalid user name" #~ msgstr "无效用户名" @@ -6172,13 +6147,6 @@ #~ msgid "Revisions %(revs)s are already part of pull request or have set status" #~ msgstr "修订%(revs)s已经包含在拉取请求中或者或者已经设置状态" -#~ msgid "" -#~ "Comma separated list of plugins. Order" -#~ " of plugins is also order in " -#~ "which Kallithea will try to authenticate" -#~ " user" -#~ msgstr "" - #~ msgid "Defaults" #~ msgstr "默认设置" @@ -6224,12 +6192,6 @@ #~ msgid "current IP" #~ msgstr "" -#~ msgid "" -#~ "Your user is in an external source" -#~ " of record; some details cannot be" -#~ " managed here" -#~ msgstr "" - #~ msgid "Permissions Administration" #~ msgstr "权限管理" @@ -6239,20 +6201,6 @@ #~ msgid "Overwrite existing settings" #~ msgstr "" -#~ msgid "" -#~ "All default permissions on each user " -#~ "group will be reset to chosen " -#~ "permission, note that all custom default" -#~ " permission on repository groups will " -#~ "be lost" -#~ msgstr "" - -#~ msgid "" -#~ "Write permission to a repository group" -#~ " allows creating repositories inside that" -#~ " group." -#~ msgstr "" - #~ msgid "Default IP Whitelist for All Users" #~ msgstr "" @@ -6298,20 +6246,6 @@ #~ msgid "Non-changeable id" #~ msgstr "" -#~ msgid "" -#~ "In case this repository is renamed " -#~ "or moved into another group the " -#~ "repository URL changes.\n" -#~ " Using the above " -#~ "URL guarantees that this repository will" -#~ " always be accessible under such URL." -#~ "\n" -#~ " Useful for CI " -#~ "systems, or any other cases that " -#~ "you need to hardcode the URL into" -#~ " 3rd party service." -#~ msgstr "" - #~ msgid "edit" #~ msgstr "编辑" @@ -6357,12 +6291,6 @@ #~ msgid "Destroy old data" #~ msgstr "" -#~ msgid "" -#~ "Check this option to remove references" -#~ " to repositories that no longer exist" -#~ " in on the filesystem." -#~ msgstr "" - #~ msgid "check for updates" #~ msgstr "" @@ -6372,29 +6300,12 @@ #~ msgid "user groups" #~ msgstr "" -#~ msgid "" -#~ "This user is in an external source" -#~ " of record (%s); some details cannot" -#~ " be managed here." -#~ msgstr "" - #~ msgid "Inherit from defaults" #~ msgstr "" -#~ msgid "" -#~ "Select to inherit permissions from %s" -#~ " permissions settings, and default IP " -#~ "address whitelist." -#~ msgstr "" - #~ msgid "show" #~ msgstr "" -#~ msgid "" -#~ "Changeset status: %s\n" -#~ "Click to open associated pull request #%s" -#~ msgstr "" - #~ msgid "parent rev." #~ msgstr "" @@ -6413,11 +6324,6 @@ #~ msgid "Comment on changeset" #~ msgstr "" -#~ msgid "" -#~ "Use @username inside this text to " -#~ "send notification to another local user." -#~ msgstr "在文本中使用 @用户名 以发送通知到该Kallithea用户" - #~ msgid "revision" #~ msgstr "" @@ -6442,3 +6348,45 @@ #~ msgid "owner" #~ msgstr "所有者" +#~ msgid "" +#~ "Your password reset was successful, new" +#~ " password has been sent to your " +#~ "email" +#~ msgstr "密码已经成功重置，新密码已经发送到你的邮箱" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Added by %(pr_username)s] %(repo_name)s pull" +#~ " request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "Your new password" +#~ msgstr "" + +#~ msgid "Your new Kallithea password:%s" +#~ msgstr "" + +#~ msgid "Open New Pull Request for Selected Changesets" +#~ msgstr "为选择的变更集创建新的拉取请求" + +#~ msgid "Show Selected Changesets __S → __E" +#~ msgstr "" + +#~ msgid "You can generate it by clicking following URL" +#~ msgstr "点击下面的链接以重新生成密码：" + +#~ msgid "Please ignore this email if you did not request a new password ." +#~ msgstr "" + +#~ msgid "Created by" +#~ msgstr "创建于" +
--- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Tue Sep 08 10:21:46 2015 +0000 +++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Tue Sep 08 10:37:51 2015 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2015-08-25 11:37+0200\n" +"POT-Creation-Date: 2015-09-08 10:34+0200\n" "PO-Revision-Date: 2015-08-21 15:52+0200\n" "Last-Translator: EriCSN Chang <ericsning@gmail.com>\n" "Language-Team: Chinese (Taiwan) " @@ -20,7 +20,7 @@ "X-Generator: Weblate 2.4-dev\n" #: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:241 kallithea/lib/base.py:512 +#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 msgid "There are no changesets yet" msgstr "" @@ -36,7 +36,7 @@ msgid "None" msgstr "無" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "（已關閉）" @@ -51,12 +51,11 @@ #: kallithea/controllers/changeset.py:169 #, fuzzy, python-format -#| msgid "increase diff context to %(num)s lines" msgid "Increase diff context to %(num)s lines" msgstr "增加 diff 上下文至 %(num) 行" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:743 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 msgid "Such revision does not exist for this repository" msgstr "" @@ -66,17 +65,16 @@ "not allowed" msgstr "" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:42 +#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 msgid "Select changeset" msgstr "" -#: kallithea/controllers/compare.py:258 +#: kallithea/controllers/compare.py:261 msgid "Cannot compare repositories without using common ancestor" msgstr "" #: kallithea/controllers/error.py:71 #, fuzzy -#| msgid "revisions" msgid "No response" msgstr "修訂" @@ -121,8 +119,8 @@ #: kallithea/templates/changeset/changeset.html:195 #: kallithea/templates/compare/compare_diff.html:78 #: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Changeset was too big and was cut off..." msgstr "" @@ -131,111 +129,111 @@ msgid "%s committed on %s" msgstr "" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:91 msgid "Click here to add new file" msgstr "" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:92 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 -#: kallithea/controllers/files.py:433 +#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 +#: kallithea/controllers/files.py:432 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:318 +#: kallithea/controllers/files.py:317 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:329 +#: kallithea/controllers/files.py:328 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:351 +#: kallithea/controllers/files.py:350 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 -#: kallithea/controllers/files.py:502 +#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 +#: kallithea/controllers/files.py:501 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:378 +#: kallithea/controllers/files.py:377 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:392 +#: kallithea/controllers/files.py:391 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:408 +#: kallithea/controllers/files.py:407 msgid "No changes" msgstr "沒有修改" -#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 +#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 #, python-format msgid "Successfully committed to %s" msgstr "成功遞交至 %s" -#: kallithea/controllers/files.py:444 +#: kallithea/controllers/files.py:443 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:464 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:469 +#: kallithea/controllers/files.py:468 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:494 +#: kallithea/controllers/files.py:493 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:527 +#: kallithea/controllers/files.py:526 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:538 +#: kallithea/controllers/files.py:537 #, python-format msgid "Unknown revision %s" msgstr "未知修訂 %s" -#: kallithea/controllers/files.py:540 +#: kallithea/controllers/files.py:539 msgid "Empty repository" msgstr "空的版本庫" -#: kallithea/controllers/files.py:542 +#: kallithea/controllers/files.py:541 msgid "Unknown archive type" msgstr "未知的存檔類型" -#: kallithea/controllers/files.py:772 +#: kallithea/controllers/files.py:771 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:15 #: kallithea/templates/pullrequests/pullrequest.html:97 msgid "Changesets" msgstr "變更" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:821 kallithea/templates/switch_to_list.html:3 +#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 +#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "分支" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:832 kallithea/templates/switch_to_list.html:25 +#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 +#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "標籤" @@ -256,9 +254,9 @@ #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:131 -#: kallithea/templates/base/base.html:397 -#: kallithea/templates/base/base.html:569 +#: kallithea/templates/base/base.html:124 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "版本庫" @@ -284,29 +282,36 @@ msgstr "開放日誌" #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:229 +#: kallithea/templates/base/base.html:222 #: kallithea/templates/journal/journal.html:4 #: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "日誌" -#: kallithea/controllers/login.py:150 kallithea/controllers/login.py:196 +#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:156 +#: kallithea/controllers/login.py:157 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:201 -msgid "Your password reset link was sent" +#: kallithea/controllers/login.py:202 +#, fuzzy +#| msgid "Your password reset link was sent" +msgid "A password reset confirmation code has been sent" msgstr "您的密碼重設連結已寄出" -#: kallithea/controllers/login.py:222 -msgid "" -"Your password reset was successful, new password has been sent to your " -"email" -msgstr "您的密碼重設動作已完成，新的密碼已寄至您的信箱" +#: kallithea/controllers/login.py:251 +#, fuzzy +#| msgid "Your password reset link was sent" +msgid "Invalid password reset token" +msgstr "您的密碼重設連結已寄出" + +#: kallithea/controllers/login.py:256 +#: kallithea/controllers/admin/my_account.py:167 +msgid "Successfully updated password" +msgstr "" #: kallithea/controllers/pullrequests.py:124 #, python-format @@ -327,113 +332,113 @@ msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:827 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:306 +#: kallithea/controllers/pullrequests.py:310 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:352 -#: kallithea/controllers/pullrequests.py:499 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:503 #, fuzzy msgid "No description" msgstr "描述" -#: kallithea/controllers/pullrequests.py:359 +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:362 -#: kallithea/controllers/pullrequests.py:449 -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:453 +#: kallithea/controllers/pullrequests.py:509 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:365 -#: kallithea/controllers/pullrequests.py:452 +#: kallithea/controllers/pullrequests.py:369 +#: kallithea/controllers/pullrequests.py:456 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:401 msgid "Missing changesets since the previous pull request:" msgstr "" -#: kallithea/controllers/pullrequests.py:404 +#: kallithea/controllers/pullrequests.py:408 #, python-format msgid "New changesets on %s %s since the previous pull request:" msgstr "" -#: kallithea/controllers/pullrequests.py:411 +#: kallithea/controllers/pullrequests.py:415 msgid "Ancestor didn't change - show diff since previous version:" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:422 #, python-format msgid "" "This pull request is based on another %s revision and there is no simple " "diff." msgstr "" -#: kallithea/controllers/pullrequests.py:420 +#: kallithea/controllers/pullrequests.py:424 #, python-format msgid "No changes found on %s %s since previous version." msgstr "" -#: kallithea/controllers/pullrequests.py:458 +#: kallithea/controllers/pullrequests.py:462 #, python-format msgid "Closed, replaced by %s ." msgstr "" -#: kallithea/controllers/pullrequests.py:466 +#: kallithea/controllers/pullrequests.py:470 msgid "Pull request update created" msgstr "" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:513 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:523 +#: kallithea/controllers/pullrequests.py:528 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:582 +#: kallithea/controllers/pullrequests.py:594 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:584 +#: kallithea/controllers/pullrequests.py:596 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:602 +#: kallithea/controllers/pullrequests.py:614 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:605 +#: kallithea/controllers/pullrequests.py:617 msgid "No changesets found for updating this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:613 +#: kallithea/controllers/pullrequests.py:625 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:619 +#: kallithea/controllers/pullrequests.py:631 msgid "Git pull requests don't support updates yet." msgstr "" -#: kallithea/controllers/pullrequests.py:710 +#: kallithea/controllers/pullrequests.py:722 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:715 +#: kallithea/controllers/pullrequests.py:727 #, fuzzy msgid "Closing." msgstr "使用中" @@ -478,37 +483,37 @@ #: kallithea/controllers/admin/gists.py:59 #: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:283 +#: kallithea/controllers/admin/users.py:285 msgid "Forever" msgstr "" #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/users.py:286 msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/users.py:287 msgid "1 hour" msgstr "" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/users.py:288 msgid "1 day" msgstr "" #: kallithea/controllers/admin/gists.py:63 #: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/users.py:289 msgid "1 month" msgstr "" #: kallithea/controllers/admin/gists.py:67 #: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/users.py:291 msgid "Lifetime" msgstr "" @@ -523,7 +528,6 @@ #: kallithea/controllers/admin/gists.py:233 #, fuzzy -#| msgid "Last Modified" msgid "Unmodified" msgstr "最後修改" @@ -540,8 +544,8 @@ msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:208 -#: kallithea/model/user.py:230 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 +#: kallithea/model/user.py:237 msgid "You can't edit this user since it's crucial for entire application" msgstr "" @@ -550,47 +554,43 @@ msgstr "您的帳號已更新完成" #: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:204 +#: kallithea/controllers/admin/users.py:202 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:167 -msgid "Successfully updated password" -msgstr "" - #: kallithea/controllers/admin/my_account.py:178 msgid "Error occurred during update of user password" msgstr "" #: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:413 +#: kallithea/controllers/admin/users.py:415 #, python-format msgid "Added email %s to user" msgstr "" #: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:419 +#: kallithea/controllers/admin/users.py:421 msgid "An error occurred during email saving" msgstr "" #: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:431 +#: kallithea/controllers/admin/users.py:433 msgid "Removed email from user" msgstr "" #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:306 +#: kallithea/controllers/admin/users.py:308 msgid "API key successfully created" msgstr "" #: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:319 +#: kallithea/controllers/admin/users.py:321 msgid "API key successfully reset" msgstr "" #: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:323 +#: kallithea/controllers/admin/users.py:325 msgid "API key successfully deleted" msgstr "" @@ -640,10 +640,10 @@ #: kallithea/templates/admin/users/user_edit_profile.html:105 #: kallithea/templates/admin/users/users.html:10 #: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:252 +#: kallithea/templates/base/base.html:253 #: kallithea/templates/base/base.html:259 #: kallithea/templates/base/base.html:260 -#: kallithea/templates/base/base.html:266 -#: kallithea/templates/base/base.html:267 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "管理" @@ -857,17 +857,13 @@ #: kallithea/controllers/admin/repos.py:537 #: kallithea/controllers/admin/repos.py:564 -#, fuzzy, python-format -#| msgid "This repository has %s fork" -#| msgid_plural "This repository has %s forks" +#, fuzzy msgid "Repository has been locked" msgstr "" #: kallithea/controllers/admin/repos.py:540 #: kallithea/controllers/admin/repos.py:561 -#, fuzzy, python-format -#| msgid "This repository has %s fork" -#| msgid_plural "This repository has %s forks" +#, fuzzy msgid "Repository has been unlocked" msgstr "" @@ -907,48 +903,48 @@ msgstr "" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:274 +#: kallithea/controllers/admin/settings.py:277 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:213 +#: kallithea/controllers/admin/settings.py:216 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:270 +#: kallithea/controllers/admin/settings.py:273 msgid "Updated application settings" msgstr "更新應用設定" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:335 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:361 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:373 +#: kallithea/controllers/admin/settings.py:376 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Added new hook" msgstr "新增hook" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:421 msgid "Updated hooks" msgstr "更新hook" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:425 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:448 +#: kallithea/controllers/admin/settings.py:451 msgid "Whoosh reindex task scheduled" msgstr "Whoosh 重新索引工作排程" @@ -989,68 +985,68 @@ msgstr "" #: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:382 +#: kallithea/controllers/admin/users.py:384 msgid "Updated permissions" msgstr "" #: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:386 +#: kallithea/controllers/admin/users.py:388 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:134 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:184 +#: kallithea/controllers/admin/users.py:182 msgid "User updated successfully" msgstr "使用者更新完成" -#: kallithea/controllers/admin/users.py:220 +#: kallithea/controllers/admin/users.py:218 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:225 +#: kallithea/controllers/admin/users.py:223 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:238 +#: kallithea/controllers/admin/users.py:236 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:461 +#: kallithea/controllers/admin/users.py:463 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:467 +#: kallithea/controllers/admin/users.py:469 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:744 +#: kallithea/lib/auth.py:743 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:757 +#: kallithea/lib/auth.py:756 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:795 +#: kallithea/lib/auth.py:812 msgid "You need to be a registered user to perform this action" msgstr "您必須是註冊使用者才能執行這個動作" -#: kallithea/lib/auth.py:827 +#: kallithea/lib/auth.py:844 msgid "You need to be signed in to view this page" msgstr "您必須登入後才能瀏覽這個頁面" @@ -1108,13 +1104,11 @@ #: kallithea/lib/helpers.py:722 #, fuzzy, python-format -#| msgid "Fork name" msgid "Fork name %s" msgstr "分支名稱" #: kallithea/lib/helpers.py:742 #, fuzzy, python-format -#| msgid "Pull Request Content" msgid "Pull request %s" msgstr "文件內容" @@ -1205,7 +1199,7 @@ #: kallithea/lib/helpers.py:1128 #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "" @@ -1811,13 +1805,11 @@ #: kallithea/model/db.py:1694 #, fuzzy -#| msgid "Location of repositories" msgid "Only admins can fork repositories" msgstr "建立版本庫" #: kallithea/model/db.py:1695 #, fuzzy -#| msgid "Location of repositories" msgid "Non-admins can can fork repositories" msgstr "建立版本庫" @@ -1830,16 +1822,12 @@ msgstr "" #: kallithea/model/db.py:2228 -#, fuzzy, python-format -#| msgid "%d reviewer" -#| msgid_plural "%d reviewers" +#, fuzzy msgid "Not reviewed" msgstr "" #: kallithea/model/db.py:2231 -#, fuzzy, python-format -#| msgid "%d reviewer" -#| msgid_plural "%d reviewers" +#, fuzzy msgid "Under review" msgstr "" @@ -1927,9 +1915,7 @@ #: kallithea/model/notification.py:302 #, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s changeset %(short_id)s " -"on %(branch)s" +msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" #: kallithea/model/notification.py:305 @@ -1939,16 +1925,12 @@ #: kallithea/model/notification.py:307 #, python-format -msgid "" -"[Added by %(pr_username)s] %(repo_name)s pull request %(pr_nice_id)s from" -" %(ref)s" +msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" #: kallithea/model/notification.py:308 #, python-format -msgid "" -"[Comment from %(comment_username)s] %(repo_name)s pull request " -"%(pr_nice_id)s from %(ref)s" +msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" #: kallithea/model/notification.py:321 @@ -1961,52 +1943,53 @@ msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:813 +#: kallithea/model/scm.py:812 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:185 +#: kallithea/model/user.py:192 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:249 +#: kallithea/model/user.py:256 #, fuzzy -#| msgid "You can't remove this user since it's crucial for entire application" msgid "You can't remove this user since it is crucial for the entire application" msgstr "您無法移除這個使用者，因為他是系統帳號" -#: kallithea/model/user.py:254 +#: kallithea/model/user.py:261 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "" -#: kallithea/model/user.py:259 -#, python-format -msgid "" -"User \"%s\" still owns %s repository groups and cannot be removed. Switch" -" owners or remove those repository groups: %s" -msgstr "" - #: kallithea/model/user.py:266 #, python-format msgid "" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch" +" owners or remove those repository groups: %s" +msgstr "" + +#: kallithea/model/user.py:273 +#, python-format +msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "" -#: kallithea/model/user.py:296 +#: kallithea/model/user.py:360 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:319 -msgid "Your new password" -msgstr "" - -#: kallithea/model/user.py:320 -#, python-format -msgid "Your new Kallithea password:%s" +#: kallithea/model/user.py:408 +msgid "Password reset notification" +msgstr "" + +#: kallithea/model/user.py:409 +#, python-format +msgid "" +"The password to your account %s has been changed using password reset " +"form." msgstr "" #: kallithea/model/validators.py:77 kallithea/model/validators.py:78 @@ -2081,7 +2064,6 @@ #: kallithea/model/validators.py:300 #, fuzzy -#| msgid "invalid password" msgid "Invalid username or password" msgstr "無效的密碼" @@ -2111,7 +2093,6 @@ #: kallithea/model/validators.py:465 #, fuzzy -#| msgid "private repository" msgid "Invalid repository URL" msgstr "私有版本庫" @@ -2147,7 +2128,6 @@ #: kallithea/model/validators.py:705 #, fuzzy -#| msgid "This email address is already taken" msgid "This email address is already in use" msgstr "這個郵件位址已經使用了" @@ -2304,7 +2284,9 @@ #: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:229 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/pullrequests/pullrequest_show.html:156 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 #: kallithea/templates/summary/summary.html:134 msgid "Owner" msgstr "擁有者" @@ -2312,7 +2294,7 @@ #: kallithea/templates/index_base.html:140 #: kallithea/templates/admin/my_account/my_account_repos.html:57 #: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:44 +#: kallithea/templates/base/root.html:43 #: kallithea/templates/bookmarks/bookmarks.html:79 #: kallithea/templates/branches/branches.html:79 #: kallithea/templates/journal/journal.html:198 @@ -2324,7 +2306,7 @@ #: kallithea/templates/index_base.html:141 #: kallithea/templates/admin/my_account/my_account_repos.html:58 #: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:45 +#: kallithea/templates/base/root.html:44 #: kallithea/templates/bookmarks/bookmarks.html:80 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:199 @@ -2340,7 +2322,7 @@ #: kallithea/templates/index_base.html:143 #: kallithea/templates/admin/my_account/my_account_repos.html:60 #: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:46 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:201 @@ -2352,7 +2334,7 @@ #: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:147 kallithea/templates/base/root.html:48 +#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:202 @@ -2362,7 +2344,7 @@ msgstr "" #: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:333 +#: kallithea/templates/base/base.html:326 msgid "Log In" msgstr "" @@ -2377,14 +2359,15 @@ #: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:24 #: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/pullrequests/pullrequest_show.html:166 msgid "Username" msgstr "帳號" #: kallithea/templates/login.html:33 kallithea/templates/register.html:33 #: kallithea/templates/admin/my_account/my_account.html:37 #: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:311 msgid "Password" msgstr "密碼" @@ -2396,7 +2379,7 @@ msgid "Forgot your password ?" msgstr "忘記您的密碼?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:329 +#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 msgid "Don't have an account ?" msgstr "沒有帳號?" @@ -2409,11 +2392,14 @@ msgstr "" #: kallithea/templates/password_reset.html:12 +#: kallithea/templates/password_reset_confirmation.html:12 #, fuzzy, python-format msgid "Reset Your Password to %s" msgstr "" #: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset_confirmation.html:5 +#: kallithea/templates/password_reset_confirmation.html:14 #, fuzzy msgid "Reset Your Password" msgstr "忘記您的密碼?" @@ -2433,11 +2419,44 @@ #: kallithea/templates/password_reset.html:47 #, fuzzy +#| msgid "" "Password reset link will be sent to the email address matching +#| your " "username." msgid "" -"Password reset link will be sent to the email address matching your " -"username." +"A password reset link will be sent to the specified email address if it " +"is registered in the system." msgstr "密碼重設連結已郵寄至您的信箱" +#: kallithea/templates/password_reset_confirmation.html:19 +#, python-format +msgid "You are about to set a new password for the email address %s." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:20 +msgid "" +"Note that you must use the same browser session for this as the one used " +"to request the password reset." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:30 +msgid "Code you received in the email" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:39 +#, fuzzy +#| msgid "New password" +msgid "New Password" +msgstr "新密碼" + +#: kallithea/templates/password_reset_confirmation.html:48 +#, fuzzy +#| msgid "New password" +msgid "Confirm New Password" +msgstr "新密碼" + +#: kallithea/templates/password_reset_confirmation.html:56 +msgid "Confirm" +msgstr "" + #: kallithea/templates/register.html:5 kallithea/templates/register.html:14 #: kallithea/templates/register.html:90 msgid "Sign Up" @@ -2719,7 +2738,6 @@ #: kallithea/templates/admin/users/user_edit_api_keys.html:8 #: kallithea/templates/admin/users/user_edit_api_keys.html:27 #, fuzzy -#| msgid "Owner" msgid "Never" msgstr "擁有者" @@ -2751,7 +2769,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:244 +#: kallithea/templates/base/base.html:237 msgid "Create New Gist" msgstr "" @@ -2893,7 +2911,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/base/base.html:343 msgid "My Account" msgstr "我的帳號" @@ -2913,14 +2931,12 @@ #: kallithea/templates/admin/my_account/my_account.html:39 #, fuzzy -#| msgid "repositories" msgid "Owned Repositories" msgstr "個版本庫" #: kallithea/templates/admin/my_account/my_account.html:40 #: kallithea/templates/journal/journal.html:53 #, fuzzy -#| msgid "Create repositories" msgid "Watched Repositories" msgstr "建立版本庫" @@ -2929,7 +2945,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 #, fuzzy -#| msgid "Permissions" msgid "Show Permissions" msgstr "權限" @@ -2952,14 +2967,12 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:40 #: kallithea/templates/admin/users/user_edit_api_keys.html:40 #, fuzzy, python-format -#| msgid "Confirm to remove current statistics." msgid "Confirm to remove this API key: %s" msgstr "確認移除目前的統計" #: kallithea/templates/admin/my_account/my_account_api_keys.html:42 #: kallithea/templates/admin/users/user_edit_api_keys.html:42 #, fuzzy -#| msgid "file removed" msgid "Remove" msgstr "移除檔案" @@ -3058,7 +3071,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:45 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:200 @@ -3086,7 +3099,7 @@ msgstr "" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 msgid "Pull Requests" msgstr "" @@ -3104,7 +3117,7 @@ msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:342 msgid "Notifications" msgstr "" @@ -3145,7 +3158,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:26 #, fuzzy -#| msgid "Location of repositories" msgid "Apply to all existing repositories" msgstr "建立版本庫" @@ -3198,7 +3210,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:60 #, fuzzy -#| msgid "Repository creation" msgid "Top level repository creation" msgstr "版本庫建立" @@ -3250,8 +3261,6 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:13 #: kallithea/templates/admin/users/user_edit_ips.html:23 #, fuzzy, python-format -#| msgid "Confirm to delete this group: %s with %s repository" -#| msgid_plural "Confirm to delete this group: %s with %s repositories" msgid "Confirm to delete this IP address: %s" msgstr "" @@ -3309,7 +3318,7 @@ #: kallithea/templates/admin/repos/repo_edit.html:40 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:158 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 #: kallithea/templates/data_table/_dt_elements.html:45 #: kallithea/templates/data_table/_dt_elements.html:49 msgid "Settings" @@ -3348,7 +3357,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:146 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 msgid "Created on" msgstr "" @@ -3376,7 +3385,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 #, fuzzy -#| msgid "delete" msgid "Default" msgstr "刪除" @@ -3449,7 +3457,6 @@ #: kallithea/templates/admin/repos/repo_add_base.html:17 #, fuzzy -#| msgid "private repository" msgid "Clone remote repository" msgstr "私有版本庫" @@ -3711,25 +3718,21 @@ #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 #, fuzzy -#| msgid "private repository" msgid "Private Repository" msgstr "私有版本庫" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 #, fuzzy -#| msgid "private repository" msgid "Remote repository URL" msgstr "私有版本庫" #: kallithea/templates/admin/repos/repo_edit_remote.html:9 -#, fuzzy, python-format -#| msgid "Changes on %s repository" +#, fuzzy msgid "Pull Changes from Remote Repository" msgstr "修改於版本庫 %s" #: kallithea/templates/admin/repos/repo_edit_remote.html:11 #, fuzzy -#| msgid "Confirm to unlock repository." msgid "Confirm to pull changes from remote repository." msgstr "確認廢止版本庫快取" @@ -3739,7 +3742,6 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:11 #, fuzzy -#| msgid "private repository" msgid "Permanent Repository ID" msgstr "私有版本庫" @@ -3763,13 +3765,11 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:21 #, fuzzy -#| msgid "private repository" msgid "Remote repository" msgstr "私有版本庫" #: kallithea/templates/admin/repos/repo_edit_settings.html:25 #, fuzzy -#| msgid "Repository" msgid "Repository URL" msgstr "版本庫" @@ -3914,7 +3914,7 @@ msgid "Custom Hooks" msgstr "自訂hook" -#: kallithea/templates/admin/settings/settings_hooks.html:68 +#: kallithea/templates/admin/settings/settings_hooks.html:67 msgid "Failed to remove hook" msgstr "移除hook失敗" @@ -3950,7 +3950,18 @@ "Current hooks will be updated to the latest version." msgstr "" +#: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "Overwrite existing Git hooks" +msgstr "" + #: kallithea/templates/admin/settings/settings_mapping.html:30 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any" +" custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:35 msgid "Rescan Repositories" msgstr "" @@ -4179,7 +4190,6 @@ #: kallithea/templates/admin/settings/settings_visual.html:92 #, fuzzy -#| msgid "Settings" msgid "Meta Tagging" msgstr "設定" @@ -4221,7 +4231,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit.html:33 #, fuzzy -#| msgid "members" msgid "Show Members" msgstr "成員" @@ -4368,47 +4377,47 @@ msgid "Git repository" msgstr "Git 版本庫" -#: kallithea/templates/base/base.html:126 +#: kallithea/templates/base/base.html:119 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:130 #: kallithea/templates/data_table/_dt_elements.html:13 #: kallithea/templates/data_table/_dt_elements.html:17 #: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "概況" -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:141 +#: kallithea/templates/base/base.html:132 +#: kallithea/templates/base/base.html:134 #: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:21 #: kallithea/templates/data_table/_dt_elements.html:25 msgid "Changelog" msgstr "修改紀錄" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:136 #: kallithea/templates/data_table/_dt_elements.html:29 #: kallithea/templates/data_table/_dt_elements.html:33 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "檔案" -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:138 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/base/base.html:154 +#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:147 msgid "Options" msgstr "選項" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:155 #: kallithea/templates/forks/forks_data.html:21 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:164 +#: kallithea/templates/base/base.html:157 #: kallithea/templates/bookmarks/bookmarks.html:56 #: kallithea/templates/bookmarks/bookmarks_data.html:13 #: kallithea/templates/branches/branches.html:56 @@ -4418,117 +4427,116 @@ msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:166 -#: kallithea/templates/base/base.html:254 +#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:247 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:54 msgid "Search" msgstr "搜尋" -#: kallithea/templates/base/base.html:170 +#: kallithea/templates/base/base.html:163 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:172 +#: kallithea/templates/base/base.html:165 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:173 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:174 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:184 +#: kallithea/templates/base/base.html:177 #: kallithea/templates/data_table/_dt_elements.html:37 #: kallithea/templates/data_table/_dt_elements.html:41 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "分支" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:178 #: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:183 #, python-format msgid "Show Pull Requests for %s" msgstr "" +#: kallithea/templates/base/base.html:221 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:227 #: kallithea/templates/base/base.html:228 -msgid "Show recent activity" +msgid "Public journal" +msgstr "公開日誌" + +#: kallithea/templates/base/base.html:233 +msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:234 -#: kallithea/templates/base/base.html:235 -msgid "Public journal" -msgstr "公開日誌" +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:238 +msgid "All Public Gists" +msgstr "" #: kallithea/templates/base/base.html:240 -msgid "Show public gists" +msgid "My Public Gists" msgstr "" #: kallithea/templates/base/base.html:241 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:245 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:247 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:248 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:253 +#: kallithea/templates/base/base.html:246 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:276 -#: kallithea/templates/base/base.html:277 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +#: kallithea/templates/base/base.html:269 +#: kallithea/templates/base/base.html:270 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" +#: kallithea/templates/base/base.html:289 +msgid "Not Logged In" +msgstr "" + #: kallithea/templates/base/base.html:296 -msgid "Not Logged In" -msgstr "" - -#: kallithea/templates/base/base.html:303 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:319 msgid "Forgot password ?" msgstr "忘記密碼?" -#: kallithea/templates/base/base.html:353 +#: kallithea/templates/base/base.html:346 msgid "Log Out" msgstr "登出" -#: kallithea/templates/base/base.html:402 +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:540 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" #: kallithea/templates/base/default_perms_box.html:14 #, fuzzy -#| msgid "Repository Defaults" msgid "Inherit defaults" msgstr "個版本庫" @@ -4625,54 +4633,49 @@ msgstr "" #: kallithea/templates/base/root.html:31 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 -msgid "Open New Pull Request" +msgid "Open New Pull Request from {0}" msgstr "" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for Selected Changesets" +msgid "Open New Pull Request for {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets __S → __E" +msgid "Show Selected Changesets {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:34 -msgid "Show Selected Changeset __S" +msgid "Selection Link" msgstr "" #: kallithea/templates/base/root.html:35 -msgid "Selection Link" -msgstr "" - -#: kallithea/templates/base/root.html:36 #: kallithea/templates/changeset/diff_block.html:8 #, fuzzy msgid "Collapse Diff" msgstr "檔案差異" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:36 #, fuzzy msgid "Expand Diff" msgstr "檔案差異" +#: kallithea/templates/base/root.html:37 +msgid "Failed to revoke permission" +msgstr "" + #: kallithea/templates/base/root.html:38 -msgid "Failed to revoke permission" +msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "" #: kallithea/templates/base/root.html:39 -msgid "Confirm to revoke permission for {0}: {1} ?" +msgid "enabled" msgstr "" #: kallithea/templates/base/root.html:40 -msgid "enabled" -msgstr "" - -#: kallithea/templates/base/root.html:41 msgid "disabled" msgstr "" -#: kallithea/templates/base/root.html:43 +#: kallithea/templates/base/root.html:42 msgid "Specify changeset" msgstr "" @@ -4690,7 +4693,6 @@ #: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 #: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" @@ -4729,7 +4731,7 @@ msgid_plural "showing %d out of %d revisions" msgstr[0] "" -#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/templates/changelog/changelog.html:49 msgid "Clear selection" msgstr "" @@ -4802,7 +4804,7 @@ msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:291 +#: kallithea/templates/changelog/changelog.html:310 msgid "There are no changes yet" msgstr "尚未有任何變更" @@ -4860,7 +4862,6 @@ #: kallithea/templates/changelog/changelog_summary_data.html:90 #, fuzzy -#| msgid "private repository" msgid "Push new repository" msgstr "私有版本庫" @@ -4906,7 +4907,6 @@ #: kallithea/templates/changeset/changeset.html:89 #: kallithea/templates/changeset/changeset_range.html:88 #, fuzzy -#| msgid "merge" msgid "Merge" msgstr "合併" @@ -4928,7 +4928,7 @@ #: kallithea/templates/changeset/changeset.html:166 #: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:314 +#: kallithea/templates/pullrequests/pullrequest_show.html:318 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -4936,7 +4936,7 @@ #: kallithea/templates/changeset/changeset.html:168 #: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:320 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -4944,15 +4944,14 @@ #: kallithea/templates/changeset/changeset.html:182 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:335 -#: kallithea/templates/pullrequests/pullrequest_show.html:359 +#: kallithea/templates/pullrequests/pullrequest_show.html:339 +#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Show full diff anyway" msgstr "" #: kallithea/templates/changeset/changeset.html:247 #: kallithea/templates/changeset/changeset.html:284 #, fuzzy -#| msgid "revisions" msgid "No revisions" msgstr "修訂" @@ -4967,7 +4966,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:24 #, fuzzy -#| msgid "No changes" msgid "on this changeset" msgstr "沒有修改" @@ -4978,7 +4976,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:37 #, fuzzy -#| msgid "Latest Changes" msgid "Status change" msgstr "多個檔案修改" @@ -5126,7 +5123,7 @@ msgstr "" #: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:306 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 msgid "Common ancestor" msgstr "" @@ -5168,7 +5165,7 @@ msgstr "" #: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:301 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5231,15 +5228,23 @@ msgstr "" #: kallithea/templates/email_templates/password_reset.html:6 -msgid "We received a request to create a new password for your account." +msgid "We have received a request to reset the password for your account." msgstr "" #: kallithea/templates/email_templates/password_reset.html:7 -msgid "You can generate it by clicking following URL" +msgid "To set a new password, click the following link" msgstr "" #: kallithea/templates/email_templates/password_reset.html:10 -msgid "Please ignore this email if you did not request a new password ." +msgid "" +"Should you not be able to use the link above, please type the following " +"code into the password reset form" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:12 +msgid "" +"If it weren't you who requested the password reset, just disregard this " +"message." msgstr "" #: kallithea/templates/email_templates/pull_request.html:5 @@ -5602,7 +5607,6 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:14 #, fuzzy -#| msgid "Remote" msgid "Vote" msgstr "遠端" @@ -5643,8 +5647,6 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:70 #, fuzzy, python-format -#| msgid "Confirm to delete this group: %s with %s repository" -#| msgid_plural "Confirm to delete this group: %s with %s repositories" msgid "Confirm again to delete this pull request with %s comments" msgstr "" @@ -5704,103 +5706,109 @@ msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:131 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +msgid "" +"This is just a range of changesets and doesn't have a target or a real " +"merge ancestor." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:133 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:154 -msgid "Created by" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:169 +#: kallithea/templates/pullrequests/pullrequest_show.html:173 #, fuzzy msgid "Update" msgstr "時間" -#: kallithea/templates/pullrequests/pullrequest_show.html:187 +#: kallithea/templates/pullrequests/pullrequest_show.html:191 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:209 +#: kallithea/templates/pullrequests/pullrequest_show.html:213 msgid "Pull Request Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:234 +#: kallithea/templates/pullrequests/pullrequest_show.html:238 #, fuzzy msgid "Remove reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:246 +#: kallithea/templates/pullrequests/pullrequest_show.html:250 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:254 +#: kallithea/templates/pullrequests/pullrequest_show.html:258 #, fuzzy msgid "Potential Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:257 +#: kallithea/templates/pullrequests/pullrequest_show.html:261 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:280 +#: kallithea/templates/pullrequests/pullrequest_show.html:284 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/templates/pullrequests/pullrequest_show.html:285 msgid "Save as New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:282 +#: kallithea/templates/pullrequests/pullrequest_show.html:286 #, fuzzy msgid "Cancel Changes" msgstr "沒有修改" -#: kallithea/templates/pullrequests/pullrequest_show.html:292 +#: kallithea/templates/pullrequests/pullrequest_show.html:296 #, fuzzy msgid "Pull Request Content" msgstr "文件內容" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 -#, python-format -msgid "Pull Requests from %s'" -msgstr "" - #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, python-format +msgid "Pull Requests from %s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:13 +#, python-format msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 -#, python-format -msgid "Show Pull Requests to %s" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +msgid "Open New Pull Request" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:37 #, python-format +msgid "Show Pull Requests to %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 -msgid "Hide closed pull requests (only show open pull requests)" -msgstr "" - #: kallithea/templates/pullrequests/pullrequest_show_all.html:49 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 msgid "Pull Requests I Participate In" msgstr "" @@ -6063,21 +6071,6 @@ #~ msgstr "沒有檔案" #~ msgid "" -#~ "Comment on %(repo_name)s changeset " -#~ "%(short_id)s on %(branch)s by " -#~ "%(comment_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Review request on %(repo_name)s pull " -#~ "request #%(pr_id)s from %(ref)s by " -#~ "%(pr_username)s" -#~ msgstr "" - -#~ msgid "" -#~ "Comment on %(repo_name)s pull request " -#~ "#%(pr_id)s from %(ref)s by " -#~ "%(comment_username)s" #~ msgstr "" #~ msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" @@ -6086,13 +6079,6 @@ #~ msgid "Username \"%(username)s\" is forbidden" #~ msgstr "" -#~ msgid "" -#~ "Username may only contain alphanumeric " -#~ "characters underscores, periods or dashes " -#~ "and must begin with alphanumeric " -#~ "character or underscore" -#~ msgstr "" - #~ msgid "invalid user name" #~ msgstr "無效的使用者名稱" @@ -6114,13 +6100,6 @@ #~ msgid "Revisions %(revs)s are already part of pull request or have set status" #~ msgstr "" -#~ msgid "" -#~ "Comma separated list of plugins. Order" -#~ " of plugins is also order in " -#~ "which Kallithea will try to authenticate" -#~ " user" -#~ msgstr "" - #~ msgid "Defaults" #~ msgstr "" @@ -6163,12 +6142,6 @@ #~ msgid "current IP" #~ msgstr "" -#~ msgid "" -#~ "Your user is in an external source" -#~ " of record; some details cannot be" -#~ " managed here" -#~ msgstr "" - #~ msgid "Permissions Administration" #~ msgstr "權限管理員" @@ -6178,20 +6151,6 @@ #~ msgid "Overwrite existing settings" #~ msgstr "" -#~ msgid "" -#~ "All default permissions on each user " -#~ "group will be reset to chosen " -#~ "permission, note that all custom default" -#~ " permission on repository groups will " -#~ "be lost" -#~ msgstr "" - -#~ msgid "" -#~ "Write permission to a repository group" -#~ " allows creating repositories inside that" -#~ " group." -#~ msgstr "" - #~ msgid "Default IP Whitelist for All Users" #~ msgstr "" @@ -6249,20 +6208,6 @@ #~ msgid "Non-changeable id" #~ msgstr "" -#~ msgid "" -#~ "In case this repository is renamed " -#~ "or moved into another group the " -#~ "repository URL changes.\n" -#~ " Using the above " -#~ "URL guarantees that this repository will" -#~ " always be accessible under such URL." -#~ "\n" -#~ " Useful for CI " -#~ "systems, or any other cases that " -#~ "you need to hardcode the URL into" -#~ " 3rd party service." -#~ msgstr "" - #~ msgid "edit" #~ msgstr "編輯" @@ -6308,12 +6253,6 @@ #~ msgid "Destroy old data" #~ msgstr "" -#~ msgid "" -#~ "Check this option to remove references" -#~ " to repositories that no longer exist" -#~ " in on the filesystem." -#~ msgstr "" - #~ msgid "check for updates" #~ msgstr "" @@ -6326,29 +6265,12 @@ #~ msgid "user groups" #~ msgstr "" -#~ msgid "" -#~ "This user is in an external source" -#~ " of record (%s); some details cannot" -#~ " be managed here." -#~ msgstr "" - #~ msgid "Inherit from defaults" #~ msgstr "" -#~ msgid "" -#~ "Select to inherit permissions from %s" -#~ " permissions settings, and default IP " -#~ "address whitelist." -#~ msgstr "" - #~ msgid "show" #~ msgstr "" -#~ msgid "" -#~ "Changeset status: %s\n" -#~ "Click to open associated pull request #%s" -#~ msgstr "" - #~ msgid "Push new repo" #~ msgstr "" @@ -6373,11 +6295,6 @@ #~ msgid "Comment on changeset" #~ msgstr "" -#~ msgid "" -#~ "Use @username inside this text to " -#~ "send notification to another local user." -#~ msgstr "" - #~ msgid "revision" #~ msgstr "" @@ -6408,3 +6325,51 @@ #~ msgid "with subrepos" #~ msgstr "" +#~ msgid "" +#~ "Your password reset was successful, new" +#~ " password has been sent to your " +#~ "email" +#~ msgstr "您的密碼重設動作已完成，新的密碼已寄至您的信箱" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Added by %(pr_username)s] %(repo_name)s pull" +#~ " request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "" +#~ "[Comment from %(comment_username)s] %(repo_name)s" +#~ " pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "Your new password" +#~ msgstr "" + +#~ msgid "Your new Kallithea password:%s" +#~ msgstr "" + +#~ msgid "Open New Pull Request for Selected Changesets" +#~ msgstr "" + +#~ msgid "Show Selected Changesets __S → __E" +#~ msgstr "" + +#~ msgid "Show Selected Changeset __S" +#~ msgstr "" + +#~ msgid "We received a request to create a new password for your account." +#~ msgstr "" + +#~ msgid "You can generate it by clicking following URL" +#~ msgstr "" + +#~ msgid "Please ignore this email if you did not request a new password ." +#~ msgstr "" + +#~ msgid "Created by" +#~ msgstr "" +