# HG changeset patch # User Andrew Shadura # Date 1500993809 -7200 # Node ID da2a9107ee7c6990eae244d676d58821e1d9792d # Parent de0a8b4fd5e090dabe0f6e1b57b889c0442bf345 i18n: regenerate translations diff -r de0a8b4fd5e0 -r da2a9107ee7c kallithea/i18n/be/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/be/LC_MESSAGES/kallithea.po Thu Jul 13 12:26:01 2017 +0200 +++ b/kallithea/i18n/be/LC_MESSAGES/kallithea.po Tue Jul 25 16:43:29 2017 +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-09-08 10:34+0200\n" +"POT-Creation-Date: 2017-07-25 16:37+0200\n" "PO-Revision-Date: 2017-04-22 21:08+0000\n" "Last-Translator: Viktar Vauchkevich \n" "Language-Team: Belarusian " @@ -25,7 +25,7 @@ msgid "There are no changesets yet" msgstr "Яшчэ не было змен" -#: kallithea/controllers/changelog.py:166 +#: kallithea/controllers/changelog.py:165 #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 @@ -37,7 +37,7 @@ msgid "None" msgstr "Нічога" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(зачынена)" @@ -152,8 +152,8 @@ msgstr "Рэпазітар заблакаваў %s у %s" #: kallithea/controllers/files.py:317 -msgid "You can only delete files with revision being a valid branch " -msgstr "Вы можаце выдаляць файлы толькі ў рэвізіі, злучанай з існай галінкай " +msgid "You can only delete files with revision being a valid branch" +msgstr "Вы можаце выдаляць файлы толькі ў рэвізіі, злучанай з існай галінкай" #: kallithea/controllers/files.py:328 #, python-format @@ -171,8 +171,8 @@ msgstr "Падчас каміта адбылася памылка" #: kallithea/controllers/files.py:377 -msgid "You can only edit files with revision being a valid branch " -msgstr "Вы можаце рэдагаваць файлы толькі ў рэвізіі, злучанай з існай галінкай " +msgid "You can only edit files with revision being a valid branch" +msgstr "Вы можаце рэдагаваць файлы толькі ў рэвізіі, злучанай з існай галінкай" #: kallithea/controllers/files.py:391 #, python-format @@ -292,27 +292,23 @@ msgid "Journal" msgstr "Часопіс" -#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 msgid "Bad captcha" msgstr "Няслушная капча" -#: kallithea/controllers/login.py:157 +#: kallithea/controllers/login.py:152 msgid "You have successfully registered into Kallithea" msgstr "Рэгістрацыя ў Kallithea прайшла паспяхова" -#: kallithea/controllers/login.py:202 -#, fuzzy -#| msgid "Your password reset link was sent" +#: kallithea/controllers/login.py:197 msgid "A password reset confirmation code has been sent" -msgstr "Спасылка для скідання пароля адпраўлена" +msgstr "Спасылка для скідання пароля адасланая" + +#: kallithea/controllers/login.py:246 +msgid "Invalid password reset token" +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 "Пароль абноўлены" @@ -358,7 +354,7 @@ #: kallithea/controllers/pullrequests.py:366 #: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:509 +#: kallithea/controllers/pullrequests.py:510 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" @@ -402,46 +398,46 @@ msgid "Pull request update created" msgstr "Абнаўленне для pull-запыту створана" -#: kallithea/controllers/pullrequests.py:513 +#: kallithea/controllers/pullrequests.py:514 msgid "Pull request updated" msgstr "Pull-запыт абноўлены" -#: kallithea/controllers/pullrequests.py:528 +#: kallithea/controllers/pullrequests.py:529 msgid "Successfully deleted pull request" msgstr "Pull-запыт паспяхова выдалены" -#: kallithea/controllers/pullrequests.py:594 +#: kallithea/controllers/pullrequests.py:595 #, python-format msgid "This pull request has already been merged to %s." msgstr "Гэты pull-запыт ужо прыняты на галінку %s." -#: kallithea/controllers/pullrequests.py:596 +#: kallithea/controllers/pullrequests.py:597 msgid "This pull request has been closed and can not be updated." msgstr "Гэты pull-запыт быў зачынены і не можа быць абноўлены." -#: kallithea/controllers/pullrequests.py:614 +#: kallithea/controllers/pullrequests.py:615 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "Гэты pull-запыт можа быць абноўлены з %s:" -#: kallithea/controllers/pullrequests.py:617 +#: kallithea/controllers/pullrequests.py:619 msgid "No changesets found for updating this pull request." msgstr "Няма змен для абнаўлення гэтага pull-запыту." -#: kallithea/controllers/pullrequests.py:625 +#: kallithea/controllers/pullrequests.py:627 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Увага: Галінка %s мае яшчэ адну верхавіну: %s." -#: kallithea/controllers/pullrequests.py:631 +#: kallithea/controllers/pullrequests.py:633 msgid "Git pull requests don't support updates yet." msgstr "Абнаўленне pull-запытаў git не падтрымліваецца." -#: kallithea/controllers/pullrequests.py:722 +#: kallithea/controllers/pullrequests.py:724 msgid "No permission to change pull request status" msgstr "Няма правоў змяняць статус pull-запыту" -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:729 msgid "Closing." msgstr "Зачынены." @@ -677,7 +673,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1701 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 msgid "Manual activation of external account" msgstr "Ручная актывацыя вонкавага ўліковага запісу" @@ -689,7 +685,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1702 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 msgid "Automatic activation of external account" msgstr "Аўтаматычная актывацыя вонкавага ўліковага запісу" @@ -906,48 +902,53 @@ "адсутнічае" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:277 +#: kallithea/controllers/admin/settings.py:284 msgid "Error occurred while updating application settings" msgstr "Адбылася памылка пры абнаўленні налад прыкладання" -#: kallithea/controllers/admin/settings.py:216 +#: kallithea/controllers/admin/settings.py:211 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "Рэпазітары паспяхова перасканіраваны, дададзена: %s, выдалена: %s." -#: kallithea/controllers/admin/settings.py:273 +#: kallithea/controllers/admin/settings.py:226 +#, python-format +msgid "Invalidated %s repositories" +msgstr "Скінуць кэш для %s рэпазітароў" + +#: kallithea/controllers/admin/settings.py:280 msgid "Updated application settings" msgstr "Абноўленыя параметры налады прыкладання" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:337 msgid "Updated visualisation settings" msgstr "Налады візуалізацыі абноўленыя" -#: kallithea/controllers/admin/settings.py:335 +#: kallithea/controllers/admin/settings.py:342 msgid "Error occurred during updating visualisation settings" msgstr "Адбылася памылка пры абнаўленні налад візуалізацыі" -#: kallithea/controllers/admin/settings.py:361 +#: kallithea/controllers/admin/settings.py:368 msgid "Please enter email address" msgstr "Калі ласка, увядзіце email-адрас" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:383 msgid "Send email task created" msgstr "Задача адпраўкі e-mail створаная" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:414 msgid "Added new hook" msgstr "Дададзены новы хук" -#: kallithea/controllers/admin/settings.py:421 +#: kallithea/controllers/admin/settings.py:428 msgid "Updated hooks" msgstr "Абноўленыя хукі" -#: kallithea/controllers/admin/settings.py:425 +#: kallithea/controllers/admin/settings.py:432 msgid "Error occurred during hook creation" msgstr "адбылася памылка пры стварэнні хука" -#: kallithea/controllers/admin/settings.py:451 +#: kallithea/controllers/admin/settings.py:458 msgid "Whoosh reindex task scheduled" msgstr "Запланавана пераіндэксаванне базы Whoosh" @@ -1036,20 +1037,24 @@ msgid "Removed IP address from user whitelist" msgstr "Выдалены IP %s з белага спісу карыстача" -#: kallithea/lib/auth.py:743 +#: kallithea/lib/auth.py:744 #, python-format msgid "IP %s not allowed" msgstr "IP %s заблакаваны" -#: kallithea/lib/auth.py:756 +#: kallithea/lib/auth.py:757 msgid "Invalid API key" msgstr "Няслушны API-ключ" -#: kallithea/lib/auth.py:812 +#: kallithea/lib/auth.py:785 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/auth.py:832 msgid "You need to be a registered user to perform this action" msgstr "Вы павінны быць зарэгістраваным карыстачом, каб выканаць гэта дзеянне" -#: kallithea/lib/auth.py:844 +#: kallithea/lib/auth.py:864 msgid "You need to be signed in to view this page" msgstr "Старонка даступная толькі аўтарызаваным карыстачам" @@ -1057,9 +1062,10 @@ msgid "Repository not found in the filesystem" msgstr "Рэпазітар не знойдзены на файлавай сістэме" -#: kallithea/lib/base.py:516 kallithea/lib/helpers.py:622 -msgid "Changeset not found" -msgstr "Набор змен не знойдзены" +#: kallithea/lib/base.py:516 +#, python-format +msgid "Changeset for %s %s not found in %s" +msgstr "Набор змен для %s %s не знойдзены ў %s" #: kallithea/lib/diffs.py:66 msgid "Binary file" @@ -1075,161 +1081,165 @@ msgid "No changes detected" msgstr "Змен не выяўлена" -#: kallithea/lib/helpers.py:609 +#: kallithea/lib/helpers.py:610 #, python-format msgid "Deleted branch: %s" msgstr "Выдалена галінка: %s" -#: kallithea/lib/helpers.py:611 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Created tag: %s" msgstr "Створаны тэг: %s" -#: kallithea/lib/helpers.py:671 +#: kallithea/lib/helpers.py:623 +#, python-format +msgid "Changeset %s not found" +msgstr "Набор змен %s не знойдзены" + +#: kallithea/lib/helpers.py:672 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Паказаць адрозненні разам %s->%s" -#: kallithea/lib/helpers.py:677 -#, fuzzy +#: kallithea/lib/helpers.py:678 msgid "Compare view" -msgstr "параўнанне" - -#: kallithea/lib/helpers.py:696 +msgstr "Параўнанне" + +#: kallithea/lib/helpers.py:697 msgid "and" msgstr "і" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:698 #, python-format msgid "%s more" msgstr "на %s больш" -#: kallithea/lib/helpers.py:698 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "версіі" -#: kallithea/lib/helpers.py:722 +#: kallithea/lib/helpers.py:723 #, python-format msgid "Fork name %s" msgstr "Імя форка %s" -#: kallithea/lib/helpers.py:742 +#: kallithea/lib/helpers.py:743 #, python-format msgid "Pull request %s" msgstr "Pull-запыт %s" -#: kallithea/lib/helpers.py:752 +#: kallithea/lib/helpers.py:753 msgid "[deleted] repository" msgstr "[выдалены] рэпазітар" -#: kallithea/lib/helpers.py:754 kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 msgid "[created] repository" msgstr "[створаны] рэпазітар" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:757 msgid "[created] repository as fork" msgstr "[створаны] рэпазітар як форк" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 msgid "[forked] repository" msgstr "[форкнуты] рэпазітар" -#: kallithea/lib/helpers.py:760 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 msgid "[updated] repository" msgstr "[абноўлены] рэпазітар" -#: kallithea/lib/helpers.py:762 +#: kallithea/lib/helpers.py:763 msgid "[downloaded] archive from repository" msgstr "[загружаны] архіў з рэпазітара" -#: kallithea/lib/helpers.py:764 +#: kallithea/lib/helpers.py:765 msgid "[delete] repository" msgstr "[выдалены] рэпазітар" -#: kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:773 msgid "[created] user" msgstr "[створаны] карыстач" -#: kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:775 msgid "[updated] user" msgstr "[абноўлены] карыстач" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:777 msgid "[created] user group" msgstr "[створана] група карыстачоў" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:779 msgid "[updated] user group" msgstr "[абноўлена] група карыстачоў" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:781 msgid "[commented] on revision in repository" msgstr "[каментар] да рэвізіі ў рэпазітары" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:783 msgid "[commented] on pull request for" msgstr "[пракаменціравана] у запыце на занясенне змен для" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:785 msgid "[closed] pull request for" msgstr "[зачынены] Pull-запыт для" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:787 msgid "[pushed] into" msgstr "[адпраўлена] у" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:789 msgid "[committed via Kallithea] into repository" msgstr "[занесены змены з дапамогай Kallithea] у рэпазітары" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:791 msgid "[pulled from remote] into repository" msgstr "[занесены змены з выдаленага рэпазітара] у рэпазітар" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:793 msgid "[pulled] from" msgstr "[занесены змены] з" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:795 msgid "[started following] repository" msgstr "[дададзены ў назіранні] рэпазітар" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:797 msgid "[stopped following] repository" msgstr "[выдалены з назірання] рэпазітар" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:1125 #, python-format msgid " and %s more" msgstr " і на %s больш" -#: kallithea/lib/helpers.py:1128 +#: kallithea/lib/helpers.py:1129 #: kallithea/templates/compare/compare_diff.html:65 #: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "Няма файлаў" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:1195 msgid "new file" msgstr "новы файл" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:1198 msgid "mod" msgstr "зменены" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:1201 msgid "del" msgstr "выдалены" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:1204 msgid "rename" msgstr "пераназваны" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:1209 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1444 +#: kallithea/lib/helpers.py:1445 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1407,7 +1417,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1665 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 msgid "Kallithea Administrator" msgstr "Адміністратар Kallithea" @@ -1518,7 +1528,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2229 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 msgid "Approved" msgstr "Ухвалена" @@ -1533,7 +1543,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2230 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 msgid "Rejected" msgstr "Адхілена" @@ -1560,7 +1570,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1514 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 msgid "top level" msgstr "верхні ўзровень" @@ -1707,7 +1717,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1697 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 msgid "Registration disabled" msgstr "Рэгістрацыя адключана" @@ -1734,12 +1744,12 @@ msgstr "Рэгістрацыя карыстача з аўтаматычнай актывацыяй" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1691 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 msgid "Repository creation enabled with write permission to a repository group" msgstr "" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 msgid "Repository creation disabled with write permission to a repository group" msgstr "" @@ -1752,113 +1762,101 @@ msgid "[Mention]" msgstr "[Згадванне]" -#: kallithea/model/db.py:1667 +#: kallithea/model/db.py:1668 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1668 -#, fuzzy -msgid "Default user has read access to new repositories" -msgstr "Несанкцыянаваны доступ да рэсурсу" - #: kallithea/model/db.py:1669 #, fuzzy -msgid "Default user has write access to new repositories" +msgid "Default user has read access to new repositories" msgstr "Несанкцыянаваны доступ да рэсурсу" #: kallithea/model/db.py:1670 +#, fuzzy +msgid "Default user has write access to new repositories" +msgstr "Несанкцыянаваны доступ да рэсурсу" + +#: kallithea/model/db.py:1671 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1673 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1674 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1675 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1676 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1678 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1679 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1680 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1681 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 -#, fuzzy -msgid "Only admins can create repository groups" -msgstr "Створана новая група рэпазітароў %s" - #: kallithea/model/db.py:1683 -#, fuzzy +msgid "Only admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1684 msgid "Non-admins can create repository groups" -msgstr "Створана новая група рэпазітароў %s" - -#: kallithea/model/db.py:1685 -#, fuzzy -msgid "Only admins can create user groups" -msgstr "Ствараць групы карыстачоў" +msgstr "" #: kallithea/model/db.py:1686 -#, fuzzy +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1687 msgid "Non-admins can create user groups" -msgstr "Ствараць групы карыстачоў" - -#: kallithea/model/db.py:1688 -#, fuzzy -msgid "Only admins can create top level repositories" -msgstr "Рэпазітары верхняга ўзроўню" +msgstr "" #: kallithea/model/db.py:1689 -#, fuzzy +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1690 msgid "Non-admins can create top level repositories" -msgstr "Рэпазітары верхняга ўзроўню" - -#: kallithea/model/db.py:1694 -#, fuzzy -msgid "Only admins can fork repositories" -msgstr "Месцазнаходжанне рэпазітароў" +msgstr "" #: kallithea/model/db.py:1695 -#, fuzzy -msgid "Non-admins can can fork repositories" -msgstr "Скінуць кэш для ўсіх рэпазітароў" - -#: kallithea/model/db.py:1698 -#, fuzzy -msgid "User registration with manual account activation" -msgstr "Рэгістрацыя карыстача з ручной актывацыяй уліковага запісу" +msgid "Only admins can fork repositories" +msgstr "" + +#: kallithea/model/db.py:1696 +msgid "Non-admins can fork repositories" +msgstr "" #: kallithea/model/db.py:1699 -#, fuzzy +msgid "User registration with manual account activation" +msgstr "Рэгістрацыя карыстальніка з ручной актывацыяй уліковага запісу" + +#: kallithea/model/db.py:1700 msgid "User registration with automatic account activation" -msgstr "Рэгістрацыя карыстача з аўтаматычнай актывацыяй" - -#: kallithea/model/db.py:2228 -#, fuzzy +msgstr "Рэгістрацыя карыстальніка з аўтаматычнай актывацыяй" + +#: kallithea/model/db.py:2238 msgid "Not reviewed" msgstr "Не прагледжана" -#: kallithea/model/db.py:2231 -#, fuzzy +#: kallithea/model/db.py:2241 msgid "Under review" msgstr "На разглядзе" @@ -1884,89 +1882,87 @@ msgid "Name must not contain only digits" msgstr "Імя не можа ўтрымліваць толькі лічбы" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "%(user)s пакінуў каментар да набору змен %(age)s" -#: kallithea/model/notification.py:255 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s sent message %(age)s" msgstr "%(user)s адправіў паведамленне %(age)s" -#: kallithea/model/notification.py:256 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s mentioned you %(age)s" msgstr "%(user)s згадаў вас %(age)s" -#: kallithea/model/notification.py:257 +#: kallithea/model/notification.py:258 #, python-format msgid "%(user)s registered in Kallithea %(age)s" msgstr "%(user)s зарэгістраваўся ў Kallithea %(age)s" -#: kallithea/model/notification.py:258 +#: kallithea/model/notification.py:259 #, python-format msgid "%(user)s opened new pull request %(age)s" msgstr "%(user)s адкрыў новы pull-запыт %(age)s" -#: kallithea/model/notification.py:259 +#: kallithea/model/notification.py:260 #, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "%(user)s пакінуў каментар да pull-запыту %(age)s" -#: kallithea/model/notification.py:266 +#: kallithea/model/notification.py:267 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s пакінуў каментар да набору змен %(when)s" -#: kallithea/model/notification.py:267 +#: kallithea/model/notification.py:268 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s адправіў паведамленне %(when)s" -#: kallithea/model/notification.py:268 +#: kallithea/model/notification.py:269 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s згадаў вас %(when)s" -#: kallithea/model/notification.py:269 +#: kallithea/model/notification.py:270 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s зарэгістраваўся ў Kallithea %(when)s" -#: kallithea/model/notification.py:270 +#: kallithea/model/notification.py:271 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s адкрыў новы pull-запыт %(when)s" -#: kallithea/model/notification.py:271 +#: kallithea/model/notification.py:272 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s пакінуў каментар да pull-запыту %(when)s" -#: kallithea/model/notification.py:302 +#: kallithea/model/notification.py:303 #, python-format msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:306 #, python-format msgid "New user %(new_username)s registered" msgstr "Новы карыстач \"%(new_username)s\" зарэгістраваны" -#: kallithea/model/notification.py:307 +#: kallithea/model/notification.py:308 #, fuzzy, python-format -#| msgid "%(user)s wants you to review pull request %(pr_nice_id)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 +#: kallithea/model/notification.py:309 #, 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 +#: kallithea/model/notification.py:322 msgid "Closing" msgstr "Зачынены" @@ -2023,8 +2019,6 @@ msgstr "Спасылка скіду пароля" #: kallithea/model/user.py:408 -#, fuzzy -#| msgid "Password reset link" msgid "Password reset notification" msgstr "Спасылка скіду пароля" @@ -2144,7 +2138,6 @@ msgstr "Няслушны URL рэпазітара" #: kallithea/model/validators.py:466 -#, fuzzy msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" @@ -2181,9 +2174,9 @@ msgstr "Гэты E-mail ужо заняты" #: kallithea/model/validators.py:725 -#, fuzzy, python-format +#, python-format msgid "Email address \"%(email)s\" not found" -msgstr "\"%(email)s\" не існуе." +msgstr "\"%(email)s\" не знойдзены." #: kallithea/model/validators.py:762 msgid "" @@ -2472,12 +2465,10 @@ msgstr "Паслаць спасылку скіду пароля" #: kallithea/templates/password_reset.html:47 -#, fuzzy -#| msgid "" " msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." -msgstr "Спасылка для скіду пароля была адпраўлена на адпаведны e-mail." +msgstr "Спасылка для скіду пароля была адасланая на адпаведны e-mail." #: kallithea/templates/password_reset_confirmation.html:19 #, python-format @@ -2495,14 +2486,10 @@ 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 "Пацвердзіце новы пароль" @@ -2653,7 +2640,6 @@ msgstr "Уключаныя ўбудовы" #: kallithea/templates/admin/auth/auth_settings.html:33 -#, fuzzy msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" @@ -2792,9 +2778,8 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:27 #: kallithea/templates/admin/users/user_edit_api_keys.html:8 #: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#, fuzzy msgid "Never" -msgstr "ніколі" +msgstr "Ніколі" #: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" @@ -2976,9 +2961,8 @@ msgstr "Профіль" #: kallithea/templates/admin/my_account/my_account.html:36 -#, fuzzy msgid "Email Addresses" -msgstr "Новы E-mail" +msgstr "" #: kallithea/templates/admin/my_account/my_account.html:38 #: kallithea/templates/admin/users/user_edit.html:31 @@ -2986,15 +2970,13 @@ msgstr "API-ключы" #: kallithea/templates/admin/my_account/my_account.html:39 -#, fuzzy msgid "Owned Repositories" -msgstr "рэпазітары" +msgstr "" #: kallithea/templates/admin/my_account/my_account.html:40 #: kallithea/templates/journal/journal.html:53 -#, fuzzy msgid "Watched Repositories" -msgstr "Стварыць рэпазітары" +msgstr "" #: kallithea/templates/admin/my_account/my_account.html:41 #: kallithea/templates/admin/permissions/permissions.html:30 @@ -3011,9 +2993,9 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 -#, fuzzy, python-format +#, python-format msgid "Confirm to reset this API key: %s" -msgstr "Пацвердзіце скід гэтага API-ключа: %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 @@ -3023,27 +3005,24 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:40 #: kallithea/templates/admin/users/user_edit_api_keys.html:40 -#, fuzzy, python-format +#, python-format 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" -msgstr "выдаліць" +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" -msgstr "Дадатковыя адрасы e-mail не пазначаны." +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" -msgstr "Ключ" +msgstr "Новы API-ключ" #: kallithea/templates/admin/my_account/my_account_api_keys.html:69 #: kallithea/templates/admin/my_account/my_account_emails.html:45 @@ -3065,7 +3044,7 @@ #: kallithea/templates/admin/users/user_edit_emails.html:20 #, python-format msgid "Confirm to delete this email: %s" -msgstr "Пацвердзіце выдаленне E-mail: %s" +msgstr "Пацвердзіце выдаленне e-mail: %s" #: kallithea/templates/admin/my_account/my_account_emails.html:26 #: kallithea/templates/admin/users/user_edit_emails.html:26 @@ -3657,6 +3636,11 @@ msgid "Unlock Repository" msgstr "Разблакаваць рэпазітар" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#, python-format +msgid "Locked by %s on %s" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Confirm to lock repository." msgstr "Пацвердзіце блакаванне рэпазітара." @@ -4697,7 +4681,6 @@ #: kallithea/templates/base/root.html:31 #, fuzzy -#| msgid "on pull request" msgid "Open New Pull Request from {0}" msgstr "Каментар у pull-запыце" @@ -4707,7 +4690,6 @@ #: kallithea/templates/base/root.html:33 #, fuzzy -#| msgid "Show Selected Changesets __S → __E" msgid "Show Selected Changesets {0} → {1}" msgstr "Паказаць абраныя наборы змен: __S → __E" @@ -4872,7 +4854,7 @@ msgid "Branch %s" msgstr "Галінка %s" -#: kallithea/templates/changelog/changelog.html:310 +#: kallithea/templates/changelog/changelog.html:309 msgid "There are no changes yet" msgstr "Змен яшчэ няма" @@ -5310,7 +5292,6 @@ #: kallithea/templates/email_templates/password_reset.html:6 #, 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 "Мы атрымалі запыт на стварэнне новага пароля для вашага акаўнта." @@ -5849,8 +5830,9 @@ msgstr "%s Запыты на занясенне змен" #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 -#, python-format -msgid "Pull Requests from %s'" +#, fuzzy, python-format +#| msgid "Pull Requests from %s'" +msgid "Pull Requests from '%s'" msgstr "Pull-запыты ад %s" #: kallithea/templates/pullrequests/pullrequest_show_all.html:13 @@ -6310,27 +6292,6 @@ #~ 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 "Ваш новы пароль" @@ -6348,9 +6309,7 @@ #~ msgid "Please ignore this email if you did not request a new password ." #~ msgstr "" -#~ "Калі ласка, праігнаруйце дадзенае " -#~ "паведамленне, калі вы не запытвалі новы" -#~ " пароль." #~ msgid "Created by" #~ msgstr "Створана" + diff -r de0a8b4fd5e0 -r da2a9107ee7c kallithea/i18n/cs/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Thu Jul 13 12:26:01 2017 +0200 +++ b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Tue Jul 25 16:43:29 2017 +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-09-08 10:34+0200\n" +"POT-Creation-Date: 2017-07-25 16:37+0200\n" "PO-Revision-Date: 2015-11-12 08:51+0000\n" "Last-Translator: Michal Čihař \n" "Language-Team: Czech " @@ -24,7 +24,7 @@ msgid "There are no changesets yet" msgstr "" -#: kallithea/controllers/changelog.py:166 +#: kallithea/controllers/changelog.py:165 #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 @@ -36,7 +36,7 @@ msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(zavřeno)" @@ -150,7 +150,7 @@ msgstr "" #: kallithea/controllers/files.py:317 -msgid "You can only delete files with revision being a valid branch " +msgid "You can only delete files with revision being a valid branch" msgstr "" #: kallithea/controllers/files.py:328 @@ -169,7 +169,7 @@ msgstr "" #: kallithea/controllers/files.py:377 -msgid "You can only edit files with revision being a valid branch " +msgid "You can only edit files with revision being a valid branch" msgstr "" #: kallithea/controllers/files.py:391 @@ -288,23 +288,23 @@ msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 msgid "Bad captcha" msgstr "Špatná captcha" -#: kallithea/controllers/login.py:157 +#: kallithea/controllers/login.py:152 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:202 +#: kallithea/controllers/login.py:197 msgid "A password reset confirmation code has been sent" msgstr "" +#: kallithea/controllers/login.py:246 +msgid "Invalid password reset token" +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" @@ -350,7 +350,7 @@ #: kallithea/controllers/pullrequests.py:366 #: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:509 +#: kallithea/controllers/pullrequests.py:510 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" @@ -394,46 +394,46 @@ msgid "Pull request update created" msgstr "" -#: kallithea/controllers/pullrequests.py:513 +#: kallithea/controllers/pullrequests.py:514 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:528 +#: kallithea/controllers/pullrequests.py:529 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:594 +#: kallithea/controllers/pullrequests.py:595 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:596 +#: kallithea/controllers/pullrequests.py:597 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:614 +#: kallithea/controllers/pullrequests.py:615 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:617 +#: kallithea/controllers/pullrequests.py:619 msgid "No changesets found for updating this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:625 +#: kallithea/controllers/pullrequests.py:627 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:631 +#: kallithea/controllers/pullrequests.py:633 msgid "Git pull requests don't support updates yet." msgstr "" -#: kallithea/controllers/pullrequests.py:722 +#: kallithea/controllers/pullrequests.py:724 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:729 msgid "Closing." msgstr "" @@ -667,7 +667,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1701 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 msgid "Manual activation of external account" msgstr "" @@ -679,7 +679,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1702 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 msgid "Automatic activation of external account" msgstr "" @@ -894,48 +894,54 @@ msgstr "" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:277 +#: kallithea/controllers/admin/settings.py:284 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:216 +#: kallithea/controllers/admin/settings.py:211 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:273 +#: kallithea/controllers/admin/settings.py:226 +#, fuzzy, python-format +#| msgid "Watched Repositories" +msgid "Invalidated %s repositories" +msgstr "Repozitáře" + +#: kallithea/controllers/admin/settings.py:280 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:337 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:335 +#: kallithea/controllers/admin/settings.py:342 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:361 +#: kallithea/controllers/admin/settings.py:368 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:383 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:414 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:421 +#: kallithea/controllers/admin/settings.py:428 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:425 +#: kallithea/controllers/admin/settings.py:432 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:451 +#: kallithea/controllers/admin/settings.py:458 msgid "Whoosh reindex task scheduled" msgstr "" @@ -1024,20 +1030,24 @@ msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:743 +#: kallithea/lib/auth.py:744 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:756 +#: kallithea/lib/auth.py:757 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:812 +#: kallithea/lib/auth.py:785 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/auth.py:832 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:844 +#: kallithea/lib/auth.py:864 msgid "You need to be signed in to view this page" msgstr "" @@ -1045,8 +1055,9 @@ msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:516 kallithea/lib/helpers.py:622 -msgid "Changeset not found" +#: kallithea/lib/base.py:516 +#, python-format +msgid "Changeset for %s %s not found in %s" msgstr "" #: kallithea/lib/diffs.py:66 @@ -1061,160 +1072,166 @@ msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:609 +#: kallithea/lib/helpers.py:610 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:611 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:671 +#: kallithea/lib/helpers.py:623 +#, fuzzy, python-format +#| msgid "Set changeset status" +msgid "Changeset %s not found" +msgstr "Změny" + +#: kallithea/lib/helpers.py:672 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:677 +#: kallithea/lib/helpers.py:678 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:696 -msgid "and" -msgstr "" - #: kallithea/lib/helpers.py:697 +msgid "and" +msgstr "" + +#: kallithea/lib/helpers.py:698 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:698 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:722 +#: kallithea/lib/helpers.py:723 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:742 +#: kallithea/lib/helpers.py:743 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:752 +#: kallithea/lib/helpers.py:753 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:754 kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:757 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:760 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:762 +#: kallithea/lib/helpers.py:763 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:764 +#: kallithea/lib/helpers.py:765 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:773 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:775 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:777 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:779 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:781 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:783 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:785 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:787 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:789 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:791 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:793 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:795 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:797 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:1125 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1128 +#: kallithea/lib/helpers.py:1129 #: kallithea/templates/compare/compare_diff.html:65 #: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:1195 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:1198 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:1201 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:1204 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:1209 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1444 +#: kallithea/lib/helpers.py:1445 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1389,7 +1406,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1665 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 msgid "Kallithea Administrator" msgstr "" @@ -1500,7 +1517,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2229 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 msgid "Approved" msgstr "" @@ -1515,7 +1532,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2230 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 msgid "Rejected" msgstr "" @@ -1542,7 +1559,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1514 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 msgid "top level" msgstr "" @@ -1689,7 +1706,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1697 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 msgid "Registration disabled" msgstr "" @@ -1716,12 +1733,12 @@ msgstr "" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1691 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 msgid "Repository creation enabled with write permission to a repository group" msgstr "" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 msgid "Repository creation disabled with write permission to a repository group" msgstr "" @@ -1734,102 +1751,103 @@ msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1667 +#: kallithea/model/db.py:1668 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1668 -msgid "Default user has read access to new repositories" -msgstr "" - #: kallithea/model/db.py:1669 -msgid "Default user has write access to new repositories" +msgid "Default user has read access to new repositories" msgstr "" #: kallithea/model/db.py:1670 +msgid "Default user has write access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1671 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1673 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1674 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1675 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1676 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1678 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1679 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1680 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1681 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 -msgid "Only admins can create repository groups" -msgstr "" - #: kallithea/model/db.py:1683 +msgid "Only admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1684 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1685 -msgid "Only admins can create user groups" -msgstr "" - #: kallithea/model/db.py:1686 +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1687 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1688 -msgid "Only admins can create top level repositories" -msgstr "" - #: kallithea/model/db.py:1689 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1690 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1694 -#, fuzzy -msgid "Only admins can fork repositories" -msgstr "Chyba při vytváření repozitáře %s" - #: kallithea/model/db.py:1695 #, fuzzy -msgid "Non-admins can can fork repositories" +msgid "Only admins can fork repositories" msgstr "Chyba při vytváření repozitáře %s" -#: kallithea/model/db.py:1698 -msgid "User registration with manual account activation" -msgstr "" +#: kallithea/model/db.py:1696 +#, fuzzy +#| msgid "Non-admins can can fork repositories" +msgid "Non-admins can fork repositories" +msgstr "Chyba při vytváření repozitáře %s" #: kallithea/model/db.py:1699 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1700 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2228 +#: kallithea/model/db.py:2238 #, fuzzy msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2231 +#: kallithea/model/db.py:2241 #, fuzzy msgid "Under review" msgstr "" @@ -1856,87 +1874,87 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "" -#: kallithea/model/notification.py:255 -#, python-format -msgid "%(user)s sent message %(age)s" -msgstr "" - #: kallithea/model/notification.py:256 #, python-format -msgid "%(user)s mentioned you %(age)s" +msgid "%(user)s sent message %(age)s" msgstr "" #: kallithea/model/notification.py:257 #, python-format -msgid "%(user)s registered in Kallithea %(age)s" +msgid "%(user)s mentioned you %(age)s" msgstr "" #: kallithea/model/notification.py:258 #, python-format -msgid "%(user)s opened new pull request %(age)s" +msgid "%(user)s registered in Kallithea %(age)s" msgstr "" #: kallithea/model/notification.py:259 #, python-format +msgid "%(user)s opened new pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:260 +#, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "" -#: kallithea/model/notification.py:266 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - #: kallithea/model/notification.py:267 #, python-format -msgid "%(user)s sent message at %(when)s" +msgid "%(user)s commented on changeset at %(when)s" msgstr "" #: kallithea/model/notification.py:268 #, python-format -msgid "%(user)s mentioned you at %(when)s" +msgid "%(user)s sent message at %(when)s" msgstr "" #: kallithea/model/notification.py:269 #, python-format -msgid "%(user)s registered in Kallithea at %(when)s" +msgid "%(user)s mentioned you at %(when)s" msgstr "" #: kallithea/model/notification.py:270 #, python-format -msgid "%(user)s opened new pull request at %(when)s" +msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" #: kallithea/model/notification.py:271 #, python-format +msgid "%(user)s opened new pull request at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:272 +#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:302 +#: kallithea/model/notification.py:303 #, python-format msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:306 #, python-format msgid "New user %(new_username)s registered" msgstr "" -#: kallithea/model/notification.py:307 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - #: kallithea/model/notification.py:308 #, python-format +msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgstr "" + +#: kallithea/model/notification.py:309 +#, python-format msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" -#: kallithea/model/notification.py:321 +#: kallithea/model/notification.py:322 msgid "Closing" msgstr "" @@ -3569,6 +3587,11 @@ msgid "Unlock Repository" msgstr "Prázdný repozitář" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#, python-format +msgid "Locked by %s on %s" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 #, fuzzy msgid "Confirm to lock repository." @@ -4605,7 +4628,6 @@ #: kallithea/templates/base/root.html:31 #, fuzzy -#| msgid "on pull request" msgid "Open New Pull Request from {0}" msgstr "Změna stavu-> %s" @@ -4777,7 +4799,7 @@ msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:310 +#: kallithea/templates/changelog/changelog.html:309 msgid "There are no changes yet" msgstr "" @@ -5750,9 +5772,10 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 -#, python-format -msgid "Pull Requests from %s'" -msgstr "" +#, fuzzy, python-format +#| msgid "Open New Pull Request from {0}" +msgid "Pull Requests from '%s'" +msgstr "Změna stavu-> %s" #: kallithea/templates/pullrequests/pullrequest_show_all.html:13 #, python-format @@ -6047,8 +6070,6 @@ #~ msgstr "" #~ msgid "" -#~ "_: \n" -#~ "" #~ msgstr "" #~ msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" @@ -6324,39 +6345,12 @@ #~ 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 "" @@ -6377,3 +6371,16 @@ #~ msgid "Created by" #~ msgstr "" + +#~ msgid "You can only delete files with revision being a valid branch " +#~ msgstr "" + +#~ msgid "You can only edit files with revision being a valid branch " +#~ msgstr "" + +#~ msgid "Changeset not found" +#~ msgstr "" + +#~ msgid "Pull Requests from %s'" +#~ msgstr "" + diff -r de0a8b4fd5e0 -r da2a9107ee7c kallithea/i18n/de/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po Thu Jul 13 12:26:01 2017 +0200 +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po Tue Jul 25 16:43:29 2017 +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-09-08 10:34+0200\n" +"POT-Creation-Date: 2017-07-25 16:37+0200\n" "PO-Revision-Date: 2015-09-08 10:56+0200\n" "Last-Translator: Robert Rauch \n" "Language-Team: German " @@ -20,11 +20,11 @@ "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" -#: kallithea/controllers/changelog.py:166 +#: kallithea/controllers/changelog.py:165 #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 @@ -36,7 +36,7 @@ msgid "None" msgstr "Keine" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:168 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,18 +67,17 @@ "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" " möglich" #: kallithea/controllers/error.py:71 -#| msgid "revisions" msgid "No response" msgstr "Keine Rückmeldung" @@ -128,8 +126,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..." @@ -138,112 +136,115 @@ msgid "%s committed on %s" msgstr "%s committed am %s" -#: 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 -msgid "You can only delete files with revision being a valid branch " +#: kallithea/controllers/files.py:317 +#, fuzzy +#| msgid "You can only delete files with revision being a valid branch " +msgid "You can only delete files with revision being a valid branch" msgstr "Du kannst nur Dateien löschen, deren Revision ein gültiger Branch ist " -#: kallithea/controllers/files.py:329 +#: 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 -msgid "You can only edit files with revision being a valid branch " -msgstr "" -"Du kannst nur Dateien bearbeiten, deren Revision ein gültiger Branch ist " - -#: kallithea/controllers/files.py:392 +#: kallithea/controllers/files.py:377 +#, fuzzy +#| msgid "You can only edit files with revision being a valid branch " +msgid "You can only edit files with revision being a valid branch" +msgstr "Du kannst nur Dateien bearbeiten, deren Revision ein gültiger Branch ist " + +#: 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" @@ -264,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 "Repositories" @@ -292,32 +293,36 @@ 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 -#| msgid "bad captcha" +#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 msgid "Bad captcha" msgstr "Falsches Captcha" -#: kallithea/controllers/login.py:156 +#: kallithea/controllers/login.py:152 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:197 +#, 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:246 +#, fuzzy +#| msgid "Password reset link" +msgid "Invalid password reset token" +msgstr "Link zum Zurücksetzen des Passworts" + +#: kallithea/controllers/login.py:251 +#: kallithea/controllers/admin/my_account.py:167 +msgid "Successfully updated password" +msgstr "Erfolgreich Kennwort geändert" #: kallithea/controllers/pullrequests.py:124 #, python-format @@ -338,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:510 #, 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 "Fehlende Changesets seit letztem 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 "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 " @@ -392,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:514 msgid "Pull request updated" msgstr "Pull Request aktualisiert" -#: kallithea/controllers/pullrequests.py:523 +#: kallithea/controllers/pullrequests.py:529 msgid "Successfully deleted pull request" msgstr "Erfolgreich Pull-Request gelöscht" -#: kallithea/controllers/pullrequests.py:582 +#: kallithea/controllers/pullrequests.py:595 #, 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:597 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:615 #, 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:619 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:627 #, 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:633 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:724 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:715 +#: kallithea/controllers/pullrequests.py:729 msgid "Closing." msgstr "Schließen." @@ -491,38 +496,37 @@ #: kallithea/controllers/admin/gists.py:59 #: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:283 -#| msgid "forever" +#: kallithea/controllers/admin/users.py:285 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" @@ -552,8 +556,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 " @@ -564,47 +568,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" @@ -654,10 +654,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" @@ -688,7 +688,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1701 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 msgid "Manual activation of external account" msgstr "Manuelle Aktivierung externen Kontos" @@ -700,7 +700,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1702 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 msgid "Automatic activation of external account" msgstr "Automatische Aktivierung externen Kontos" @@ -824,7 +824,6 @@ #: kallithea/controllers/admin/repos.py:321 #, 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 noch Forks besitzt" @@ -874,13 +873,11 @@ #: kallithea/controllers/admin/repos.py:537 #: kallithea/controllers/admin/repos.py:564 -#| msgid "Repository is not locked" msgid "Repository has been locked" msgstr "Repository wurde gesperrt" #: kallithea/controllers/admin/repos.py:540 #: kallithea/controllers/admin/repos.py:561 -#| msgid "Repository is not locked" msgid "Repository has been unlocked" msgstr "Repository nicht mehr gesperrt" @@ -924,54 +921,60 @@ "\"hgsubversion\"-Bibliothek fehlt" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:274 +#: kallithea/controllers/admin/settings.py:284 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:211 #, 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:226 +#, fuzzy, python-format +#| msgid "Invalidate Repository Cache" +msgid "Invalidated %s repositories" +msgstr "Ungültiger Repositorycache" + +#: kallithea/controllers/admin/settings.py:280 msgid "Updated application settings" msgstr "Anwendungseinstellungen aktualisiert" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:337 msgid "Updated visualisation settings" msgstr "Visualisierungseinstellungen aktualisiert" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:342 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:368 msgid "Please enter email address" msgstr "Bitte gebe eine E-Mailadresse an" -#: kallithea/controllers/admin/settings.py:373 +#: kallithea/controllers/admin/settings.py:383 msgid "Send email task created" msgstr "Task zum Versenden von E-Mails erstellt" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:414 msgid "Added new hook" msgstr "Neuer Hook hinzugefügt" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:428 msgid "Updated hooks" msgstr "Die Hooks wurden aktutalisiert" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:432 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:458 msgid "Whoosh reindex task scheduled" msgstr "Whoosh Reindizierungs Aufgabe wurde zur Ausführung geplant" @@ -1012,51 +1015,51 @@ 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 "Der Standard-Benutzer kann nicht bearbeitet werden" -#: 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" @@ -1069,11 +1072,15 @@ msgid "Invalid API key" msgstr "Ungültiger API Key" -#: kallithea/lib/auth.py:795 +#: kallithea/lib/auth.py:785 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/auth.py:832 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:864 msgid "You need to be signed in to view this page" msgstr "Sie müssen sich anmelden um diese Seite aufzurufen" @@ -1081,8 +1088,10 @@ msgid "Repository not found in the filesystem" msgstr "Das Repository konnte nicht im Filesystem gefunden werden" -#: kallithea/lib/base.py:516 kallithea/lib/helpers.py:622 -msgid "Changeset not found" +#: kallithea/lib/base.py:516 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "Changeset for %s %s not found in %s" msgstr "Änderungssatz nicht gefunden" #: kallithea/lib/diffs.py:66 @@ -1099,162 +1108,166 @@ msgid "No changes detected" msgstr "Keine Änderungen erkannt" -#: kallithea/lib/helpers.py:609 +#: kallithea/lib/helpers.py:610 #, python-format msgid "Deleted branch: %s" msgstr "Branch %s gelöscht" -#: kallithea/lib/helpers.py:611 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Created tag: %s" msgstr "Tag %s erstellt" -#: kallithea/lib/helpers.py:671 +#: kallithea/lib/helpers.py:623 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "Changeset %s not found" +msgstr "Änderungssatz nicht gefunden" + +#: kallithea/lib/helpers.py:672 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Zeige alle Kombinierten Änderungensätze %s->%s" -#: kallithea/lib/helpers.py:677 +#: kallithea/lib/helpers.py:678 msgid "Compare view" msgstr "Vergleichsansicht" -#: kallithea/lib/helpers.py:696 +#: kallithea/lib/helpers.py:697 msgid "and" msgstr "und" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:698 #, python-format msgid "%s more" msgstr "%s mehr" -#: kallithea/lib/helpers.py:698 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "revisionen" -#: kallithea/lib/helpers.py:722 +#: kallithea/lib/helpers.py:723 #, fuzzy, python-format -#| msgid "fork name %s" msgid "Fork name %s" msgstr "Fork Name %s" -#: kallithea/lib/helpers.py:742 +#: kallithea/lib/helpers.py:743 #, fuzzy, python-format -#| msgid "Pull request #%s" msgid "Pull request %s" msgstr "Pull Request #%s" -#: kallithea/lib/helpers.py:752 +#: kallithea/lib/helpers.py:753 msgid "[deleted] repository" msgstr "[gelöscht] Repository" -#: kallithea/lib/helpers.py:754 kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 msgid "[created] repository" msgstr "[erstellt] Repository" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:757 msgid "[created] repository as fork" msgstr "[erstellt] Repository als Fork" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 msgid "[forked] repository" msgstr "[forked] Repository" -#: kallithea/lib/helpers.py:760 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 msgid "[updated] repository" msgstr "[aktualisiert] Repository" -#: kallithea/lib/helpers.py:762 +#: kallithea/lib/helpers.py:763 msgid "[downloaded] archive from repository" msgstr "Archiv von Repository [heruntergeladen]" -#: kallithea/lib/helpers.py:764 +#: kallithea/lib/helpers.py:765 msgid "[delete] repository" msgstr "Repository [gelöscht]" -#: kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:773 msgid "[created] user" msgstr "Benutzer [erstellt]" -#: kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:775 msgid "[updated] user" msgstr "Benutzer [akutalisiert]" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:777 msgid "[created] user group" msgstr "Benutzergruppe [erstellt]" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:779 msgid "[updated] user group" msgstr "Benutzergruppe [aktualisiert]" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:781 msgid "[commented] on revision in repository" msgstr "Revision [kommentiert] in Repository" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:783 msgid "[commented] on pull request for" msgstr "Pull Request [kommentiert] für" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:785 msgid "[closed] pull request for" msgstr "Pull Request [geschlossen] für" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:787 msgid "[pushed] into" msgstr "[Pushed] in" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:789 msgid "[committed via Kallithea] into repository" msgstr "[via Kallithea] in Repository [committed]" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:791 msgid "[pulled from remote] into repository" msgstr "[Pulled von Remote] in Repository" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:793 msgid "[pulled] from" msgstr "[Pulled] von" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:795 msgid "[started following] repository" msgstr "[Following gestartet] für Repository" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:797 msgid "[stopped following] repository" msgstr "[Following gestoppt] für Repository" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:1125 #, python-format msgid " and %s more" msgstr " und %s weitere" -#: kallithea/lib/helpers.py:1128 +#: kallithea/lib/helpers.py:1129 #: 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 "Keine Dateien" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:1195 msgid "new file" msgstr "neue Datei" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:1198 msgid "mod" msgstr "mod" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:1201 msgid "del" msgstr "entf" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:1204 msgid "rename" msgstr "umbenennen" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:1209 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1444 +#: kallithea/lib/helpers.py:1445 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1426,7 +1439,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1665 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 msgid "Kallithea Administrator" msgstr "Kallithea Administrator" @@ -1537,7 +1550,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2229 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 msgid "Approved" msgstr "Akzeptiert" @@ -1552,7 +1565,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2230 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 msgid "Rejected" msgstr "Abgelehnt" @@ -1579,7 +1592,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1514 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 msgid "top level" msgstr "höchste Ebene" @@ -1726,7 +1739,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1697 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 msgid "Registration disabled" msgstr "Registrierung deaktiviert" @@ -1753,14 +1766,14 @@ msgstr "Benutzerregistrierung mit automatische Kontoaktivierung" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1691 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 msgid "Repository creation enabled with write permission to a repository group" msgstr "" "Erstellung von Repositories mit Schreibzugriff für Repositorygruppe " "aktiviert" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 msgid "Repository creation disabled with write permission to a repository group" msgstr "" "Erstellung von Repositories mit Schreibzugriff für Repositorygruppe " @@ -1775,121 +1788,108 @@ msgid "[Mention]" msgstr "[Mention]" -#: kallithea/model/db.py:1667 +#: kallithea/model/db.py:1668 msgid "Default user has no access to new repositories" msgstr "Der Standard-Benutzer hat keinen Zugriff auf neue Repositories" -#: kallithea/model/db.py:1668 -#| msgid "Unauthorized access to resource" +#: kallithea/model/db.py:1669 msgid "Default user has read access to new repositories" msgstr "Der Standard-Benutzer hat Leserechte auf neuen Repositories" -#: kallithea/model/db.py:1669 -#| msgid "Unauthorized access to resource" +#: kallithea/model/db.py:1670 msgid "Default user has write access to new repositories" msgstr "Der Standard-Benutzer hat Schreibrechte auf neuen Repositories" -#: kallithea/model/db.py:1670 +#: kallithea/model/db.py:1671 msgid "Default user has admin access to new repositories" msgstr "Der Standard-Benutzer hat Admin-Rechte auf neuen Repositories" -#: kallithea/model/db.py:1672 +#: kallithea/model/db.py:1673 msgid "Default user has no access to new repository groups" msgstr "Der Standard-Benutzer hat keinen Zugriff auf neue Repository-Gruppen" -#: kallithea/model/db.py:1673 -msgid "Default user has read access to new repository groups" -msgstr "Der Standard-Benutzer hat Leserechte auf neuen Repository-Gruppen" - #: kallithea/model/db.py:1674 -msgid "Default user has write access to new repository groups" -msgstr "Der Standard-Benutzer Schreibrechte auf neuen Repository-Gruppen" +msgid "Default user has read access to new repository groups" +msgstr "Der Standard-Benutzer hat Leserechte auf neuen Repository-Gruppen" #: kallithea/model/db.py:1675 +msgid "Default user has write access to new repository groups" +msgstr "Der Standard-Benutzer Schreibrechte auf neuen Repository-Gruppen" + +#: kallithea/model/db.py:1676 msgid "Default user has admin access to new repository groups" msgstr "Der Standard-Benutzer Admin-Rechte auf neuen Repository-Gruppen" -#: kallithea/model/db.py:1677 -msgid "Default user has no access to new user groups" -msgstr "Der Standard-Benutzer hat keinen Zugriff auf neue Benutzer-Gruppen" - #: kallithea/model/db.py:1678 +msgid "Default user has no access to new user groups" +msgstr "Der Standard-Benutzer hat keinen Zugriff auf neue Benutzer-Gruppen" + +#: kallithea/model/db.py:1679 msgid "Default user has read access to new user groups" msgstr "Der Standard-Benutzer hat Leserechte auf neuen Benutzer-Gruppen" -#: kallithea/model/db.py:1679 -msgid "Default user has write access to new user groups" -msgstr "Der Standard-Benutzer hat Schreibrechte auf neuen Benutzer-Gruppen" - #: kallithea/model/db.py:1680 +msgid "Default user has write access to new user groups" +msgstr "Der Standard-Benutzer hat Schreibrechte auf neuen Benutzer-Gruppen" + +#: kallithea/model/db.py:1681 msgid "Default user has admin access to new user groups" msgstr "Der Standard-Benutzer hat Admin-Rechte auf neuen Benutzer-Gruppen" -#: kallithea/model/db.py:1682 -#, python-format -#| msgid "Created repository group %s" -msgid "Only admins can create repository groups" -msgstr "Nur Admins können Repository-Gruppen erstellen" - #: kallithea/model/db.py:1683 -#, fuzzy, python-format -#| msgid "Created repository group %s" +msgid "Only admins can create repository groups" +msgstr "Nur Admins können Repository-Gruppen erstellen" + +#: kallithea/model/db.py:1684 +#, fuzzy msgid "Non-admins can create repository groups" msgstr "Nicht-Admins können Repository-Gruppen erstellen" -#: kallithea/model/db.py:1685 -#| msgid "[created] user group" +#: kallithea/model/db.py:1686 msgid "Only admins can create user groups" msgstr "Nur Admins können Benutzer-Gruppen erstellen" -#: kallithea/model/db.py:1686 -#| msgid "[created] user group" +#: kallithea/model/db.py:1687 msgid "Non-admins can create user groups" msgstr "Nicht-Admins können Benutzer-Gruppen erstellen" -#: 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 "Only admins can create top level repositories" +msgstr "Repositories oberster Ebene" + +#: kallithea/model/db.py:1690 +#, fuzzy msgid "Non-admins can create top level repositories" msgstr "Repositories oberster Ebene" -#: kallithea/model/db.py:1694 -#| msgid "Location of repositories" -msgid "Only admins can fork repositories" -msgstr "Nur Admins können Repositories forken" - #: kallithea/model/db.py:1695 -#| msgid "Location of repositories" -msgid "Non-admins can can fork repositories" +msgid "Only admins can fork repositories" +msgstr "Nur Admins können Repositories forken" + +#: kallithea/model/db.py:1696 +#, fuzzy +#| msgid "Non-admins can can fork repositories" +msgid "Non-admins can fork repositories" msgstr "Nicht-Admins können Repositories forken" -#: 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 manual account activation" +msgstr "Benutzerregistrierung mit manueller Kontoaktivierung" + +#: kallithea/model/db.py:1700 +#, fuzzy msgid "User registration with automatic account activation" msgstr "Benutzerregistrierung mit automatische Kontoaktivierung" -#: kallithea/model/db.py:2228 +#: kallithea/model/db.py:2238 #, fuzzy -#| msgid "Not Reviewed" msgid "Not reviewed" msgstr "Nicht Begutachtet" -#: kallithea/model/db.py:2231 +#: kallithea/model/db.py:2241 #, fuzzy -#| msgid "Under Review" msgid "Under review" msgstr "In Begutachtung" @@ -1915,136 +1915,123 @@ msgid "Name must not contain only digits" msgstr "Name darf nicht nur Ziffern enthalten" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:255 #, 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" +msgid "%(user)s sent message %(age)s" +msgstr "%(user)s hat am %(when)s eine Nachricht gesendet" #: 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" +msgid "%(user)s mentioned you %(age)s" +msgstr "%(user)s hat Sie am %(when)s erwähnt" #: 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" +msgid "%(user)s registered in Kallithea %(age)s" +msgstr "%(user)s hat sich am %(when)s bei Kallithea registriert" #: kallithea/model/notification.py:259 #, fuzzy, python-format -#| msgid "%(user)s commented on 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:260 +#, fuzzy, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "%(user)s hat am %(when)s einen Pull Request kommentiert" -#: kallithea/model/notification.py:266 +#: kallithea/model/notification.py:267 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s hat am %(when)s ein Changeset kommentiert" -#: kallithea/model/notification.py:267 +#: kallithea/model/notification.py:268 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s hat am %(when)s eine Nachricht gesendet" -#: kallithea/model/notification.py:268 +#: kallithea/model/notification.py:269 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s hat Sie am %(when)s erwähnt" -#: kallithea/model/notification.py:269 +#: kallithea/model/notification.py:270 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s hat sich am %(when)s bei Kallithea registriert" -#: kallithea/model/notification.py:270 +#: kallithea/model/notification.py:271 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s hat am %(when)s einen neuen Pull Request eröffnet" -#: kallithea/model/notification.py:271 +#: kallithea/model/notification.py:272 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s hat am %(when)s einen Pull Request kommentiert" -#: kallithea/model/notification.py:302 +#: kallithea/model/notification.py:303 #, 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" -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:306 #, python-format msgid "New user %(new_username)s registered" msgstr "Neuer Benutzer %(new_username)s registriert" -#: kallithea/model/notification.py:307 +#: kallithea/model/notification.py:308 #, 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 +#: kallithea/model/notification.py:309 #, 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" -#: kallithea/model/notification.py:321 +#: kallithea/model/notification.py:322 msgid "Closing" msgstr "Schließen" #: 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 " @@ -2054,7 +2041,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" @@ -2064,7 +2051,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 " @@ -2074,18 +2061,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" @@ -2098,13 +2089,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" @@ -2168,7 +2157,6 @@ #: kallithea/model/validators.py:300 #, fuzzy -#| msgid "invalid password" msgid "Invalid username or password" msgstr "Ungültiges Passwort" @@ -2178,7 +2166,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" @@ -2201,7 +2188,6 @@ #: kallithea/model/validators.py:465 #, fuzzy -#| msgid "private repository" msgid "Invalid repository URL" msgstr "privates Repository" @@ -2239,13 +2225,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." @@ -2405,7 +2389,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" @@ -2413,7 +2399,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 @@ -2425,7 +2411,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 @@ -2441,7 +2427,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 @@ -2453,7 +2439,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 @@ -2463,7 +2449,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" @@ -2478,14 +2464,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" @@ -2497,7 +2484,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?" @@ -2510,11 +2497,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" @@ -2532,13 +2522,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" @@ -2684,7 +2708,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 +2852,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" @@ -2861,7 +2883,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" @@ -3003,7 +3025,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" @@ -3014,7 +3036,6 @@ #: kallithea/templates/admin/my_account/my_account.html:36 #, fuzzy -#| msgid "New email address" msgid "Email Addresses" msgstr "Neue E-Mailadresse" @@ -3025,14 +3046,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" @@ -3041,7 +3060,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" @@ -3053,42 +3071,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" @@ -3167,7 +3179,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" @@ -3177,7 +3188,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 +3215,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" @@ -3222,7 +3233,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" @@ -3267,7 +3278,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:26 #, fuzzy -#| msgid "Import existing repository ?" msgid "Apply to all existing repositories" msgstr "Bestehendes Repository importieren?" @@ -3295,13 +3305,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." @@ -3312,9 +3320,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 " @@ -3334,7 +3339,6 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:60 #, fuzzy -#| msgid "Repository creation" msgid "Top level repository creation" msgstr "Repository erstellung" @@ -3354,7 +3358,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 " @@ -3390,7 +3393,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" @@ -3448,7 +3450,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" @@ -3487,7 +3489,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" @@ -3507,7 +3509,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" @@ -3518,7 +3519,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" @@ -3529,7 +3529,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" @@ -3590,7 +3589,6 @@ #: kallithea/templates/admin/repos/repo_add_base.html:17 #, fuzzy -#| msgid "[created] repository" msgid "Clone remote repository" msgstr "[erstellt] Repository" @@ -3722,6 +3720,11 @@ msgid "Unlock Repository" msgstr "Repository entsperren" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#, python-format +msgid "Locked by %s on %s" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Confirm to lock repository." msgstr "Sperren des Repositorys bestätigen." @@ -3846,25 +3849,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" @@ -3874,7 +3873,6 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:11 #, fuzzy -#| msgid "private repository" msgid "Permanent Repository ID" msgstr "privates Repository" @@ -3898,13 +3896,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" @@ -4043,7 +4039,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 "" @@ -4079,7 +4075,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 "" @@ -4107,7 +4114,6 @@ #: kallithea/templates/admin/settings/settings_system.html:4 #, fuzzy -#| msgid "check for updates" msgid "Check for updates" msgstr "Auf Updates prüfen" @@ -4310,7 +4316,6 @@ #: kallithea/templates/admin/settings/settings_visual.html:92 #, fuzzy -#| msgid "Settings" msgid "Meta Tagging" msgstr "Einstellungen" @@ -4352,7 +4357,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit.html:33 #, fuzzy -#| msgid "members" msgid "Show Members" msgstr "mitglieder" @@ -4497,47 +4501,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 @@ -4547,117 +4551,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" @@ -4753,52 +4756,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" @@ -4816,7 +4818,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" @@ -4856,7 +4857,7 @@ msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/templates/changelog/changelog.html:49 msgid "Clear selection" msgstr "" @@ -4928,7 +4929,7 @@ msgid "Branch %s" msgstr "Branch %s" -#: kallithea/templates/changelog/changelog.html:291 +#: kallithea/templates/changelog/changelog.html:309 msgid "There are no changes yet" msgstr "Bisher gibt es keine Änderungen" @@ -4986,7 +4987,6 @@ #: kallithea/templates/changelog/changelog_summary_data.html:90 #, fuzzy -#| msgid "private repository" msgid "Push new repository" msgstr "privates Repository" @@ -5044,19 +5044,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" @@ -5065,7 +5063,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" @@ -5074,21 +5072,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" @@ -5097,8 +5093,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" @@ -5108,7 +5103,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:37 #, fuzzy -#| msgid "Latest Changes" msgid "Status change" msgstr "Letzte Änderungen" @@ -5255,7 +5249,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 "" @@ -5296,7 +5290,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" @@ -5360,20 +5354,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 @@ -5733,7 +5735,6 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:14 #, fuzzy -#| msgid "revoke" msgid "Vote" msgstr "entziehen" @@ -5774,20 +5775,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" @@ -5835,98 +5832,105 @@ 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 -#, python-format -msgid "Pull Requests from %s'" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#, fuzzy, python-format +#| msgid "Pull Requests from %s'" +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 "" @@ -6177,14 +6181,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" @@ -6208,9 +6207,6 @@ #~ msgstr "löschen" #~ msgid "" -#~ "Your user is in an external source" -#~ " of record; some details cannot be" -#~ " managed here" #~ msgstr "" #~ msgid "Permissions Administration" @@ -6264,20 +6260,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" @@ -6323,12 +6305,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 "" @@ -6338,29 +6314,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 "" @@ -6385,11 +6344,6 @@ #~ msgid "Comment on changeset" #~ msgstr "" -#~ msgid "" -#~ "Use @username inside this text to " -#~ "send notification to another local user." -#~ msgstr "" - #~ msgid "revision" #~ msgstr "" @@ -6416,3 +6370,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" + diff -r de0a8b4fd5e0 -r da2a9107ee7c kallithea/i18n/fr/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Thu Jul 13 12:26:01 2017 +0200 +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Tue Jul 25 16:43:29 2017 +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-09-08 10:34+0200\n" +"POT-Creation-Date: 2017-07-25 16:37+0200\n" "PO-Revision-Date: 2015-09-10 15:13+0200\n" "Last-Translator: Étienne Gilli \n" "Language-Team: French " @@ -24,7 +24,7 @@ msgid "There are no changesets yet" msgstr "Il n’y a aucun changement pour le moment" -#: kallithea/controllers/changelog.py:166 +#: kallithea/controllers/changelog.py:165 #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 @@ -36,7 +36,7 @@ msgid "None" msgstr "Aucun" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(fermé)" @@ -155,7 +155,9 @@ msgstr "Ce dépôt a été verrouillé par %s sur %s" #: kallithea/controllers/files.py:317 -msgid "You can only delete files with revision being a valid branch " +#, fuzzy +#| msgid "You can only delete files with revision being a valid branch " +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 " @@ -176,7 +178,9 @@ msgstr "Une erreur est survenue durant le commit" #: kallithea/controllers/files.py:377 -msgid "You can only edit files with revision being a valid branch " +#, fuzzy +#| msgid "You can only edit files with revision being a valid branch " +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 " @@ -299,26 +303,23 @@ msgid "Journal" msgstr "Historique" -#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 msgid "Bad captcha" msgstr "Mauvais captcha" -#: kallithea/controllers/login.py:157 +#: kallithea/controllers/login.py:152 msgid "You have successfully registered into Kallithea" msgstr "Vous vous êtes inscrits avec succès à Kallithea" -#: kallithea/controllers/login.py:202 -#| msgid "Your password reset link was sent" +#: kallithea/controllers/login.py:197 msgid "A password reset confirmation code has been sent" -msgstr "" -"Un lien de confirmation de réinitialisation de mot de passe a été envoyé" +msgstr "Un lien de confirmation de réinitialisation de mot de passe a été envoyé" + +#: kallithea/controllers/login.py:246 +msgid "Invalid password reset token" +msgstr "Clé de réinitialisation de mot de passe invalide" #: kallithea/controllers/login.py:251 -#| msgid "Password reset link" -msgid "Invalid password reset token" -msgstr "Clé de réinitialisation de mot de passe invalide" - -#: 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" @@ -364,7 +365,7 @@ #: kallithea/controllers/pullrequests.py:366 #: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:509 +#: kallithea/controllers/pullrequests.py:510 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "Reviewer spécifié \"%s\" non valide" @@ -412,46 +413,46 @@ msgid "Pull request update created" msgstr "Mise à jour de la pull request créée" -#: kallithea/controllers/pullrequests.py:513 +#: kallithea/controllers/pullrequests.py:514 msgid "Pull request updated" msgstr "Pull request mise à jour" -#: kallithea/controllers/pullrequests.py:528 +#: kallithea/controllers/pullrequests.py:529 msgid "Successfully deleted pull request" msgstr "La requête de pull a été supprimée avec succès" -#: kallithea/controllers/pullrequests.py:594 +#: kallithea/controllers/pullrequests.py:595 #, 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:596 +#: kallithea/controllers/pullrequests.py:597 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:614 +#: kallithea/controllers/pullrequests.py:615 #, 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:617 +#: kallithea/controllers/pullrequests.py:619 msgid "No changesets found for updating this pull request." msgstr "Pas de changeset trouvé pour ce pull request." -#: kallithea/controllers/pullrequests.py:625 +#: kallithea/controllers/pullrequests.py:627 #, 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:631 +#: kallithea/controllers/pullrequests.py:633 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:722 +#: kallithea/controllers/pullrequests.py:724 msgid "No permission to change pull request status" msgstr "Permission manquante pour changer le statut du pull request" -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:729 msgid "Closing." msgstr "Fermeture." @@ -693,7 +694,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1701 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 msgid "Manual activation of external account" msgstr "Activation manuelle du compte externe" @@ -705,7 +706,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1702 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 msgid "Automatic activation of external account" msgstr "Activation automatique du compte externe" @@ -924,52 +925,58 @@ "« hgsubversion » est manquante" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:277 +#: kallithea/controllers/admin/settings.py:284 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:216 +#: kallithea/controllers/admin/settings.py:211 #, 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:273 +#: kallithea/controllers/admin/settings.py:226 +#, fuzzy, python-format +#| msgid "Invalidate cache for all repositories" +msgid "Invalidated %s repositories" +msgstr "Invalider le cache pour tous les dépôts" + +#: kallithea/controllers/admin/settings.py:280 msgid "Updated application settings" msgstr "Réglages mis à jour" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:337 msgid "Updated visualisation settings" msgstr "Réglages d’affichage mis à jour" -#: kallithea/controllers/admin/settings.py:335 +#: kallithea/controllers/admin/settings.py:342 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:361 +#: kallithea/controllers/admin/settings.py:368 msgid "Please enter email address" msgstr "Veuillez entrer votre adresse e-mail" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:383 msgid "Send email task created" msgstr "Tâche d'envoi d'e-mail créée" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:414 msgid "Added new hook" msgstr "Le nouveau hook a été ajouté" -#: kallithea/controllers/admin/settings.py:421 +#: kallithea/controllers/admin/settings.py:428 msgid "Updated hooks" msgstr "Hooks mis à jour" -#: kallithea/controllers/admin/settings.py:425 +#: kallithea/controllers/admin/settings.py:432 msgid "Error occurred during hook creation" msgstr "Une erreur est survenue durant la création du hook" -#: kallithea/controllers/admin/settings.py:451 +#: kallithea/controllers/admin/settings.py:458 msgid "Whoosh reindex task scheduled" msgstr "La tâche de réindexation Whoosh a été planifiée" @@ -1058,20 +1065,24 @@ msgid "Removed IP address from user whitelist" msgstr "L'adresse IP a été supprimée de la liste blanche" -#: kallithea/lib/auth.py:743 +#: kallithea/lib/auth.py:744 #, python-format msgid "IP %s not allowed" msgstr "IP %s non autorisée" -#: kallithea/lib/auth.py:756 +#: kallithea/lib/auth.py:757 msgid "Invalid API key" msgstr "Clé d'API invalide" -#: kallithea/lib/auth.py:812 +#: kallithea/lib/auth.py:785 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/auth.py:832 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:844 +#: kallithea/lib/auth.py:864 msgid "You need to be signed in to view this page" msgstr "Vous devez être connecté pour visualiser cette page" @@ -1079,8 +1090,10 @@ msgid "Repository not found in the filesystem" msgstr "Dépôt non trouvé sur le système de fichiers" -#: kallithea/lib/base.py:516 kallithea/lib/helpers.py:622 -msgid "Changeset not found" +#: kallithea/lib/base.py:516 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "Changeset for %s %s not found in %s" msgstr "Ensemble de changements non trouvé" #: kallithea/lib/diffs.py:66 @@ -1097,160 +1110,166 @@ msgid "No changes detected" msgstr "Aucun changement détecté" -#: kallithea/lib/helpers.py:609 +#: kallithea/lib/helpers.py:610 #, python-format msgid "Deleted branch: %s" msgstr "Branche supprimée : %s" -#: kallithea/lib/helpers.py:611 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Created tag: %s" msgstr "Étiquette créée : %s" -#: kallithea/lib/helpers.py:671 +#: kallithea/lib/helpers.py:623 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "Changeset %s not found" +msgstr "Ensemble de changements non trouvé" + +#: kallithea/lib/helpers.py:672 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Afficher les changements combinés %s->%s" -#: kallithea/lib/helpers.py:677 +#: kallithea/lib/helpers.py:678 msgid "Compare view" msgstr "Vue de comparaison" -#: kallithea/lib/helpers.py:696 +#: kallithea/lib/helpers.py:697 msgid "and" msgstr "et" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:698 #, python-format msgid "%s more" msgstr "%s de plus" -#: kallithea/lib/helpers.py:698 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "révisions" -#: kallithea/lib/helpers.py:722 +#: kallithea/lib/helpers.py:723 #, python-format msgid "Fork name %s" msgstr "Nom du fork %s" -#: kallithea/lib/helpers.py:742 +#: kallithea/lib/helpers.py:743 #, python-format msgid "Pull request %s" msgstr "Requête de pull %s" -#: kallithea/lib/helpers.py:752 +#: kallithea/lib/helpers.py:753 msgid "[deleted] repository" msgstr "[a supprimé] le dépôt" -#: kallithea/lib/helpers.py:754 kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 msgid "[created] repository" msgstr "[a créé] le dépôt" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:757 msgid "[created] repository as fork" msgstr "[a créé] le dépôt en tant que fork" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 msgid "[forked] repository" msgstr "[a forké] le dépôt" -#: kallithea/lib/helpers.py:760 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 msgid "[updated] repository" msgstr "[a mis à jour] le dépôt" -#: kallithea/lib/helpers.py:762 +#: kallithea/lib/helpers.py:763 msgid "[downloaded] archive from repository" msgstr "[téléchargée] archive depuis le dépôt" -#: kallithea/lib/helpers.py:764 +#: kallithea/lib/helpers.py:765 msgid "[delete] repository" msgstr "[a supprimé] le dépôt" -#: kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:773 msgid "[created] user" msgstr "[a créé] l’utilisateur" -#: kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:775 msgid "[updated] user" msgstr "[a mis à jour] l’utilisateur" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:777 msgid "[created] user group" msgstr "[créé] groupe d'utilisateurs" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:779 msgid "[updated] user group" msgstr "[mis à jour] groupe d'utilisateurs" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:781 msgid "[commented] on revision in repository" msgstr "[a commenté] une révision du dépôt" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:783 msgid "[commented] on pull request for" msgstr "[a commenté] la requête de pull pour" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:785 msgid "[closed] pull request for" msgstr "[a fermé] la requête de pull de" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:787 msgid "[pushed] into" msgstr "[a pushé] dans" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:789 msgid "[committed via Kallithea] into repository" msgstr "[a commité via Kallithea] dans le dépôt" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:791 msgid "[pulled from remote] into repository" msgstr "[a pullé depuis un site distant] dans le dépôt" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:793 msgid "[pulled] from" msgstr "[a pullé] depuis" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:795 msgid "[started following] repository" msgstr "[suit maintenant] le dépôt" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:797 msgid "[stopped following] repository" msgstr "[ne suit plus] le dépôt" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:1125 #, python-format msgid " and %s more" msgstr " et %s de plus" -#: kallithea/lib/helpers.py:1128 +#: kallithea/lib/helpers.py:1129 #: kallithea/templates/compare/compare_diff.html:65 #: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "Aucun fichier" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:1195 msgid "new file" msgstr "nouveau fichier" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:1198 msgid "mod" msgstr "mod" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:1201 msgid "del" msgstr "suppr." -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:1204 msgid "rename" msgstr "renommer" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:1209 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1444 +#: kallithea/lib/helpers.py:1445 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1422,7 +1441,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1665 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 msgid "Kallithea Administrator" msgstr "Administrateur Kallithea" @@ -1533,7 +1552,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2229 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 msgid "Approved" msgstr "Approuvée" @@ -1548,7 +1567,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2230 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 msgid "Rejected" msgstr "Rejetée" @@ -1575,7 +1594,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1514 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 msgid "top level" msgstr "niveau supérieur" @@ -1722,7 +1741,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1697 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 msgid "Registration disabled" msgstr "Enregistrement désactivé" @@ -1749,14 +1768,14 @@ msgstr "Enregistrement des utilisateurs avec activation de compte automatique" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1691 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 msgid "Repository creation enabled with write permission to a repository group" msgstr "" "Création de dépôts activée avec l'accès en écriture vers un groupe de " "dépôts" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 msgid "Repository creation disabled with write permission to a repository group" msgstr "" "Création de dépôts désactivée avec l'accès en écriture vers un groupe de " @@ -1771,115 +1790,117 @@ msgid "[Mention]" msgstr "[Mention]" -#: kallithea/model/db.py:1667 +#: kallithea/model/db.py:1668 msgid "Default user has no access to new repositories" msgstr "L'utilisateur par défaut n'a pas accès aux nouveaux dépôts" -#: kallithea/model/db.py:1668 +#: kallithea/model/db.py:1669 msgid "Default user has read access to new repositories" msgstr "L'utilisateur par défaut a un accès en lecture aux nouveaux dépôts" -#: kallithea/model/db.py:1669 +#: kallithea/model/db.py:1670 msgid "Default user has write access to new repositories" msgstr "L'utilisateur par défaut a un accès en écriture aux nouveaux dépôts" -#: kallithea/model/db.py:1670 +#: kallithea/model/db.py:1671 msgid "Default user has admin access to new repositories" msgstr "L'utilisateur par défaut a un accès administrateur aux nouveaux dépôts" -#: kallithea/model/db.py:1672 +#: kallithea/model/db.py:1673 msgid "Default user has no access to new repository groups" msgstr "L'utilisateur par défaut n'a pas accès aux nouveaux groupes de dépôts" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1674 msgid "Default user has read access to new repository groups" msgstr "" -"L'utilisateur par défaut a accès en lecture seule aux nouveaux groupes de " -"dépôts" - -#: kallithea/model/db.py:1674 +"L'utilisateur par défaut a accès en lecture seule aux nouveaux groupes de" +" dépôts" + +#: kallithea/model/db.py:1675 msgid "Default user has write access to new repository groups" msgstr "" -"L'utilisateur par défaut a accès en écriture aux nouveaux groupes de dépôts" - -#: kallithea/model/db.py:1675 +"L'utilisateur par défaut a accès en écriture aux nouveaux groupes de " +"dépôts" + +#: kallithea/model/db.py:1676 msgid "Default user has admin access to new repository groups" msgstr "" "L'utilisateur par défaut a accès administrateur aux nouveaux groupes de " "dépôts" -#: kallithea/model/db.py:1677 +#: kallithea/model/db.py:1678 msgid "Default user has no access to new user groups" -msgstr "" -"L'utilisateur par défaut n'a pas accès aux nouveaux groupes d'utilisateurs" - -#: kallithea/model/db.py:1678 +msgstr "L'utilisateur par défaut n'a pas accès aux nouveaux groupes d'utilisateurs" + +#: kallithea/model/db.py:1679 msgid "Default user has read access to new user groups" msgstr "" "L'utilisateur par défaut a accès en lecture seule aux nouveaux groupes " "d'utilisateurs" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1680 msgid "Default user has write access to new user groups" msgstr "" "L'utilisateur par défaut a accès en écriture aux nouveaux groupes " "d'utilisateurs" -#: kallithea/model/db.py:1680 +#: kallithea/model/db.py:1681 msgid "Default user has admin access to new user groups" msgstr "" "L'utilisateur par défaut a un accès administrateur aux nouveaux groupes " "d'utilisateurs" -#: kallithea/model/db.py:1682 +#: kallithea/model/db.py:1683 msgid "Only admins can create repository groups" msgstr "Seul un administrateur peut créer un groupe de dépôts" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1684 msgid "Non-admins can create repository groups" -msgstr "" -"Les utilisateurs non-administrateurs peuvent créer des groupes de dépôts" - -#: kallithea/model/db.py:1685 +msgstr "Les utilisateurs non-administrateurs peuvent créer des groupes de dépôts" + +#: kallithea/model/db.py:1686 msgid "Only admins can create user groups" msgstr "Seul un administrateur peut créer des groupes d'utilisateurs" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1687 msgid "Non-admins can create user groups" msgstr "" -"Les utilisateurs non-administrateurs peuvent créer des groupes d'utilisateurs" - -#: kallithea/model/db.py:1688 +"Les utilisateurs non-administrateurs peuvent créer des groupes " +"d'utilisateurs" + +#: kallithea/model/db.py:1689 msgid "Only admins can create top level repositories" msgstr "Seul un administrateur peut créer des dépôts de niveau supérieur" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1690 msgid "Non-admins can create top level repositories" msgstr "" "Les utilisateurs non-administrateurs peuvent créer des dépôts de niveau " "supérieur" -#: kallithea/model/db.py:1694 +#: kallithea/model/db.py:1695 msgid "Only admins can fork repositories" msgstr "Seul un administrateur peut faire un fork de dépôt" -#: kallithea/model/db.py:1695 -msgid "Non-admins can can fork repositories" +#: kallithea/model/db.py:1696 +#, fuzzy +#| msgid "Non-admins can can fork repositories" +msgid "Non-admins can fork repositories" msgstr "Les utilisateurs non-administrateurs peuvent faire un fork de dépôt" -#: kallithea/model/db.py:1698 +#: kallithea/model/db.py:1699 msgid "User registration with manual account activation" msgstr "Enregistrement des utilisateurs avec activation de compte manuelle" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1700 msgid "User registration with automatic account activation" msgstr "Enregistrement des utilisateurs avec activation de compte automatique" -#: kallithea/model/db.py:2228 +#: kallithea/model/db.py:2238 msgid "Not reviewed" msgstr "Pas encore relue" -#: kallithea/model/db.py:2231 +#: kallithea/model/db.py:2241 msgid "Under review" msgstr "En cours de relecture" @@ -1905,93 +1926,91 @@ msgid "Name must not contain only digits" msgstr "Le nom ne doit pas contenir seulement des chiffres" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "%(user)s a commenté sur le changeset %(age)s" -#: kallithea/model/notification.py:255 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s sent message %(age)s" msgstr "%(user)s a envoyé un message %(age)s" -#: kallithea/model/notification.py:256 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s mentioned you %(age)s" msgstr "%(user)s vous a mentionné %(age)s" -#: kallithea/model/notification.py:257 +#: kallithea/model/notification.py:258 #, python-format msgid "%(user)s registered in Kallithea %(age)s" msgstr "%(user)s s'est enregistré sur Kallithea %(age)s" -#: kallithea/model/notification.py:258 +#: kallithea/model/notification.py:259 #, python-format msgid "%(user)s opened new pull request %(age)s" msgstr "%(user)s a ouvert une nouvelle demande de pull %(age)s" -#: kallithea/model/notification.py:259 +#: kallithea/model/notification.py:260 #, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "%(user)s a commenté la demande de pull %(age)s" -#: kallithea/model/notification.py:266 +#: kallithea/model/notification.py:267 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s a commenté sur le changeset à %(when)s" -#: kallithea/model/notification.py:267 +#: kallithea/model/notification.py:268 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s a envoyé un message à %(when)s" -#: kallithea/model/notification.py:268 +#: kallithea/model/notification.py:269 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s vous a mentionné à %(when)s" -#: kallithea/model/notification.py:269 +#: kallithea/model/notification.py:270 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s s'est enregistré sur Kallithea à %(when)s" -#: kallithea/model/notification.py:270 +#: kallithea/model/notification.py:271 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s a ouvert une nouvelle demande de pull à %(when)s" -#: kallithea/model/notification.py:271 +#: kallithea/model/notification.py:272 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s a commenté la demande de pull à %(when)s" -#: kallithea/model/notification.py:302 +#: kallithea/model/notification.py:303 #, python-format msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "[Commentaire] Changeset %(short_id)s de %(repo_name)s dans %(branch)s" -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:306 #, python-format msgid "New user %(new_username)s registered" msgstr "Nouvel utilisateur %(new_username)s enregistré" -#: kallithea/model/notification.py:307 -#, python-format -#| msgid "%(user)s wants you to review pull request %(pr_nice_id)s:" +#: kallithea/model/notification.py:308 +#, python-format msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" "[Ajouté] Demande de pull %(pr_nice_id)s à partir de %(ref)s pour " "%(repo_name)s" -#: kallithea/model/notification.py:308 -#, python-format -#| msgid "[commented] on pull request for" +#: kallithea/model/notification.py:309 +#, python-format msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" "[Commentaire] Demande de pull %(pr_nice_id)s à partir de %(ref)s pour " "%(repo_name)s" -#: kallithea/model/notification.py:321 +#: kallithea/model/notification.py:322 msgid "Closing" msgstr "Fermeture" @@ -2013,8 +2032,8 @@ #: kallithea/model/user.py:256 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" +"Vous ne pouvez pas supprimer cet utilisateur ; il est nécessaire pour le " +"bon fonctionnement de l’application" #: kallithea/model/user.py:261 #, python-format @@ -2040,16 +2059,15 @@ "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "" -"L’utilisateur « %s » possède %s groupes d'utilisateurs et ne peut pas être " -"supprimé. Changez les propriétaires de ces groupes d'utilisateurs ou " -"supprimez-les : %s" +"L’utilisateur « %s » possède %s groupes d'utilisateurs et ne peut pas " +"être supprimé. Changez les propriétaires de ces groupes d'utilisateurs ou" +" supprimez-les : %s" #: kallithea/model/user.py:360 msgid "Password reset link" msgstr "Lien de remise à zéro du mot de passe" #: kallithea/model/user.py:408 -#| msgid "Password reset link" msgid "Password reset notification" msgstr "Notification de réinitialisation du mot de passe" @@ -2081,8 +2099,8 @@ "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with an alphanumeric character or underscore" msgstr "" -"Le nom d'utilisateur ne peut contenir que des caractères alphanumériques, " -"des underscores (_), points, traits d'union et doit commencer avec un " +"Le nom d'utilisateur ne peut contenir que des caractères alphanumériques," +" des underscores (_), points, traits d'union et doit commencer avec un " "caractère alphanumérique ou un underscore" #: kallithea/model/validators.py:126 @@ -2175,8 +2193,8 @@ "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -"URL de dépôt invalide. Ce doit être une URL valide de type http, https, ssh, " -"svn+http ou svn+https" +"URL de dépôt invalide. Ce doit être une URL valide de type http, https, " +"ssh, svn+http ou svn+https" #: kallithea/model/validators.py:489 msgid "Fork has to be the same type as parent" @@ -2498,39 +2516,37 @@ msgstr "Envoyer l'E-mail de réinitialisation du mot de passe" #: kallithea/templates/password_reset.html:47 -#| msgid "" " msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "" -"Un lien de réinitialisation du mot de passe sera envoyé à l'adresse e-mail " -"indiquée si elle est enregistrée dans le système." +"Un lien de réinitialisation du mot de passe sera envoyé à l'adresse " +"e-mail indiquée si elle est enregistrée dans le système." #: kallithea/templates/password_reset_confirmation.html:19 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -"Vous êtes sur le point de changer le mot de passe pour l'adresse e-mail %s." +"Vous êtes sur le point de changer le mot de passe pour l'adresse e-mail " +"%s." #: 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 "" -"Vous devez utiliser la même session de navigateur pour cette opération que " -"celle utilisée pour la demande de réinitialisation de mot de passe." +"Vous devez utiliser la même session de navigateur pour cette opération " +"que celle utilisée pour la demande de réinitialisation de mot de passe." #: kallithea/templates/password_reset_confirmation.html:30 msgid "Code you received in the email" msgstr "Le code que vous avez reçu dans l'e-mail" #: kallithea/templates/password_reset_confirmation.html:39 -#| msgid "New password" msgid "New Password" msgstr "Nouveau mot de passe" #: kallithea/templates/password_reset_confirmation.html:48 -#| msgid "Confirm new password" msgid "Confirm New Password" msgstr "Confirmer le nouveau mot de passe" @@ -2579,8 +2595,8 @@ #: kallithea/templates/register.html:92 msgid "Registered accounts are ready to use and need no further action." msgstr "" -"Les comptes enregistrés sont prêts à être utilisés, et ne nécessitent aucune " -"autre action." +"Les comptes enregistrés sont prêts à être utilisés, et ne nécessitent " +"aucune autre action." #: kallithea/templates/register.html:94 msgid "Please wait for an administrator to activate your account." @@ -2686,8 +2702,9 @@ "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" msgstr "" -"Une liste séparée avec des virgules des greffons. L'ordre des greffons est " -"aussi celui dans lequel Kallithea va essayer d'authentifier un utilisateur" +"Une liste séparée avec des virgules des greffons. L'ordre des greffons " +"est aussi celui dans lequel Kallithea va essayer d'authentifier un " +"utilisateur" #: kallithea/templates/admin/auth/auth_settings.html:34 msgid "Available built-in plugins" @@ -3120,8 +3137,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:45 #, python-format msgid "This account is managed with %s and the password cannot be changed here" -msgstr "" -"Ce compte est géré avec %s et le mot de passe ne peut pas être changé ici" +msgstr "Ce compte est géré avec %s et le mot de passe ne peut pas être changé ici" #: kallithea/templates/admin/my_account/my_account_profile.html:11 msgid "Change your avatar at" @@ -3236,9 +3252,9 @@ "permission, note that all custom default permission on repositories will " "be lost" msgstr "" -"Toutes les permissions par défaut de chaque dépôt vont être réinitialisées " -"aux valeurs choisies. Notez que toutes les permissions par défaut " -"personnalisées sur les dépôts seront perdues" +"Toutes les permissions par défaut de chaque dépôt vont être " +"réinitialisées aux valeurs choisies. Notez que toutes les permissions par" +" défaut personnalisées sur les dépôts seront perdues" #: kallithea/templates/admin/permissions/permissions_globals.html:26 msgid "Apply to all existing repositories" @@ -3263,8 +3279,8 @@ "will be lost" msgstr "" "Toutes les permissions par défaut de chaque groupe de dépôts vont être " -"réinitialisées aux valeurs choisies. Notez que toutes les permissions par " -"défaut personnalisées sur les groupes de dépôts seront perdues" +"réinitialisées aux valeurs choisies. Notez que toutes les permissions par" +" défaut personnalisées sur les groupes de dépôts seront perdues" #: kallithea/templates/admin/permissions/permissions_globals.html:40 msgid "Apply to all existing repository groups" @@ -3273,7 +3289,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:41 msgid "Permissions for the Default user on new repository groups." msgstr "" -"Permissions pour l'utilisateur par défaut sur les nouveaux groupes de dépôts." +"Permissions pour l'utilisateur par défaut sur les nouveaux groupes de " +"dépôts." #: kallithea/templates/admin/permissions/permissions_globals.html:46 #: kallithea/templates/data_table/_dt_elements.html:209 @@ -3286,9 +3303,10 @@ "permission, note that all custom default permission on user groups will " "be lost" msgstr "" -"Toutes les permissions par défaut de chaque groupe d'utilisateurs vont être " -"réinitialisées aux valeurs choisies. Notez que toutes les permissions par " -"défaut personnalisées sur les groupes d'utilisateurs seront perdues" +"Toutes les permissions par défaut de chaque groupe d'utilisateurs vont " +"être réinitialisées aux valeurs choisies. Notez que toutes les " +"permissions par défaut personnalisées sur les groupes d'utilisateurs " +"seront perdues" #: kallithea/templates/admin/permissions/permissions_globals.html:54 msgid "Apply to all existing user groups" @@ -3307,17 +3325,17 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:64 msgid "Enable this to allow non-admins to create repositories at the top level." msgstr "" -"Activer pour autoriser les non-administrateurs à créer des dépôts au niveau " -"supérieur." +"Activer pour autoriser les non-administrateurs à créer des dépôts au " +"niveau supérieur." #: kallithea/templates/admin/permissions/permissions_globals.html:65 msgid "" "Note: This will also give all users API access to create repositories " "everywhere. That might change in future versions." msgstr "" -"Note : Cela autorisera également tous les utilisateurs à utiliser l'API pour " -"créer des dépôts partout. Ce comportement peut changer dans des versions " -"futures." +"Note : Cela autorisera également tous les utilisateurs à utiliser l'API " +"pour créer des dépôts partout. Ce comportement peut changer dans des " +"versions futures." #: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Repository creation with group write access" @@ -3349,8 +3367,7 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:92 msgid "Enable this to allow non-admins to fork repositories." -msgstr "" -"Activer pour autoriser les non-administrateurs à faire des fork de dépôt." +msgstr "Activer pour autoriser les non-administrateurs à faire des fork de dépôt." #: kallithea/templates/admin/permissions/permissions_globals.html:97 msgid "Registration" @@ -3567,8 +3584,8 @@ "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -"Optionnel : URL d'un dépôt distant. Si renseigné, le dépôt sera créé comme " -"un clone à partir de cette URL." +"Optionnel : URL d'un dépôt distant. Si renseigné, le dépôt sera créé " +"comme un clone à partir de cette URL." #: kallithea/templates/admin/repos/repo_add_base.html:32 #: kallithea/templates/admin/repos/repo_edit_settings.html:69 @@ -3626,8 +3643,8 @@ "We're sorry but error occurred during this operation. Please check your " "Kallithea server logs, or contact administrator." msgstr "" -"Désolé, une erreur est survenue pendant l'opération. Vérifiez les journaux " -"du serveur Kallithea, ou contactez votre administrateur." +"Désolé, une erreur est survenue pendant l'opération. Vérifiez les " +"journaux du serveur Kallithea, ou contactez votre administrateur." #: kallithea/templates/admin/repos/repo_edit.html:8 #, python-format @@ -3684,8 +3701,8 @@ "All actions done in this repository will be visible to everyone in the " "public journal." msgstr "" -"Les actions réalisées sur ce dépôt seront visibles à tous depuis le journal " -"public." +"Les actions réalisées sur ce dépôt seront visibles à tous depuis le " +"journal public." #: kallithea/templates/admin/repos/repo_edit_advanced.html:46 msgid "Change Locking" @@ -3699,6 +3716,11 @@ msgid "Unlock Repository" msgstr "Déverrouiller le dépôt" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#, python-format +msgid "Locked by %s on %s" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Confirm to lock repository." msgstr "Veuillez confirmer le verrouillage de ce dépôt." @@ -3718,10 +3740,10 @@ "pulling locks the repository; only the user who pulled and locked it can " "unlock it by doing a push." msgstr "" -"Forcer le verrouillage du dépôt. Ne fonctionne que lorsque l'accès anonyme " -"est désactivé. Déclencher un pull verrouille le dépôt. L'utilisateur qui " -"fait le pull verrouille le dépôt ; seul l'utilisateur qui a fait le pull et " -"a verrouillé peut déverrouiller en faisant un push." +"Forcer le verrouillage du dépôt. Ne fonctionne que lorsque l'accès " +"anonyme est désactivé. Déclencher un pull verrouille le dépôt. " +"L'utilisateur qui fait le pull verrouille le dépôt ; seul l'utilisateur " +"qui a fait le pull et a verrouillé peut déverrouiller en faisant un push." #: kallithea/templates/admin/repos/repo_edit_advanced.html:79 #: kallithea/templates/data_table/_dt_elements.html:130 @@ -3754,9 +3776,9 @@ "administrator expires it. The administrator can both permanently delete " "it or restore it." msgstr "" -"Le dépôt supprimé sera mis de côté et caché jusqu'à ce que l'administrateur " -"le fasse expirer. L'administrateur peut soit le supprimer définitivement, " -"soit le restaurer." +"Le dépôt supprimé sera mis de côté et caché jusqu'à ce que " +"l'administrateur le fasse expirer. L'administrateur peut soit le " +"supprimer définitivement, soit le restaurer." #: kallithea/templates/admin/repos/repo_edit_caches.html:4 msgid "Invalidate Repository Cache" @@ -3771,8 +3793,8 @@ "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." msgstr "" -"Invalider manuellement le cache de ce dépôt. Au prochain accès sur ce dépôt, " -"il sera à nouveau mis en cache." +"Invalider manuellement le cache de ce dépôt. Au prochain accès sur ce " +"dépôt, il sera à nouveau mis en cache." #: kallithea/templates/admin/repos/repo_edit_caches.html:12 msgid "List of Cached Values" @@ -3844,8 +3866,7 @@ #: kallithea/templates/admin/repos/repo_edit_remote.html:11 msgid "Confirm to pull changes from remote repository." -msgstr "" -"Voulez-vous vraiment récupérer les changements depuis le dépôt distant ?" +msgstr "Voulez-vous vraiment récupérer les changements depuis le dépôt distant ?" #: kallithea/templates/admin/repos/repo_edit_remote.html:17 msgid "This repository does not have a remote repository URL." @@ -3874,11 +3895,11 @@ msgstr "" "Si ce dépôt est renommé ou déplacé dans un autre groupe, l'URL du dépôt " "change.\n" -" L'utilisation de l'URL permanente ci-dessus " -"garantit que ce dépôt sera toujours accessible via cette URL.\n" +" L'utilisation de l'URL permanente ci-" +"dessus garantit que ce dépôt sera toujours accessible via cette URL.\n" " Cela peut être utile pour les systèmes " -"d'intégration continue, ou dans tous les cas où vous devez saisir l'URL « en " -"dur » dans un service tiers." +"d'intégration continue, ou dans tous les cas où vous devez saisir l'URL " +"« en dur » dans un service tiers." #: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" @@ -4026,9 +4047,9 @@ "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" -"Les hooks peuvent être utilisés pour déclencher des actions lors de certains " -"évènements comme le push et le pull. Ils peuvent déclencher des fonctions " -"Python ou des applications externes." +"Les hooks peuvent être utilisés pour déclencher des actions lors de " +"certains évènements comme le push et le pull. Ils peuvent déclencher des " +"fonctions Python ou des applications externes." #: kallithea/templates/admin/settings/settings_hooks.html:19 msgid "Custom Hooks" @@ -4051,9 +4072,9 @@ "Check this option to remove all comments, pull requests and other records" " related to repositories that no longer exist in the filesystem." msgstr "" -"Cocher cette option pour supprimer tous les commentaires, les requêtes de " -"pull et d'autres informations liées aux dépôts qui n'existent plus sur le " -"système de fichiers." +"Cocher cette option pour supprimer tous les commentaires, les requêtes de" +" pull et d'autres informations liées aux dépôts qui n'existent plus sur " +"le système de fichiers." #: kallithea/templates/admin/settings/settings_mapping.html:17 msgid "Invalidate cache for all repositories" @@ -4061,8 +4082,7 @@ #: kallithea/templates/admin/settings/settings_mapping.html:19 msgid "Check this to reload data and clear cache keys for all repositories." -msgstr "" -"Cocher pour recharger les données et vider le cache pour tous les dépôts." +msgstr "Cocher pour recharger les données et vider le cache pour tous les dépôts." #: kallithea/templates/admin/settings/settings_mapping.html:23 msgid "Install Git hooks" @@ -4073,8 +4093,8 @@ "Verify if Kallithea's Git hooks are installed for each repository. " "Current hooks will be updated to the latest version." msgstr "" -"Vérifier si les hooks Git de Kallithea sont installés pour chaque dépôt. Les " -"hooks actuels seront mis à jour vers la dernière version." +"Vérifier si les hooks Git de Kallithea sont installés pour chaque dépôt. " +"Les hooks actuels seront mis à jour vers la dernière version." #: kallithea/templates/admin/settings/settings_mapping.html:28 msgid "Overwrite existing Git hooks" @@ -4086,9 +4106,9 @@ "not seem to come from Kallithea. WARNING: This operation will destroy any" " custom git hooks you may have deployed by hand!" msgstr "" -"Lors de l'installation des hooks Git, écraser tous les hooks existants, même " -"s'ils ne semblent pas provenir de Kallithea. ATTENTION : cette opération " -"détruira tous les hooks Git que vous avez déployés à la main !" +"Lors de l'installation des hooks Git, écraser tous les hooks existants, " +"même s'ils ne semblent pas provenir de Kallithea. ATTENTION : cette " +"opération détruira tous les hooks Git que vous avez déployés à la main !" #: kallithea/templates/admin/settings/settings_mapping.html:35 msgid "Rescan Repositories" @@ -4107,8 +4127,8 @@ "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -"Cette option ré-indexe complètement tous les dépôts pour pouvoir faire des " -"recherches dans le texte complet." +"Cette option ré-indexe complètement tous les dépôts pour pouvoir faire " +"des recherches dans le texte complet." #: kallithea/templates/admin/settings/settings_search.html:21 msgid "Reindex" @@ -4171,9 +4191,9 @@ "Activate to require SSL both pushing and pulling. If SSL certificate is " "missing, it will return an HTTP Error 406: Not Acceptable." msgstr "" -"Activez pour faire en sorte que Kallithea force l'utilisation de SSL pour " -"pousser ou tirer. Si le certificat SSL est manquant, une erreur « HTTP 406: " -"Not Acceptable » sera renvoyée." +"Activez pour faire en sorte que Kallithea force l'utilisation de SSL pour" +" pousser ou tirer. Si le certificat SSL est manquant, une erreur « HTTP " +"406: Not Acceptable » sera renvoyée." #: kallithea/templates/admin/settings/settings_vcs.html:24 msgid "Show repository size after push" @@ -4208,8 +4228,8 @@ "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -"La bibliothèque hgsubversion doit être installée. Elle permet de cloner des " -"dépôts SVN distants et de les migrer vers Mercurial." +"La bibliothèque hgsubversion doit être installée. Elle permet de cloner " +"des dépôts SVN distants et de les migrer vers Mercurial." #: kallithea/templates/admin/settings/settings_vcs.html:64 msgid "Location of repositories" @@ -4229,7 +4249,8 @@ "value, a restart and rescan of the repository folder are both required." msgstr "" "Emplacement où les dépôts sont stockés sur le système de fichiers. La " -"modification de cette valeur nécessite un re-démarrage et un nouveau scan." +"modification de cette valeur nécessite un re-démarrage et un nouveau " +"scan." #: kallithea/templates/admin/settings/settings_visual.html:8 msgid "General" @@ -4242,7 +4263,8 @@ #: kallithea/templates/admin/settings/settings_visual.html:15 msgid "Allows storing additional customized fields per repository." msgstr "" -"Permet d'enregistrer des champs personnalisés additionnels pour chaque dépôt." +"Permet d'enregistrer des champs personnalisés additionnels pour chaque " +"dépôt." #: kallithea/templates/admin/settings/settings_visual.html:18 msgid "Show Kallithea version" @@ -4250,8 +4272,7 @@ #: kallithea/templates/admin/settings/settings_visual.html:20 msgid "Shows or hides a version number of Kallithea displayed in the footer." -msgstr "" -"Afficher ou cacher le numéro de version de Kallithea dans le pied de page." +msgstr "Afficher ou cacher le numéro de version de Kallithea dans le pied de page." #: kallithea/templates/admin/settings/settings_visual.html:24 msgid "Use Gravatars in Kallithea" @@ -4276,15 +4297,16 @@ "L'URL de Gravatar vous permet d'utiliser un autre serveur d'avatars.\n" " Les variables " "suivantes dans l'URL seront remplacées comme suit :\n" -" {scheme} 'http' " -"ou 'https' envoyé à partir du serveur Kallithea en cours d'utilisation,\n" -" {email} adresse " -"e-mail de l'utilisateur,\n" +" {scheme} " +"'http' ou 'https' envoyé à partir du serveur Kallithea en cours " +"d'utilisation,\n" +" {email} " +"adresse e-mail de l'utilisateur,\n" " {md5email} " "empreinte md5 (hash) de l'adresse e-mail de l'utilisateur (comme sur " "gravatar.com),\n" -" {size} taille " -"de l'image demandée au serveur,\n" +" {size} " +"taille de l'image demandée au serveur,\n" " {netloc} " "emplacement réseau/hôte du serveur Kallithea en cours d'utilisation." @@ -4309,16 +4331,17 @@ "'{scheme}://{user}@{netloc}/{repo}'.\n" " Les variables " "suivantes sont disponibles :\n" -" {scheme} 'http' " -"ou 'https' envoyé à partir du serveur Kallithea en cours d'utilisation,\n" -" {user} nom de " -"l'utilisateur courant,\n" +" {scheme} " +"'http' ou 'https' envoyé à partir du serveur Kallithea en cours " +"d'utilisation,\n" +" {user} nom de" +" l'utilisateur courant,\n" " {netloc} " "emplacement réseau/hôte du serveur Kallithea en cours d'utilisation,\n" " {repo} nom " "complet du dépôt,\n" -" {repoid} ID du " -"dépôt, peut être utilisé pour cloner par ID." +" {repoid} ID du" +" dépôt, peut être utilisé pour cloner par ID." #: kallithea/templates/admin/settings/settings_visual.html:55 msgid "Dashboard items" @@ -4329,8 +4352,8 @@ "Number of items displayed in the main page dashboard before pagination is" " shown." msgstr "" -"Nombre d'éléments affichés dans la page principale du tableau de bord avant " -"d'afficher la pagination." +"Nombre d'éléments affichés dans la page principale du tableau de bord " +"avant d'afficher la pagination." #: kallithea/templates/admin/settings/settings_visual.html:65 msgid "Admin pages items" @@ -4341,8 +4364,8 @@ "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -"Nombre d'éléments affichés dans les grilles des pages admin avant d'afficher " -"la pagination." +"Nombre d'éléments affichés dans les grilles des pages admin avant " +"d'afficher la pagination." #: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Icons" @@ -4513,7 +4536,8 @@ #: kallithea/templates/admin/users/user_edit_profile.html:12 msgid "Missing email, please update this user email address." msgstr "" -"E-mail manquant, veuillez mettre à jour l'adresse e-mail de cet utilisateur." +"E-mail manquant, veuillez mettre à jour l'adresse e-mail de cet " +"utilisateur." #: kallithea/templates/admin/users/user_edit_profile.html:51 msgid "Name in Source of Record" @@ -4716,8 +4740,8 @@ "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -"Sélectionner pour hériter des réglages généraux, de la liste blanche d'IP et " -"des permissions depuis les %s." +"Sélectionner pour hériter des réglages généraux, de la liste blanche d'IP" +" et des permissions depuis les %s." #: kallithea/templates/base/default_perms_box.html:28 msgid "Create repositories" @@ -4726,7 +4750,8 @@ #: kallithea/templates/base/default_perms_box.html:33 msgid "Select this option to allow repository creation for this user" msgstr "" -"Sélectionner cette option pour autoriser cet utilisateur à créer des dépôts" +"Sélectionner cette option pour autoriser cet utilisateur à créer des " +"dépôts" #: kallithea/templates/base/default_perms_box.html:40 msgid "Create user groups" @@ -4735,8 +4760,8 @@ #: kallithea/templates/base/default_perms_box.html:45 msgid "Select this option to allow user group creation for this user" msgstr "" -"Sélectionner cette option pour autoriser cet utilisateur à créer des groupes " -"d'utilisateurs" +"Sélectionner cette option pour autoriser cet utilisateur à créer des " +"groupes d'utilisateurs" #: kallithea/templates/base/default_perms_box.html:52 msgid "Fork repositories" @@ -4745,7 +4770,8 @@ #: kallithea/templates/base/default_perms_box.html:57 msgid "Select this option to allow repository forking for this user" msgstr "" -"Sélectionner cette option pour autoriser cet utilisateur à forker des dépôts" +"Sélectionner cette option pour autoriser cet utilisateur à forker des " +"dépôts" #: kallithea/templates/base/perms_summary.html:13 #: kallithea/templates/changelog/changelog.html:42 @@ -4808,7 +4834,6 @@ msgstr "Aucun fichier correspondant" #: kallithea/templates/base/root.html:31 -#| msgid "on pull request" msgid "Open New Pull Request from {0}" msgstr "Ouvrir une nouvelle requête de pull à partir de {0}" @@ -4817,7 +4842,6 @@ msgstr "Ouvrir une nouvelle requête de pull pour {0} → {1}" #: kallithea/templates/base/root.html:33 -#| msgid "Show Selected Changeset __S" msgid "Show Selected Changesets {0} → {1}" msgstr "Afficher les changesets sélectionnés {0} → {1}" @@ -4981,7 +5005,7 @@ msgid "Branch %s" msgstr "Branche %s" -#: kallithea/templates/changelog/changelog.html:310 +#: kallithea/templates/changelog/changelog.html:309 msgid "There are no changes yet" msgstr "Il n’y a aucun changement pour le moment" @@ -5166,8 +5190,8 @@ #: kallithea/templates/changeset/changeset_file_comment.html:62 msgid "Use @username inside this text to notify another user" msgstr "" -"Utilisez @nomutilisateur dans ce texte pour envoyer une notification à un " -"autre utilisateur" +"Utilisez @nomutilisateur dans ce texte pour envoyer une notification à un" +" autre utilisateur" #: kallithea/templates/changeset/changeset_file_comment.html:72 #: kallithea/templates/changeset/changeset_file_comment.html:184 @@ -5224,8 +5248,8 @@ #: kallithea/templates/changeset/changeset_file_comment.html:150 msgid "Use @username inside this text to notify another user." msgstr "" -"Utilisez @nomutilisateur dans ce texte pour envoyer une notification à un " -"autre utilisateur." +"Utilisez @nomutilisateur dans ce texte pour envoyer une notification à un" +" autre utilisateur." #: kallithea/templates/changeset/changeset_file_comment.html:157 msgid "Vote for pull request status" @@ -5419,8 +5443,8 @@ "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -"Si vous ne pouvez pas utiliser le lien ci-dessus, merci de saisir le code " -"suivant dans le formulaire de réinitialisation de mot de passe" +"Si vous ne pouvez pas utiliser le lien ci-dessus, merci de saisir le code" +" suivant dans le formulaire de réinitialisation de mot de passe" #: kallithea/templates/email_templates/password_reset.html:12 msgid "" @@ -5628,14 +5652,14 @@ #: kallithea/templates/files/files_source.html:44 msgid "Editing files allowed only when on branch head revision" msgstr "" -"Édition de fichiers autorisée uniquement sur la révision de tête (head) de " -"la branche" +"Édition de fichiers autorisée uniquement sur la révision de tête (head) " +"de la branche" #: kallithea/templates/files/files_source.html:45 msgid "Deleting files allowed only when on branch head revision" msgstr "" -"Suppression de fichiers autorisée uniquement sur la révision de tête (head) " -"de la branche" +"Suppression de fichiers autorisée uniquement sur la révision de tête " +"(head) de la branche" #: kallithea/templates/files/files_source.html:63 #, python-format @@ -5897,8 +5921,8 @@ "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -"Ceci est juste une série de changesets, et n'a pas de cible ou de véritable " -"ancêtre de fusion." +"Ceci est juste une série de changesets, et n'a pas de cible ou de " +"véritable ancêtre de fusion." #: kallithea/templates/pullrequests/pullrequest_show.html:133 msgid "Pull changes" @@ -5954,8 +5978,9 @@ msgstr "Requêtes de pull pour %s" #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 -#, python-format -msgid "Pull Requests from %s'" +#, fuzzy, python-format +#| msgid "Pull Requests from %s'" +msgid "Pull Requests from '%s'" msgstr "Requête de pull depuis %s'" #: kallithea/templates/pullrequests/pullrequest_show_all.html:13 @@ -5988,7 +6013,8 @@ #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -"Afficher les requêtes de pull fermées (en plus des requêtes de pull ouvertes)" +"Afficher les requêtes de pull fermées (en plus des requêtes de pull " +"ouvertes)" #: kallithea/templates/pullrequests/pullrequest_show_my.html:35 msgid "Pull Requests Created by Me" @@ -6232,8 +6258,6 @@ #~ msgstr "Aucun fichier" #~ msgid "" -#~ "_: \n" -#~ "" #~ msgstr "" #~ msgid "Username \"%(username)s\" is forbidden" @@ -6422,30 +6446,6 @@ #~ 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" @@ -6469,3 +6469,4 @@ #~ msgid "Created by" #~ msgstr "créé" + diff -r de0a8b4fd5e0 -r da2a9107ee7c kallithea/i18n/hu/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po Thu Jul 13 12:26:01 2017 +0200 +++ b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po Tue Jul 25 16:43:29 2017 +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-09-08 10:34+0200\n" +"POT-Creation-Date: 2017-07-25 16:37+0200\n" "PO-Revision-Date: 2015-04-11 00:59+0200\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian " @@ -24,7 +24,7 @@ msgid "There are no changesets yet" msgstr "" -#: kallithea/controllers/changelog.py:166 +#: kallithea/controllers/changelog.py:165 #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 @@ -36,7 +36,7 @@ msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "" @@ -149,7 +149,7 @@ msgstr "" #: kallithea/controllers/files.py:317 -msgid "You can only delete files with revision being a valid branch " +msgid "You can only delete files with revision being a valid branch" msgstr "" #: kallithea/controllers/files.py:328 @@ -168,7 +168,7 @@ msgstr "" #: kallithea/controllers/files.py:377 -msgid "You can only edit files with revision being a valid branch " +msgid "You can only edit files with revision being a valid branch" msgstr "" #: kallithea/controllers/files.py:391 @@ -287,23 +287,23 @@ msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:157 +#: kallithea/controllers/login.py:152 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:202 +#: kallithea/controllers/login.py:197 msgid "A password reset confirmation code has been sent" msgstr "" +#: kallithea/controllers/login.py:246 +msgid "Invalid password reset token" +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 "" @@ -349,7 +349,7 @@ #: kallithea/controllers/pullrequests.py:366 #: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:509 +#: kallithea/controllers/pullrequests.py:510 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" @@ -393,46 +393,46 @@ msgid "Pull request update created" msgstr "" -#: kallithea/controllers/pullrequests.py:513 +#: kallithea/controllers/pullrequests.py:514 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:528 +#: kallithea/controllers/pullrequests.py:529 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:594 +#: kallithea/controllers/pullrequests.py:595 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:596 +#: kallithea/controllers/pullrequests.py:597 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:614 +#: kallithea/controllers/pullrequests.py:615 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:617 +#: kallithea/controllers/pullrequests.py:619 msgid "No changesets found for updating this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:625 +#: kallithea/controllers/pullrequests.py:627 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:631 +#: kallithea/controllers/pullrequests.py:633 msgid "Git pull requests don't support updates yet." msgstr "" -#: kallithea/controllers/pullrequests.py:722 +#: kallithea/controllers/pullrequests.py:724 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:729 msgid "Closing." msgstr "" @@ -666,7 +666,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1701 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 msgid "Manual activation of external account" msgstr "" @@ -678,7 +678,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1702 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 msgid "Automatic activation of external account" msgstr "" @@ -895,48 +895,54 @@ msgstr "" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:277 +#: kallithea/controllers/admin/settings.py:284 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:216 +#: kallithea/controllers/admin/settings.py:211 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:273 +#: kallithea/controllers/admin/settings.py:226 +#, fuzzy, python-format +#| msgid "Private Repository" +msgid "Invalidated %s repositories" +msgstr "Tároló törlése" + +#: kallithea/controllers/admin/settings.py:280 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:337 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:335 +#: kallithea/controllers/admin/settings.py:342 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:361 +#: kallithea/controllers/admin/settings.py:368 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:383 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:414 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:421 +#: kallithea/controllers/admin/settings.py:428 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:425 +#: kallithea/controllers/admin/settings.py:432 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:451 +#: kallithea/controllers/admin/settings.py:458 msgid "Whoosh reindex task scheduled" msgstr "" @@ -1025,20 +1031,24 @@ msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:743 +#: kallithea/lib/auth.py:744 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:756 +#: kallithea/lib/auth.py:757 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:812 +#: kallithea/lib/auth.py:785 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/auth.py:832 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:844 +#: kallithea/lib/auth.py:864 msgid "You need to be signed in to view this page" msgstr "" @@ -1046,8 +1056,9 @@ msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:516 kallithea/lib/helpers.py:622 -msgid "Changeset not found" +#: kallithea/lib/base.py:516 +#, python-format +msgid "Changeset for %s %s not found in %s" msgstr "" #: kallithea/lib/diffs.py:66 @@ -1062,160 +1073,165 @@ msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:609 +#: kallithea/lib/helpers.py:610 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:611 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:671 +#: kallithea/lib/helpers.py:623 +#, python-format +msgid "Changeset %s not found" +msgstr "" + +#: kallithea/lib/helpers.py:672 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:677 +#: kallithea/lib/helpers.py:678 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:696 -msgid "and" -msgstr "" - #: kallithea/lib/helpers.py:697 +msgid "and" +msgstr "" + +#: kallithea/lib/helpers.py:698 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:698 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:722 +#: kallithea/lib/helpers.py:723 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:742 +#: kallithea/lib/helpers.py:743 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:752 +#: kallithea/lib/helpers.py:753 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:754 kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:757 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:760 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:762 +#: kallithea/lib/helpers.py:763 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:764 +#: kallithea/lib/helpers.py:765 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:773 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:775 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:777 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:779 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:781 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:783 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:785 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:787 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:789 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:791 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:793 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:795 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:797 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:1125 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1128 +#: kallithea/lib/helpers.py:1129 #: kallithea/templates/compare/compare_diff.html:65 #: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:1195 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:1198 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:1201 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:1204 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:1209 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1444 +#: kallithea/lib/helpers.py:1445 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1384,7 +1400,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1665 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 msgid "Kallithea Administrator" msgstr "" @@ -1495,7 +1511,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2229 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 msgid "Approved" msgstr "" @@ -1510,7 +1526,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2230 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 msgid "Rejected" msgstr "" @@ -1537,7 +1553,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1514 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 msgid "top level" msgstr "" @@ -1684,7 +1700,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1697 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 msgid "Registration disabled" msgstr "" @@ -1711,12 +1727,12 @@ msgstr "" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1691 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 msgid "Repository creation enabled with write permission to a repository group" msgstr "" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 msgid "Repository creation disabled with write permission to a repository group" msgstr "" @@ -1729,100 +1745,100 @@ msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1667 +#: kallithea/model/db.py:1668 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1668 -msgid "Default user has read access to new repositories" -msgstr "" - #: kallithea/model/db.py:1669 -msgid "Default user has write access to new repositories" +msgid "Default user has read access to new repositories" msgstr "" #: kallithea/model/db.py:1670 +msgid "Default user has write access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1671 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1673 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1674 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1675 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1676 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1678 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1679 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1680 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1681 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 -msgid "Only admins can create repository groups" -msgstr "" - #: kallithea/model/db.py:1683 +msgid "Only admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1684 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1685 -msgid "Only admins can create user groups" -msgstr "" - #: kallithea/model/db.py:1686 +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1687 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1688 -msgid "Only admins can create top level repositories" -msgstr "" - #: kallithea/model/db.py:1689 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1690 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1694 -msgid "Only admins can fork repositories" -msgstr "" - #: kallithea/model/db.py:1695 -msgid "Non-admins can can fork repositories" -msgstr "" - -#: kallithea/model/db.py:1698 -msgid "User registration with manual account activation" +msgid "Only admins can fork repositories" +msgstr "" + +#: kallithea/model/db.py:1696 +msgid "Non-admins can fork repositories" msgstr "" #: kallithea/model/db.py:1699 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1700 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2228 +#: kallithea/model/db.py:2238 #, fuzzy msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2231 +#: kallithea/model/db.py:2241 #, fuzzy msgid "Under review" msgstr "" @@ -1849,87 +1865,87 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "" -#: kallithea/model/notification.py:255 -#, python-format -msgid "%(user)s sent message %(age)s" -msgstr "" - #: kallithea/model/notification.py:256 #, python-format -msgid "%(user)s mentioned you %(age)s" +msgid "%(user)s sent message %(age)s" msgstr "" #: kallithea/model/notification.py:257 #, python-format -msgid "%(user)s registered in Kallithea %(age)s" +msgid "%(user)s mentioned you %(age)s" msgstr "" #: kallithea/model/notification.py:258 #, python-format -msgid "%(user)s opened new pull request %(age)s" +msgid "%(user)s registered in Kallithea %(age)s" msgstr "" #: kallithea/model/notification.py:259 #, python-format +msgid "%(user)s opened new pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:260 +#, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "" -#: kallithea/model/notification.py:266 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - #: kallithea/model/notification.py:267 #, python-format -msgid "%(user)s sent message at %(when)s" +msgid "%(user)s commented on changeset at %(when)s" msgstr "" #: kallithea/model/notification.py:268 #, python-format -msgid "%(user)s mentioned you at %(when)s" +msgid "%(user)s sent message at %(when)s" msgstr "" #: kallithea/model/notification.py:269 #, python-format -msgid "%(user)s registered in Kallithea at %(when)s" +msgid "%(user)s mentioned you at %(when)s" msgstr "" #: kallithea/model/notification.py:270 #, python-format -msgid "%(user)s opened new pull request at %(when)s" +msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" #: kallithea/model/notification.py:271 #, python-format +msgid "%(user)s opened new pull request at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:272 +#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:302 +#: kallithea/model/notification.py:303 #, python-format msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:306 #, python-format msgid "New user %(new_username)s registered" msgstr "" -#: kallithea/model/notification.py:307 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - #: kallithea/model/notification.py:308 #, python-format +msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgstr "" + +#: kallithea/model/notification.py:309 +#, python-format msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" -#: kallithea/model/notification.py:321 +#: kallithea/model/notification.py:322 msgid "Closing" msgstr "" @@ -3551,6 +3567,11 @@ msgid "Unlock Repository" msgstr "" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#, python-format +msgid "Locked by %s on %s" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Confirm to lock repository." msgstr "" @@ -4741,7 +4762,7 @@ msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:310 +#: kallithea/templates/changelog/changelog.html:309 msgid "There are no changes yet" msgstr "" @@ -5695,7 +5716,7 @@ #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, python-format -msgid "Pull Requests from %s'" +msgid "Pull Requests from '%s'" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:13 @@ -6271,39 +6292,12 @@ #~ 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 "" @@ -6325,3 +6319,18 @@ #~ msgid "Created by" #~ msgstr "" +#~ msgid "You can only delete files with revision being a valid branch " +#~ msgstr "" + +#~ msgid "You can only edit files with revision being a valid branch " +#~ msgstr "" + +#~ msgid "Changeset not found" +#~ msgstr "" + +#~ msgid "Non-admins can can fork repositories" +#~ msgstr "" + +#~ msgid "Pull Requests from %s'" +#~ msgstr "" + diff -r de0a8b4fd5e0 -r da2a9107ee7c kallithea/i18n/ja/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Thu Jul 13 12:26:01 2017 +0200 +++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Tue Jul 25 16:43:29 2017 +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-09-08 10:34+0200\n" +"POT-Creation-Date: 2017-07-25 16:37+0200\n" "PO-Revision-Date: 2016-01-07 01:53+0000\n" "Last-Translator: Takumi IINO \n" "Language-Team: Japanese " @@ -29,7 +29,7 @@ msgid "There are no changesets yet" msgstr "まだチェンジセットがありません" -#: kallithea/controllers/changelog.py:166 +#: kallithea/controllers/changelog.py:165 #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 @@ -41,7 +41,7 @@ msgid "None" msgstr "なし" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(閉鎖済み)" @@ -154,7 +154,9 @@ msgstr "このリポジトリは %s によって %s にロックされました" #: kallithea/controllers/files.py:317 -msgid "You can only delete files with revision being a valid branch " +#, fuzzy +#| msgid "You can only delete files with revision being a valid branch " +msgid "You can only delete files with revision being a valid branch" msgstr "有効なブランチ上のリビジョンからしかファイルを削除できません" #: kallithea/controllers/files.py:328 @@ -173,7 +175,9 @@ msgstr "コミット中にエラーが発生しました" #: kallithea/controllers/files.py:377 -msgid "You can only edit files with revision being a valid branch " +#, fuzzy +#| msgid "You can only edit files with revision being a valid branch " +msgid "You can only edit files with revision being a valid branch" msgstr "有効なブランチを示すリビジョンでのみファイルを編集できます " #: kallithea/controllers/files.py:391 @@ -292,25 +296,23 @@ msgid "Journal" msgstr "ジャーナル" -#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 msgid "Bad captcha" msgstr "キャプチャが一致しません" -#: kallithea/controllers/login.py:157 +#: kallithea/controllers/login.py:152 msgid "You have successfully registered into Kallithea" msgstr "Kallitheaへの登録を受け付けました" -#: kallithea/controllers/login.py:202 -#| msgid "Your password reset link was sent" +#: kallithea/controllers/login.py:197 msgid "A password reset confirmation code has been sent" msgstr "パスワードリセットの確認コードが送信されました" +#: kallithea/controllers/login.py:246 +msgid "Invalid password reset token" +msgstr "無効なパスワードリセットトークン" + #: kallithea/controllers/login.py:251 -#| 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 "パスワードを更新しました" @@ -356,7 +358,7 @@ #: kallithea/controllers/pullrequests.py:366 #: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:509 +#: kallithea/controllers/pullrequests.py:510 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" @@ -401,46 +403,46 @@ msgid "Pull request update created" msgstr "プルリクエストレビュアー" -#: kallithea/controllers/pullrequests.py:513 +#: kallithea/controllers/pullrequests.py:514 msgid "Pull request updated" msgstr "プルリクエストを更新しました" -#: kallithea/controllers/pullrequests.py:528 +#: kallithea/controllers/pullrequests.py:529 msgid "Successfully deleted pull request" msgstr "プルリクエストの削除に成功しました" -#: kallithea/controllers/pullrequests.py:594 +#: kallithea/controllers/pullrequests.py:595 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:596 +#: kallithea/controllers/pullrequests.py:597 msgid "This pull request has been closed and can not be updated." msgstr "このプルリクエストはすでにクローズされていて、更新することはできません。" -#: kallithea/controllers/pullrequests.py:614 +#: kallithea/controllers/pullrequests.py:615 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:617 +#: kallithea/controllers/pullrequests.py:619 msgid "No changesets found for updating this pull request." msgstr "プルリクエストを更新するためのチェンジセットが見つかりません。" -#: kallithea/controllers/pullrequests.py:625 +#: kallithea/controllers/pullrequests.py:627 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "ノート: ブランチ%sには別のヘッド%sがあります。" -#: kallithea/controllers/pullrequests.py:631 +#: kallithea/controllers/pullrequests.py:633 msgid "Git pull requests don't support updates yet." msgstr "Gitのプルリクエストはまだ更新をサポートしていません。" -#: kallithea/controllers/pullrequests.py:722 +#: kallithea/controllers/pullrequests.py:724 msgid "No permission to change pull request status" msgstr "プルリクエストステータスを変更する権限がありません" -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:729 msgid "Closing." msgstr "クローズ。" @@ -674,7 +676,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1701 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 msgid "Manual activation of external account" msgstr "外部アカウントを手動でアクティベートする" @@ -686,7 +688,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1702 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 msgid "Automatic activation of external account" msgstr "外部アカウントを自動でアクティベートする" @@ -901,48 +903,54 @@ msgstr "\"hgsubversion\"ライブラリが見つからないため、hgsubversionサポートを有効に出来ません" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:277 +#: kallithea/controllers/admin/settings.py:284 msgid "Error occurred while updating application settings" msgstr "アプリケーション設定の更新中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:216 +#: kallithea/controllers/admin/settings.py:211 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "リポジトリの再スキャンに成功しました。 追加: %s 削除: %s。" -#: kallithea/controllers/admin/settings.py:273 +#: kallithea/controllers/admin/settings.py:226 +#, fuzzy, python-format +#| msgid "Invalidate cache for all repositories" +msgid "Invalidated %s repositories" +msgstr "すべてのリポジトリのキャッシュを無効化する" + +#: kallithea/controllers/admin/settings.py:280 msgid "Updated application settings" msgstr "アプリケーション設定を更新しました" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:337 msgid "Updated visualisation settings" msgstr "表示設定を更新しました" -#: kallithea/controllers/admin/settings.py:335 +#: kallithea/controllers/admin/settings.py:342 msgid "Error occurred during updating visualisation settings" msgstr "表示設定の更新中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:361 +#: kallithea/controllers/admin/settings.py:368 msgid "Please enter email address" msgstr "メールアドレスを入力してください" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:383 msgid "Send email task created" msgstr "メール送信タスクを作成しました" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:414 msgid "Added new hook" msgstr "新しいフックを追加しました" -#: kallithea/controllers/admin/settings.py:421 +#: kallithea/controllers/admin/settings.py:428 msgid "Updated hooks" msgstr "フックを更新しました" -#: kallithea/controllers/admin/settings.py:425 +#: kallithea/controllers/admin/settings.py:432 msgid "Error occurred during hook creation" msgstr "フックの作成中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:451 +#: kallithea/controllers/admin/settings.py:458 msgid "Whoosh reindex task scheduled" msgstr "Whooshの再インデックスタスクを予定に入れました" @@ -1031,20 +1039,24 @@ msgid "Removed IP address from user whitelist" msgstr "ユーザーホワイトリストからIPアドレスを削除しました" -#: kallithea/lib/auth.py:743 +#: kallithea/lib/auth.py:744 #, python-format msgid "IP %s not allowed" msgstr "IPアドレス %s は許可されません" -#: kallithea/lib/auth.py:756 +#: kallithea/lib/auth.py:757 msgid "Invalid API key" msgstr "APIキーが無効です" -#: kallithea/lib/auth.py:812 +#: kallithea/lib/auth.py:785 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/auth.py:832 msgid "You need to be a registered user to perform this action" msgstr "このアクションを実行するためには登録済みのユーザーである必要があります" -#: kallithea/lib/auth.py:844 +#: kallithea/lib/auth.py:864 msgid "You need to be signed in to view this page" msgstr "このページを閲覧するためにはサインインが必要です" @@ -1052,8 +1064,10 @@ msgid "Repository not found in the filesystem" msgstr "ファイルシステム内にリポジトリが見つかりません" -#: kallithea/lib/base.py:516 kallithea/lib/helpers.py:622 -msgid "Changeset not found" +#: kallithea/lib/base.py:516 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "Changeset for %s %s not found in %s" msgstr "リビジョンが見つかりません" #: kallithea/lib/diffs.py:66 @@ -1068,168 +1082,174 @@ msgid "No changes detected" msgstr "検出された変更はありません" -#: kallithea/lib/helpers.py:609 +#: kallithea/lib/helpers.py:610 #, python-format msgid "Deleted branch: %s" msgstr "削除されたブランチ: %s" -#: kallithea/lib/helpers.py:611 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Created tag: %s" msgstr "作成したタグ: %s" -#: kallithea/lib/helpers.py:671 +#: kallithea/lib/helpers.py:623 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "Changeset %s not found" +msgstr "リビジョンが見つかりません" + +#: kallithea/lib/helpers.py:672 #, python-format msgid "Show all combined changesets %s->%s" msgstr "%s から %s までのすべてのチェンジセットを表示" -#: kallithea/lib/helpers.py:677 +#: kallithea/lib/helpers.py:678 msgid "Compare view" msgstr "比較ビュー" -#: kallithea/lib/helpers.py:696 +#: kallithea/lib/helpers.py:697 msgid "and" msgstr "と" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:698 #, python-format msgid "%s more" msgstr "%s 以上" -#: kallithea/lib/helpers.py:698 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "リビジョン" -#: kallithea/lib/helpers.py:722 +#: kallithea/lib/helpers.py:723 #, python-format msgid "Fork name %s" msgstr "フォーク名 %s" -#: kallithea/lib/helpers.py:742 +#: kallithea/lib/helpers.py:743 #, python-format msgid "Pull request %s" msgstr "プルリクエスト #%s" -#: kallithea/lib/helpers.py:752 +#: kallithea/lib/helpers.py:753 msgid "[deleted] repository" msgstr "リポジトリを[削除]" -#: kallithea/lib/helpers.py:754 kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 msgid "[created] repository" msgstr "リポジトリを[作成]" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:757 msgid "[created] repository as fork" msgstr "フォークしてリポジトリを[作成]" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 msgid "[forked] repository" msgstr "リポジトリを[フォーク]" -#: kallithea/lib/helpers.py:760 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 msgid "[updated] repository" msgstr "リポジトリを[更新]" -#: kallithea/lib/helpers.py:762 +#: kallithea/lib/helpers.py:763 msgid "[downloaded] archive from repository" msgstr "リポジトリからアーカイブを[ダウンロード]" -#: kallithea/lib/helpers.py:764 +#: kallithea/lib/helpers.py:765 msgid "[delete] repository" msgstr "リポジトリを[削除]" -#: kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:773 msgid "[created] user" msgstr "ユーザーを[作成]" -#: kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:775 msgid "[updated] user" msgstr "ユーザーを[更新]" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:777 msgid "[created] user group" msgstr "ユーザーグループを[作成]" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:779 msgid "[updated] user group" msgstr "ユーザーグループを[更新]" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:781 msgid "[commented] on revision in repository" msgstr "リポジトリのリビジョンに[コメント]" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:783 msgid "[commented] on pull request for" msgstr "プルリクエストに[コメント]" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:785 msgid "[closed] pull request for" msgstr "プルリクエストを[クローズ]" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:787 msgid "[pushed] into" msgstr "[プッシュ]" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:789 msgid "[committed via Kallithea] into repository" msgstr "リポジトリに[Kallithea経由でコミット]" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:791 msgid "[pulled from remote] into repository" msgstr "リポジトリに[リモートからプル]" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:793 msgid "[pulled] from" msgstr "[プル]" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:795 msgid "[started following] repository" msgstr "リポジトリの[フォローを開始]" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:797 msgid "[stopped following] repository" msgstr "リポジトリの[フォローを停止]" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:1125 #, python-format msgid " and %s more" msgstr " と %s 以上" -#: kallithea/lib/helpers.py:1128 +#: kallithea/lib/helpers.py:1129 #: kallithea/templates/compare/compare_diff.html:65 #: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "ファイルはありません" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:1195 msgid "new file" msgstr "新しいファイル" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:1198 msgid "mod" msgstr "変更" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:1201 msgid "del" msgstr "削除" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:1204 msgid "rename" msgstr "リネーム" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:1209 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1444 +#: kallithea/lib/helpers.py:1445 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " "the filesystem please run the application again in order to rescan " "repositories" msgstr "" -"%s リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプ" -"リケーションを再起動してください" +"%s " +"リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを再起動してください" #: kallithea/lib/utils2.py:415 #, python-format @@ -1386,7 +1406,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1665 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 msgid "Kallithea Administrator" msgstr "Kallithea 管理者" @@ -1497,7 +1517,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2229 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 msgid "Approved" msgstr "承認" @@ -1512,7 +1532,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2230 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 msgid "Rejected" msgstr "却下" @@ -1539,7 +1559,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1514 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 msgid "top level" msgstr "top level" @@ -1686,7 +1706,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1697 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 msgid "Registration disabled" msgstr "新規登録を無効にする" @@ -1713,12 +1733,12 @@ msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1691 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 msgid "Repository creation enabled with write permission to a repository group" msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成が有効です" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 msgid "Repository creation disabled with write permission to a repository group" msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成は無効です" @@ -1731,99 +1751,101 @@ msgid "[Mention]" msgstr "[Mention]" -#: kallithea/model/db.py:1667 +#: kallithea/model/db.py:1668 msgid "Default user has no access to new repositories" msgstr "デフォルトユーザーは新しいリポジトリにアクセスできません" -#: kallithea/model/db.py:1668 -msgid "Default user has read access to new repositories" -msgstr "デフォルトユーザーは新しいリポジトリに読み取りアクセスする権限があります" - #: kallithea/model/db.py:1669 -msgid "Default user has write access to new repositories" -msgstr "デフォルトユーザーは新しいリポジトリに書き込みアクセスする権限があります" +msgid "Default user has read access to new repositories" +msgstr "デフォルトユーザーは新しいリポジトリに読み取りアクセスする権限があります" #: kallithea/model/db.py:1670 +msgid "Default user has write access to new repositories" +msgstr "デフォルトユーザーは新しいリポジトリに書き込みアクセスする権限があります" + +#: kallithea/model/db.py:1671 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1673 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1674 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1675 -msgid "Default user has admin access to new repository groups" +msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 -msgid "Default user has no access to new user groups" +#: kallithea/model/db.py:1676 +msgid "Default user has admin access to new repository groups" msgstr "" #: kallithea/model/db.py:1678 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1679 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1680 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1681 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 +#: kallithea/model/db.py:1683 msgid "Only admins can create repository groups" msgstr "管理者のみがリポジトリのグループを作成できます" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1684 msgid "Non-admins can create repository groups" msgstr "非管理者がリポジトリのグループを作成できます" -#: kallithea/model/db.py:1685 +#: kallithea/model/db.py:1686 msgid "Only admins can create user groups" msgstr "管理者だけがユーザー グループを作成することができます" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1687 msgid "Non-admins can create user groups" msgstr "非管理者ユーザーがグループを作成することができます" -#: kallithea/model/db.py:1688 -msgid "Only admins can create top level repositories" -msgstr "管理者だけがトップレベルにリポジトリを作成することができます" - #: kallithea/model/db.py:1689 +msgid "Only admins can create top level repositories" +msgstr "管理者だけがトップレベルにリポジトリを作成することができます" + +#: kallithea/model/db.py:1690 msgid "Non-admins can create top level repositories" msgstr "非管理者がトップレベルにリポジトリを作成することができます" -#: kallithea/model/db.py:1694 -msgid "Only admins can fork repositories" -msgstr "管理者のみがリポジトリをフォークすることができます" - #: kallithea/model/db.py:1695 -msgid "Non-admins can can fork repositories" +msgid "Only admins can fork repositories" +msgstr "管理者のみがリポジトリをフォークすることができます" + +#: kallithea/model/db.py:1696 +#, fuzzy +#| msgid "Non-admins can can fork repositories" +msgid "Non-admins can fork repositories" msgstr "非管理者がリポジトリをフォークすることができます" -#: kallithea/model/db.py:1698 -msgid "User registration with manual account activation" -msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする" - #: kallithea/model/db.py:1699 +msgid "User registration with manual account activation" +msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする" + +#: kallithea/model/db.py:1700 msgid "User registration with automatic account activation" msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする" -#: kallithea/model/db.py:2228 +#: kallithea/model/db.py:2238 msgid "Not reviewed" msgstr "未レビュー" -#: kallithea/model/db.py:2231 +#: kallithea/model/db.py:2241 msgid "Under review" msgstr "レビュー中" @@ -1849,89 +1871,87 @@ msgid "Name must not contain only digits" msgstr "数字だけの名前は使えません" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "%(user)s がチェンジセットにコメント %(age)s" -#: kallithea/model/notification.py:255 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s sent message %(age)s" msgstr "%(user)s がメッセージを送信 %(age)s" -#: kallithea/model/notification.py:256 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s mentioned you %(age)s" msgstr "%(user)s がにあなたにメンション %(age)s" -#: kallithea/model/notification.py:257 +#: kallithea/model/notification.py:258 #, python-format msgid "%(user)s registered in Kallithea %(age)s" msgstr "%(user)s がKallitheaに登録 %(age)s" -#: kallithea/model/notification.py:258 +#: kallithea/model/notification.py:259 #, python-format msgid "%(user)s opened new pull request %(age)s" msgstr "%(user)s が新しいプルリクエストを作成 %(age)s" -#: kallithea/model/notification.py:259 +#: kallithea/model/notification.py:260 #, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "%(user)s がプルリクエストにコメント %(age)s" -#: kallithea/model/notification.py:266 +#: kallithea/model/notification.py:267 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s がチェンジセットにコメント %(when)s" -#: kallithea/model/notification.py:267 +#: kallithea/model/notification.py:268 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s がメッセージを送信 %(when)s" -#: kallithea/model/notification.py:268 +#: kallithea/model/notification.py:269 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s がにあなたにメンション %(when)s" -#: kallithea/model/notification.py:269 +#: kallithea/model/notification.py:270 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s がKallitheaに登録 %(when)s" -#: kallithea/model/notification.py:270 +#: kallithea/model/notification.py:271 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s が新しいプルリクエストを作成 %(when)s" -#: kallithea/model/notification.py:271 +#: kallithea/model/notification.py:272 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s がプルリクエストにコメント %(when)s" -#: kallithea/model/notification.py:302 +#: kallithea/model/notification.py:303 #, python-format msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:306 #, python-format msgid "New user %(new_username)s registered" msgstr "新しいユーザー %(new_username)s が登録されました" -#: kallithea/model/notification.py:307 +#: kallithea/model/notification.py:308 #, fuzzy, python-format -#| msgid "%(user)s wants you to review pull request %(pr_nice_id)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 +#: kallithea/model/notification.py:309 #, 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 +#: kallithea/model/notification.py:322 msgid "Closing" msgstr "クローズ" @@ -1958,8 +1978,7 @@ msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" -msgstr "" -"ユーザー \"%s\" はまだ %s 個のリポジトリの所有者のため削除することはできません。リポジトリの所有者を変更するか削除してください： %s" +msgstr "ユーザー \"%s\" はまだ %s 個のリポジトリの所有者のため削除することはできません。リポジトリの所有者を変更するか削除してください： %s" #: kallithea/model/user.py:266 #, python-format @@ -1976,15 +1995,14 @@ "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "" -"ユーザー \"%s\" はまだ %s 個のユーザーグループの所有者のため削除することはできません。ユーザーグループの所有者を変更するか削除してください。 " -"%s" +"ユーザー \"%s\" はまだ %s " +"個のユーザーグループの所有者のため削除することはできません。ユーザーグループの所有者を変更するか削除してください。 %s" #: kallithea/model/user.py:360 msgid "Password reset link" msgstr "パスワードリセットのリンク" #: kallithea/model/user.py:408 -#| msgid "Password reset link" msgid "Password reset notification" msgstr "パスワードの再設定通知" @@ -2013,9 +2031,7 @@ msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with an alphanumeric character or underscore" -msgstr "" -"ユーザー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットまたはアンダースコア(_)から始まる必" -"要があります" +msgstr "ユーザー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットまたはアンダースコア(_)から始まる必要があります" #: kallithea/model/validators.py:126 msgid "The input is not valid" @@ -2039,8 +2055,7 @@ msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" -msgstr "" -"ユーザーグループ名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります" +msgstr "ユーザーグループ名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります" #: kallithea/model/validators.py:193 msgid "Cannot assign this group as parent" @@ -2420,7 +2435,6 @@ msgstr "パスワードリセットメールを送信" #: kallithea/templates/password_reset.html:47 -#| msgid "" " msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." @@ -2442,12 +2456,10 @@ msgstr "" #: kallithea/templates/password_reset_confirmation.html:39 -#| msgid "New password" msgid "New Password" msgstr "新しいパスワード" #: kallithea/templates/password_reset_confirmation.html:48 -#| msgid "Confirm new password" msgid "Confirm New Password" msgstr "新しいパスワードの確認" @@ -3571,6 +3583,11 @@ msgid "Unlock Repository" msgstr "リポジトリのロックを解除" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#, python-format +msgid "Locked by %s on %s" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Confirm to lock repository." msgstr "このリポジトリをロックしますか？" @@ -4130,16 +4147,16 @@ msgstr "" "クローン URL のスキーマは、 '{scheme}://{user}@{netloc}/{repo}' " "のような形式にします。使える変数は下記の通りです:\n" -" {scheme} Kallithea " -"サーバからリクエストを送信するときに使うスキーム。 'http' または 'https'\n" +" {scheme} " +"Kallithea サーバからリクエストを送信するときに使うスキーム。 'http' または 'https'\n" " {user} " "現在のユーザーのユーザー名\n" -" {netloc} Kallithea " -"サーバーのアドレスまたはホスト名\n" +" {netloc} " +"Kallithea サーバーのアドレスまたはホスト名\n" " {repo} " "リポジトリの完全な名前\n" -" {repoid} リポジトリの ID。 " -"clone-by-id に使います。" +" {repoid} リポジトリの " +"ID。 clone-by-id に使います。" #: kallithea/templates/admin/settings/settings_visual.html:55 msgid "Dashboard items" @@ -4616,7 +4633,6 @@ msgstr "マッチするファイルはありません" #: kallithea/templates/base/root.html:31 -#| msgid "on pull request" msgid "Open New Pull Request from {0}" msgstr "新しいプルリクエストを{0}から作成" @@ -4625,7 +4641,6 @@ msgstr "{0} → {1}から新しいプルリクエストを作成する" #: kallithea/templates/base/root.html:33 -#| msgid "Show Selected Changesets __S → __E" msgid "Show Selected Changesets {0} → {1}" msgstr "選択したチェンジセット{0} → {0}を表示" @@ -4789,7 +4804,7 @@ msgid "Branch %s" msgstr "ブランチ %s" -#: kallithea/templates/changelog/changelog.html:310 +#: kallithea/templates/changelog/changelog.html:309 msgid "There are no changes yet" msgstr "まだ変更がありません" @@ -5207,7 +5222,6 @@ msgstr "こんにちは %s" #: 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 "あなたのアカウントのパスワードリセットリクエストを受け取りました。" @@ -5741,8 +5755,9 @@ msgstr "%s プルリクエスト" #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 -#, python-format -msgid "Pull Requests from %s'" +#, fuzzy, python-format +#| msgid "Pull Requests from %s'" +msgid "Pull Requests from '%s'" msgstr "%s' からのプルリクエスト" #: kallithea/templates/pullrequests/pullrequest_show_all.html:13 @@ -6016,7 +6031,7 @@ #~ msgstr "ファイルなし" #~ msgid "" -#~ msgstr "テキスト内で @username を使うと、その Kallithea のユーザーに通知を送信します" +#~ msgstr "" #~ msgid "Username \"%(username)s\" is forbidden" #~ msgstr "ユーザー名 \"%(username)s\" は許可されていません" @@ -6186,27 +6201,6 @@ #~ 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 "新しいパスワード" @@ -6227,3 +6221,4 @@ #~ msgid "Created by" #~ msgstr "作成日" + diff -r de0a8b4fd5e0 -r da2a9107ee7c kallithea/i18n/kallithea.pot --- a/kallithea/i18n/kallithea.pot Thu Jul 13 12:26:01 2017 +0200 +++ b/kallithea/i18n/kallithea.pot Tue Jul 25 16:43:29 2017 +0200 @@ -1,14 +1,14 @@ # Translations template for Kallithea. -# Copyright (C) 2015 Various authors, licensing as GPLv3 +# Copyright (C) 2017 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. -# FIRST AUTHOR , 2015. +# FIRST AUTHOR , 2017. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Kallithea 0.3\n" +"Project-Id-Version: Kallithea 0.3.2\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2015-09-08 10:34+0200\n" +"POT-Creation-Date: 2017-07-25 16:37+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,7 +21,7 @@ msgid "There are no changesets yet" msgstr "" -#: kallithea/controllers/changelog.py:166 +#: kallithea/controllers/changelog.py:165 #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 @@ -33,7 +33,7 @@ msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "" @@ -142,7 +142,7 @@ msgstr "" #: kallithea/controllers/files.py:317 -msgid "You can only delete files with revision being a valid branch " +msgid "You can only delete files with revision being a valid branch" msgstr "" #: kallithea/controllers/files.py:328 @@ -161,7 +161,7 @@ msgstr "" #: kallithea/controllers/files.py:377 -msgid "You can only edit files with revision being a valid branch " +msgid "You can only edit files with revision being a valid branch" msgstr "" #: kallithea/controllers/files.py:391 @@ -280,23 +280,23 @@ msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:157 +#: kallithea/controllers/login.py:152 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:202 +#: kallithea/controllers/login.py:197 msgid "A password reset confirmation code has been sent" msgstr "" +#: kallithea/controllers/login.py:246 +msgid "Invalid password reset token" +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 "" @@ -342,7 +342,7 @@ #: kallithea/controllers/pullrequests.py:366 #: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:509 +#: kallithea/controllers/pullrequests.py:510 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" @@ -384,46 +384,46 @@ msgid "Pull request update created" msgstr "" -#: kallithea/controllers/pullrequests.py:513 +#: kallithea/controllers/pullrequests.py:514 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:528 +#: kallithea/controllers/pullrequests.py:529 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:594 +#: kallithea/controllers/pullrequests.py:595 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:596 +#: kallithea/controllers/pullrequests.py:597 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:614 +#: kallithea/controllers/pullrequests.py:615 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:617 +#: kallithea/controllers/pullrequests.py:619 msgid "No changesets found for updating this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:625 +#: kallithea/controllers/pullrequests.py:627 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:631 +#: kallithea/controllers/pullrequests.py:633 msgid "Git pull requests don't support updates yet." msgstr "" -#: kallithea/controllers/pullrequests.py:722 +#: kallithea/controllers/pullrequests.py:724 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:729 msgid "Closing." msgstr "" @@ -657,7 +657,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1701 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 msgid "Manual activation of external account" msgstr "" @@ -669,7 +669,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1702 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 msgid "Automatic activation of external account" msgstr "" @@ -882,48 +882,53 @@ msgstr "" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:277 +#: kallithea/controllers/admin/settings.py:284 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:216 +#: kallithea/controllers/admin/settings.py:211 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:273 +#: kallithea/controllers/admin/settings.py:226 +#, python-format +msgid "Invalidated %s repositories" +msgstr "" + +#: kallithea/controllers/admin/settings.py:280 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:337 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:335 +#: kallithea/controllers/admin/settings.py:342 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:361 +#: kallithea/controllers/admin/settings.py:368 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:383 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:414 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:421 +#: kallithea/controllers/admin/settings.py:428 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:425 +#: kallithea/controllers/admin/settings.py:432 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:451 +#: kallithea/controllers/admin/settings.py:458 msgid "Whoosh reindex task scheduled" msgstr "" @@ -1012,20 +1017,24 @@ msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:743 +#: kallithea/lib/auth.py:744 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:756 +#: kallithea/lib/auth.py:757 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:812 +#: kallithea/lib/auth.py:785 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/auth.py:832 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:844 +#: kallithea/lib/auth.py:864 msgid "You need to be signed in to view this page" msgstr "" @@ -1033,8 +1042,9 @@ msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:516 kallithea/lib/helpers.py:622 -msgid "Changeset not found" +#: kallithea/lib/base.py:516 +#, python-format +msgid "Changeset for %s %s not found in %s" msgstr "" #: kallithea/lib/diffs.py:66 @@ -1049,160 +1059,165 @@ msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:609 +#: kallithea/lib/helpers.py:610 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:611 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:671 +#: kallithea/lib/helpers.py:623 +#, python-format +msgid "Changeset %s not found" +msgstr "" + +#: kallithea/lib/helpers.py:672 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:677 +#: kallithea/lib/helpers.py:678 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:696 -msgid "and" -msgstr "" - #: kallithea/lib/helpers.py:697 +msgid "and" +msgstr "" + +#: kallithea/lib/helpers.py:698 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:698 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:722 +#: kallithea/lib/helpers.py:723 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:742 +#: kallithea/lib/helpers.py:743 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:752 +#: kallithea/lib/helpers.py:753 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:754 kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:757 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:760 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:762 +#: kallithea/lib/helpers.py:763 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:764 +#: kallithea/lib/helpers.py:765 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:773 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:775 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:777 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:779 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:781 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:783 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:785 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:787 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:789 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:791 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:793 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:795 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:797 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:1125 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1128 +#: kallithea/lib/helpers.py:1129 #: kallithea/templates/compare/compare_diff.html:65 #: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:1195 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:1198 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:1201 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:1204 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:1209 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1444 +#: kallithea/lib/helpers.py:1445 #, python-format msgid "%s repository is not mapped to db perhaps it was created or renamed from the filesystem please run the application again in order to rescan repositories" msgstr "" @@ -1368,7 +1383,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1665 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 msgid "Kallithea Administrator" msgstr "" @@ -1479,7 +1494,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2229 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 msgid "Approved" msgstr "" @@ -1494,7 +1509,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2230 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 msgid "Rejected" msgstr "" @@ -1521,7 +1536,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1514 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 msgid "top level" msgstr "" @@ -1668,7 +1683,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1697 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 msgid "Registration disabled" msgstr "" @@ -1695,12 +1710,12 @@ msgstr "" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1691 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 msgid "Repository creation enabled with write permission to a repository group" msgstr "" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 msgid "Repository creation disabled with write permission to a repository group" msgstr "" @@ -1713,99 +1728,99 @@ msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1667 +#: kallithea/model/db.py:1668 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1668 -msgid "Default user has read access to new repositories" -msgstr "" - #: kallithea/model/db.py:1669 -msgid "Default user has write access to new repositories" +msgid "Default user has read access to new repositories" msgstr "" #: kallithea/model/db.py:1670 +msgid "Default user has write access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1671 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1673 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1674 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1675 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1676 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1678 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1679 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1680 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1681 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 -msgid "Only admins can create repository groups" -msgstr "" - #: kallithea/model/db.py:1683 +msgid "Only admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1684 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1685 -msgid "Only admins can create user groups" -msgstr "" - #: kallithea/model/db.py:1686 +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1687 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1688 -msgid "Only admins can create top level repositories" -msgstr "" - #: kallithea/model/db.py:1689 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1690 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1694 -msgid "Only admins can fork repositories" -msgstr "" - #: kallithea/model/db.py:1695 -msgid "Non-admins can can fork repositories" -msgstr "" - -#: kallithea/model/db.py:1698 -msgid "User registration with manual account activation" +msgid "Only admins can fork repositories" +msgstr "" + +#: kallithea/model/db.py:1696 +msgid "Non-admins can fork repositories" msgstr "" #: kallithea/model/db.py:1699 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1700 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2228 +#: kallithea/model/db.py:2238 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2231 +#: kallithea/model/db.py:2241 msgid "Under review" msgstr "" @@ -1831,87 +1846,87 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "" -#: kallithea/model/notification.py:255 -#, python-format -msgid "%(user)s sent message %(age)s" -msgstr "" - #: kallithea/model/notification.py:256 #, python-format -msgid "%(user)s mentioned you %(age)s" +msgid "%(user)s sent message %(age)s" msgstr "" #: kallithea/model/notification.py:257 #, python-format -msgid "%(user)s registered in Kallithea %(age)s" +msgid "%(user)s mentioned you %(age)s" msgstr "" #: kallithea/model/notification.py:258 #, python-format -msgid "%(user)s opened new pull request %(age)s" +msgid "%(user)s registered in Kallithea %(age)s" msgstr "" #: kallithea/model/notification.py:259 #, python-format +msgid "%(user)s opened new pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:260 +#, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "" -#: kallithea/model/notification.py:266 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - #: kallithea/model/notification.py:267 #, python-format -msgid "%(user)s sent message at %(when)s" +msgid "%(user)s commented on changeset at %(when)s" msgstr "" #: kallithea/model/notification.py:268 #, python-format -msgid "%(user)s mentioned you at %(when)s" +msgid "%(user)s sent message at %(when)s" msgstr "" #: kallithea/model/notification.py:269 #, python-format -msgid "%(user)s registered in Kallithea at %(when)s" +msgid "%(user)s mentioned you at %(when)s" msgstr "" #: kallithea/model/notification.py:270 #, python-format -msgid "%(user)s opened new pull request at %(when)s" +msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" #: kallithea/model/notification.py:271 #, python-format +msgid "%(user)s opened new pull request at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:272 +#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:302 +#: kallithea/model/notification.py:303 #, python-format msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:306 #, python-format msgid "New user %(new_username)s registered" msgstr "" -#: kallithea/model/notification.py:307 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - #: kallithea/model/notification.py:308 #, python-format +msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgstr "" + +#: kallithea/model/notification.py:309 +#, python-format msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" -#: kallithea/model/notification.py:321 +#: kallithea/model/notification.py:322 msgid "Closing" msgstr "" @@ -3476,6 +3491,11 @@ msgid "Unlock Repository" msgstr "" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#, python-format +msgid "Locked by %s on %s" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Confirm to lock repository." msgstr "" @@ -4605,7 +4625,7 @@ msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:310 +#: kallithea/templates/changelog/changelog.html:309 msgid "There are no changes yet" msgstr "" @@ -5551,7 +5571,7 @@ #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, python-format -msgid "Pull Requests from %s'" +msgid "Pull Requests from '%s'" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:13 diff -r de0a8b4fd5e0 -r da2a9107ee7c kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po Thu Jul 13 12:26:01 2017 +0200 +++ b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po Tue Jul 25 16:43:29 2017 +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-09-08 10:34+0200\n" +"POT-Creation-Date: 2017-07-25 16:37+0200\n" "PO-Revision-Date: 2017-01-10 07:35+0000\n" "Last-Translator: Sam Jaques \n" "Language-Team: Dutch (Belgium) " @@ -24,7 +24,7 @@ msgid "There are no changesets yet" msgstr "Er zijn nog geen changesets" -#: kallithea/controllers/changelog.py:166 +#: kallithea/controllers/changelog.py:165 #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 @@ -36,7 +36,7 @@ msgid "None" msgstr "Geen" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(gesloten)" @@ -152,7 +152,7 @@ msgstr "" #: kallithea/controllers/files.py:317 -msgid "You can only delete files with revision being a valid branch " +msgid "You can only delete files with revision being a valid branch" msgstr "" #: kallithea/controllers/files.py:328 @@ -171,7 +171,7 @@ msgstr "" #: kallithea/controllers/files.py:377 -msgid "You can only edit files with revision being a valid branch " +msgid "You can only edit files with revision being a valid branch" msgstr "" #: kallithea/controllers/files.py:391 @@ -290,23 +290,23 @@ msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:157 +#: kallithea/controllers/login.py:152 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:202 +#: kallithea/controllers/login.py:197 msgid "A password reset confirmation code has been sent" msgstr "" +#: kallithea/controllers/login.py:246 +msgid "Invalid password reset token" +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 "" @@ -352,7 +352,7 @@ #: kallithea/controllers/pullrequests.py:366 #: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:509 +#: kallithea/controllers/pullrequests.py:510 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" @@ -396,46 +396,46 @@ msgid "Pull request update created" msgstr "" -#: kallithea/controllers/pullrequests.py:513 +#: kallithea/controllers/pullrequests.py:514 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:528 +#: kallithea/controllers/pullrequests.py:529 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:594 +#: kallithea/controllers/pullrequests.py:595 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:596 +#: kallithea/controllers/pullrequests.py:597 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:614 +#: kallithea/controllers/pullrequests.py:615 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:617 +#: kallithea/controllers/pullrequests.py:619 msgid "No changesets found for updating this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:625 +#: kallithea/controllers/pullrequests.py:627 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:631 +#: kallithea/controllers/pullrequests.py:633 msgid "Git pull requests don't support updates yet." msgstr "" -#: kallithea/controllers/pullrequests.py:722 +#: kallithea/controllers/pullrequests.py:724 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:729 msgid "Closing." msgstr "" @@ -669,7 +669,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1701 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 msgid "Manual activation of external account" msgstr "" @@ -681,7 +681,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1702 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 msgid "Automatic activation of external account" msgstr "" @@ -898,48 +898,53 @@ msgstr "" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:277 +#: kallithea/controllers/admin/settings.py:284 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:216 +#: kallithea/controllers/admin/settings.py:211 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:273 +#: kallithea/controllers/admin/settings.py:226 +#, python-format +msgid "Invalidated %s repositories" +msgstr "" + +#: kallithea/controllers/admin/settings.py:280 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:337 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:335 +#: kallithea/controllers/admin/settings.py:342 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:361 +#: kallithea/controllers/admin/settings.py:368 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:383 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:414 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:421 +#: kallithea/controllers/admin/settings.py:428 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:425 +#: kallithea/controllers/admin/settings.py:432 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:451 +#: kallithea/controllers/admin/settings.py:458 msgid "Whoosh reindex task scheduled" msgstr "" @@ -1028,20 +1033,24 @@ msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:743 +#: kallithea/lib/auth.py:744 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:756 +#: kallithea/lib/auth.py:757 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:812 +#: kallithea/lib/auth.py:785 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/auth.py:832 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:844 +#: kallithea/lib/auth.py:864 msgid "You need to be signed in to view this page" msgstr "" @@ -1049,8 +1058,9 @@ msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:516 kallithea/lib/helpers.py:622 -msgid "Changeset not found" +#: kallithea/lib/base.py:516 +#, python-format +msgid "Changeset for %s %s not found in %s" msgstr "" #: kallithea/lib/diffs.py:66 @@ -1065,160 +1075,166 @@ msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:609 +#: kallithea/lib/helpers.py:610 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:611 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:671 +#: kallithea/lib/helpers.py:623 +#, fuzzy, python-format +#| msgid "Set changeset status" +msgid "Changeset %s not found" +msgstr "Selecteer de changeset" + +#: kallithea/lib/helpers.py:672 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:677 +#: kallithea/lib/helpers.py:678 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:696 -msgid "and" -msgstr "" - #: kallithea/lib/helpers.py:697 +msgid "and" +msgstr "" + +#: kallithea/lib/helpers.py:698 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:698 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:722 +#: kallithea/lib/helpers.py:723 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:742 +#: kallithea/lib/helpers.py:743 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:752 +#: kallithea/lib/helpers.py:753 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:754 kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:757 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:760 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:762 +#: kallithea/lib/helpers.py:763 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:764 +#: kallithea/lib/helpers.py:765 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:773 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:775 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:777 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:779 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:781 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:783 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:785 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:787 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:789 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:791 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:793 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:795 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:797 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:1125 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1128 +#: kallithea/lib/helpers.py:1129 #: kallithea/templates/compare/compare_diff.html:65 #: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:1195 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:1198 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:1201 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:1204 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:1209 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1444 +#: kallithea/lib/helpers.py:1445 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1387,7 +1403,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1665 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 msgid "Kallithea Administrator" msgstr "" @@ -1498,7 +1514,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2229 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 msgid "Approved" msgstr "" @@ -1513,7 +1529,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2230 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 msgid "Rejected" msgstr "" @@ -1540,7 +1556,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1514 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 msgid "top level" msgstr "" @@ -1687,7 +1703,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1697 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 msgid "Registration disabled" msgstr "" @@ -1714,12 +1730,12 @@ msgstr "" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1691 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 msgid "Repository creation enabled with write permission to a repository group" msgstr "" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 msgid "Repository creation disabled with write permission to a repository group" msgstr "" @@ -1732,100 +1748,100 @@ msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1667 +#: kallithea/model/db.py:1668 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1668 -msgid "Default user has read access to new repositories" -msgstr "" - #: kallithea/model/db.py:1669 -msgid "Default user has write access to new repositories" +msgid "Default user has read access to new repositories" msgstr "" #: kallithea/model/db.py:1670 +msgid "Default user has write access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1671 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1673 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1674 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1675 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1676 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1678 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1679 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1680 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1681 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 -msgid "Only admins can create repository groups" -msgstr "" - #: kallithea/model/db.py:1683 +msgid "Only admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1684 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1685 -msgid "Only admins can create user groups" -msgstr "" - #: kallithea/model/db.py:1686 +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1687 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1688 -msgid "Only admins can create top level repositories" -msgstr "" - #: kallithea/model/db.py:1689 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1690 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1694 -msgid "Only admins can fork repositories" -msgstr "" - #: kallithea/model/db.py:1695 -msgid "Non-admins can can fork repositories" -msgstr "" - -#: kallithea/model/db.py:1698 -msgid "User registration with manual account activation" +msgid "Only admins can fork repositories" +msgstr "" + +#: kallithea/model/db.py:1696 +msgid "Non-admins can fork repositories" msgstr "" #: kallithea/model/db.py:1699 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1700 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2228 +#: kallithea/model/db.py:2238 #, fuzzy msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2231 +#: kallithea/model/db.py:2241 #, fuzzy msgid "Under review" msgstr "" @@ -1852,87 +1868,87 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "" -#: kallithea/model/notification.py:255 -#, python-format -msgid "%(user)s sent message %(age)s" -msgstr "" - #: kallithea/model/notification.py:256 #, python-format -msgid "%(user)s mentioned you %(age)s" +msgid "%(user)s sent message %(age)s" msgstr "" #: kallithea/model/notification.py:257 #, python-format -msgid "%(user)s registered in Kallithea %(age)s" +msgid "%(user)s mentioned you %(age)s" msgstr "" #: kallithea/model/notification.py:258 #, python-format -msgid "%(user)s opened new pull request %(age)s" +msgid "%(user)s registered in Kallithea %(age)s" msgstr "" #: kallithea/model/notification.py:259 #, python-format +msgid "%(user)s opened new pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:260 +#, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "" -#: kallithea/model/notification.py:266 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - #: kallithea/model/notification.py:267 #, python-format -msgid "%(user)s sent message at %(when)s" +msgid "%(user)s commented on changeset at %(when)s" msgstr "" #: kallithea/model/notification.py:268 #, python-format -msgid "%(user)s mentioned you at %(when)s" +msgid "%(user)s sent message at %(when)s" msgstr "" #: kallithea/model/notification.py:269 #, python-format -msgid "%(user)s registered in Kallithea at %(when)s" +msgid "%(user)s mentioned you at %(when)s" msgstr "" #: kallithea/model/notification.py:270 #, python-format -msgid "%(user)s opened new pull request at %(when)s" +msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" #: kallithea/model/notification.py:271 #, python-format +msgid "%(user)s opened new pull request at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:272 +#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:302 +#: kallithea/model/notification.py:303 #, python-format msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:306 #, python-format msgid "New user %(new_username)s registered" msgstr "" -#: kallithea/model/notification.py:307 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - #: kallithea/model/notification.py:308 #, python-format +msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgstr "" + +#: kallithea/model/notification.py:309 +#, python-format msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" -#: kallithea/model/notification.py:321 +#: kallithea/model/notification.py:322 msgid "Closing" msgstr "" @@ -3554,6 +3570,11 @@ msgid "Unlock Repository" msgstr "" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#, python-format +msgid "Locked by %s on %s" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Confirm to lock repository." msgstr "" @@ -4575,7 +4596,6 @@ #: kallithea/templates/base/root.html:31 #, fuzzy -#| msgid "on pull request" msgid "Open New Pull Request from {0}" msgstr "Statuswijziging -> %s" @@ -4585,7 +4605,6 @@ #: kallithea/templates/base/root.html:33 #, fuzzy -#| msgid "Show Selected Changeset __S" msgid "Show Selected Changesets {0} → {1}" msgstr "Selecteer de changeset" @@ -4748,7 +4767,7 @@ msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:310 +#: kallithea/templates/changelog/changelog.html:309 msgid "There are no changes yet" msgstr "" @@ -5709,9 +5728,10 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 -#, python-format -msgid "Pull Requests from %s'" -msgstr "" +#, fuzzy, python-format +#| msgid "Open New Pull Request from {0}" +msgid "Pull Requests from '%s'" +msgstr "Statuswijziging -> %s" #: kallithea/templates/pullrequests/pullrequest_show_all.html:13 #, python-format @@ -6006,8 +6026,6 @@ #~ msgstr "" #~ msgid "" -#~ "_: \n" -#~ "" #~ msgstr "" #~ msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" @@ -6283,39 +6301,12 @@ #~ 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 "" @@ -6333,3 +6324,19 @@ #~ msgid "Created by" #~ msgstr "" + +#~ msgid "You can only delete files with revision being a valid branch " +#~ msgstr "" + +#~ msgid "You can only edit files with revision being a valid branch " +#~ msgstr "" + +#~ msgid "Changeset not found" +#~ msgstr "" + +#~ msgid "Non-admins can can fork repositories" +#~ msgstr "" + +#~ msgid "Pull Requests from %s'" +#~ msgstr "" + diff -r de0a8b4fd5e0 -r da2a9107ee7c kallithea/i18n/pl/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Thu Jul 13 12:26:01 2017 +0200 +++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Tue Jul 25 16:43:29 2017 +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-09-08 10:34+0200\n" +"POT-Creation-Date: 2017-07-25 16:37+0200\n" "PO-Revision-Date: 2015-04-04 09:08+0200\n" "Last-Translator: Andrew Shadura \n" "Language-Team: Polish " @@ -29,7 +29,7 @@ msgid "There are no changesets yet" msgstr "Brak zestawienia zmian" -#: kallithea/controllers/changelog.py:166 +#: kallithea/controllers/changelog.py:165 #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 @@ -41,7 +41,7 @@ msgid "None" msgstr "Brak" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(zamknięty)" @@ -161,8 +161,10 @@ msgstr "Repozytorium zostało zablokowane przez %s na %s" #: kallithea/controllers/files.py:317 -msgid "You can only delete files with revision being a valid branch " -msgstr "" +#, fuzzy +#| msgid "You can only edit files with revision being a valid branch " +msgid "You can only delete files with revision being a valid branch" +msgstr "Można tylko edytować pliki z rewizji obecnej gałęzi " #: kallithea/controllers/files.py:328 #, python-format @@ -180,7 +182,9 @@ msgstr "Wystąpił błąd w trakcie zatwierdzania" #: kallithea/controllers/files.py:377 -msgid "You can only edit files with revision being a valid branch " +#, fuzzy +#| msgid "You can only edit files with revision being a valid branch " +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:391 @@ -299,27 +303,25 @@ msgid "Journal" msgstr "Dziennik" -#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:157 +#: kallithea/controllers/login.py:152 msgid "You have successfully registered into Kallithea" msgstr "Udało Ci się zarejestrować na stronie" -#: kallithea/controllers/login.py:202 -#, fuzzy -#| msgid "Your password reset link was sent" +#: kallithea/controllers/login.py:197 +#, fuzzy msgid "A password reset confirmation code has been sent" msgstr "Twój link zresetowania hasła został wysłany" +#: kallithea/controllers/login.py:246 +#, fuzzy +msgid "Invalid password reset token" +msgstr "łącze resetowania hasła" + #: 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 "" @@ -365,7 +367,7 @@ #: kallithea/controllers/pullrequests.py:366 #: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:509 +#: kallithea/controllers/pullrequests.py:510 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" @@ -409,48 +411,48 @@ msgid "Pull request update created" msgstr "Recenzje wniosków połączenia gałęzi" -#: kallithea/controllers/pullrequests.py:513 +#: kallithea/controllers/pullrequests.py:514 #, fuzzy msgid "Pull request updated" msgstr "Połączone gałęzie" -#: kallithea/controllers/pullrequests.py:528 +#: kallithea/controllers/pullrequests.py:529 msgid "Successfully deleted pull request" msgstr "Prośba o skasowanie połączenia gałęzi została wykonana prawidłowo" -#: kallithea/controllers/pullrequests.py:594 +#: kallithea/controllers/pullrequests.py:595 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:596 +#: kallithea/controllers/pullrequests.py:597 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:614 +#: kallithea/controllers/pullrequests.py:615 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:617 +#: kallithea/controllers/pullrequests.py:619 msgid "No changesets found for updating this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:625 +#: kallithea/controllers/pullrequests.py:627 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:631 +#: kallithea/controllers/pullrequests.py:633 msgid "Git pull requests don't support updates yet." msgstr "" -#: kallithea/controllers/pullrequests.py:722 +#: kallithea/controllers/pullrequests.py:724 #, fuzzy msgid "No permission to change pull request status" msgstr "Zagłosuj na żądanie na grupę zmian" -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:729 msgid "Closing." msgstr "Zamknięcie." @@ -689,7 +691,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1701 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 msgid "Manual activation of external account" msgstr "Ręczna aktywacja nowego konta" @@ -701,7 +703,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1702 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 msgid "Automatic activation of external account" msgstr "Automatyczna aktywacja nowego konta" @@ -918,50 +920,56 @@ msgstr "" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:277 +#: kallithea/controllers/admin/settings.py:284 msgid "Error occurred while updating application settings" msgstr "Wystąpił błąd podczas aktualizacji ustawień aplikacji" -#: kallithea/controllers/admin/settings.py:216 +#: kallithea/controllers/admin/settings.py:211 #, 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:273 +#: kallithea/controllers/admin/settings.py:226 +#, fuzzy, python-format +#| msgid "Invalidate cache for all repositories" +msgid "Invalidated %s repositories" +msgstr "Unieważnia cache dla wszystkich repozytoriów" + +#: kallithea/controllers/admin/settings.py:280 msgid "Updated application settings" msgstr "Aktualizacja ustawień aplikacji" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:337 msgid "Updated visualisation settings" msgstr "Aktualizacja ustawień wizualizacji" -#: kallithea/controllers/admin/settings.py:335 +#: kallithea/controllers/admin/settings.py:342 msgid "Error occurred during updating visualisation settings" msgstr "Wystąpił błąd podczas aktualizacji ustawień wizualizacji" -#: kallithea/controllers/admin/settings.py:361 +#: kallithea/controllers/admin/settings.py:368 msgid "Please enter email address" msgstr "Proszę podać adres email" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:383 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:414 msgid "Added new hook" msgstr "Dodano nowy hook" -#: kallithea/controllers/admin/settings.py:421 +#: kallithea/controllers/admin/settings.py:428 msgid "Updated hooks" msgstr "Aktualizacja hooku" -#: kallithea/controllers/admin/settings.py:425 +#: kallithea/controllers/admin/settings.py:432 msgid "Error occurred during hook creation" msgstr "Wystąpił błąd podczas tworzenia hooku" -#: kallithea/controllers/admin/settings.py:451 +#: kallithea/controllers/admin/settings.py:458 msgid "Whoosh reindex task scheduled" msgstr "Zadanie ponownej indeksacji whoosh zostało zaplanowane" @@ -1050,20 +1058,24 @@ msgid "Removed IP address from user whitelist" msgstr "Usunięto adres ip z listy dozwolonych adresów dla użytkownika" -#: kallithea/lib/auth.py:743 +#: kallithea/lib/auth.py:744 #, python-format msgid "IP %s not allowed" msgstr "Obserwatorzy %s" -#: kallithea/lib/auth.py:756 +#: kallithea/lib/auth.py:757 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:812 +#: kallithea/lib/auth.py:785 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/auth.py:832 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:844 +#: kallithea/lib/auth.py:864 msgid "You need to be signed in to view this page" msgstr "Musisz być zalogowany, żeby oglądać stronę" @@ -1071,8 +1083,10 @@ msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:516 kallithea/lib/helpers.py:622 -msgid "Changeset not found" +#: kallithea/lib/base.py:516 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "Changeset for %s %s not found in %s" msgstr "Nie znaleziono changeset" #: kallithea/lib/diffs.py:66 @@ -1089,161 +1103,167 @@ msgid "No changes detected" msgstr "Nie wykryto zmian" -#: kallithea/lib/helpers.py:609 +#: kallithea/lib/helpers.py:610 #, python-format msgid "Deleted branch: %s" msgstr "Usunięta gałąź: %s" -#: kallithea/lib/helpers.py:611 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Created tag: %s" msgstr "Utworzony tag: %s" -#: kallithea/lib/helpers.py:671 +#: kallithea/lib/helpers.py:623 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "Changeset %s not found" +msgstr "Nie znaleziono changeset" + +#: kallithea/lib/helpers.py:672 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Pokaż wszystkie zestawienia zmian changesets %s->%s" -#: kallithea/lib/helpers.py:677 +#: kallithea/lib/helpers.py:678 #, fuzzy msgid "Compare view" msgstr "Wyświetl porównanie" -#: kallithea/lib/helpers.py:696 +#: kallithea/lib/helpers.py:697 msgid "and" msgstr "i" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:698 #, python-format msgid "%s more" msgstr "%s więcej" -#: kallithea/lib/helpers.py:698 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "rewizja" -#: kallithea/lib/helpers.py:722 +#: kallithea/lib/helpers.py:723 #, fuzzy, python-format msgid "Fork name %s" msgstr "nazwa rozgałęzienia %s" -#: kallithea/lib/helpers.py:742 +#: kallithea/lib/helpers.py:743 #, fuzzy, python-format msgid "Pull request %s" msgstr "Połączonych gałęzi #%s" -#: kallithea/lib/helpers.py:752 +#: kallithea/lib/helpers.py:753 msgid "[deleted] repository" msgstr "[usunięte] repozytorium" -#: kallithea/lib/helpers.py:754 kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 msgid "[created] repository" msgstr "[utworzone] repozytorium" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:757 msgid "[created] repository as fork" msgstr "[utworzone] repozytorium jako rozgałęzienie" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 msgid "[forked] repository" msgstr "[rozgałęzione] repozytorium" -#: kallithea/lib/helpers.py:760 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 msgid "[updated] repository" msgstr "[zaktualizowane] repozytorium" -#: kallithea/lib/helpers.py:762 +#: kallithea/lib/helpers.py:763 msgid "[downloaded] archive from repository" msgstr "[pobierz] archiwum z repozytorium" -#: kallithea/lib/helpers.py:764 +#: kallithea/lib/helpers.py:765 msgid "[delete] repository" msgstr "[skasowane] repozytorium" -#: kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:773 msgid "[created] user" msgstr "[utworzony] użytkownik" -#: kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:775 msgid "[updated] user" msgstr "[zaktualizowany] użytkownik" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:777 msgid "[created] user group" msgstr "[utworzona] grupa użytkowników" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:779 msgid "[updated] user group" msgstr "[zaktualizowana] grupa użytkowników" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:781 msgid "[commented] on revision in repository" msgstr "[komentarz] do zmiany w repozytorium" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:783 msgid "[commented] on pull request for" msgstr "[komentarz] wniosek o połączenie gałęzi" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:785 msgid "[closed] pull request for" msgstr "[zamknięty] wniosek o połączenie gałęzi" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:787 msgid "[pushed] into" msgstr "[wysłane zmiany] w" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:789 msgid "[committed via Kallithea] into repository" msgstr "[synchronizacja przez Kallithea] z repozytorium" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:791 msgid "[pulled from remote] into repository" msgstr "[pobieranie z zdalnego] do repozytorium" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:793 msgid "[pulled] from" msgstr "[pobrano]" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:795 msgid "[started following] repository" msgstr "[start następnego] repozytorium" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:797 msgid "[stopped following] repository" msgstr "[zatrzymany po] repozytorium" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:1125 #, python-format msgid " and %s more" msgstr " i %s więcej" -#: kallithea/lib/helpers.py:1128 +#: kallithea/lib/helpers.py:1129 #: kallithea/templates/compare/compare_diff.html:65 #: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "Brak plików" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:1195 msgid "new file" msgstr "nowy plik" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:1198 msgid "mod" msgstr "modyfikuj" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:1201 msgid "del" msgstr "kasuj" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:1204 msgid "rename" msgstr "zmień nazwę" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:1209 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1444 +#: kallithea/lib/helpers.py:1445 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1421,7 +1441,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1665 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 msgid "Kallithea Administrator" msgstr "Administrator Repo" @@ -1532,7 +1552,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2229 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 msgid "Approved" msgstr "Zaakceptowano" @@ -1547,7 +1567,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2230 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 msgid "Rejected" msgstr "Odrzucono" @@ -1574,7 +1594,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1514 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 msgid "top level" msgstr "najwyższy poziom" @@ -1721,7 +1741,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1697 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 msgid "Registration disabled" msgstr "Rejestracja wyłączona" @@ -1748,12 +1768,12 @@ msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1691 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 msgid "Repository creation enabled with write permission to a repository group" msgstr "" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 msgid "Repository creation disabled with write permission to a repository group" msgstr "" @@ -1766,110 +1786,111 @@ msgid "[Mention]" msgstr "[Wymieniony]" -#: kallithea/model/db.py:1667 +#: kallithea/model/db.py:1668 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1668 +#: kallithea/model/db.py:1669 #, fuzzy msgid "Default user has read access to new repositories" msgstr "Nieautoryzowany dostęp do zasobów" -#: kallithea/model/db.py:1669 -#, fuzzy -msgid "Default user has write access to new repositories" -msgstr "Nieautoryzowany dostęp do zasobów" - #: kallithea/model/db.py:1670 +#, fuzzy +msgid "Default user has write access to new repositories" +msgstr "Nieautoryzowany dostęp do zasobów" + +#: kallithea/model/db.py:1671 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1673 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1674 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1675 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1676 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1678 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1679 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1680 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1681 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 +#: kallithea/model/db.py:1683 #, fuzzy msgid "Only admins can create repository groups" msgstr "Utworzono grupę repo %s" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1684 #, fuzzy msgid "Non-admins can create repository groups" msgstr "Utworzono grupę repo %s" -#: kallithea/model/db.py:1685 +#: kallithea/model/db.py:1686 #, fuzzy msgid "Only admins can create user groups" msgstr "Tworzenie grup użytkowników" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1687 #, fuzzy msgid "Non-admins can create user groups" msgstr "Tworzenie grup użytkowników" -#: kallithea/model/db.py:1688 +#: kallithea/model/db.py:1689 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1690 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1694 +#: kallithea/model/db.py:1695 #, fuzzy msgid "Only admins can fork repositories" msgstr "Ogólna liczba repozytoriów" -#: kallithea/model/db.py:1695 -#, fuzzy -msgid "Non-admins can can fork repositories" +#: kallithea/model/db.py:1696 +#, fuzzy +#| msgid "Non-admins can can fork repositories" +msgid "Non-admins can fork repositories" msgstr "Unieważnia cache dla wszystkich repozytoriów" -#: kallithea/model/db.py:1698 +#: kallithea/model/db.py:1699 #, fuzzy msgid "User registration with manual account activation" msgstr "Rejestracja użytkownika z ręczną aktywacją konta" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1700 #, fuzzy msgid "User registration with automatic account activation" msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" -#: kallithea/model/db.py:2228 +#: kallithea/model/db.py:2238 #, fuzzy msgid "Not reviewed" msgstr "Brak Korekty" -#: kallithea/model/db.py:2231 +#: kallithea/model/db.py:2241 #, fuzzy msgid "Under review" msgstr "Objęty Przeglądem" @@ -1896,90 +1917,87 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:255 #, fuzzy, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "%(user)s skomentował zatwierdzenie %(when)s" -#: kallithea/model/notification.py:255 +#: kallithea/model/notification.py:256 #, fuzzy, python-format 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 %(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 %(age)s" -msgstr "%(user)s zarejestrował na stronie w %(when)s" +msgid "%(user)s mentioned you %(age)s" +msgstr "%(user)s wspomniał o Tobie w %(when)s" #: kallithea/model/notification.py:258 #, fuzzy, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "%(user)s otworzył nowe połączenie gałęzi w %(when)s" +msgid "%(user)s registered in Kallithea %(age)s" +msgstr "%(user)s zarejestrował na stronie w %(when)s" #: kallithea/model/notification.py:259 #, fuzzy, python-format +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:260 +#, fuzzy, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "%(user)s skomentował nowe połączenie gałęzi w %(when)s" -#: kallithea/model/notification.py:266 +#: kallithea/model/notification.py:267 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s skomentował zatwierdzenie %(when)s" -#: kallithea/model/notification.py:267 +#: kallithea/model/notification.py:268 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s wysłał wiadomość do %(when)s" -#: kallithea/model/notification.py:268 +#: kallithea/model/notification.py:269 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s wspomniał o Tobie w %(when)s" -#: kallithea/model/notification.py:269 +#: kallithea/model/notification.py:270 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s zarejestrował na stronie w %(when)s" -#: kallithea/model/notification.py:270 +#: kallithea/model/notification.py:271 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s otworzył nowe połączenie gałęzi w %(when)s" -#: kallithea/model/notification.py:271 +#: kallithea/model/notification.py:272 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s skomentował nowe połączenie gałęzi w %(when)s" -#: kallithea/model/notification.py:302 +#: kallithea/model/notification.py:303 #, python-format msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:306 #, fuzzy, python-format msgid "New user %(new_username)s registered" msgstr "Użytkownik %(new_username)s zarejestrował" -#: kallithea/model/notification.py:307 +#: kallithea/model/notification.py:308 #, 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 +#: kallithea/model/notification.py:309 #, 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 +#: kallithea/model/notification.py:322 #, fuzzy msgid "Closing" msgstr "Używa:" @@ -2037,7 +2055,6 @@ #: kallithea/model/user.py:408 #, fuzzy -#| msgid "Password reset link" msgid "Password reset notification" msgstr "łącze resetowania hasła" @@ -2486,8 +2503,6 @@ #: kallithea/templates/password_reset.html:47 #, fuzzy -#| 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." @@ -2510,13 +2525,11 @@ #: 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" @@ -3695,6 +3708,11 @@ msgid "Unlock Repository" msgstr "Odblokowane repozytorium" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#, python-format +msgid "Locked by %s on %s" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 #, fuzzy msgid "Confirm to lock repository." @@ -4766,7 +4784,6 @@ #: kallithea/templates/base/root.html:31 #, fuzzy -#| msgid "on pull request" msgid "Open New Pull Request from {0}" msgstr "Komentarz połączenia gałęzi %s" @@ -4776,7 +4793,6 @@ #: kallithea/templates/base/root.html:33 #, fuzzy -#| msgid "Show Selected Changesets __S → __E" msgid "Show Selected Changesets {0} → {1}" msgstr "Pokaż wybrane zmiany __S -> __E" @@ -4946,7 +4962,7 @@ msgid "Branch %s" msgstr "Gałęzie %s" -#: kallithea/templates/changelog/changelog.html:310 +#: kallithea/templates/changelog/changelog.html:309 msgid "There are no changes yet" msgstr "Nie ma jeszcze zmian" @@ -5399,7 +5415,6 @@ #: kallithea/templates/email_templates/password_reset.html:6 #, 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." @@ -5958,7 +5973,8 @@ #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, fuzzy, python-format -msgid "Pull Requests from %s'" +#| msgid "Pull Requests from %s'" +msgid "Pull Requests from '%s'" msgstr "Połączonych gałęzi #%s" #: kallithea/templates/pullrequests/pullrequest_show_all.html:13 @@ -6462,27 +6478,6 @@ #~ 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" @@ -6501,3 +6496,6 @@ #~ msgid "Created by" #~ msgstr "utworzono" +#~ msgid "You can only delete files with revision being a valid branch " +#~ msgstr "" + diff -r de0a8b4fd5e0 -r da2a9107ee7c kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Thu Jul 13 12:26:01 2017 +0200 +++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Tue Jul 25 16:43:29 2017 +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-09-08 10:34+0200\n" +"POT-Creation-Date: 2017-07-25 16:37+0200\n" "PO-Revision-Date: 2014-02-13 14:34+0000\n" "Last-Translator: marcinkuzminski \n" "Language-Team: Portuguese (Brazil) " @@ -23,7 +23,7 @@ msgid "There are no changesets yet" msgstr "Não há nenhum changeset ainda" -#: kallithea/controllers/changelog.py:166 +#: kallithea/controllers/changelog.py:165 #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 @@ -35,7 +35,7 @@ msgid "None" msgstr "Nenhum" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(fechado)" @@ -153,8 +153,10 @@ msgstr "Este repositório foi travado por %s em %s" #: kallithea/controllers/files.py:317 -msgid "You can only delete files with revision being a valid branch " -msgstr "" +#, fuzzy +#| msgid "You can only edit files with revision being a valid branch " +msgid "You can only delete 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:328 #, python-format @@ -172,7 +174,9 @@ msgstr "Ocorreu um erro ao realizar commit" #: kallithea/controllers/files.py:377 -msgid "You can only edit files with revision being a valid branch " +#, fuzzy +#| msgid "You can only edit files with revision being a valid branch " +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:391 @@ -291,27 +295,25 @@ msgid "Journal" msgstr "Diário" -#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:157 +#: kallithea/controllers/login.py:152 msgid "You have successfully registered into Kallithea" msgstr "Você foi registrado no Kallithea com sucesso" -#: kallithea/controllers/login.py:202 -#, fuzzy -#| msgid "Your password reset link was sent" +#: kallithea/controllers/login.py:197 +#, fuzzy msgid "A password reset confirmation code has been sent" msgstr "Seu link de reinicialização de senha foi enviado" +#: kallithea/controllers/login.py:246 +#, fuzzy +msgid "Invalid password reset token" +msgstr "Link para trocar senha" + #: 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 "" @@ -358,7 +360,7 @@ #: kallithea/controllers/pullrequests.py:366 #: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:509 +#: kallithea/controllers/pullrequests.py:510 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" @@ -404,48 +406,48 @@ msgid "Pull request update created" msgstr "Revisores do pull request" -#: kallithea/controllers/pullrequests.py:513 +#: kallithea/controllers/pullrequests.py:514 #, fuzzy msgid "Pull request updated" msgstr "Pull requests para %s" -#: kallithea/controllers/pullrequests.py:528 +#: kallithea/controllers/pullrequests.py:529 msgid "Successfully deleted pull request" msgstr "Pull request excluído com sucesso" -#: kallithea/controllers/pullrequests.py:594 +#: kallithea/controllers/pullrequests.py:595 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:596 +#: kallithea/controllers/pullrequests.py:597 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:614 +#: kallithea/controllers/pullrequests.py:615 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:617 +#: kallithea/controllers/pullrequests.py:619 msgid "No changesets found for updating this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:625 +#: kallithea/controllers/pullrequests.py:627 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:631 +#: kallithea/controllers/pullrequests.py:633 msgid "Git pull requests don't support updates yet." msgstr "" -#: kallithea/controllers/pullrequests.py:722 +#: kallithea/controllers/pullrequests.py:724 #, fuzzy msgid "No permission to change pull request status" msgstr "Vote para estado do pull request" -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:729 #, fuzzy msgid "Closing." msgstr "carregando ..." @@ -684,7 +686,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1701 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 msgid "Manual activation of external account" msgstr "Ativação manual de conta externa" @@ -696,7 +698,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1702 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 msgid "Automatic activation of external account" msgstr "Ativação automática de conta externa" @@ -913,48 +915,54 @@ msgstr "" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:277 +#: kallithea/controllers/admin/settings.py:284 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:216 +#: kallithea/controllers/admin/settings.py:211 #, 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:273 +#: kallithea/controllers/admin/settings.py:226 +#, fuzzy, python-format +#| msgid "Invalidate cache for all repositories" +msgid "Invalidated %s repositories" +msgstr "Invalidar o cache para todos os repositórios" + +#: kallithea/controllers/admin/settings.py:280 msgid "Updated application settings" msgstr "Configurações da aplicação atualizadas" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:337 msgid "Updated visualisation settings" msgstr "Configurações de visualização atualizadas" -#: kallithea/controllers/admin/settings.py:335 +#: kallithea/controllers/admin/settings.py:342 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:361 +#: kallithea/controllers/admin/settings.py:368 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:383 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:414 msgid "Added new hook" msgstr "Adicionado novo gancho" -#: kallithea/controllers/admin/settings.py:421 +#: kallithea/controllers/admin/settings.py:428 msgid "Updated hooks" msgstr "Atualizados os ganchos" -#: kallithea/controllers/admin/settings.py:425 +#: kallithea/controllers/admin/settings.py:432 msgid "Error occurred during hook creation" msgstr "Ocorreu um erro durante a criação do hook" -#: kallithea/controllers/admin/settings.py:451 +#: kallithea/controllers/admin/settings.py:458 msgid "Whoosh reindex task scheduled" msgstr "Tarefa de reindexação do whoosh agendada" @@ -1043,20 +1051,24 @@ msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:743 +#: kallithea/lib/auth.py:744 #, python-format msgid "IP %s not allowed" msgstr "IP %s não permitido" -#: kallithea/lib/auth.py:756 +#: kallithea/lib/auth.py:757 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:812 +#: kallithea/lib/auth.py:785 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/auth.py:832 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:844 +#: kallithea/lib/auth.py:864 msgid "You need to be signed in to view this page" msgstr "Você precisa estar logado para ver essa página" @@ -1064,8 +1076,10 @@ msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:516 kallithea/lib/helpers.py:622 -msgid "Changeset not found" +#: kallithea/lib/base.py:516 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "Changeset for %s %s not found in %s" msgstr "Conjunto de alterações não encontrado" #: kallithea/lib/diffs.py:66 @@ -1082,161 +1096,167 @@ msgid "No changes detected" msgstr "Nenhuma alteração detectada" -#: kallithea/lib/helpers.py:609 +#: kallithea/lib/helpers.py:610 #, python-format msgid "Deleted branch: %s" msgstr "Excluído ramo: %s" -#: kallithea/lib/helpers.py:611 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Created tag: %s" msgstr "Tag criada: %s" -#: kallithea/lib/helpers.py:671 +#: kallithea/lib/helpers.py:623 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "Changeset %s not found" +msgstr "Conjunto de alterações não encontrado" + +#: kallithea/lib/helpers.py:672 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Ver todos os conjuntos de mudanças combinados %s->%s" -#: kallithea/lib/helpers.py:677 +#: kallithea/lib/helpers.py:678 #, fuzzy msgid "Compare view" msgstr "comparar exibir" -#: kallithea/lib/helpers.py:696 +#: kallithea/lib/helpers.py:697 msgid "and" msgstr "e" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:698 #, python-format msgid "%s more" msgstr "%s mais" -#: kallithea/lib/helpers.py:698 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "revisões" -#: kallithea/lib/helpers.py:722 +#: kallithea/lib/helpers.py:723 #, fuzzy, python-format msgid "Fork name %s" msgstr "nome da bifurcação %s" -#: kallithea/lib/helpers.py:742 +#: kallithea/lib/helpers.py:743 #, fuzzy, python-format msgid "Pull request %s" msgstr "Pull request #%s" -#: kallithea/lib/helpers.py:752 +#: kallithea/lib/helpers.py:753 msgid "[deleted] repository" msgstr "repositório [excluído]" -#: kallithea/lib/helpers.py:754 kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 msgid "[created] repository" msgstr "repositório [criado]" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:757 msgid "[created] repository as fork" msgstr "repositório [criado] como uma bifurcação" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 msgid "[forked] repository" msgstr "repositório [bifurcado]" -#: kallithea/lib/helpers.py:760 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 msgid "[updated] repository" msgstr "repositório [atualizado]" -#: kallithea/lib/helpers.py:762 +#: kallithea/lib/helpers.py:763 msgid "[downloaded] archive from repository" msgstr "[baixado] archive do repositório" -#: kallithea/lib/helpers.py:764 +#: kallithea/lib/helpers.py:765 msgid "[delete] repository" msgstr "[excluir] repositório" -#: kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:773 msgid "[created] user" msgstr "usuário [criado]" -#: kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:775 msgid "[updated] user" msgstr "usuário [atualizado]" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:777 msgid "[created] user group" msgstr "[criado] grupo de usuários" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:779 msgid "[updated] user group" msgstr "[atualizado] grupo de usuários" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:781 msgid "[commented] on revision in repository" msgstr "[comentado] em revisão no repositório" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:783 msgid "[commented] on pull request for" msgstr "[comentado] no pull request para" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:785 msgid "[closed] pull request for" msgstr "[fechado] pull request para" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:787 msgid "[pushed] into" msgstr "[realizado push] para" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:789 msgid "[committed via Kallithea] into repository" msgstr "[commitado via Kallithea] no repositório" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:791 msgid "[pulled from remote] into repository" msgstr "[pulled do remote] no repositório" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:793 msgid "[pulled] from" msgstr "[realizado pull] a partir de" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:795 msgid "[started following] repository" msgstr "[passou a seguir] o repositório" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:797 msgid "[stopped following] repository" msgstr "[parou de seguir] o repositório" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:1125 #, python-format msgid " and %s more" msgstr " e mais %s" -#: kallithea/lib/helpers.py:1128 +#: kallithea/lib/helpers.py:1129 #: kallithea/templates/compare/compare_diff.html:65 #: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "Nenhum arquivo" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:1195 msgid "new file" msgstr "novo arquivo" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:1198 msgid "mod" msgstr "mod" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:1201 msgid "del" msgstr "excluir" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:1204 msgid "rename" msgstr "renomear" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:1209 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1444 +#: kallithea/lib/helpers.py:1445 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1408,7 +1428,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1665 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 msgid "Kallithea Administrator" msgstr "Administrador do Kallithea" @@ -1519,7 +1539,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2229 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 msgid "Approved" msgstr "Aprovado" @@ -1534,7 +1554,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2230 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 msgid "Rejected" msgstr "Rejeitado" @@ -1561,7 +1581,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1514 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 msgid "top level" msgstr "nível superior" @@ -1708,7 +1728,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1697 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 msgid "Registration disabled" msgstr "Registro desatilitado" @@ -1735,12 +1755,12 @@ msgstr "Registro de Usuário com ativação automática de conta" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1691 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 msgid "Repository creation enabled with write permission to a repository group" msgstr "" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 msgid "Repository creation disabled with write permission to a repository group" msgstr "" @@ -1753,110 +1773,111 @@ msgid "[Mention]" msgstr "[Menção]" -#: kallithea/model/db.py:1667 +#: kallithea/model/db.py:1668 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1668 +#: kallithea/model/db.py:1669 #, fuzzy msgid "Default user has read access to new repositories" msgstr "Acesso não autorizado ao recurso" -#: kallithea/model/db.py:1669 -#, fuzzy -msgid "Default user has write access to new repositories" -msgstr "Acesso não autorizado ao recurso" - #: kallithea/model/db.py:1670 +#, fuzzy +msgid "Default user has write access to new repositories" +msgstr "Acesso não autorizado ao recurso" + +#: kallithea/model/db.py:1671 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1673 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1674 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1675 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1676 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1678 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1679 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1680 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1681 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 +#: kallithea/model/db.py:1683 #, fuzzy msgid "Only admins can create repository groups" msgstr "Grupo de repositórios %s criado" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1684 #, fuzzy msgid "Non-admins can create repository groups" msgstr "Grupo de repositórios %s criado" -#: kallithea/model/db.py:1685 +#: kallithea/model/db.py:1686 #, fuzzy msgid "Only admins can create user groups" msgstr "Criar grupos de usuários" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1687 #, fuzzy msgid "Non-admins can create user groups" msgstr "Criar grupos de usuários" -#: kallithea/model/db.py:1688 +#: kallithea/model/db.py:1689 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1690 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1694 +#: kallithea/model/db.py:1695 #, fuzzy msgid "Only admins can fork repositories" msgstr "Criar repositórios" -#: kallithea/model/db.py:1695 -#, fuzzy -msgid "Non-admins can can fork repositories" +#: kallithea/model/db.py:1696 +#, fuzzy +#| msgid "Non-admins can can fork repositories" +msgid "Non-admins can fork repositories" msgstr "Invalidar o cache para todos os repositórios" -#: kallithea/model/db.py:1698 +#: kallithea/model/db.py:1699 #, fuzzy msgid "User registration with manual account activation" msgstr "Registro de Usuário com ativação manual de conta" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1700 #, fuzzy msgid "User registration with automatic account activation" msgstr "Registro de Usuário com ativação automática de conta" -#: kallithea/model/db.py:2228 +#: kallithea/model/db.py:2238 #, fuzzy msgid "Not reviewed" msgstr "Não Revisado" -#: kallithea/model/db.py:2231 +#: kallithea/model/db.py:2241 #, fuzzy msgid "Under review" msgstr "Sob Revisão" @@ -1883,90 +1904,87 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:255 #, fuzzy, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "%(user)s comentou no changeset em %(when)s" -#: kallithea/model/notification.py:255 +#: kallithea/model/notification.py:256 #, fuzzy, python-format 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 %(age)s" -msgstr "%(user)s mencionou-o em %(when)s" - #: kallithea/model/notification.py:257 #, fuzzy, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "%(user)s registrou-se no Kallithea em %(when)s" +msgid "%(user)s mentioned you %(age)s" +msgstr "%(user)s mencionou-o em %(when)s" #: kallithea/model/notification.py:258 #, fuzzy, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "%(user)s abriu um novo pull request em %(when)s" +msgid "%(user)s registered in Kallithea %(age)s" +msgstr "%(user)s registrou-se no Kallithea em %(when)s" #: kallithea/model/notification.py:259 #, fuzzy, python-format +msgid "%(user)s opened new pull request %(age)s" +msgstr "%(user)s abriu um novo pull request em %(when)s" + +#: kallithea/model/notification.py:260 +#, fuzzy, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "%(user)s comentou no pull request em %(when)s" -#: kallithea/model/notification.py:266 +#: kallithea/model/notification.py:267 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s comentou no changeset em %(when)s" -#: kallithea/model/notification.py:267 +#: kallithea/model/notification.py:268 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s enviou mensagem em %(when)s" -#: kallithea/model/notification.py:268 +#: kallithea/model/notification.py:269 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s mencionou-o em %(when)s" -#: kallithea/model/notification.py:269 +#: kallithea/model/notification.py:270 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s registrou-se no Kallithea em %(when)s" -#: kallithea/model/notification.py:270 +#: kallithea/model/notification.py:271 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s abriu um novo pull request em %(when)s" -#: kallithea/model/notification.py:271 +#: kallithea/model/notification.py:272 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s comentou no pull request em %(when)s" -#: kallithea/model/notification.py:302 +#: kallithea/model/notification.py:303 #, python-format msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:306 #, fuzzy, python-format msgid "New user %(new_username)s registered" msgstr "O username \"%(new_username)s\" não é válido" -#: kallithea/model/notification.py:307 +#: kallithea/model/notification.py:308 #, 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 +#: kallithea/model/notification.py:309 #, 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 +#: kallithea/model/notification.py:322 #, fuzzy msgid "Closing" msgstr "Usando" @@ -2024,7 +2042,6 @@ #: kallithea/model/user.py:408 #, fuzzy -#| msgid "Password reset link" msgid "Password reset notification" msgstr "Link para trocar senha" @@ -2471,8 +2488,6 @@ #: kallithea/templates/password_reset.html:47 #, fuzzy -#| 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." @@ -2497,13 +2512,11 @@ #: 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" @@ -3680,6 +3693,11 @@ msgid "Unlock Repository" msgstr "Repositório público" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#, python-format +msgid "Locked by %s on %s" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 #, fuzzy msgid "Confirm to lock repository." @@ -4750,7 +4768,6 @@ #: kallithea/templates/base/root.html:31 #, fuzzy -#| msgid "on pull request" msgid "Open New Pull Request from {0}" msgstr "Comentar no pull request #%s" @@ -4760,7 +4777,6 @@ #: kallithea/templates/base/root.html:33 #, fuzzy -#| msgid "Show Selected Changesets __S → __E" msgid "Show Selected Changesets {0} → {1}" msgstr "Mostrar changesets selecionados __S -> __E" @@ -4931,7 +4947,7 @@ msgid "Branch %s" msgstr "Ramo %s" -#: kallithea/templates/changelog/changelog.html:310 +#: kallithea/templates/changelog/changelog.html:309 msgid "There are no changes yet" msgstr "Ainda não há alteações" @@ -5378,7 +5394,6 @@ #: kallithea/templates/email_templates/password_reset.html:6 #, 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." @@ -5935,7 +5950,8 @@ #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, fuzzy, python-format -msgid "Pull Requests from %s'" +#| msgid "Pull Requests from %s'" +msgid "Pull Requests from '%s'" msgstr "Pull requests de %s" #: kallithea/templates/pullrequests/pullrequest_show_all.html:13 @@ -6443,30 +6459,6 @@ #~ 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" @@ -6485,3 +6477,6 @@ #~ msgid "Created by" #~ msgstr "criado" +#~ msgid "You can only delete files with revision being a valid branch " +#~ msgstr "" + diff -r de0a8b4fd5e0 -r da2a9107ee7c kallithea/i18n/ru/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Thu Jul 13 12:26:01 2017 +0200 +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Tue Jul 25 16:43:29 2017 +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-09-08 10:34+0200\n" +"POT-Creation-Date: 2017-07-25 16:37+0200\n" "PO-Revision-Date: 2017-01-05 14:58+0000\n" "Last-Translator: Andrew Shadura \n" "Language-Team: Russian " @@ -36,7 +36,7 @@ msgid "There are no changesets yet" msgstr "Ещё не было изменений" -#: kallithea/controllers/changelog.py:166 +#: kallithea/controllers/changelog.py:165 #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 @@ -48,7 +48,7 @@ msgid "None" msgstr "Ничего" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(закрыто)" @@ -163,7 +163,9 @@ msgstr "Репозиторий заблокировал %s в %s" #: kallithea/controllers/files.py:317 -msgid "You can only delete files with revision being a valid branch " +#, fuzzy +#| msgid "You can only delete files with revision being a valid branch " +msgid "You can only delete files with revision being a valid branch" msgstr "Вы можете удалять файлы только в ревизии, связанной с существующей веткой " #: kallithea/controllers/files.py:328 @@ -182,7 +184,9 @@ msgstr "Во время коммита произошла ошибка" #: kallithea/controllers/files.py:377 -msgid "You can only edit files with revision being a valid branch " +#, fuzzy +#| msgid "You can only edit files with revision being a valid branch " +msgid "You can only edit files with revision being a valid branch" msgstr "" "Вы можете редактировать файлы только в ревизии, связанной с существующей " "веткой " @@ -305,23 +309,23 @@ msgid "Journal" msgstr "Журнал" -#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 msgid "Bad captcha" msgstr "Неверная капча" -#: kallithea/controllers/login.py:157 +#: kallithea/controllers/login.py:152 msgid "You have successfully registered into Kallithea" msgstr "Регистрация в Kallithea прошла успешно" -#: kallithea/controllers/login.py:202 +#: kallithea/controllers/login.py:197 msgid "A password reset confirmation code has been sent" msgstr "Код для сброса пароля отправлен" +#: kallithea/controllers/login.py:246 +msgid "Invalid password reset token" +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 "Пароль обновлён" @@ -367,7 +371,7 @@ #: kallithea/controllers/pullrequests.py:366 #: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:509 +#: kallithea/controllers/pullrequests.py:510 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" @@ -411,46 +415,46 @@ msgid "Pull request update created" msgstr "Обновление для pull-запроса создано" -#: kallithea/controllers/pullrequests.py:513 +#: kallithea/controllers/pullrequests.py:514 msgid "Pull request updated" msgstr "Pull-запрос обновлён" -#: kallithea/controllers/pullrequests.py:528 +#: kallithea/controllers/pullrequests.py:529 msgid "Successfully deleted pull request" msgstr "Pull-запрос успешно удалён" -#: kallithea/controllers/pullrequests.py:594 +#: kallithea/controllers/pullrequests.py:595 #, python-format msgid "This pull request has already been merged to %s." msgstr "Этот pull-запрос уже принят на ветку %s." -#: kallithea/controllers/pullrequests.py:596 +#: kallithea/controllers/pullrequests.py:597 msgid "This pull request has been closed and can not be updated." msgstr "Этот pull-запрос был закрыт и не может быть обновлён." -#: kallithea/controllers/pullrequests.py:614 +#: kallithea/controllers/pullrequests.py:615 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "Этот pull-запрос может быть обновлён из %s:" -#: kallithea/controllers/pullrequests.py:617 +#: kallithea/controllers/pullrequests.py:619 msgid "No changesets found for updating this pull request." msgstr "Нет изменений для обновления этого pull-запроса." -#: kallithea/controllers/pullrequests.py:625 +#: kallithea/controllers/pullrequests.py:627 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Внимание: Ветка %s имеет ещё одну верхушку: %s." -#: kallithea/controllers/pullrequests.py:631 +#: kallithea/controllers/pullrequests.py:633 msgid "Git pull requests don't support updates yet." msgstr "Обновление pull-запросы git не поддерживается." -#: kallithea/controllers/pullrequests.py:722 +#: kallithea/controllers/pullrequests.py:724 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:729 msgid "Closing." msgstr "Закрыт." @@ -687,7 +691,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1701 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 msgid "Manual activation of external account" msgstr "Ручная активация внешней учетной записи" @@ -699,7 +703,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1702 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 msgid "Automatic activation of external account" msgstr "Автоматическая активация внешней учетной записи" @@ -916,48 +920,54 @@ "отсутствует" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:277 +#: kallithea/controllers/admin/settings.py:284 msgid "Error occurred while updating application settings" msgstr "Произошла ошибка при обновлении настроек приложения" -#: kallithea/controllers/admin/settings.py:216 +#: kallithea/controllers/admin/settings.py:211 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "Репозитории успешно пересканированы, добавлено: %s, удалено: %s." -#: kallithea/controllers/admin/settings.py:273 +#: kallithea/controllers/admin/settings.py:226 +#, fuzzy, python-format +#| msgid "Invalidate cache for all repositories" +msgid "Invalidated %s repositories" +msgstr "Сбросить кэш для всех репозиториев" + +#: kallithea/controllers/admin/settings.py:280 msgid "Updated application settings" msgstr "Обновленные параметры настройки приложения" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:337 msgid "Updated visualisation settings" msgstr "Настройки визуализации обновлены" -#: kallithea/controllers/admin/settings.py:335 +#: kallithea/controllers/admin/settings.py:342 msgid "Error occurred during updating visualisation settings" msgstr "Произошла ошибка при обновлении настроек визуализации" -#: kallithea/controllers/admin/settings.py:361 +#: kallithea/controllers/admin/settings.py:368 msgid "Please enter email address" msgstr "Пожалуйста, введите адрес электронной почты" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:383 msgid "Send email task created" msgstr "Задача отправки Email создана" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:414 msgid "Added new hook" msgstr "Добавлена новая ловушка" -#: kallithea/controllers/admin/settings.py:421 +#: kallithea/controllers/admin/settings.py:428 msgid "Updated hooks" msgstr "Обновлённые ловушки" -#: kallithea/controllers/admin/settings.py:425 +#: kallithea/controllers/admin/settings.py:432 msgid "Error occurred during hook creation" msgstr "произошла ошибка при создании хука" -#: kallithea/controllers/admin/settings.py:451 +#: kallithea/controllers/admin/settings.py:458 msgid "Whoosh reindex task scheduled" msgstr "Запланирована переиндексация базы Whoosh" @@ -1046,22 +1056,26 @@ msgid "Removed IP address from user whitelist" msgstr "Удален IP %s из белого списка пользователя" -#: kallithea/lib/auth.py:743 +#: kallithea/lib/auth.py:744 #, python-format msgid "IP %s not allowed" msgstr "IP %s заблокирован" -#: kallithea/lib/auth.py:756 +#: kallithea/lib/auth.py:757 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:812 +#: kallithea/lib/auth.py:785 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/auth.py:832 msgid "You need to be a registered user to perform this action" msgstr "" "Вы должны быть зарегистрированным пользователем, чтобы выполнить это " "действие" -#: kallithea/lib/auth.py:844 +#: kallithea/lib/auth.py:864 msgid "You need to be signed in to view this page" msgstr "Страница доступна только авторизованным пользователям" @@ -1069,8 +1083,10 @@ msgid "Repository not found in the filesystem" msgstr "Репозиторий не найден на файловой системе" -#: kallithea/lib/base.py:516 kallithea/lib/helpers.py:622 -msgid "Changeset not found" +#: kallithea/lib/base.py:516 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "Changeset for %s %s not found in %s" msgstr "Набор изменений не найден" #: kallithea/lib/diffs.py:66 @@ -1087,161 +1103,167 @@ msgid "No changes detected" msgstr "Изменений не обнаружено" -#: kallithea/lib/helpers.py:609 +#: kallithea/lib/helpers.py:610 #, python-format msgid "Deleted branch: %s" msgstr "Удалена ветка: %s" -#: kallithea/lib/helpers.py:611 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Created tag: %s" msgstr "Создан тег: %s" -#: kallithea/lib/helpers.py:671 +#: kallithea/lib/helpers.py:623 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "Changeset %s not found" +msgstr "Набор изменений не найден" + +#: kallithea/lib/helpers.py:672 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Показать отличия вместе %s->%s" -#: kallithea/lib/helpers.py:677 +#: kallithea/lib/helpers.py:678 #, fuzzy msgid "Compare view" msgstr "сравнение" -#: kallithea/lib/helpers.py:696 +#: kallithea/lib/helpers.py:697 msgid "and" msgstr "и" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:698 #, python-format msgid "%s more" msgstr "на %s больше" -#: kallithea/lib/helpers.py:698 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "версии" -#: kallithea/lib/helpers.py:722 +#: kallithea/lib/helpers.py:723 #, fuzzy, python-format msgid "Fork name %s" msgstr "имя форка %s" -#: kallithea/lib/helpers.py:742 +#: kallithea/lib/helpers.py:743 #, python-format msgid "Pull request %s" msgstr "Pull-запрос %s" -#: kallithea/lib/helpers.py:752 +#: kallithea/lib/helpers.py:753 msgid "[deleted] repository" msgstr "[удален] репозиторий" -#: kallithea/lib/helpers.py:754 kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 msgid "[created] repository" msgstr "[создан] репозиторий" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:757 msgid "[created] repository as fork" msgstr "[создан] репозиторий как форк" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 msgid "[forked] repository" msgstr "[форкнут] репозиторий" -#: kallithea/lib/helpers.py:760 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 msgid "[updated] repository" msgstr "[обновлён] репозиторий" -#: kallithea/lib/helpers.py:762 +#: kallithea/lib/helpers.py:763 msgid "[downloaded] archive from repository" msgstr "[загружен] архив из репозитория" -#: kallithea/lib/helpers.py:764 +#: kallithea/lib/helpers.py:765 msgid "[delete] repository" msgstr "[удален] репозиторий" -#: kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:773 msgid "[created] user" msgstr "[создан] пользователь" -#: kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:775 msgid "[updated] user" msgstr "[обновлён] пользователь" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:777 msgid "[created] user group" msgstr "[создана] группа пользователей" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:779 msgid "[updated] user group" msgstr "[обновлена] группа пользователей" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:781 msgid "[commented] on revision in repository" msgstr "[комментарий] к ревизии в репозитории" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:783 msgid "[commented] on pull request for" msgstr "[прокомментировано] в запросе на внесение изменений для" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:785 msgid "[closed] pull request for" msgstr "[закрыт] Pull-запрос для" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:787 msgid "[pushed] into" msgstr "[отправлено] в" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:789 msgid "[committed via Kallithea] into repository" msgstr "[внесены изменения с помощью Kallithea] в репозитории" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:791 msgid "[pulled from remote] into repository" msgstr "[внесены изменения из удалённого репозитория] в репозиторий" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:793 msgid "[pulled] from" msgstr "[внесены изменения] из" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:795 msgid "[started following] repository" msgstr "[добавлен в наблюдения] репозиторий" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:797 msgid "[stopped following] repository" msgstr "[удалён из наблюдения] репозиторий" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:1125 #, python-format msgid " and %s more" msgstr " и на %s больше" -#: kallithea/lib/helpers.py:1128 +#: kallithea/lib/helpers.py:1129 #: kallithea/templates/compare/compare_diff.html:65 #: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "Нет файлов" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:1195 msgid "new file" msgstr "новый файл" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:1198 msgid "mod" msgstr "изменён" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:1201 msgid "del" msgstr "удалён" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:1204 msgid "rename" msgstr "переименован" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:1209 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1444 +#: kallithea/lib/helpers.py:1445 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1419,7 +1441,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1665 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 msgid "Kallithea Administrator" msgstr "Администратор Kallithea" @@ -1530,7 +1552,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2229 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 msgid "Approved" msgstr "Одобрено" @@ -1545,7 +1567,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2230 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 msgid "Rejected" msgstr "Отклонено" @@ -1572,7 +1594,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1514 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 msgid "top level" msgstr "верхний уровень" @@ -1719,7 +1741,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1697 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 msgid "Registration disabled" msgstr "Регистрация отключена" @@ -1746,12 +1768,12 @@ msgstr "Регистрация пользователя с автоматической активацией" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1691 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 msgid "Repository creation enabled with write permission to a repository group" msgstr "" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 msgid "Repository creation disabled with write permission to a repository group" msgstr "" @@ -1764,107 +1786,108 @@ msgid "[Mention]" msgstr "[Упоминание]" -#: kallithea/model/db.py:1667 +#: kallithea/model/db.py:1668 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1668 -msgid "Default user has read access to new repositories" -msgstr "Неавторизованные пользователи имеют право чтения новых репозиториев" - #: kallithea/model/db.py:1669 -msgid "Default user has write access to new repositories" -msgstr "Неавторизованные пользователи имеют право записи в новые репозитории" +msgid "Default user has read access to new repositories" +msgstr "Неавторизованные пользователи имеют право чтения новых репозиториев" #: kallithea/model/db.py:1670 +msgid "Default user has write access to new repositories" +msgstr "Неавторизованные пользователи имеют право записи в новые репозитории" + +#: kallithea/model/db.py:1671 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1673 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1674 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1675 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1676 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1678 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1679 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1680 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1681 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 +#: kallithea/model/db.py:1683 msgid "Only admins can create repository groups" msgstr "Только администраторы могут создавать группы" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1684 #, fuzzy msgid "Non-admins can create repository groups" msgstr "Создана новая группа репозиториев %s" -#: kallithea/model/db.py:1685 +#: kallithea/model/db.py:1686 #, fuzzy msgid "Only admins can create user groups" msgstr "Создавать группы пользователей" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1687 #, fuzzy msgid "Non-admins can create user groups" msgstr "Создавать группы пользователей" -#: kallithea/model/db.py:1688 +#: kallithea/model/db.py:1689 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1690 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1694 -#, fuzzy -msgid "Only admins can fork repositories" -msgstr "Местонахождение репозиториев" - #: kallithea/model/db.py:1695 #, fuzzy -msgid "Non-admins can can fork repositories" +msgid "Only admins can fork repositories" +msgstr "Местонахождение репозиториев" + +#: kallithea/model/db.py:1696 +#, fuzzy +#| msgid "Non-admins can can fork repositories" +msgid "Non-admins can fork repositories" msgstr "Сбросить кэш для всех репозиториев" -#: kallithea/model/db.py:1698 -#, fuzzy -msgid "User registration with manual account activation" -msgstr "Регистрация пользователя с ручной активацией учётной записи" - #: kallithea/model/db.py:1699 #, fuzzy +msgid "User registration with manual account activation" +msgstr "Регистрация пользователя с ручной активацией учётной записи" + +#: kallithea/model/db.py:1700 +#, fuzzy msgid "User registration with automatic account activation" msgstr "Регистрация пользователя с автоматической активацией" -#: kallithea/model/db.py:2228 +#: kallithea/model/db.py:2238 #, fuzzy msgid "Not reviewed" msgstr "Не просмотрено" -#: kallithea/model/db.py:2231 +#: kallithea/model/db.py:2241 #, fuzzy msgid "Under review" msgstr "На рассмотрении" @@ -1891,89 +1914,87 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "%(user)s оставил комментарий к набору изменений %(age)s" -#: kallithea/model/notification.py:255 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s sent message %(age)s" msgstr "%(user)s отправил сообщение %(age)s" -#: kallithea/model/notification.py:256 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s mentioned you %(age)s" msgstr "%(user)s упомянул вас %(age)s" -#: kallithea/model/notification.py:257 +#: kallithea/model/notification.py:258 #, python-format msgid "%(user)s registered in Kallithea %(age)s" msgstr "%(user)s зарегистрировался в Kallithea %(age)s" -#: kallithea/model/notification.py:258 +#: kallithea/model/notification.py:259 #, python-format msgid "%(user)s opened new pull request %(age)s" msgstr "%(user)s открыл новый pull-запрос %(age)s" -#: kallithea/model/notification.py:259 +#: kallithea/model/notification.py:260 #, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "%(user)s оставил комментарий к pull-запросу %(age)s" -#: kallithea/model/notification.py:266 +#: kallithea/model/notification.py:267 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s оставил комментарий к набору изменений %(when)s" -#: kallithea/model/notification.py:267 +#: kallithea/model/notification.py:268 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s отправил сообщение %(when)s" -#: kallithea/model/notification.py:268 +#: kallithea/model/notification.py:269 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s упомянул вас %(when)s" -#: kallithea/model/notification.py:269 +#: kallithea/model/notification.py:270 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s зарегистрировался в Kallithea %(when)s" -#: kallithea/model/notification.py:270 +#: kallithea/model/notification.py:271 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s открыл новый pull-запрос %(when)s" -#: kallithea/model/notification.py:271 +#: kallithea/model/notification.py:272 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s оставил комментарий к pull-запросу %(when)s" -#: kallithea/model/notification.py:302 +#: kallithea/model/notification.py:303 #, python-format msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:306 #, python-format msgid "New user %(new_username)s registered" msgstr "Новый пользователь \"%(new_username)s\" зарегистрирован" -#: kallithea/model/notification.py:307 +#: kallithea/model/notification.py:308 #, fuzzy, python-format -#| msgid "%(user)s wants you to review pull request %(pr_nice_id)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 +#: kallithea/model/notification.py:309 #, 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 +#: kallithea/model/notification.py:322 msgid "Closing" msgstr "Закрыт" @@ -2032,7 +2053,6 @@ #: kallithea/model/user.py:408 #, fuzzy -#| msgid "Password reset link" msgid "Password reset notification" msgstr "Ссылка сброса пароля" @@ -2481,7 +2501,6 @@ #: kallithea/templates/password_reset.html:47 #, fuzzy -#| msgid "" " msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." @@ -2504,13 +2523,11 @@ #: 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 "Подтвердите новый пароль" @@ -3650,8 +3667,8 @@ "All actions done in this repository will be visible to everyone in the " "public journal." msgstr "" -"Все производимые с этим репозиторием действия будут отображаться в публичном " -"журнале." +"Все производимые с этим репозиторием действия будут отображаться в " +"публичном журнале." #: kallithea/templates/admin/repos/repo_edit_advanced.html:46 msgid "Change Locking" @@ -3665,6 +3682,11 @@ msgid "Unlock Repository" msgstr "Разблокировать репозиторий" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#, python-format +msgid "Locked by %s on %s" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Confirm to lock repository." msgstr "Подтвердите блокировку репозитория." @@ -4702,7 +4724,6 @@ #: kallithea/templates/base/root.html:31 #, fuzzy -#| msgid "on pull request" msgid "Open New Pull Request from {0}" msgstr "Комментарий в pull-запросе" @@ -4712,7 +4733,6 @@ #: kallithea/templates/base/root.html:33 #, fuzzy -#| msgid "Show Selected Changesets __S → __E" msgid "Show Selected Changesets {0} → {1}" msgstr "Показать выбранные наборы изменений: __S → __E" @@ -4877,7 +4897,7 @@ msgid "Branch %s" msgstr "Ветка %s" -#: kallithea/templates/changelog/changelog.html:310 +#: kallithea/templates/changelog/changelog.html:309 msgid "There are no changes yet" msgstr "Изменений ещё нет" @@ -5317,7 +5337,6 @@ #: kallithea/templates/email_templates/password_reset.html:6 #, 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 "Мы отправили запрос на создание нового пароля для вашего аккаунта." @@ -5861,8 +5880,9 @@ msgstr "%s Запросы на внесение изменений" #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 -#, python-format -msgid "Pull Requests from %s'" +#, fuzzy, python-format +#| msgid "Pull Requests from %s'" +msgid "Pull Requests from '%s'" msgstr "Pull-запросы от %s" #: kallithea/templates/pullrequests/pullrequest_show_all.html:13 @@ -6143,8 +6163,6 @@ #~ msgstr "Файлов нет" #~ msgid "" -#~ "_: \n" -#~ "" #~ msgstr "" #~ msgid "Username \"%(username)s\" is forbidden" @@ -6348,27 +6366,6 @@ #~ 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 "Ваш новый пароль" @@ -6386,8 +6383,7 @@ #~ msgid "Please ignore this email if you did not request a new password ." #~ msgstr "" -#~ "Пожалуйста, проигнорируйте данное сообщение, " -#~ "если вы не запрашивали новый пароль." #~ msgid "Created by" #~ msgstr "Создано" + diff -r de0a8b4fd5e0 -r da2a9107ee7c kallithea/i18n/sk/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po Thu Jul 13 12:26:01 2017 +0200 +++ b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po Tue Jul 25 16:43:29 2017 +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-09-08 10:34+0200\n" +"POT-Creation-Date: 2017-07-25 16:37+0200\n" "PO-Revision-Date: 2015-04-01 12:59+0200\n" "Last-Translator: Andrew Shadura \n" "Language-Team: Slovak " @@ -24,7 +24,7 @@ msgid "There are no changesets yet" msgstr "Zatiaľ nie sú žiadne zmeny" -#: kallithea/controllers/changelog.py:166 +#: kallithea/controllers/changelog.py:165 #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 @@ -36,7 +36,7 @@ msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(zatvorené)" @@ -150,7 +150,7 @@ msgstr "Tento repozitár bol uzamknutý používateľom %s dňa %s" #: kallithea/controllers/files.py:317 -msgid "You can only delete files with revision being a valid branch " +msgid "You can only delete files with revision being a valid branch" msgstr "" #: kallithea/controllers/files.py:328 @@ -169,7 +169,7 @@ msgstr "Došlo k chybe pri ukladaní" #: kallithea/controllers/files.py:377 -msgid "You can only edit files with revision being a valid branch " +msgid "You can only edit files with revision being a valid branch" msgstr "" #: kallithea/controllers/files.py:391 @@ -288,24 +288,24 @@ msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 #, fuzzy msgid "Bad captcha" msgstr "zlá captcha" -#: kallithea/controllers/login.py:157 +#: kallithea/controllers/login.py:152 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:202 +#: kallithea/controllers/login.py:197 msgid "A password reset confirmation code has been sent" msgstr "" +#: kallithea/controllers/login.py:246 +msgid "Invalid password reset token" +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" @@ -351,7 +351,7 @@ #: kallithea/controllers/pullrequests.py:366 #: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:509 +#: kallithea/controllers/pullrequests.py:510 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" @@ -395,46 +395,46 @@ msgid "Pull request update created" msgstr "" -#: kallithea/controllers/pullrequests.py:513 +#: kallithea/controllers/pullrequests.py:514 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:528 +#: kallithea/controllers/pullrequests.py:529 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:594 +#: kallithea/controllers/pullrequests.py:595 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:596 +#: kallithea/controllers/pullrequests.py:597 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:614 +#: kallithea/controllers/pullrequests.py:615 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:617 +#: kallithea/controllers/pullrequests.py:619 msgid "No changesets found for updating this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:625 +#: kallithea/controllers/pullrequests.py:627 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:631 +#: kallithea/controllers/pullrequests.py:633 msgid "Git pull requests don't support updates yet." msgstr "" -#: kallithea/controllers/pullrequests.py:722 +#: kallithea/controllers/pullrequests.py:724 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:729 msgid "Closing." msgstr "" @@ -668,7 +668,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1701 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 msgid "Manual activation of external account" msgstr "" @@ -680,7 +680,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1702 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 msgid "Automatic activation of external account" msgstr "" @@ -897,48 +897,54 @@ msgstr "" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:277 +#: kallithea/controllers/admin/settings.py:284 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:216 +#: kallithea/controllers/admin/settings.py:211 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:273 +#: kallithea/controllers/admin/settings.py:226 +#, fuzzy, python-format +#| msgid "Watched Repositories" +msgid "Invalidated %s repositories" +msgstr "Repozitáre" + +#: kallithea/controllers/admin/settings.py:280 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:337 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:335 +#: kallithea/controllers/admin/settings.py:342 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:361 +#: kallithea/controllers/admin/settings.py:368 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:383 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:414 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:421 +#: kallithea/controllers/admin/settings.py:428 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:425 +#: kallithea/controllers/admin/settings.py:432 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:451 +#: kallithea/controllers/admin/settings.py:458 msgid "Whoosh reindex task scheduled" msgstr "" @@ -1027,20 +1033,24 @@ msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:743 +#: kallithea/lib/auth.py:744 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:756 +#: kallithea/lib/auth.py:757 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:812 +#: kallithea/lib/auth.py:785 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/auth.py:832 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:844 +#: kallithea/lib/auth.py:864 msgid "You need to be signed in to view this page" msgstr "" @@ -1048,8 +1058,9 @@ msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:516 kallithea/lib/helpers.py:622 -msgid "Changeset not found" +#: kallithea/lib/base.py:516 +#, python-format +msgid "Changeset for %s %s not found in %s" msgstr "" #: kallithea/lib/diffs.py:66 @@ -1064,160 +1075,166 @@ msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:609 +#: kallithea/lib/helpers.py:610 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:611 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:671 +#: kallithea/lib/helpers.py:623 +#, fuzzy, python-format +#| msgid "Set changeset status" +msgid "Changeset %s not found" +msgstr "Zmeny" + +#: kallithea/lib/helpers.py:672 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:677 +#: kallithea/lib/helpers.py:678 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:696 -msgid "and" -msgstr "" - #: kallithea/lib/helpers.py:697 +msgid "and" +msgstr "" + +#: kallithea/lib/helpers.py:698 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:698 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:722 +#: kallithea/lib/helpers.py:723 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:742 +#: kallithea/lib/helpers.py:743 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:752 +#: kallithea/lib/helpers.py:753 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:754 kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:757 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:760 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:762 +#: kallithea/lib/helpers.py:763 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:764 +#: kallithea/lib/helpers.py:765 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:773 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:775 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:777 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:779 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:781 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:783 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:785 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:787 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:789 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:791 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:793 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:795 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:797 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:1125 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1128 +#: kallithea/lib/helpers.py:1129 #: kallithea/templates/compare/compare_diff.html:65 #: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:1195 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:1198 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:1201 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:1204 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:1209 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1444 +#: kallithea/lib/helpers.py:1445 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1392,7 +1409,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1665 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 msgid "Kallithea Administrator" msgstr "" @@ -1503,7 +1520,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2229 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 msgid "Approved" msgstr "" @@ -1518,7 +1535,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2230 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 msgid "Rejected" msgstr "" @@ -1545,7 +1562,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1514 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 msgid "top level" msgstr "" @@ -1692,7 +1709,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1697 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 msgid "Registration disabled" msgstr "" @@ -1719,12 +1736,12 @@ msgstr "" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1691 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 msgid "Repository creation enabled with write permission to a repository group" msgstr "" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 msgid "Repository creation disabled with write permission to a repository group" msgstr "" @@ -1737,102 +1754,103 @@ msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1667 +#: kallithea/model/db.py:1668 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1668 -msgid "Default user has read access to new repositories" -msgstr "" - #: kallithea/model/db.py:1669 -msgid "Default user has write access to new repositories" +msgid "Default user has read access to new repositories" msgstr "" #: kallithea/model/db.py:1670 +msgid "Default user has write access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1671 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1673 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1674 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1675 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1676 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1678 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1679 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1680 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1681 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 -msgid "Only admins can create repository groups" -msgstr "" - #: kallithea/model/db.py:1683 +msgid "Only admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1684 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1685 -msgid "Only admins can create user groups" -msgstr "" - #: kallithea/model/db.py:1686 +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1687 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1688 -msgid "Only admins can create top level repositories" -msgstr "" - #: kallithea/model/db.py:1689 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1690 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1694 -#, fuzzy -msgid "Only admins can fork repositories" -msgstr "Repozitáre" - #: kallithea/model/db.py:1695 #, fuzzy -msgid "Non-admins can can fork repositories" +msgid "Only admins can fork repositories" msgstr "Repozitáre" -#: kallithea/model/db.py:1698 -msgid "User registration with manual account activation" -msgstr "" +#: kallithea/model/db.py:1696 +#, fuzzy +#| msgid "Non-admins can can fork repositories" +msgid "Non-admins can fork repositories" +msgstr "Repozitáre" #: kallithea/model/db.py:1699 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1700 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2228 +#: kallithea/model/db.py:2238 #, fuzzy msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2231 +#: kallithea/model/db.py:2241 #, fuzzy msgid "Under review" msgstr "" @@ -1859,87 +1877,87 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "" -#: kallithea/model/notification.py:255 -#, python-format -msgid "%(user)s sent message %(age)s" -msgstr "" - #: kallithea/model/notification.py:256 #, python-format -msgid "%(user)s mentioned you %(age)s" +msgid "%(user)s sent message %(age)s" msgstr "" #: kallithea/model/notification.py:257 #, python-format -msgid "%(user)s registered in Kallithea %(age)s" +msgid "%(user)s mentioned you %(age)s" msgstr "" #: kallithea/model/notification.py:258 #, python-format -msgid "%(user)s opened new pull request %(age)s" +msgid "%(user)s registered in Kallithea %(age)s" msgstr "" #: kallithea/model/notification.py:259 #, python-format +msgid "%(user)s opened new pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:260 +#, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "" -#: kallithea/model/notification.py:266 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - #: kallithea/model/notification.py:267 #, python-format -msgid "%(user)s sent message at %(when)s" +msgid "%(user)s commented on changeset at %(when)s" msgstr "" #: kallithea/model/notification.py:268 #, python-format -msgid "%(user)s mentioned you at %(when)s" +msgid "%(user)s sent message at %(when)s" msgstr "" #: kallithea/model/notification.py:269 #, python-format -msgid "%(user)s registered in Kallithea at %(when)s" +msgid "%(user)s mentioned you at %(when)s" msgstr "" #: kallithea/model/notification.py:270 #, python-format -msgid "%(user)s opened new pull request at %(when)s" +msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" #: kallithea/model/notification.py:271 #, python-format +msgid "%(user)s opened new pull request at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:272 +#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:302 +#: kallithea/model/notification.py:303 #, python-format msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:306 #, python-format msgid "New user %(new_username)s registered" msgstr "" -#: kallithea/model/notification.py:307 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - #: kallithea/model/notification.py:308 #, python-format +msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgstr "" + +#: kallithea/model/notification.py:309 +#, python-format msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" -#: kallithea/model/notification.py:321 +#: kallithea/model/notification.py:322 msgid "Closing" msgstr "" @@ -3569,6 +3587,11 @@ msgid "Unlock Repository" msgstr "Odblokovať repozitár" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#, python-format +msgid "Locked by %s on %s" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Confirm to lock repository." msgstr "Potvrdenie blokovania repozitára." @@ -4599,7 +4622,6 @@ #: kallithea/templates/base/root.html:31 #, fuzzy -#| msgid "on pull request" msgid "Open New Pull Request from {0}" msgstr "Zmena stavu" @@ -4771,7 +4793,7 @@ msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:310 +#: kallithea/templates/changelog/changelog.html:309 msgid "There are no changes yet" msgstr "" @@ -5743,9 +5765,10 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 -#, python-format -msgid "Pull Requests from %s'" -msgstr "" +#, fuzzy, python-format +#| msgid "Open New Pull Request from {0}" +msgid "Pull Requests from '%s'" +msgstr "Zmena stavu" #: kallithea/templates/pullrequests/pullrequest_show_all.html:13 #, python-format @@ -6314,39 +6337,12 @@ #~ 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 "" @@ -6368,3 +6364,15 @@ #~ msgid "Created by" #~ msgstr "" +#~ msgid "You can only delete files with revision being a valid branch " +#~ msgstr "" + +#~ msgid "You can only edit files with revision being a valid branch " +#~ msgstr "" + +#~ msgid "Changeset not found" +#~ msgstr "" + +#~ msgid "Pull Requests from %s'" +#~ msgstr "" + diff -r de0a8b4fd5e0 -r da2a9107ee7c kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Thu Jul 13 12:26:01 2017 +0200 +++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Tue Jul 25 16:43:29 2017 +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-09-08 10:34+0200\n" +"POT-Creation-Date: 2017-07-25 16:37+0200\n" "PO-Revision-Date: 2014-12-12 14:19+0200\n" "Last-Translator: Michal Čihař \n" "Language-Team: Simplified Chinese " @@ -25,7 +25,7 @@ msgid "There are no changesets yet" msgstr "还没有修订集" -#: kallithea/controllers/changelog.py:166 +#: kallithea/controllers/changelog.py:165 #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 @@ -37,7 +37,7 @@ msgid "None" msgstr "无" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "" @@ -151,7 +151,7 @@ msgstr "版本库由%s于%s锁定" #: kallithea/controllers/files.py:317 -msgid "You can only delete files with revision being a valid branch " +msgid "You can only delete files with revision being a valid branch" msgstr "" #: kallithea/controllers/files.py:328 @@ -170,7 +170,7 @@ msgstr "提交时发生错误" #: kallithea/controllers/files.py:377 -msgid "You can only edit files with revision being a valid branch " +msgid "You can only edit files with revision being a valid branch" msgstr "" #: kallithea/controllers/files.py:391 @@ -289,27 +289,25 @@ msgid "Journal" msgstr "日志" -#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:157 +#: kallithea/controllers/login.py:152 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:202 -#, fuzzy -#| msgid "Your password reset link was sent" +#: kallithea/controllers/login.py:197 +#, fuzzy msgid "A password reset confirmation code has been sent" msgstr "密码重置链接已经发送" +#: kallithea/controllers/login.py:246 +#, fuzzy +msgid "Invalid password reset token" +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 "" @@ -356,7 +354,7 @@ #: kallithea/controllers/pullrequests.py:366 #: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:509 +#: kallithea/controllers/pullrequests.py:510 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" @@ -402,47 +400,47 @@ msgid "Pull request update created" msgstr "拉取请求检视人员" -#: kallithea/controllers/pullrequests.py:513 +#: kallithea/controllers/pullrequests.py:514 #, fuzzy msgid "Pull request updated" msgstr "拉取请求" -#: kallithea/controllers/pullrequests.py:528 +#: kallithea/controllers/pullrequests.py:529 msgid "Successfully deleted pull request" msgstr "成功删除拉取请求" -#: kallithea/controllers/pullrequests.py:594 +#: kallithea/controllers/pullrequests.py:595 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:596 +#: kallithea/controllers/pullrequests.py:597 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:614 +#: kallithea/controllers/pullrequests.py:615 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:617 +#: kallithea/controllers/pullrequests.py:619 msgid "No changesets found for updating this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:625 +#: kallithea/controllers/pullrequests.py:627 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:631 +#: kallithea/controllers/pullrequests.py:633 msgid "Git pull requests don't support updates yet." msgstr "" -#: kallithea/controllers/pullrequests.py:722 +#: kallithea/controllers/pullrequests.py:724 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:729 #, fuzzy msgid "Closing." msgstr "使用中" @@ -681,7 +679,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1701 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 msgid "Manual activation of external account" msgstr "" @@ -693,7 +691,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1702 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 msgid "Automatic activation of external account" msgstr "" @@ -910,48 +908,54 @@ msgstr "" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:277 +#: kallithea/controllers/admin/settings.py:284 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:216 +#: kallithea/controllers/admin/settings.py:211 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:273 +#: kallithea/controllers/admin/settings.py:226 +#, fuzzy, python-format +#| msgid "Invalidate Repository Cache" +msgid "Invalidated %s repositories" +msgstr "清除版本库缓存" + +#: kallithea/controllers/admin/settings.py:280 msgid "Updated application settings" msgstr "更新应用设置" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:337 msgid "Updated visualisation settings" msgstr "成功更新可视化设置" -#: kallithea/controllers/admin/settings.py:335 +#: kallithea/controllers/admin/settings.py:342 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:361 +#: kallithea/controllers/admin/settings.py:368 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:383 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:414 msgid "Added new hook" msgstr "新建钩子" -#: kallithea/controllers/admin/settings.py:421 +#: kallithea/controllers/admin/settings.py:428 msgid "Updated hooks" msgstr "更新钩子" -#: kallithea/controllers/admin/settings.py:425 +#: kallithea/controllers/admin/settings.py:432 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:451 +#: kallithea/controllers/admin/settings.py:458 msgid "Whoosh reindex task scheduled" msgstr "Whoosh重新索引任务调度" @@ -1040,20 +1044,24 @@ msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:743 +#: kallithea/lib/auth.py:744 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:756 +#: kallithea/lib/auth.py:757 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:812 +#: kallithea/lib/auth.py:785 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/auth.py:832 msgid "You need to be a registered user to perform this action" msgstr "必须是注册用户才能进行此操作" -#: kallithea/lib/auth.py:844 +#: kallithea/lib/auth.py:864 msgid "You need to be signed in to view this page" msgstr "必须登录才能访问该页面" @@ -1061,8 +1069,10 @@ msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:516 kallithea/lib/helpers.py:622 -msgid "Changeset not found" +#: kallithea/lib/base.py:516 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "Changeset for %s %s not found in %s" msgstr "未找到修订集" #: kallithea/lib/diffs.py:66 @@ -1077,161 +1087,167 @@ msgid "No changes detected" msgstr "未发现差异" -#: kallithea/lib/helpers.py:609 +#: kallithea/lib/helpers.py:610 #, python-format msgid "Deleted branch: %s" msgstr "已经删除分支%s" -#: kallithea/lib/helpers.py:611 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Created tag: %s" msgstr "创建标签%s" -#: kallithea/lib/helpers.py:671 +#: kallithea/lib/helpers.py:623 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "Changeset %s not found" +msgstr "未找到修订集" + +#: kallithea/lib/helpers.py:672 #, python-format msgid "Show all combined changesets %s->%s" msgstr "显示合并的修订集%s->%s" -#: kallithea/lib/helpers.py:677 +#: kallithea/lib/helpers.py:678 #, fuzzy msgid "Compare view" msgstr "比较显示" -#: kallithea/lib/helpers.py:696 +#: kallithea/lib/helpers.py:697 msgid "and" msgstr "还有" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:698 #, python-format msgid "%s more" msgstr "%s个" -#: kallithea/lib/helpers.py:698 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "修订" -#: kallithea/lib/helpers.py:722 +#: kallithea/lib/helpers.py:723 #, fuzzy, python-format msgid "Fork name %s" msgstr "复刻名称%s" -#: kallithea/lib/helpers.py:742 +#: kallithea/lib/helpers.py:743 #, fuzzy, python-format msgid "Pull request %s" msgstr "拉取请求#%s" -#: kallithea/lib/helpers.py:752 +#: kallithea/lib/helpers.py:753 msgid "[deleted] repository" msgstr "[删除]版本库" -#: kallithea/lib/helpers.py:754 kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 msgid "[created] repository" msgstr "[创建]版本库" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:757 msgid "[created] repository as fork" msgstr "[创建]复刻版本库" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 msgid "[forked] repository" msgstr "[复刻]版本库" -#: kallithea/lib/helpers.py:760 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 msgid "[updated] repository" msgstr "[更新]版本库" -#: kallithea/lib/helpers.py:762 +#: kallithea/lib/helpers.py:763 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:764 +#: kallithea/lib/helpers.py:765 msgid "[delete] repository" msgstr "[删除]版本库" -#: kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:773 msgid "[created] user" msgstr "[创建]用户" -#: kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:775 msgid "[updated] user" msgstr "[更新]用户" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:777 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:779 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:781 msgid "[commented] on revision in repository" msgstr "[评论]了版本库中的修订" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:783 msgid "[commented] on pull request for" msgstr "[评论]拉取请求" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:785 msgid "[closed] pull request for" msgstr "[关闭] 拉取请求" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:787 msgid "[pushed] into" msgstr "[推送]到" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:789 msgid "[committed via Kallithea] into repository" msgstr "[通过Kallithea提交]到版本库" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:791 msgid "[pulled from remote] into repository" msgstr "[远程拉取]到版本库" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:793 msgid "[pulled] from" msgstr "[拉取]自" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:795 msgid "[started following] repository" msgstr "[开始关注]版本库" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:797 msgid "[stopped following] repository" msgstr "[停止关注]版本库" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:1125 #, python-format msgid " and %s more" msgstr " 还有%s个" -#: kallithea/lib/helpers.py:1128 +#: kallithea/lib/helpers.py:1129 #: kallithea/templates/compare/compare_diff.html:65 #: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "无文件" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:1195 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:1198 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:1201 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:1204 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:1209 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1444 +#: kallithea/lib/helpers.py:1445 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1394,7 +1410,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1665 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 msgid "Kallithea Administrator" msgstr "Kallithea 管理员" @@ -1505,7 +1521,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2229 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 msgid "Approved" msgstr "已批准" @@ -1520,7 +1536,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2230 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 msgid "Rejected" msgstr "驳回" @@ -1547,7 +1563,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1514 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 msgid "top level" msgstr "" @@ -1694,7 +1710,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1697 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 msgid "Registration disabled" msgstr "" @@ -1721,12 +1737,12 @@ msgstr "" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1691 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 msgid "Repository creation enabled with write permission to a repository group" msgstr "" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 msgid "Repository creation disabled with write permission to a repository group" msgstr "" @@ -1739,106 +1755,107 @@ msgid "[Mention]" msgstr "[提及]" -#: kallithea/model/db.py:1667 +#: kallithea/model/db.py:1668 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1668 +#: kallithea/model/db.py:1669 #, fuzzy msgid "Default user has read access to new repositories" msgstr "未授权的资源访问" -#: kallithea/model/db.py:1669 -#, fuzzy -msgid "Default user has write access to new repositories" -msgstr "未授权的资源访问" - #: kallithea/model/db.py:1670 +#, fuzzy +msgid "Default user has write access to new repositories" +msgstr "未授权的资源访问" + +#: kallithea/model/db.py:1671 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1673 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1674 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1675 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1676 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1678 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1679 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1680 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1681 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 +#: kallithea/model/db.py:1683 #, fuzzy msgid "Only admins can create repository groups" msgstr "没有在该版本库组中创建版本库的权限" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1684 #, fuzzy msgid "Non-admins can create repository groups" msgstr "没有在该版本库组中创建版本库的权限" -#: kallithea/model/db.py:1685 +#: kallithea/model/db.py:1686 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1687 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1688 -msgid "Only admins can create top level repositories" -msgstr "" - #: kallithea/model/db.py:1689 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1690 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1694 +#: kallithea/model/db.py:1695 #, fuzzy msgid "Only admins can fork repositories" msgstr "创建版本库" -#: kallithea/model/db.py:1695 -#, fuzzy -msgid "Non-admins can can fork repositories" +#: kallithea/model/db.py:1696 +#, fuzzy +#| msgid "Non-admins can can fork repositories" +msgid "Non-admins can fork repositories" msgstr "创建版本库" -#: kallithea/model/db.py:1698 -msgid "User registration with manual account activation" -msgstr "" - #: kallithea/model/db.py:1699 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1700 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2228 +#: kallithea/model/db.py:2238 #, fuzzy msgid "Not reviewed" msgstr "未检视" -#: kallithea/model/db.py:2231 +#: kallithea/model/db.py:2241 #, fuzzy msgid "Under review" msgstr "检视中" @@ -1865,88 +1882,87 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "" -#: kallithea/model/notification.py:255 -#, python-format -msgid "%(user)s sent message %(age)s" -msgstr "" - #: kallithea/model/notification.py:256 #, python-format -msgid "%(user)s mentioned you %(age)s" +msgid "%(user)s sent message %(age)s" msgstr "" #: kallithea/model/notification.py:257 #, python-format -msgid "%(user)s registered in Kallithea %(age)s" +msgid "%(user)s mentioned you %(age)s" msgstr "" #: kallithea/model/notification.py:258 -#, fuzzy, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "成功提交拉取请求" +#, python-format +msgid "%(user)s registered in Kallithea %(age)s" +msgstr "" #: kallithea/model/notification.py:259 #, fuzzy, python-format +msgid "%(user)s opened new pull request %(age)s" +msgstr "成功提交拉取请求" + +#: kallithea/model/notification.py:260 +#, fuzzy, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "[评论]拉取请求" -#: kallithea/model/notification.py:266 +#: kallithea/model/notification.py:267 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "" -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - #: kallithea/model/notification.py:268 #, python-format -msgid "%(user)s mentioned you at %(when)s" +msgid "%(user)s sent message at %(when)s" msgstr "" #: kallithea/model/notification.py:269 #, python-format -msgid "%(user)s registered in Kallithea at %(when)s" +msgid "%(user)s mentioned you at %(when)s" msgstr "" #: kallithea/model/notification.py:270 #, python-format -msgid "%(user)s opened new pull request at %(when)s" +msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" #: kallithea/model/notification.py:271 #, python-format +msgid "%(user)s opened new pull request at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:272 +#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:302 +#: kallithea/model/notification.py:303 #, python-format msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:306 #, fuzzy, python-format msgid "New user %(new_username)s registered" msgstr "用户名称 %(new_username)s 无效" -#: kallithea/model/notification.py:307 +#: kallithea/model/notification.py:308 #, python-format msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" -#: kallithea/model/notification.py:308 +#: kallithea/model/notification.py:309 #, 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 +#: kallithea/model/notification.py:322 #, fuzzy msgid "Closing" msgstr "使用中" @@ -1996,7 +2012,6 @@ #: kallithea/model/user.py:408 #, fuzzy -#| msgid "Password confirmation" msgid "Password reset notification" msgstr "确认密码" @@ -2435,8 +2450,6 @@ #: kallithea/templates/password_reset.html:47 #, fuzzy -#| 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." @@ -2459,13 +2472,11 @@ #: 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 "新密码" @@ -3614,6 +3625,11 @@ msgid "Unlock Repository" msgstr "公共版本库" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#, python-format +msgid "Locked by %s on %s" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 #, fuzzy msgid "Confirm to lock repository." @@ -4667,7 +4683,6 @@ #: kallithea/templates/base/root.html:31 #, fuzzy -#| msgid "on pull request" msgid "Open New Pull Request from {0}" msgstr "[评论]拉取请求" @@ -4677,7 +4692,6 @@ #: kallithea/templates/base/root.html:33 #, fuzzy -#| msgid "Show Selected Changeset __S" msgid "Show Selected Changesets {0} → {1}" msgstr "显示合并的修订集%s->%s" @@ -4844,7 +4858,7 @@ msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:310 +#: kallithea/templates/changelog/changelog.html:309 msgid "There are no changes yet" msgstr "没有任何变更" @@ -5277,7 +5291,6 @@ #: kallithea/templates/email_templates/password_reset.html:6 #, 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 "我们收到重置你用户密码的请求。" @@ -5829,7 +5842,8 @@ #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, fuzzy, python-format -msgid "Pull Requests from %s'" +#| msgid "Pull Requests from %s'" +msgid "Pull Requests from '%s'" msgstr "拉取请求#%s" #: kallithea/templates/pullrequests/pullrequest_show_all.html:13 @@ -6124,7 +6138,7 @@ #~ msgstr "没有文件" #~ msgid "" -#~ msgstr "在文本中使用 @用户名 以发送通知到该Kallithea用户" +#~ msgstr "" #~ msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" #~ msgstr "" @@ -6348,27 +6362,6 @@ #~ 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 "" @@ -6390,3 +6383,9 @@ #~ msgid "Created by" #~ msgstr "创建于" +#~ msgid "You can only delete files with revision being a valid branch " +#~ msgstr "" + +#~ msgid "You can only edit files with revision being a valid branch " +#~ msgstr "" + diff -r de0a8b4fd5e0 -r da2a9107ee7c kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Thu Jul 13 12:26:01 2017 +0200 +++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Tue Jul 25 16:43:29 2017 +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-09-08 10:34+0200\n" +"POT-Creation-Date: 2017-07-25 16:37+0200\n" "PO-Revision-Date: 2017-03-10 18:26+0000\n" "Last-Translator: mao \n" "Language-Team: Chinese (Traditional) " @@ -24,7 +24,7 @@ msgid "There are no changesets yet" msgstr "" -#: kallithea/controllers/changelog.py:166 +#: kallithea/controllers/changelog.py:165 #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 @@ -36,7 +36,7 @@ msgid "None" msgstr "無" -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "（已關閉）" @@ -149,7 +149,7 @@ msgstr "" #: kallithea/controllers/files.py:317 -msgid "You can only delete files with revision being a valid branch " +msgid "You can only delete files with revision being a valid branch" msgstr "" #: kallithea/controllers/files.py:328 @@ -168,7 +168,7 @@ msgstr "" #: kallithea/controllers/files.py:377 -msgid "You can only edit files with revision being a valid branch " +msgid "You can only edit files with revision being a valid branch" msgstr "" #: kallithea/controllers/files.py:391 @@ -287,23 +287,23 @@ msgid "Journal" msgstr "日誌" -#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:157 +#: kallithea/controllers/login.py:152 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:202 +#: kallithea/controllers/login.py:197 msgid "A password reset confirmation code has been sent" msgstr "密碼重設的確認碼已寄出" -#: kallithea/controllers/login.py:251 +#: kallithea/controllers/login.py:246 msgid "Invalid password reset token" msgstr "無效的密碼重設確認碼" -#: kallithea/controllers/login.py:256 +#: kallithea/controllers/login.py:251 #: kallithea/controllers/admin/my_account.py:167 msgid "Successfully updated password" msgstr "" @@ -349,7 +349,7 @@ #: kallithea/controllers/pullrequests.py:366 #: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:509 +#: kallithea/controllers/pullrequests.py:510 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" @@ -393,46 +393,46 @@ msgid "Pull request update created" msgstr "" -#: kallithea/controllers/pullrequests.py:513 +#: kallithea/controllers/pullrequests.py:514 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:528 +#: kallithea/controllers/pullrequests.py:529 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:594 +#: kallithea/controllers/pullrequests.py:595 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:596 +#: kallithea/controllers/pullrequests.py:597 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:614 +#: kallithea/controllers/pullrequests.py:615 #, python-format msgid "This pull request can be updated with changes on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:617 +#: kallithea/controllers/pullrequests.py:619 msgid "No changesets found for updating this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:625 +#: kallithea/controllers/pullrequests.py:627 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:631 +#: kallithea/controllers/pullrequests.py:633 msgid "Git pull requests don't support updates yet." msgstr "" -#: kallithea/controllers/pullrequests.py:722 +#: kallithea/controllers/pullrequests.py:724 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:729 msgid "Closing." msgstr "關閉中。" @@ -666,7 +666,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1701 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 msgid "Manual activation of external account" msgstr "" @@ -678,7 +678,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1702 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 msgid "Automatic activation of external account" msgstr "" @@ -893,48 +893,54 @@ msgstr "" #: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:277 +#: kallithea/controllers/admin/settings.py:284 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:216 +#: kallithea/controllers/admin/settings.py:211 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:273 +#: kallithea/controllers/admin/settings.py:226 +#, fuzzy, python-format +#| msgid "Invalidate Repository Cache" +msgid "Invalidated %s repositories" +msgstr "確認廢止版本庫快取" + +#: kallithea/controllers/admin/settings.py:280 msgid "Updated application settings" msgstr "更新應用設定" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:337 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:335 +#: kallithea/controllers/admin/settings.py:342 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:361 +#: kallithea/controllers/admin/settings.py:368 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:383 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:414 msgid "Added new hook" msgstr "新增hook" -#: kallithea/controllers/admin/settings.py:421 +#: kallithea/controllers/admin/settings.py:428 msgid "Updated hooks" msgstr "更新hook" -#: kallithea/controllers/admin/settings.py:425 +#: kallithea/controllers/admin/settings.py:432 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:451 +#: kallithea/controllers/admin/settings.py:458 msgid "Whoosh reindex task scheduled" msgstr "Whoosh 重新索引工作排程" @@ -1023,20 +1029,24 @@ msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:743 +#: kallithea/lib/auth.py:744 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:756 +#: kallithea/lib/auth.py:757 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:812 +#: kallithea/lib/auth.py:785 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/auth.py:832 msgid "You need to be a registered user to perform this action" msgstr "您必須是註冊使用者才能執行這個動作" -#: kallithea/lib/auth.py:844 +#: kallithea/lib/auth.py:864 msgid "You need to be signed in to view this page" msgstr "您必須登入後才能瀏覽這個頁面" @@ -1044,8 +1054,9 @@ msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:516 kallithea/lib/helpers.py:622 -msgid "Changeset not found" +#: kallithea/lib/base.py:516 +#, python-format +msgid "Changeset for %s %s not found in %s" msgstr "" #: kallithea/lib/diffs.py:66 @@ -1060,160 +1071,166 @@ msgid "No changes detected" msgstr "尚未有任何變更" -#: kallithea/lib/helpers.py:609 +#: kallithea/lib/helpers.py:610 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:611 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:671 +#: kallithea/lib/helpers.py:623 +#, fuzzy, python-format +#| msgid "Set changeset status" +msgid "Changeset %s not found" +msgstr "尚未有任何變更" + +#: kallithea/lib/helpers.py:672 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:677 +#: kallithea/lib/helpers.py:678 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:696 -msgid "and" -msgstr "和" - #: kallithea/lib/helpers.py:697 +msgid "and" +msgstr "和" + +#: kallithea/lib/helpers.py:698 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:698 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "修訂" -#: kallithea/lib/helpers.py:722 +#: kallithea/lib/helpers.py:723 #, python-format msgid "Fork name %s" msgstr "分支名稱 %s" -#: kallithea/lib/helpers.py:742 +#: kallithea/lib/helpers.py:743 #, python-format msgid "Pull request %s" msgstr "提取要求 %s" -#: kallithea/lib/helpers.py:752 +#: kallithea/lib/helpers.py:753 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:754 kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:757 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:760 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:762 +#: kallithea/lib/helpers.py:763 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:764 +#: kallithea/lib/helpers.py:765 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:773 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:775 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:777 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:779 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:781 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:783 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:785 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:787 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:789 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:791 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:793 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:795 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:797 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:1125 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1128 +#: kallithea/lib/helpers.py:1129 #: kallithea/templates/compare/compare_diff.html:65 #: kallithea/templates/pullrequests/pullrequest_show.html:326 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:1195 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:1198 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:1201 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:1204 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:1209 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1444 +#: kallithea/lib/helpers.py:1445 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1376,7 +1393,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1665 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 msgid "Kallithea Administrator" msgstr "" @@ -1487,7 +1504,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2229 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 msgid "Approved" msgstr "" @@ -1502,7 +1519,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2230 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 msgid "Rejected" msgstr "" @@ -1529,7 +1546,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1514 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 msgid "top level" msgstr "" @@ -1676,7 +1693,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1697 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 msgid "Registration disabled" msgstr "" @@ -1703,12 +1720,12 @@ msgstr "" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1691 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 msgid "Repository creation enabled with write permission to a repository group" msgstr "" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 msgid "Repository creation disabled with write permission to a repository group" msgstr "" @@ -1721,99 +1738,101 @@ msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1667 +#: kallithea/model/db.py:1668 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1668 -msgid "Default user has read access to new repositories" -msgstr "" - #: kallithea/model/db.py:1669 -msgid "Default user has write access to new repositories" +msgid "Default user has read access to new repositories" msgstr "" #: kallithea/model/db.py:1670 +msgid "Default user has write access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1671 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1673 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1674 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1675 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1676 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1678 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1679 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1680 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1681 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 -msgid "Only admins can create repository groups" -msgstr "" - #: kallithea/model/db.py:1683 +msgid "Only admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1684 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1685 -msgid "Only admins can create user groups" -msgstr "" - #: kallithea/model/db.py:1686 +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1687 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1688 -msgid "Only admins can create top level repositories" -msgstr "" - #: kallithea/model/db.py:1689 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1690 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1694 -msgid "Only admins can fork repositories" -msgstr "祗有管理者才能分歧版本庫" - #: kallithea/model/db.py:1695 -msgid "Non-admins can can fork repositories" +msgid "Only admins can fork repositories" +msgstr "祗有管理者才能分歧版本庫" + +#: kallithea/model/db.py:1696 +#, fuzzy +#| msgid "Non-admins can can fork repositories" +msgid "Non-admins can fork repositories" msgstr "非管理者可以建立分歧版本庫" -#: kallithea/model/db.py:1698 -msgid "User registration with manual account activation" -msgstr "" - #: kallithea/model/db.py:1699 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1700 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2228 +#: kallithea/model/db.py:2238 msgid "Not reviewed" msgstr "未審核" -#: kallithea/model/db.py:2231 +#: kallithea/model/db.py:2241 msgid "Under review" msgstr "審核中" @@ -1839,87 +1858,87 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "" -#: kallithea/model/notification.py:255 -#, python-format -msgid "%(user)s sent message %(age)s" -msgstr "" - #: kallithea/model/notification.py:256 #, python-format -msgid "%(user)s mentioned you %(age)s" +msgid "%(user)s sent message %(age)s" msgstr "" #: kallithea/model/notification.py:257 #, python-format -msgid "%(user)s registered in Kallithea %(age)s" +msgid "%(user)s mentioned you %(age)s" msgstr "" #: kallithea/model/notification.py:258 #, python-format -msgid "%(user)s opened new pull request %(age)s" +msgid "%(user)s registered in Kallithea %(age)s" msgstr "" #: kallithea/model/notification.py:259 #, python-format +msgid "%(user)s opened new pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:260 +#, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "" -#: kallithea/model/notification.py:266 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - #: kallithea/model/notification.py:267 #, python-format -msgid "%(user)s sent message at %(when)s" +msgid "%(user)s commented on changeset at %(when)s" msgstr "" #: kallithea/model/notification.py:268 #, python-format -msgid "%(user)s mentioned you at %(when)s" +msgid "%(user)s sent message at %(when)s" msgstr "" #: kallithea/model/notification.py:269 #, python-format -msgid "%(user)s registered in Kallithea at %(when)s" +msgid "%(user)s mentioned you at %(when)s" msgstr "" #: kallithea/model/notification.py:270 #, python-format -msgid "%(user)s opened new pull request at %(when)s" +msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" #: kallithea/model/notification.py:271 #, python-format +msgid "%(user)s opened new pull request at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:272 +#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:302 +#: kallithea/model/notification.py:303 #, python-format msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "" -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:306 #, python-format msgid "New user %(new_username)s registered" msgstr "" -#: kallithea/model/notification.py:307 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - #: kallithea/model/notification.py:308 #, python-format +msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgstr "" + +#: kallithea/model/notification.py:309 +#, python-format msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" -#: kallithea/model/notification.py:321 +#: kallithea/model/notification.py:322 msgid "Closing" msgstr "關閉中" @@ -2401,7 +2420,6 @@ #: kallithea/templates/password_reset.html:47 #, fuzzy -#| msgid "" " msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." @@ -2424,13 +2442,11 @@ #: 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 "新密碼" @@ -3571,6 +3587,11 @@ msgid "Unlock Repository" msgstr "公開的版本庫" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#, python-format +msgid "Locked by %s on %s" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 #, fuzzy msgid "Confirm to lock repository." @@ -4785,7 +4806,7 @@ msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:310 +#: kallithea/templates/changelog/changelog.html:309 msgid "There are no changes yet" msgstr "尚未有任何變更" @@ -5752,9 +5773,10 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 -#, python-format -msgid "Pull Requests from %s'" -msgstr "" +#, fuzzy, python-format +#| msgid "Pull request %s" +msgid "Pull Requests from '%s'" +msgstr "提取要求 %s" #: kallithea/templates/pullrequests/pullrequest_show_all.html:13 #, python-format @@ -6306,27 +6328,6 @@ #~ 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 "" @@ -6353,3 +6354,16 @@ #~ msgid "Created by" #~ msgstr "" + +#~ msgid "You can only delete files with revision being a valid branch " +#~ msgstr "" + +#~ msgid "You can only edit files with revision being a valid branch " +#~ msgstr "" + +#~ msgid "Changeset not found" +#~ msgstr "" + +#~ msgid "Pull Requests from %s'" +#~ msgstr "" +